From efb54100dcfe8ac83284ec59e6706c488ecb10e7 Mon Sep 17 00:00:00 2001 From: Thomas Tanner Date: Sat, 21 Nov 2015 12:30:33 +0000 Subject: Removal of (get)BinaryName --- src/gameinfoimpl.cpp | 5 +++-- src/gameinfoimpl.h | 2 +- src/organizer.pro | 6 +++--- src/organizercore.cpp | 8 ++------ src/organizercore.h | 2 +- src/organizerproxy.cpp | 13 +++++++++---- src/organizerproxy.h | 9 +++++---- src/shared/fallout3info.h | 1 - src/shared/falloutnvinfo.h | 1 - src/shared/gameinfo.h | 1 - src/shared/oblivioninfo.h | 1 - src/shared/skyriminfo.h | 1 - 12 files changed, 24 insertions(+), 26 deletions(-) diff --git a/src/gameinfoimpl.cpp b/src/gameinfoimpl.cpp index 025ce4e6..a0dd832e 100644 --- a/src/gameinfoimpl.cpp +++ b/src/gameinfoimpl.cpp @@ -47,8 +47,9 @@ QString GameInfoImpl::path() const { return QDir::fromNativeSeparators(ToQString(GameInfo::instance().getGameDirectory())); } - +/* QString GameInfoImpl::binaryName() const { - return ToQString(GameInfo::instance().getBinaryName()); + return ToQString(GameInfo::instance().getgetBinaryName()); } +*/ diff --git a/src/gameinfoimpl.h b/src/gameinfoimpl.h index 3ed7be6b..b78321c4 100644 --- a/src/gameinfoimpl.h +++ b/src/gameinfoimpl.h @@ -32,7 +32,7 @@ public: virtual Type type() const; virtual QString path() const; - virtual QString binaryName() const; +// virtual QString binaryName() const; }; diff --git a/src/organizer.pro b/src/organizer.pro index 261e3c1c..65c1e4d3 100644 --- a/src/organizer.pro +++ b/src/organizer.pro @@ -355,10 +355,10 @@ CONFIG(debug, debug|release) { } OTHER_FILES += \ - SConscript + SConscript \ + CMakeLists.txt DISTFILES += \ tutorials/tutorial_primer_main.js \ tutorials/Tooltip.qml \ - tutorials/TooltipArea.qml \ - SConscript + tutorials/TooltipArea.qml diff --git a/src/organizercore.cpp b/src/organizercore.cpp index c1f091d9..d56f64cb 100644 --- a/src/organizercore.cpp +++ b/src/organizercore.cpp @@ -594,14 +594,10 @@ MOBase::VersionInfo OrganizerCore::appVersion() const return m_Updater.getVersion(); } -MOBase::IModInterface *OrganizerCore::getMod(const QString &name) +MOBase::IModInterface *OrganizerCore::getMod(const QString &name) const { unsigned int index = ModInfo::getIndex(name); - if (index == UINT_MAX) { - return nullptr; - } else { - return ModInfo::getByIndex(index).data(); - } + return index == UINT_MAX ? nullptr : ModInfo::getByIndex(index).data(); } MOBase::IModInterface *OrganizerCore::createMod(GuessedValue &name) diff --git a/src/organizercore.h b/src/organizercore.h index 85f0e0c4..3524dcb5 100644 --- a/src/organizercore.h +++ b/src/organizercore.h @@ -132,7 +132,7 @@ public: QString profilePath() const; QString downloadsPath() const; MOBase::VersionInfo appVersion() const; - MOBase::IModInterface *getMod(const QString &name); + MOBase::IModInterface *getMod(const QString &name) const; MOBase::IModInterface *createMod(MOBase::GuessedValue &name); bool removeMod(MOBase::IModInterface *mod); void modDataChanged(MOBase::IModInterface *mod); diff --git a/src/organizerproxy.cpp b/src/organizerproxy.cpp index 9e85929f..17c5a16f 100644 --- a/src/organizerproxy.cpp +++ b/src/organizerproxy.cpp @@ -52,7 +52,7 @@ VersionInfo OrganizerProxy::appVersion() const return m_Proxied->appVersion(); } -IModInterface *OrganizerProxy::getMod(const QString &name) +IModInterface *OrganizerProxy::getMod(const QString &name) const { return m_Proxied->getMod(name); } @@ -157,17 +157,22 @@ QList OrganizerProxy::findFileInfos(const QString return m_Proxied->findFileInfos(path, filter); } -MOBase::IDownloadManager *OrganizerProxy::downloadManager() +MOBase::IDownloadManager *OrganizerProxy::downloadManager() const { return m_Proxied->downloadManager(); } -MOBase::IPluginList *OrganizerProxy::pluginList() +MOBase::IPluginList *OrganizerProxy::pluginList() const { return m_Proxied->pluginList(); } -MOBase::IModList *OrganizerProxy::modList() +MOBase::IModList *OrganizerProxy::modList() const { return m_Proxied->modList(); } + +MOBase::IPluginGame *OrganizerProxy::managedGame() const +{ + return m_Proxied->managedGame(); +} diff --git a/src/organizerproxy.h b/src/organizerproxy.h index fb502a7f..31009c8a 100644 --- a/src/organizerproxy.h +++ b/src/organizerproxy.h @@ -19,7 +19,7 @@ public: virtual QString downloadsPath() const; virtual QString overwritePath() const; virtual MOBase::VersionInfo appVersion() const; - virtual MOBase::IModInterface *getMod(const QString &name); + virtual MOBase::IModInterface *getMod(const QString &name) const; virtual MOBase::IModInterface *createMod(MOBase::GuessedValue &name); virtual bool removeMod(MOBase::IModInterface *mod); virtual void modDataChanged(MOBase::IModInterface *mod); @@ -35,9 +35,9 @@ public: virtual QStringList getFileOrigins(const QString &fileName) const; virtual QList findFileInfos(const QString &path, const std::function &filter) const; - virtual MOBase::IDownloadManager *downloadManager(); - virtual MOBase::IPluginList *pluginList(); - virtual MOBase::IModList *modList(); + virtual MOBase::IDownloadManager *downloadManager() const; + virtual MOBase::IPluginList *pluginList() const; + virtual MOBase::IModList *modList() const; virtual HANDLE startApplication(const QString &executable, const QStringList &args = QStringList(), const QString &cwd = "", const QString &profile = ""); virtual bool waitForApplication(HANDLE handle, LPDWORD exitCode = nullptr) const; virtual void refreshModList(bool saveChanges); @@ -46,6 +46,7 @@ public: virtual bool onFinishedRun(const std::function &func); virtual bool onModInstalled(const std::function &func); + virtual MOBase::IPluginGame *managedGame() const; private: diff --git a/src/shared/fallout3info.h b/src/shared/fallout3info.h index 51abe073..90bb6ec0 100644 --- a/src/shared/fallout3info.h +++ b/src/shared/fallout3info.h @@ -37,7 +37,6 @@ public: static std::wstring getRegPathStatic(); virtual std::wstring getRegPath() { return getRegPathStatic(); } - virtual std::wstring getBinaryName() { return L"Fallout3.exe"; } virtual GameInfo::Type getType() { return TYPE_FALLOUT3; } diff --git a/src/shared/falloutnvinfo.h b/src/shared/falloutnvinfo.h index 59b52323..613694b2 100644 --- a/src/shared/falloutnvinfo.h +++ b/src/shared/falloutnvinfo.h @@ -37,7 +37,6 @@ public: static std::wstring getRegPathStatic(); virtual std::wstring getRegPath() { return getRegPathStatic(); } - virtual std::wstring getBinaryName() { return L"FalloutNV.exe"; } virtual GameInfo::Type getType() { return TYPE_FALLOUTNV; } diff --git a/src/shared/gameinfo.h b/src/shared/gameinfo.h index 47a5e767..57613e5e 100644 --- a/src/shared/gameinfo.h +++ b/src/shared/gameinfo.h @@ -58,7 +58,6 @@ public: //**USED IN HOOKDLL virtual std::wstring getRegPath() = 0; - virtual std::wstring getBinaryName() = 0; virtual GameInfo::Type getType() = 0; diff --git a/src/shared/oblivioninfo.h b/src/shared/oblivioninfo.h index ac10b80a..fcdac6bd 100644 --- a/src/shared/oblivioninfo.h +++ b/src/shared/oblivioninfo.h @@ -35,7 +35,6 @@ public: static std::wstring getRegPathStatic(); virtual std::wstring getRegPath() { return getRegPathStatic(); } - virtual std::wstring getBinaryName() { return L"Oblivion.exe"; } virtual GameInfo::Type getType() { return TYPE_OBLIVION; } diff --git a/src/shared/skyriminfo.h b/src/shared/skyriminfo.h index 65977a69..f26cd065 100644 --- a/src/shared/skyriminfo.h +++ b/src/shared/skyriminfo.h @@ -37,7 +37,6 @@ public: static std::wstring getRegPathStatic(); virtual std::wstring getRegPath() { return getRegPathStatic(); } - virtual std::wstring getBinaryName() { return L"TESV.exe"; } virtual GameInfo::Type getType() { return TYPE_SKYRIM; } -- cgit v1.3.1