diff options
author | Ben Boeckel <MathStuf@gmail.com> | 2009-03-26 07:30:07 -0400 |
---|---|---|
committer | Ben Boeckel <MathStuf@gmail.com> | 2009-03-26 07:30:07 -0400 |
commit | 95e1988336bf273f8237e0301d0a8ff33d901a1b (patch) | |
tree | 8fd84c4e9fb4d34170acfefbd5638c1b7fa4c3b8 | |
parent | ef69b64492c2fb751d457ca3d4741ee823a01205 (diff) | |
download | sigen-95e1988336bf273f8237e0301d0a8ff33d901a1b.tar.gz sigen-95e1988336bf273f8237e0301d0a8ff33d901a1b.tar.xz sigen-95e1988336bf273f8237e0301d0a8ff33d901a1b.zip |
Switch from the Interfaces to Plugins namespace
-rw-r--r-- | sigencore/plugins/ArenaPlugin.cpp | 2 | ||||
-rw-r--r-- | sigencore/plugins/ArenaPlugin.h | 6 | ||||
-rw-r--r-- | sigencore/plugins/ArenaPlugin_p.h | 6 | ||||
-rw-r--r-- | sigencore/plugins/CanvasPlugin.cpp | 2 | ||||
-rw-r--r-- | sigencore/plugins/CanvasPlugin.h | 6 | ||||
-rw-r--r-- | sigencore/plugins/CanvasPlugin_p.h | 6 | ||||
-rw-r--r-- | sigencore/plugins/arenas/SigenArenas.cpp | 2 | ||||
-rw-r--r-- | sigencore/plugins/arenas/SigenArenas.h | 2 | ||||
-rw-r--r-- | sigencore/plugins/canvases/SigenCanvases.cpp | 2 | ||||
-rw-r--r-- | sigencore/plugins/canvases/SigenCanvases.h | 2 | ||||
-rw-r--r-- | sigtools/PluginLoader.cpp | 4 | ||||
-rw-r--r-- | sigtools/PluginLoader.h | 6 | ||||
-rw-r--r-- | sigtools/PluginTreeModel.cpp | 2 |
13 files changed, 24 insertions, 24 deletions
diff --git a/sigencore/plugins/ArenaPlugin.cpp b/sigencore/plugins/ArenaPlugin.cpp index 37664614..963bca58 100644 --- a/sigencore/plugins/ArenaPlugin.cpp +++ b/sigencore/plugins/ArenaPlugin.cpp @@ -27,7 +27,7 @@ using namespace Sigscript; using namespace Sigencore; -using namespace Sigencore::Interfaces; +using namespace Sigencore::Plugins; ArenaPlugin::ArenaPlugin(QObject* parent, const QVariantList& args) : QObject(parent), diff --git a/sigencore/plugins/ArenaPlugin.h b/sigencore/plugins/ArenaPlugin.h index 4b132907..50b3a98b 100644 --- a/sigencore/plugins/ArenaPlugin.h +++ b/sigencore/plugins/ArenaPlugin.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SIGENCOREINTERFACES_ARENAPLUGIN -#define SIGENCOREINTERFACES_ARENAPLUGIN +#ifndef SIGENCOREPLUGINS_ARENAPLUGIN +#define SIGENCOREPLUGINS_ARENAPLUGIN // Plugin includes #include "Global.h" @@ -40,7 +40,7 @@ namespace Sigencore { class Arena; -namespace Interfaces +namespace Plugins { class SIGENCOREPLUGINS_EXPORT ArenaPlugin : public QObject { diff --git a/sigencore/plugins/ArenaPlugin_p.h b/sigencore/plugins/ArenaPlugin_p.h index 9ae48377..30087050 100644 --- a/sigencore/plugins/ArenaPlugin_p.h +++ b/sigencore/plugins/ArenaPlugin_p.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SIGENCOREINTERFACES_ARENAPLUGIN_P -#define SIGENCOREINTERFACES_ARENAPLUGIN_P +#ifndef SIGENCOREPLUGINS_ARENAPLUGIN_P +#define SIGENCOREPLUGINS_ARENAPLUGIN_P // Header include #include "ArenaPlugin.h" @@ -26,7 +26,7 @@ class QSignalMapper; namespace Sigencore { -namespace Interfaces +namespace Plugins { class SIGENCOREPLUGINS_NO_EXPORT ArenaPlugin::Private : public QObject { diff --git a/sigencore/plugins/CanvasPlugin.cpp b/sigencore/plugins/CanvasPlugin.cpp index ec097d3a..00758319 100644 --- a/sigencore/plugins/CanvasPlugin.cpp +++ b/sigencore/plugins/CanvasPlugin.cpp @@ -27,7 +27,7 @@ using namespace Sigscript; using namespace Sigencore; -using namespace Sigencore::Interfaces; +using namespace Sigencore::Plugins; CanvasPlugin::CanvasPlugin(QObject* parent, const QVariantList& args) : QObject(parent), diff --git a/sigencore/plugins/CanvasPlugin.h b/sigencore/plugins/CanvasPlugin.h index 2ca4c18c..009c743d 100644 --- a/sigencore/plugins/CanvasPlugin.h +++ b/sigencore/plugins/CanvasPlugin.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SIGENCOREINTERFACES_CANVASPLUGIN -#define SIGENCOREINTERFACES_CANVASPLUGIN +#ifndef SIGENCOREPLUGINS_CANVASPLUGIN +#define SIGENCOREPLUGINS_CANVASPLUGIN // Plugin includes #include "Global.h" @@ -40,7 +40,7 @@ namespace Sigencore { class Canvas; -namespace Interfaces +namespace Plugins { class SIGENCOREPLUGINS_EXPORT CanvasPlugin : public QObject { diff --git a/sigencore/plugins/CanvasPlugin_p.h b/sigencore/plugins/CanvasPlugin_p.h index 81e15103..d766027d 100644 --- a/sigencore/plugins/CanvasPlugin_p.h +++ b/sigencore/plugins/CanvasPlugin_p.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SIGENCOREINTERFACES_CANVASPLUGIN_P -#define SIGENCOREINTERFACES_CANVASPLUGIN_P +#ifndef SIGENCOREPLUGINS_CANVASPLUGIN_P +#define SIGENCOREPLUGINS_CANVASPLUGIN_P // Header include #include "CanvasPlugin.h" @@ -26,7 +26,7 @@ class QSignalMapper; namespace Sigencore { -namespace Interfaces +namespace Plugins { class SIGENCOREPLUGINS_NO_EXPORT CanvasPlugin::Private : public QObject { diff --git a/sigencore/plugins/arenas/SigenArenas.cpp b/sigencore/plugins/arenas/SigenArenas.cpp index 37494c1f..6e6b7d02 100644 --- a/sigencore/plugins/arenas/SigenArenas.cpp +++ b/sigencore/plugins/arenas/SigenArenas.cpp @@ -29,7 +29,7 @@ SIGEN_ARENA_PLUGIN_VERSION(SigenArenas, "sigen_arenas", 000101) using namespace Sigscript; using namespace Sigencore; -using namespace Sigencore::Interfaces; +using namespace Sigencore::Plugins; SigenArenas::SigenArenas(QObject* parent, const QVariantList& args) : ArenaPlugin(parent, args) diff --git a/sigencore/plugins/arenas/SigenArenas.h b/sigencore/plugins/arenas/SigenArenas.h index 2bbf24d8..9007d234 100644 --- a/sigencore/plugins/arenas/SigenArenas.h +++ b/sigencore/plugins/arenas/SigenArenas.h @@ -21,7 +21,7 @@ // Sigencore plugin includes #include <sigencore/plugins/ArenaPlugin.h> -class SigenArenas : public Sigencore::Interfaces::ArenaPlugin +class SigenArenas : public Sigencore::Plugins::ArenaPlugin { Q_OBJECT diff --git a/sigencore/plugins/canvases/SigenCanvases.cpp b/sigencore/plugins/canvases/SigenCanvases.cpp index 3933317b..4619e406 100644 --- a/sigencore/plugins/canvases/SigenCanvases.cpp +++ b/sigencore/plugins/canvases/SigenCanvases.cpp @@ -28,7 +28,7 @@ SIGEN_CANVAS_PLUGIN_VERSION(SigenCanvases, "sigen_canvases", 000101) using namespace Sigscript; using namespace Sigencore; -using namespace Sigencore::Interfaces; +using namespace Sigencore::Plugins; SigenCanvases::SigenCanvases(QObject* parent, const QVariantList& args) : CanvasPlugin(parent, args) diff --git a/sigencore/plugins/canvases/SigenCanvases.h b/sigencore/plugins/canvases/SigenCanvases.h index 870f259d..4526990a 100644 --- a/sigencore/plugins/canvases/SigenCanvases.h +++ b/sigencore/plugins/canvases/SigenCanvases.h @@ -21,7 +21,7 @@ // Sigencore plugin includes #include <sigencore/plugins/CanvasPlugin.h> -class SigenCanvases : public Sigencore::Interfaces::CanvasPlugin +class SigenCanvases : public Sigencore::Plugins::CanvasPlugin { Q_OBJECT diff --git a/sigtools/PluginLoader.cpp b/sigtools/PluginLoader.cpp index d655d14f..d6f039e9 100644 --- a/sigtools/PluginLoader.cpp +++ b/sigtools/PluginLoader.cpp @@ -19,7 +19,7 @@ #include "PluginLoader.h" #include "PluginLoader_p.h" -// Sigencore interface includes +// Sigencore plugin includes #include <sigencore/plugins/ArenaPlugin.h> #include <sigencore/plugins/CanvasPlugin.h> @@ -29,7 +29,7 @@ using namespace Sigscript; using namespace Sigencore; -using namespace Sigencore::Interfaces; +using namespace Sigencore::Plugins; using namespace Sigtools; K_GLOBAL_STATIC(PluginLoader::Private, loader) diff --git a/sigtools/PluginLoader.h b/sigtools/PluginLoader.h index ccd14169..c5d96cb5 100644 --- a/sigtools/PluginLoader.h +++ b/sigtools/PluginLoader.h @@ -30,7 +30,7 @@ namespace Sigencore { class Arena; class Canvas; -namespace Interfaces +namespace Plugins { class ArenaPlugin; class CanvasPlugin; @@ -49,8 +49,8 @@ namespace PluginLoader SIGTOOLS_EXPORT QStringList availablePlugins(const QString& type, const bool forceLookup = false); SIGTOOLS_EXPORT KService::Ptr service(const QString& type, const QString& name); - SIGTOOLS_EXPORT Sigencore::Interfaces::ArenaPlugin* pluginForArena(const QString& arena); - SIGTOOLS_EXPORT Sigencore::Interfaces::CanvasPlugin* pluginForCanvas(const QString& canvas); + SIGTOOLS_EXPORT Sigencore::Plugins::ArenaPlugin* pluginForArena(const QString& arena); + SIGTOOLS_EXPORT Sigencore::Plugins::CanvasPlugin* pluginForCanvas(const QString& canvas); SIGTOOLS_EXPORT Sigencore::Arena* loadArena(const QString& arena, Sigscript::GameWrapper* game, Sigscript::Config* parent); SIGTOOLS_EXPORT Sigencore::Canvas* loadCanvas(const QString& canvas, Sigscript::GameWrapper* game, Sigscript::Config* parent); diff --git a/sigtools/PluginTreeModel.cpp b/sigtools/PluginTreeModel.cpp index d0529c66..ad544e93 100644 --- a/sigtools/PluginTreeModel.cpp +++ b/sigtools/PluginTreeModel.cpp @@ -32,7 +32,7 @@ // Qt includes #include <QtGui/QIcon> -using namespace Sigencore::Interfaces; +using namespace Sigencore::Plugins; using namespace Sigtools; PluginTreeModel::PluginTreeModel(PluginTree* tree) : |