diff options
author | Petr Mrázek <peterix@gmail.com> | 2015-02-09 01:51:14 +0100 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2015-04-12 20:57:18 +0200 |
commit | db877ba121ff87a4e029daf8555d85dfef45993a (patch) | |
tree | 7673f83c404b3883f0a4fcf6b492f0c4125c293c /logic/tools/BaseExternalTool.h | |
parent | 4730f54df7edf4775dfddf45f77c60edd86c32d9 (diff) | |
download | MultiMC-db877ba121ff87a4e029daf8555d85dfef45993a.tar MultiMC-db877ba121ff87a4e029daf8555d85dfef45993a.tar.gz MultiMC-db877ba121ff87a4e029daf8555d85dfef45993a.tar.lz MultiMC-db877ba121ff87a4e029daf8555d85dfef45993a.tar.xz MultiMC-db877ba121ff87a4e029daf8555d85dfef45993a.zip |
NOISSUE move everything.
Diffstat (limited to 'logic/tools/BaseExternalTool.h')
-rw-r--r-- | logic/tools/BaseExternalTool.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/logic/tools/BaseExternalTool.h b/logic/tools/BaseExternalTool.h index 8b8b2790..3c0b23ed 100644 --- a/logic/tools/BaseExternalTool.h +++ b/logic/tools/BaseExternalTool.h @@ -1,7 +1,7 @@ #pragma once #include <QObject> -#include <logic/BaseInstance.h> +#include <BaseInstance.h> class BaseInstance; class SettingsObject; @@ -11,12 +11,12 @@ class BaseExternalTool : public QObject { Q_OBJECT public: - explicit BaseExternalTool(InstancePtr instance, QObject *parent = 0); + explicit BaseExternalTool(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0); virtual ~BaseExternalTool(); protected: InstancePtr m_instance; - + SettingsObjectPtr globalSettings; qint64 pid(QProcess *process); }; @@ -24,7 +24,7 @@ class BaseDetachedTool : public BaseExternalTool { Q_OBJECT public: - explicit BaseDetachedTool(InstancePtr instance, QObject *parent = 0); + explicit BaseDetachedTool(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0); public slots: @@ -41,12 +41,15 @@ public: virtual QString name() const = 0; - virtual void registerSettings(std::shared_ptr<SettingsObject> settings) = 0; + virtual void registerSettings(SettingsObjectPtr settings) = 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; + +protected: + SettingsObjectPtr globalSettings; }; class BaseDetachedToolFactory : public BaseExternalToolFactory |