From db877ba121ff87a4e029daf8555d85dfef45993a Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Mon, 9 Feb 2015 01:51:14 +0100 Subject: NOISSUE move everything. --- logic/tools/BaseExternalTool.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'logic/tools/BaseExternalTool.h') 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 -#include +#include 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 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 -- cgit