diff options
| -rw-r--r-- | src/mainwindow.cpp | 3 | ||||
| -rw-r--r-- | src/modinfo.cpp | 2 | ||||
| -rw-r--r-- | src/modinfo.h | 8 | ||||
| -rw-r--r-- | src/profile.cpp | 2 |
4 files changed, 4 insertions, 11 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 809da989..b4f709d3 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -2431,7 +2431,8 @@ IModInterface *MainWindow::getMod(const QString &name) IModInterface *MainWindow::createMod(GuessedValue<QString> &name) { - if (!m_InstallationManager.testOverwrite(name)) { + bool merge = false; + if (!m_InstallationManager.testOverwrite(name, &merge)) { return NULL; } diff --git a/src/modinfo.cpp b/src/modinfo.cpp index 28a906fa..b31d3cda 100644 --- a/src/modinfo.cpp +++ b/src/modinfo.cpp @@ -232,7 +232,7 @@ void ModInfo::updateIndices() QRegExp backupRegEx(".*backup[0-9]*$"); for (unsigned int i = 0; i < s_Collection.size(); ++i) { - QString modName = s_Collection[i]->internalName(); + QString modName = s_Collection[i]->name(); int modID = s_Collection[i]->getNexusID(); s_ModsByName[modName] = i; s_ModsByModID[modID].push_back(i); diff --git a/src/modinfo.h b/src/modinfo.h index 4d70d22d..dbb5decf 100644 --- a/src/modinfo.h +++ b/src/modinfo.h @@ -317,13 +317,6 @@ public: virtual QString name() const = 0;
/**
- * @brief getter for an internal name. This is usually the same as the regular name, but with special mod types it might be
- * this is used to distinguish between mods that have the same visible name
- * @return internal mod name
- */
- virtual QString internalName() const { return name(); }
-
- /**
* @brief getter for the mod path
*
* @return the (absolute) path to the mod
@@ -1018,7 +1011,6 @@ public: virtual void endorse(bool) {}
virtual bool isEmpty() const { return false; }
virtual QString name() const;
- virtual QString internalName() const { return name() + INT_IDENTIFIER; }
virtual QString notes() const { return ""; }
virtual QDateTime creationTime() const;
virtual QString absolutePath() const;
diff --git a/src/profile.cpp b/src/profile.cpp index 12992291..fda61c4d 100644 --- a/src/profile.cpp +++ b/src/profile.cpp @@ -388,7 +388,7 @@ std::vector<std::tuple<QString, QString, int> > Profile::getActiveMods() iter != m_ModIndexByPriority.end(); ++iter) { if ((*iter != UINT_MAX) && m_ModStatus[*iter].m_Enabled) { ModInfo::Ptr modInfo = ModInfo::getByIndex(*iter); - result.push_back(std::make_tuple(modInfo->internalName(), modInfo->absolutePath(), m_ModStatus[*iter].m_Priority)); + result.push_back(std::make_tuple(modInfo->name(), modInfo->absolutePath(), m_ModStatus[*iter].m_Priority)); } } |
