From 13ffe69dfa3af6f54aa412d7536fdcc8617b9627 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 28 Mar 2009 12:39:13 -0400 Subject: recode PlayerPlugin to be a ClientPlugin --- sigencore/plugins/CMakeLists.txt | 2 ++ sigencore/plugins/ClientPlugin.cpp | 40 +++++++++++++++++++------------------- sigencore/plugins/ClientPlugin.h | 18 ++++++++--------- sigencore/plugins/ClientPlugin_p.h | 16 +++++++-------- 4 files changed, 39 insertions(+), 37 deletions(-) (limited to 'sigencore') diff --git a/sigencore/plugins/CMakeLists.txt b/sigencore/plugins/CMakeLists.txt index 869a3321..0ab6e649 100644 --- a/sigencore/plugins/CMakeLists.txt +++ b/sigencore/plugins/CMakeLists.txt @@ -3,12 +3,14 @@ project(plugins) set(sigencoreplugins_HEADERS ArenaPlugin.h CanvasPlugin.h + ClientPlugin.h PluginBase.h Global.h ) set(sigencoreplugins_SRCS ArenaPlugin.cpp CanvasPlugin.cpp + ClientPlugin.cpp PluginBase.cpp ) set(sigencoreplugins_SERVICETYPES diff --git a/sigencore/plugins/ClientPlugin.cpp b/sigencore/plugins/ClientPlugin.cpp index d9f577a0..abf9d184 100644 --- a/sigencore/plugins/ClientPlugin.cpp +++ b/sigencore/plugins/ClientPlugin.cpp @@ -16,11 +16,11 @@ */ // Header include -#include "PlayerPlugin.h" -#include "PlayerPlugin_p.h" +#include "ClientPlugin.h" +#include "ClientPlugin_p.h" // Sigencore includes -#include +#include // Qt includes #include @@ -29,52 +29,52 @@ using namespace Sigscript; using namespace Sigencore; using namespace Sigencore::Plugins; -PlayerPlugin::PlayerPlugin(QObject* parent, const QVariantList& args) : +ClientPlugin::ClientPlugin(QObject* parent, const QVariantList& args) : PluginBase(parent, args), d(new Private(this, args)) { } -PlayerPlugin::~PlayerPlugin() +ClientPlugin::~ClientPlugin() { delete d; } -Player* PlayerPlugin::getPlayer(const QString& name, GameWrapper* game, Config* parent) +Client* ClientPlugin::getClient(const QString& name, GameWrapper* game, Config* parent) { - Player* player = createPlayer(name, game, parent); - if (player) + Client* client = createClient(name, game, parent); + if (client) { ++m_count; - d->addPlayer(player); + d->addClient(client); } - return player; + return client; } -PlayerPlugin::Private::Private(PlayerPlugin* plugin, const QVariantList& args) : +ClientPlugin::Private::Private(ClientPlugin* plugin, const QVariantList& args) : q(plugin), m_mapper(new QSignalMapper(this)) { Q_UNUSED(args) - connect(m_mapper, SIGNAL(mapped(QObject*)), this, SLOT(cleanupPlayer(QObject*))); + connect(m_mapper, SIGNAL(mapped(QObject*)), this, SLOT(cleanupClient(QObject*))); } -PlayerPlugin::Private::~Private() +ClientPlugin::Private::~Private() { } -void PlayerPlugin::Private::addPlayer(Player* player) +void ClientPlugin::Private::addClient(Client* client) { - connect(player, SIGNAL(cleanupPlayer()), m_mapper, SLOT(map())); - m_mapper->setMapping(player, player); + connect(client, SIGNAL(cleanupClient()), m_mapper, SLOT(map())); + m_mapper->setMapping(client, client); } -void PlayerPlugin::Private::cleanupPlayer(QObject* object) +void ClientPlugin::Private::cleanupClient(QObject* object) { - Player* player = qobject_cast(object); - if (player) + Client* client = qobject_cast(object); + if (client) { - q->cleanupPlayer(player); + q->cleanupClient(client); --q->m_count; } } diff --git a/sigencore/plugins/ClientPlugin.h b/sigencore/plugins/ClientPlugin.h index 0a9ca054..0bb0c521 100644 --- a/sigencore/plugins/ClientPlugin.h +++ b/sigencore/plugins/ClientPlugin.h @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#ifndef SIGENCOREPLUGINS_PLAYERPLUGIN -#define SIGENCOREPLUGINS_PLAYERPLUGIN +#ifndef SIGENCOREPLUGINS_CLIENTPLUGIN +#define SIGENCOREPLUGINS_CLIENTPLUGIN // Plugin includes #include "PluginBase.h" @@ -33,27 +33,27 @@ class GameWrapper; namespace Sigencore { -class Player; +class Client; namespace Plugins { -class SIGENCOREPLUGINS_EXPORT PlayerPlugin : public PluginBase +class SIGENCOREPLUGINS_EXPORT ClientPlugin : public PluginBase { Q_OBJECT public: - PlayerPlugin(QObject* parent, const QVariantList& args); - virtual ~PlayerPlugin(); + ClientPlugin(QObject* parent, const QVariantList& args); + virtual ~ClientPlugin(); - Player* getPlayer(const QString& name, Sigscript::GameWrapper* game, Sigscript::Config* parent); + Client* getClient(const QString& name, Sigscript::GameWrapper* game, Sigscript::Config* parent); virtual QStringList classList() const = 0; virtual QString description(const QString& name) const = 0; virtual QIcon icon(const QString& name) = 0; protected: - virtual Player* createPlayer(const QString& name, Sigscript::GameWrapper* game, Sigscript::Config* parent) = 0; + virtual Client* createClient(const QString& name, Sigscript::GameWrapper* game, Sigscript::Config* parent) = 0; protected slots: - virtual void cleanupPlayer(Sigencore::Player* player) = 0; + virtual void cleanupClient(Sigencore::Client* client) = 0; private: class Private; Private* const d; diff --git a/sigencore/plugins/ClientPlugin_p.h b/sigencore/plugins/ClientPlugin_p.h index 33888984..2f9331fc 100644 --- a/sigencore/plugins/ClientPlugin_p.h +++ b/sigencore/plugins/ClientPlugin_p.h @@ -15,11 +15,11 @@ * with this program. If not, see . */ -#ifndef SIGENCOREPLUGINS_PLAYERPLUGIN_P -#define SIGENCOREPLUGINS_PLAYERPLUGIN_P +#ifndef SIGENCOREPLUGINS_CLIENTPLUGIN_P +#define SIGENCOREPLUGINS_CLIENTPLUGIN_P // Header include -#include "PlayerPlugin.h" +#include "ClientPlugin.h" // Forward declarations class QSignalMapper; @@ -28,20 +28,20 @@ namespace Sigencore { namespace Plugins { -class SIGENCOREPLUGINS_NO_EXPORT PlayerPlugin::Private : public QObject +class SIGENCOREPLUGINS_NO_EXPORT ClientPlugin::Private : public QObject { Q_OBJECT public: - Private(PlayerPlugin* plugin, const QVariantList& args); + Private(ClientPlugin* plugin, const QVariantList& args); ~Private(); - void addPlayer(Player* player); + void addClient(Client* client); private: - PlayerPlugin* const q; + ClientPlugin* const q; QSignalMapper* m_mapper; private slots: - void cleanupPlayer(QObject* object); + void cleanupClient(QObject* object); }; } } -- cgit