Update PluginLoader to handle clients, not players

2 files changed, 17 insertions, 17 deletions

diff --git a/sigtools/PluginLoader.cpp b/sigtools/PluginLoader.cpp
index 9d36b100..37eb9bc6 100644
--- a/sigtools/PluginLoader.cpp
+++ b/sigtools/PluginLoader.cpp
@@ -22,7 +22,7 @@
 // Sigencore plugin includes
 #include <sigencore/plugins/ArenaPlugin.h>
 #include <sigencore/plugins/CanvasPlugin.h>
-#include <sigencore/plugins/PlayerPlugin.h>
+#include <sigencore/plugins/ClientPlugin.h>
 #include <sigencore/plugins/PluginBase.h>
 
 // Sigmod includes
@@ -73,32 +73,32 @@ QIcon PluginLoader::icon(const QString& type, const QString& name)
     return QIcon();
 }
 
-QSharedPointer<Game> PluginLoader::game(const QString& name)
+QSharedPointer<Game> PluginLoader::game(const QString& game)
 {
-    return loader->game(name);
+    return loader->game(game);
 }
 
-Arena* PluginLoader::arena(const QString& name, GameWrapper* game, Config* parent)
+Arena* PluginLoader::arena(const QString& arena, GameWrapper* game, Config* parent)
 {
-    ArenaPlugin* plugin = qobject_cast<ArenaPlugin*>(loader->factory("Arena", name));
+    ArenaPlugin* plugin = qobject_cast<ArenaPlugin*>(loader->factory("Arena", arena));
     if (plugin)
-        return plugin->getArena(name, game, parent);
+        return plugin->getArena(arena, game, parent);
     return NULL;
 }
 
-Canvas* PluginLoader::canvas(const QString& name, GameWrapper* game, Config* parent)
+Canvas* PluginLoader::canvas(const QString& canvas, GameWrapper* game, Config* parent)
 {
-    CanvasPlugin* plugin = qobject_cast<CanvasPlugin*>(loader->factory("Canvas", name));
+    CanvasPlugin* plugin = qobject_cast<CanvasPlugin*>(loader->factory("Canvas", canvas));
     if (plugin)
-        return plugin->getCanvas(name, game, parent);
+        return plugin->getCanvas(canvas, game, parent);
     return NULL;
 }
 
-Player* PluginLoader::player(const QString& name, GameWrapper* game, Config* parent)
+Client* PluginLoader::client(const QString& client, GameWrapper* game, Config* parent)
 {
-    PlayerPlugin* plugin = qobject_cast<PlayerPlugin*>(loader->factory("Player", name));
+    ClientPlugin* plugin = qobject_cast<ClientPlugin*>(loader->factory("Player", client));
     if (plugin)
-        return plugin->getPlayer(name, game, parent);
+        return plugin->getClient(client, game, parent);
     return NULL;
 }
 
@@ -177,8 +177,8 @@ void PluginLoader::Private::refresh(const QString& type)
                     plugin = factory->create<ArenaPlugin>(this);
                 else if (type == "Canvas")
                     plugin = factory->create<CanvasPlugin>(this);
-                else if (type == "Player")
-                    plugin = factory->create<PlayerPlugin>(this);
+                else if (type == "Client")
+                    plugin = factory->create<ClientPlugin>(this);
                 else
                     KMessageBox::information(NULL, QString("The plugin type \"Sigen/%1\" is not supported.").arg(type), "Unsupported plugin type");
                 if (plugin)
diff --git a/sigtools/PluginLoader.h b/sigtools/PluginLoader.h
index 62fe27ef..6136e806 100644
--- a/sigtools/PluginLoader.h
+++ b/sigtools/PluginLoader.h
@@ -33,7 +33,7 @@ namespace Sigencore
 {
 class Arena;
 class Canvas;
-class Player;
+class Client;
 }
 namespace Sigscript
 {
@@ -55,10 +55,10 @@ namespace PluginLoader
     SIGTOOLS_EXPORT QString description(const QString& type, const QString& name);
     SIGTOOLS_EXPORT QIcon icon(const QString& type, const QString& name);
     
-    SIGTOOLS_EXPORT QSharedPointer<Sigmod::Game> game(const QString& name);
+    SIGTOOLS_EXPORT QSharedPointer<Sigmod::Game> game(const QString& game);
     SIGTOOLS_EXPORT Sigencore::Arena* arena(const QString& arena, Sigscript::GameWrapper* game, Sigscript::Config* parent);
     SIGTOOLS_EXPORT Sigencore::Canvas* canvas(const QString& canvas, Sigscript::GameWrapper* game, Sigscript::Config* parent);
-    SIGTOOLS_EXPORT Sigencore::Player* player(const QString& canvas, Sigscript::GameWrapper* game, Sigscript::Config* parent);
+    SIGTOOLS_EXPORT Sigencore::Client* client(const QString& client, Sigscript::GameWrapper* game, Sigscript::Config* parent);
 }
 }