Fix the inheritance for plugins

8 files changed, 12 insertions, 22 deletions

diff --git a/sigencore/plugins/ArenaPlugin.cpp b/sigencore/plugins/ArenaPlugin.cpp
index 963bca58..317e8e88 100644
--- a/sigencore/plugins/ArenaPlugin.cpp
+++ b/sigencore/plugins/ArenaPlugin.cpp
@@ -30,7 +30,7 @@ using namespace Sigencore;
 using namespace Sigencore::Plugins;
 
 ArenaPlugin::ArenaPlugin(QObject* parent, const QVariantList& args) :
-        QObject(parent),
+        PluginBase(parent, args),
         d(new Private(this, args))
 {
 }
diff --git a/sigencore/plugins/ArenaPlugin.h b/sigencore/plugins/ArenaPlugin.h
index 50b3a98b..cc89cd58 100644
--- a/sigencore/plugins/ArenaPlugin.h
+++ b/sigencore/plugins/ArenaPlugin.h
@@ -19,16 +19,11 @@
 #define SIGENCOREPLUGINS_ARENAPLUGIN
 
 // Plugin includes
-#include "Global.h"
+#include "PluginBase.h"
 
 // KDE includes
 #include <KPluginFactory>
 
-// Qt includes
-#include <QtCore/QStringList>
-#include <QtCore/QVariantList>
-#include <QtGui/QIcon>
-
 // Forward declarations
 namespace Sigscript
 {
@@ -42,7 +37,7 @@ class Arena;
 
 namespace Plugins
 {
-class SIGENCOREPLUGINS_EXPORT ArenaPlugin : public QObject
+class SIGENCOREPLUGINS_EXPORT ArenaPlugin : public PluginBase
 {
     Q_OBJECT
     
@@ -52,7 +47,7 @@ class SIGENCOREPLUGINS_EXPORT ArenaPlugin : public QObject
         
         Arena* getArena(const QString& name, Sigscript::GameWrapper* game, Sigscript::Config* parent);
         
-        virtual QStringList arenas() const = 0;
+        virtual QStringList classList() const = 0;
         virtual QString description(const QString& name) const = 0;
         virtual QIcon icon(const QString& name) = 0;
     protected:
diff --git a/sigencore/plugins/CanvasPlugin.cpp b/sigencore/plugins/CanvasPlugin.cpp
index 00758319..3671151c 100644
--- a/sigencore/plugins/CanvasPlugin.cpp
+++ b/sigencore/plugins/CanvasPlugin.cpp
@@ -30,7 +30,7 @@ using namespace Sigencore;
 using namespace Sigencore::Plugins;
 
 CanvasPlugin::CanvasPlugin(QObject* parent, const QVariantList& args) :
-        QObject(parent),
+        PluginBase(parent, args),
         d(new Private(this, args))
 {
 }
diff --git a/sigencore/plugins/CanvasPlugin.h b/sigencore/plugins/CanvasPlugin.h
index 009c743d..ed026be1 100644
--- a/sigencore/plugins/CanvasPlugin.h
+++ b/sigencore/plugins/CanvasPlugin.h
@@ -19,16 +19,11 @@
 #define SIGENCOREPLUGINS_CANVASPLUGIN
 
 // Plugin includes
-#include "Global.h"
+#include "PluginBase.h"
 
 // KDE includes
 #include <KPluginFactory>
 
-// Qt includes
-#include <QtCore/QStringList>
-#include <QtCore/QVariantList>
-#include <QtGui/QIcon>
-
 // Forward declarations
 namespace Sigscript
 {
@@ -42,7 +37,7 @@ class Canvas;
 
 namespace Plugins
 {
-class SIGENCOREPLUGINS_EXPORT CanvasPlugin : public QObject
+class SIGENCOREPLUGINS_EXPORT CanvasPlugin : public PluginBase
 {
     Q_OBJECT
     
@@ -52,7 +47,7 @@ class SIGENCOREPLUGINS_EXPORT CanvasPlugin : public QObject
         
         Canvas* getCanvas(const QString& name, Sigscript::GameWrapper* game, Sigscript::Config* parent);
         
-        virtual QStringList canvases() const = 0;
+        virtual QStringList classList() const = 0;
         virtual QString description(const QString& name) const = 0;
         virtual QIcon icon(const QString& name) = 0;
     protected:
diff --git a/sigencore/plugins/arenas/SigenArenas.cpp b/sigencore/plugins/arenas/SigenArenas.cpp
index 6e6b7d02..6a84dad8 100644
--- a/sigencore/plugins/arenas/SigenArenas.cpp
+++ b/sigencore/plugins/arenas/SigenArenas.cpp
@@ -40,7 +40,7 @@ SigenArenas::~SigenArenas()
 {
 }
 
-QStringList SigenArenas::arenas() const
+QStringList SigenArenas::classList() const
 {
     return QStringList() << TurnArena::name() << ATBArena::name();
 }
diff --git a/sigencore/plugins/arenas/SigenArenas.h b/sigencore/plugins/arenas/SigenArenas.h
index 9007d234..14ce15c8 100644
--- a/sigencore/plugins/arenas/SigenArenas.h
+++ b/sigencore/plugins/arenas/SigenArenas.h
@@ -29,7 +29,7 @@ class SigenArenas : public Sigencore::Plugins::ArenaPlugin
         SigenArenas(QObject* parent, const QVariantList& args);
         ~SigenArenas();
         
-        QStringList arenas() const;
+        QStringList classList() const;
         QString description(const QString& name) const;
         QIcon icon(const QString& name);
     protected:
diff --git a/sigencore/plugins/canvases/SigenCanvases.cpp b/sigencore/plugins/canvases/SigenCanvases.cpp
index 4619e406..f52917b3 100644
--- a/sigencore/plugins/canvases/SigenCanvases.cpp
+++ b/sigencore/plugins/canvases/SigenCanvases.cpp
@@ -39,7 +39,7 @@ SigenCanvases::~SigenCanvases()
 {
 }
 
-QStringList SigenCanvases::canvases() const
+QStringList SigenCanvases::classList() const
 {
     // TODO
     return QStringList();
diff --git a/sigencore/plugins/canvases/SigenCanvases.h b/sigencore/plugins/canvases/SigenCanvases.h
index 4526990a..6e0eaf22 100644
--- a/sigencore/plugins/canvases/SigenCanvases.h
+++ b/sigencore/plugins/canvases/SigenCanvases.h
@@ -29,7 +29,7 @@ class SigenCanvases : public Sigencore::Plugins::CanvasPlugin
         SigenCanvases(QObject* parent, const QVariantList& args);
         ~SigenCanvases();
         
-        QStringList canvases() const;
+        QStringList classList() const;
         QString description(const QString& name) const;
         QIcon icon(const QString& name);
     protected: