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

1 files changed, 12 insertions, 15 deletions

diff --git a/launcher/tools/BaseProfiler.h b/launcher/tools/BaseProfiler.h
index 1c934aa3..ac0f3a78 100644
--- a/launcher/tools/BaseProfiler.h
+++ b/launcher/tools/BaseProfiler.h
@@ -8,30 +8,27 @@ class SettingsObject;
 class LaunchTask;
 class QProcess;
 
-class BaseProfiler : public BaseExternalTool
-{
+class BaseProfiler : public BaseExternalTool {
     Q_OBJECT
-public:
-    explicit BaseProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0);
+   public:
+    explicit BaseProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject* parent = 0);
 
-public
-slots:
+   public slots:
     void beginProfiling(shared_qobject_ptr<LaunchTask> process);
     void abortProfiling();
 
-protected:
-    QProcess *m_profilerProcess;
+   protected:
+    QProcess* m_profilerProcess;
 
     virtual void beginProfilingImpl(shared_qobject_ptr<LaunchTask> process) = 0;
     virtual void abortProfilingImpl();
 
-signals:
-    void readyToLaunch(const QString &message);
-    void abortLaunch(const QString &message);
+   signals:
+    void readyToLaunch(const QString& message);
+    void abortLaunch(const QString& message);
 };
 
-class BaseProfilerFactory : public BaseExternalToolFactory
-{
-public:
-    virtual BaseProfiler *createProfiler(InstancePtr instance, QObject *parent = 0);
+class BaseProfilerFactory : public BaseExternalToolFactory {
+   public:
+    virtual BaseProfiler* createProfiler(InstancePtr instance, QObject* parent = 0);
 };