diff options
| author | Petr Mrázek <peterix@gmail.com> | 2019-04-07 23:59:04 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2019-04-07 23:59:04 +0200 |
| commit | 70ed30f9e6b47fbfb3151078ca61a2bb419feccb (patch) | |
| tree | 0849ab3776d3e716285f3186b4e8e21ee246ee21 /api/logic/NullInstance.h | |
| parent | 414946cad94affccddfa500056c6eeb967438643 (diff) | |
| download | MultiMC-70ed30f9e6b47fbfb3151078ca61a2bb419feccb.tar MultiMC-70ed30f9e6b47fbfb3151078ca61a2bb419feccb.tar.gz MultiMC-70ed30f9e6b47fbfb3151078ca61a2bb419feccb.tar.lz MultiMC-70ed30f9e6b47fbfb3151078ca61a2bb419feccb.tar.xz MultiMC-70ed30f9e6b47fbfb3151078ca61a2bb419feccb.zip | |
GH-2591 less std::shared_ptr and more shared_qobject_ptr
This eliminates some weird crashes.
Diffstat (limited to 'api/logic/NullInstance.h')
| -rw-r--r-- | api/logic/NullInstance.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/api/logic/NullInstance.h b/api/logic/NullInstance.h index ff3551c5..e9ba1a13 100644 --- a/api/logic/NullInstance.h +++ b/api/logic/NullInstance.h @@ -1,5 +1,6 @@ #pragma once #include "BaseInstance.h" +#include "launch/LaunchTask.h" class NullInstance: public BaseInstance { @@ -11,46 +12,46 @@ public: setVersionBroken(true); } virtual ~NullInstance() {}; - virtual void saveNow() override + void saveNow() override { } - virtual QString getStatusbarDescription() override + QString getStatusbarDescription() override { return tr("Unknown instance type"); }; - virtual QSet< QString > traits() const override + QSet< QString > traits() const override { return {}; }; - virtual QString instanceConfigFolder() const override + QString instanceConfigFolder() const override { return instanceRoot(); }; - virtual std::shared_ptr<LaunchTask> createLaunchTask(AuthSessionPtr) override + shared_qobject_ptr<LaunchTask> createLaunchTask(AuthSessionPtr) override { return nullptr; } - virtual shared_qobject_ptr< Task > createUpdateTask(Net::Mode mode) override + shared_qobject_ptr< Task > createUpdateTask(Net::Mode mode) override { return nullptr; } - virtual QProcessEnvironment createEnvironment() override + QProcessEnvironment createEnvironment() override { return QProcessEnvironment(); } - virtual QMap<QString, QString> getVariables() const override + QMap<QString, QString> getVariables() const override { return QMap<QString, QString>(); } - virtual IPathMatcher::Ptr getLogFileMatcher() override + IPathMatcher::Ptr getLogFileMatcher() override { return nullptr; } - virtual QString getLogFileRoot() override + QString getLogFileRoot() override { return instanceRoot(); } - virtual QString typeName() const override + QString typeName() const override { return "Null"; } |