From 7b087f8f9d94b3758b3dad8d29670cd73d058510 Mon Sep 17 00:00:00 2001 From: Thomas Tanner Date: Sun, 6 Dec 2015 21:10:37 +0000 Subject: Facepalm moments - realised gameinfo init call is no longer needed. Removed all references --- src/main.cpp | 4 ---- src/nxmaccessmanager.cpp | 1 - src/profile.h | 4 ---- src/profilesdialog.h | 1 - src/settings.cpp | 1 - 5 files changed, 11 deletions(-) (limited to 'src') diff --git a/src/main.cpp b/src/main.cpp index 353e7202..3469e9c3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -35,7 +35,6 @@ along with Mod Organizer. If not, see . #include #include "modlist.h" #include "profile.h" -#include "gameinfo.h" #include "spawn.h" #include "executableslist.h" #include "singleinstance.h" @@ -569,9 +568,6 @@ int main(int argc, char *argv[]) organizer.setManagedGame(game); - //*sigh just for making it work - GameInfo::init(application.applicationDirPath().toStdWString(), game->gameDirectory().absolutePath().toStdWString()); - organizer.createDefaultProfile(); //See the pragma - we apparently don't use this so not sure why we check it diff --git a/src/nxmaccessmanager.cpp b/src/nxmaccessmanager.cpp index 7d0dacc2..616b3806 100644 --- a/src/nxmaccessmanager.cpp +++ b/src/nxmaccessmanager.cpp @@ -26,7 +26,6 @@ along with Mod Organizer. If not, see . #include "selfupdater.h" #include "persistentcookiejar.h" #include "settings.h" -#include #include #include #include diff --git a/src/profile.h b/src/profile.h index b306e0c5..e33ac674 100644 --- a/src/profile.h +++ b/src/profile.h @@ -102,10 +102,6 @@ public: /** * @brief activate archive invalidation - * - * @param dataDirectory data directory of the game - * @todo passing the data directory as a parameter is useless, the function should - * be able to query it from GameInfo **/ void activateInvalidation(); diff --git a/src/profilesdialog.h b/src/profilesdialog.h index 26476883..073d92b7 100644 --- a/src/profilesdialog.h +++ b/src/profilesdialog.h @@ -48,7 +48,6 @@ public: * * @param profileName currently enabled profile * @param parent parent widget - * @todo the game path could be retrieved from GameInfo just as easily **/ explicit ProfilesDialog(const QString &profileName, MOBase::IPluginGame const *game, QWidget *parent = 0); ~ProfilesDialog(); diff --git a/src/settings.cpp b/src/settings.cpp index 479dd3ab..d493be1d 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -22,7 +22,6 @@ along with Mod Organizer. If not, see . #include "settingsdialog.h" #include "utility.h" #include "helper.h" -#include #include #include #include -- cgit v1.3.1 From 2d43645b646df75cfe76eaa952e85ffcaff3951a Mon Sep 17 00:00:00 2001 From: Thomas Tanner Date: Sun, 20 Dec 2015 22:25:11 +0000 Subject: Restore start download file method (2 of 3) --- src/downloadmanager.cpp | 5 ++--- src/downloadmanager.h | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp index cbc1ba45..c551e590 100644 --- a/src/downloadmanager.cpp +++ b/src/downloadmanager.cpp @@ -1244,14 +1244,13 @@ int DownloadManager::startDownloadURLs(const QStringList &urls) return m_ActiveDownloads.size() - 1; } -/* This doesn't appear to be used by anything int DownloadManager::startDownloadNexusFile(int modID, int fileID) { int newID = m_ActiveDownloads.size(); - addNXMDownload(QString("nxm://%1/mods/%2/files/%3").arg(ToQString(MOShared::GameInfo::instance().getGameName())).arg(modID).arg(fileID)); + addNXMDownload(QString("nxm://%1/mods/%2/files/%3").arg(m_ManagedGame->getGameShortName()).arg(modID).arg(fileID)); return newID; } -*/ + QString DownloadManager::downloadPath(int id) { return getFilePath(id); diff --git a/src/downloadmanager.h b/src/downloadmanager.h index 54db4648..e63a0113 100644 --- a/src/downloadmanager.h +++ b/src/downloadmanager.h @@ -329,9 +329,9 @@ public: virtual int startDownloadURLs(const QStringList &urls); - /* This doesn't appear to be used anywhere + virtual int startDownloadNexusFile(int modID, int fileID); - */ + virtual QString downloadPath(int id); /** -- cgit v1.3.1