Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into pack_changelog

1 files changed, 19 insertions, 24 deletions

diff --git a/launcher/tools/BaseExternalTool.h b/launcher/tools/BaseExternalTool.h
index 1ebed6ae..eb2d07e1 100644
--- a/launcher/tools/BaseExternalTool.h
+++ b/launcher/tools/BaseExternalTool.h
@@ -1,58 +1,53 @@
 #pragma once
 
-#include <QObject>
 #include <BaseInstance.h>
+#include <QObject>
 
 class BaseInstance;
 class SettingsObject;
 class QProcess;
 
-class BaseExternalTool : public QObject
-{
+class BaseExternalTool : public QObject {
     Q_OBJECT
-public:
-    explicit BaseExternalTool(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0);
+   public:
+    explicit BaseExternalTool(SettingsObjectPtr settings, InstancePtr instance, QObject* parent = 0);
     virtual ~BaseExternalTool();
 
-protected:
+   protected:
     InstancePtr m_instance;
     SettingsObjectPtr globalSettings;
 };
 
-class BaseDetachedTool : public BaseExternalTool
-{
+class BaseDetachedTool : public BaseExternalTool {
     Q_OBJECT
-public:
-    explicit BaseDetachedTool(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0);
+   public:
+    explicit BaseDetachedTool(SettingsObjectPtr settings, InstancePtr instance, QObject* parent = 0);
 
-public
-slots:
+   public slots:
     void run();
 
-protected:
+   protected:
     virtual void runImpl() = 0;
 };
 
-class BaseExternalToolFactory
-{
-public:
+class BaseExternalToolFactory {
+   public:
     virtual ~BaseExternalToolFactory();
 
     virtual QString name() const = 0;
 
     virtual void registerSettings(SettingsObjectPtr settings) = 0;
 
-    virtual BaseExternalTool *createTool(InstancePtr instance, QObject *parent = 0) = 0;
+    virtual BaseExternalTool* createTool(InstancePtr instance, QObject* parent = 0) = 0;
 
-    virtual bool check(QString *error) = 0;
-    virtual bool check(const QString &path, QString *error) = 0;
+    virtual bool check(QString* error) = 0;
+    virtual bool check(const QString& path, QString* error) = 0;
 
-protected:
+   protected:
     SettingsObjectPtr globalSettings;
 };
 
-class BaseDetachedToolFactory : public BaseExternalToolFactory
-{
-public:
-    virtual BaseDetachedTool *createDetachedTool(InstancePtr instance, QObject *parent = 0);
+class BaseDetachedToolFactory : public BaseExternalToolFactory {
+   public:
+    virtual BaseDetachedTool* createDetachedTool(InstancePtr instance, QObject* parent = 0);
 };