From 20cb97a35af5097e9d3b2062c0dfcb5f2e5fff5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 6 Sep 2014 18:16:56 +0200 Subject: Sync from quickmods --- logic/tools/BaseExternalTool.h | 2 +- logic/tools/JProfiler.cpp | 2 +- logic/tools/JProfiler.h | 2 +- logic/tools/JVisualVM.cpp | 2 +- logic/tools/JVisualVM.h | 2 +- logic/tools/MCEditTool.cpp | 2 +- logic/tools/MCEditTool.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'logic/tools') diff --git a/logic/tools/BaseExternalTool.h b/logic/tools/BaseExternalTool.h index 7672bf10..5f112970 100644 --- a/logic/tools/BaseExternalTool.h +++ b/logic/tools/BaseExternalTool.h @@ -43,7 +43,7 @@ public: virtual QString name() const = 0; - virtual void registerSettings(SettingsObject *settings) = 0; + virtual void registerSettings(std::shared_ptr settings) = 0; virtual BaseExternalTool *createTool(InstancePtr instance, QObject *parent = 0) = 0; diff --git a/logic/tools/JProfiler.cpp b/logic/tools/JProfiler.cpp index 988a875a..2134984e 100644 --- a/logic/tools/JProfiler.cpp +++ b/logic/tools/JProfiler.cpp @@ -40,7 +40,7 @@ void JProfiler::beginProfilingImpl(MinecraftProcess *process) m_profilerProcess = profiler; } -void JProfilerFactory::registerSettings(SettingsObject *settings) +void JProfilerFactory::registerSettings(std::shared_ptr settings) { settings->registerSetting("JProfilerPath"); settings->registerSetting("JProfilerPort", 42042); diff --git a/logic/tools/JProfiler.h b/logic/tools/JProfiler.h index b3fa6ec7..3085511b 100644 --- a/logic/tools/JProfiler.h +++ b/logic/tools/JProfiler.h @@ -16,7 +16,7 @@ class JProfilerFactory : public BaseProfilerFactory { public: QString name() const override { return "JProfiler"; } - void registerSettings(SettingsObject *settings) override; + void registerSettings(std::shared_ptr settings) override; BaseExternalTool *createTool(InstancePtr instance, QObject *parent = 0) override; bool check(QString *error) override; bool check(const QString &path, QString *error) override; diff --git a/logic/tools/JVisualVM.cpp b/logic/tools/JVisualVM.cpp index 09ab1762..33e271b4 100644 --- a/logic/tools/JVisualVM.cpp +++ b/logic/tools/JVisualVM.cpp @@ -37,7 +37,7 @@ void JVisualVM::beginProfilingImpl(MinecraftProcess *process) m_profilerProcess = profiler; } -void JVisualVMFactory::registerSettings(SettingsObject *settings) +void JVisualVMFactory::registerSettings(std::shared_ptr settings) { QString defaultValue = QStandardPaths::findExecutable("jvisualvm"); if (defaultValue.isNull()) diff --git a/logic/tools/JVisualVM.h b/logic/tools/JVisualVM.h index dffdde36..a646c681 100644 --- a/logic/tools/JVisualVM.h +++ b/logic/tools/JVisualVM.h @@ -16,7 +16,7 @@ class JVisualVMFactory : public BaseProfilerFactory { public: QString name() const override { return "JVisualVM"; } - void registerSettings(SettingsObject *settings) override; + void registerSettings(std::shared_ptr settings) override; BaseExternalTool *createTool(InstancePtr instance, QObject *parent = 0) override; bool check(QString *error) override; bool check(const QString &path, QString *error) override; diff --git a/logic/tools/MCEditTool.cpp b/logic/tools/MCEditTool.cpp index 91643585..1c7d9cd2 100644 --- a/logic/tools/MCEditTool.cpp +++ b/logic/tools/MCEditTool.cpp @@ -43,7 +43,7 @@ void MCEditTool::runImpl() #endif } -void MCEditFactory::registerSettings(SettingsObject *settings) +void MCEditFactory::registerSettings(std::shared_ptr settings) { settings->registerSetting("MCEditPath"); } diff --git a/logic/tools/MCEditTool.h b/logic/tools/MCEditTool.h index 9985bde1..810caf25 100644 --- a/logic/tools/MCEditTool.h +++ b/logic/tools/MCEditTool.h @@ -16,7 +16,7 @@ class MCEditFactory : public BaseDetachedToolFactory { public: QString name() const override { return "MCEdit"; } - void registerSettings(SettingsObject *settings) override; + void registerSettings(std::shared_ptr settings) override; BaseExternalTool *createTool(InstancePtr instance, QObject *parent = 0) override; bool check(QString *error) override; bool check(const QString &path, QString *error) override; -- cgit v1.2.3