From 2b9017a69ca74a80eea30c7e4f020b1b73d6fd7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 29 Oct 2016 01:34:43 +0200 Subject: NOISSUE clean up some bad/dead code --- application/MultiMC.h | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'application/MultiMC.h') 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 javalist(); // APPLICATION ONLY - std::shared_ptr instances() + std::shared_ptr instances() const { return m_instances; } - FolderInstanceProvider * folderProvider() + FolderInstanceProvider * folderProvider() const { return m_instanceFolder; } - std::shared_ptr icons() + std::shared_ptr icons() const { return m_icons; } // APPLICATION ONLY - std::shared_ptr accounts() + std::shared_ptr accounts() const { return m_accounts; } // APPLICATION ONLY - Status status() + Status status() const { return m_status; } // APPLICATION ONLY - QMap> profilers() + const QMap> &profilers() const { return m_profilers; } // APPLICATION ONLY - QMap> tools() + const QMap> &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 m_qt_translator; std::shared_ptr m_mmc_translator; std::shared_ptr m_settings; std::shared_ptr m_instances; - FolderInstanceProvider * m_instanceFolder; + FolderInstanceProvider * m_instanceFolder = nullptr; std::shared_ptr m_icons; std::shared_ptr m_updateChecker; std::shared_ptr m_accounts; @@ -192,6 +186,6 @@ private: bool consoleAttached = false; public: - QString launchId; - std::shared_ptr logFile; + QString instanceIdToLaunch; + std::unique_ptr logFile; }; -- cgit v1.2.3