Revert "Applied clang-format on source"

This reverts commit 5e5c9c07291f6b09623d31c92b1fb61c4ede576e.

1 files changed, 61 insertions, 52 deletions

diff --git a/src/plugincontainer.h b/src/plugincontainer.h
index e431142e..70392d0b 100644
--- a/src/plugincontainer.h
+++ b/src/plugincontainer.h
@@ -1,94 +1,103 @@
 #ifndef PLUGINCONTAINER_H

 #define PLUGINCONTAINER_H

 

+

 #include "organizercore.h"

 #include "previewgenerator.h"

-#include <QFile>

-#include <QPluginLoader>

-#include <QtPlugin>

 #include <iplugindiagnose.h>

-#include <ipluginfilemapper.h>

-#include <iplugingame.h>

-#include <iplugininstaller.h>

 #include <ipluginmodpage.h>

-#include <ipluginproxy.h>

+#include <iplugingame.h>

 #include <iplugintool.h>

+#include <ipluginproxy.h>

+#include <iplugininstaller.h>

+#include <ipluginfilemapper.h>

+#include <QtPlugin>

+#include <QPluginLoader>

+#include <QFile>

 #ifndef Q_MOC_RUN

 #include <boost/fusion/container.hpp>

 #include <boost/fusion/include/at_key.hpp>

 #endif // Q_MOC_RUN

 #include <vector>

 

-class PluginContainer : public QObject, public MOBase::IPluginDiagnose {

 

-    Q_OBJECT

-    Q_INTERFACES(MOBase::IPluginDiagnose)

+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*>>,

-                               boost::fusion::pair<MOBase::IPluginFileMapper, std::vector<MOBase::IPluginFileMapper*>>>

-        PluginMap;

 

-    static const unsigned int PROBLEM_PLUGINSNOTLOADED = 1;

+  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*>>,

+  boost::fusion::pair<MOBase::IPluginFileMapper, std::vector<MOBase::IPluginFileMapper*>>

+  > PluginMap;

+

+  static const unsigned int PROBLEM_PLUGINSNOTLOADED = 1;

 

 public:

-    PluginContainer(OrganizerCore* organizer);

 

-    void setUserInterface(IUserInterface* userInterface, QWidget* widget);

+  PluginContainer(OrganizerCore *organizer);

+

+  void setUserInterface(IUserInterface *userInterface, QWidget *widget);

 

-    void loadPlugins();

-    void unloadPlugins();

+  void loadPlugins();

+  void unloadPlugins();

 

-    MOBase::IPluginGame* managedGame(const QString& name) const;

+  MOBase::IPluginGame *managedGame(const QString &name) const;

 

-    template <typename T>

-    const std::vector<T*>& plugins() const {

-        typename boost::fusion::result_of::at_key<const PluginMap, T>::type temp = boost::fusion::at_key<T>(m_Plugins);

-        return temp;

-    }

+  template <typename T>

+  const std::vector<T*> &plugins() const {

+    typename boost::fusion::result_of::at_key<const PluginMap, T>::type temp = boost::fusion::at_key<T>(m_Plugins);

+    return temp;

+  }

 

-    const PreviewGenerator& previewGenerator() const;

+  const PreviewGenerator &previewGenerator() const;

 

-    QStringList pluginFileNames() const;

+  QStringList pluginFileNames() const;

 

 public: // IPluginDiagnose interface

-    virtual std::vector<unsigned int> activeProblems() const;

-    virtual QString shortDescription(unsigned int key) const;

-    virtual QString fullDescription(unsigned int key) const;

-    virtual bool hasGuidedFix(unsigned int key) const;

-    virtual void startGuidedFix(unsigned int key) const;

+

+  virtual std::vector<unsigned int> activeProblems() const;

+  virtual QString shortDescription(unsigned int key) const;

+  virtual QString fullDescription(unsigned int key) const;

+  virtual bool hasGuidedFix(unsigned int key) const;

+  virtual void startGuidedFix(unsigned int key) const;

 

 signals:

 

-    void diagnosisUpdate();

+  void diagnosisUpdate();

 

 private:

-    bool verifyPlugin(MOBase::IPlugin* plugin);

-    void registerGame(MOBase::IPluginGame* game);

-    bool registerPlugin(QObject* pluginObj, const QString& fileName);

-    bool unregisterPlugin(QObject* pluginObj, const QString& fileName);

 

-    OrganizerCore* m_Organizer;

+  bool verifyPlugin(MOBase::IPlugin *plugin);

+  void registerGame(MOBase::IPluginGame *game);

+  bool registerPlugin(QObject *pluginObj, const QString &fileName);

+  bool unregisterPlugin(QObject *pluginObj, const QString &fileName);

 

-    IUserInterface* m_UserInterface;

+  OrganizerCore *m_Organizer;

 

-    PluginMap m_Plugins;

+  IUserInterface *m_UserInterface;

 

-    std::map<QString, MOBase::IPluginGame*> m_SupportedGames;

-    std::vector<boost::signals2::connection> m_DiagnosisConnections;

-    QStringList m_FailedPlugins;

-    std::vector<QPluginLoader*> m_PluginLoaders;

+  PluginMap m_Plugins;

 

-    PreviewGenerator m_PreviewGenerator;

+  std::map<QString, MOBase::IPluginGame*> m_SupportedGames;

+  std::vector<boost::signals2::connection> m_DiagnosisConnections;

+  QStringList m_FailedPlugins;

+  std::vector<QPluginLoader*> m_PluginLoaders;

 

-    QFile m_PluginsCheck;

+  PreviewGenerator m_PreviewGenerator;

+

+  QFile m_PluginsCheck;

 };

 

+

 #endif // PLUGINCONTAINER_H