diff options
author | Petr Mrázek <peterix@gmail.com> | 2016-10-29 01:34:43 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2016-10-29 01:34:43 +0200 |
commit | 2b9017a69ca74a80eea30c7e4f020b1b73d6fd7f (patch) | |
tree | 4ae3309d25c9d7e4ad8cb4472662375b8a494fff /application/MultiMC.h | |
parent | 172ff47a659496186df6b6d8c77d0b13ad96b2fe (diff) | |
download | MultiMC-2b9017a69ca74a80eea30c7e4f020b1b73d6fd7f.tar MultiMC-2b9017a69ca74a80eea30c7e4f020b1b73d6fd7f.tar.gz MultiMC-2b9017a69ca74a80eea30c7e4f020b1b73d6fd7f.tar.lz MultiMC-2b9017a69ca74a80eea30c7e4f020b1b73d6fd7f.tar.xz MultiMC-2b9017a69ca74a80eea30c7e4f020b1b73d6fd7f.zip |
NOISSUE clean up some bad/dead code
Diffstat (limited to 'application/MultiMC.h')
-rw-r--r-- | application/MultiMC.h | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/application/MultiMC.h b/application/MultiMC.h index 06819d28..070447fc 100644 --- a/application/MultiMC.h +++ b/application/MultiMC.h @@ -87,50 +87,47 @@ public: std::shared_ptr<JavaInstallList> javalist(); // APPLICATION ONLY - std::shared_ptr<InstanceList> instances() + std::shared_ptr<InstanceList> instances() const { return m_instances; } - FolderInstanceProvider * folderProvider() + FolderInstanceProvider * folderProvider() const { return m_instanceFolder; } - std::shared_ptr<IconList> icons() + std::shared_ptr<IconList> icons() const { return m_icons; } // APPLICATION ONLY - std::shared_ptr<MojangAccountList> accounts() + std::shared_ptr<MojangAccountList> accounts() const { return m_accounts; } // APPLICATION ONLY - Status status() + Status status() const { return m_status; } // APPLICATION ONLY - QMap<QString, std::shared_ptr<BaseProfilerFactory>> profilers() + const QMap<QString, std::shared_ptr<BaseProfilerFactory>> &profilers() const { return m_profilers; } // APPLICATION ONLY - QMap<QString, std::shared_ptr<BaseDetachedToolFactory>> tools() + const QMap<QString, std::shared_ptr<BaseDetachedToolFactory>> &tools() const { return m_tools; } // APPLICATION ONLY - QString getFinishCmd(); void installUpdates(const QString updateFilesDir, GoUpdate::OperationList operations); - void updateXP(const QString updateFilesDir, GoUpdate::OperationList operations); - void updateModern(const QString updateFilesDir, GoUpdate::OperationList operations); /*! * Opens a json file using either a system default editor, or, if note empty, the editor @@ -161,16 +158,13 @@ private: void initSSL(); private: - friend class UpdateCheckerTest; - friend class DownloadTaskTest; - QDateTime startTime; std::shared_ptr<QTranslator> m_qt_translator; std::shared_ptr<QTranslator> m_mmc_translator; std::shared_ptr<SettingsObject> m_settings; std::shared_ptr<InstanceList> m_instances; - FolderInstanceProvider * m_instanceFolder; + FolderInstanceProvider * m_instanceFolder = nullptr; std::shared_ptr<IconList> m_icons; std::shared_ptr<UpdateChecker> m_updateChecker; std::shared_ptr<MojangAccountList> m_accounts; @@ -192,6 +186,6 @@ private: bool consoleAttached = false; public: - QString launchId; - std::shared_ptr<QFile> logFile; + QString instanceIdToLaunch; + std::unique_ptr<QFile> logFile; }; |