From 78f628e0af2f2df562c40ac1424b432b6a969055 Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Fri, 28 Nov 2014 11:06:28 +0100
Subject: cleanup und bugfixes after refactoring

---
 src/plugincontainer.h | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

(limited to 'src/plugincontainer.h')

diff --git a/src/plugincontainer.h b/src/plugincontainer.h
index 213b4154..d0a101ad 100644
--- a/src/plugincontainer.h
+++ b/src/plugincontainer.h
@@ -15,6 +15,7 @@
 #include <QFile>
 #ifndef Q_MOC_RUN
 #include <boost/fusion/container.hpp>
+#include <boost/fusion/include/at_key.hpp>
 #endif // Q_MOC_RUN
 #include <vector>
 
@@ -25,6 +26,21 @@ class PluginContainer : public QObject, public MOBase::IPluginDiagnose
   Q_OBJECT
   Q_INTERFACES(MOBase::IPluginDiagnose)
 
+private:
+
+  typedef boost::fusion::map<
+  boost::fusion::pair<MOBase::IPlugin, std::vector<MOBase::IPlugin*>>,
+  boost::fusion::pair<MOBase::IPluginDiagnose, std::vector<MOBase::IPluginDiagnose*>>,
+  boost::fusion::pair<MOBase::IPluginGame, std::vector<MOBase::IPluginGame*>>,
+  boost::fusion::pair<MOBase::IPluginInstaller, std::vector<MOBase::IPluginInstaller*>>,
+  boost::fusion::pair<MOBase::IPluginModPage, std::vector<MOBase::IPluginModPage*>>,
+  boost::fusion::pair<MOBase::IPluginPreview, std::vector<MOBase::IPluginPreview*>>,
+  boost::fusion::pair<MOBase::IPluginTool, std::vector<MOBase::IPluginTool*>>,
+  boost::fusion::pair<MOBase::IPluginProxy, std::vector<MOBase::IPluginProxy*>>
+  > PluginMap;
+
+  static const unsigned int PROBLEM_PLUGINSNOTLOADED = 1;
+
 public:
 
   PluginContainer(OrganizerCore *organizer);
@@ -37,7 +53,7 @@ public:
   MOBase::IPluginGame *managedGame(const QString &name) const;
 
   template <typename T>
-  std::vector<T*> plugins() const {
+  std::vector<T*> plugins() {
     return boost::fusion::at_key<T>(m_Plugins);
   }
 
@@ -60,26 +76,10 @@ signals:
 private:
 
   bool verifyPlugin(MOBase::IPlugin *plugin);
-  void registerPluginTool(MOBase::IPluginTool *tool);
-  void registerModPage(MOBase::IPluginModPage *modPage);
   void registerGame(MOBase::IPluginGame *game);
   bool registerPlugin(QObject *pluginObj, const QString &fileName);
   bool unregisterPlugin(QObject *pluginObj, const QString &fileName);
 
-private:
-
-  typedef boost::fusion::map<
-  boost::fusion::pair<MOBase::IPlugin, std::vector<MOBase::IPlugin*>>,
-  boost::fusion::pair<MOBase::IPluginDiagnose, std::vector<MOBase::IPluginDiagnose*>>,
-  boost::fusion::pair<MOBase::IPluginGame, std::vector<MOBase::IPluginGame*>>,
-  boost::fusion::pair<MOBase::IPluginInstaller, std::vector<MOBase::IPluginInstaller*>>,
-  boost::fusion::pair<MOBase::IPluginModPage, std::vector<MOBase::IPluginModPage*>>,
-  boost::fusion::pair<MOBase::IPluginPreview, std::vector<MOBase::IPluginPreview*>>,
-  boost::fusion::pair<MOBase::IPluginTool, std::vector<MOBase::IPluginTool*>>,
-  boost::fusion::pair<MOBase::IPluginProxy, std::vector<MOBase::IPluginProxy*>>
-  > PluginMap;
-
-  static const unsigned int PROBLEM_PLUGINSNOTLOADED = 1;
 
 private:
 
@@ -99,4 +99,5 @@ private:
   QFile m_PluginsCheck;
 };
 
+
 #endif // PLUGINCONTAINER_H
-- 
cgit v1.3.1