diff options
| author | Tannin <devnull@localhost> | 2015-01-24 19:34:12 +0100 |
|---|---|---|
| committer | Tannin <devnull@localhost> | 2015-01-24 19:34:12 +0100 |
| commit | c3a95bdef1d989a54684b966e042b12bf682046d (patch) | |
| tree | 83a09ca9252b9d5a060acb415b8c3c0923cfe2c3 /src/modinfo.cpp | |
| parent | 9edc39633b82b5e02d33c4b0a395fe110af28eb4 (diff) | |
| parent | f756aede08edb315ebe5882098191ebfe971fd81 (diff) | |
Merge with branch1.2
Diffstat (limited to 'src/modinfo.cpp')
| -rw-r--r-- | src/modinfo.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/modinfo.cpp b/src/modinfo.cpp index e956377c..b1d9bed4 100644 --- a/src/modinfo.cpp +++ b/src/modinfo.cpp @@ -244,7 +244,6 @@ void ModInfo::updateIndices() { s_ModsByName.clear(); s_ModsByModID.clear(); - QRegExp backupRegEx(".*backup[0-9]*$"); for (unsigned int i = 0; i < s_Collection.size(); ++i) { QString modName = s_Collection[i]->internalName(); @@ -843,7 +842,7 @@ void ModInfoRegular::ignoreUpdate(bool ignore) std::vector<ModInfo::EFlag> ModInfoRegular::getFlags() const { std::vector<ModInfo::EFlag> result = ModInfoWithConflictInfo::getFlags(); - if ((m_NexusID != -1) && (endorsedState() == ENDORSED_FALSE)) { + if ((m_NexusID > 0) && (endorsedState() == ENDORSED_FALSE)) { result.push_back(ModInfo::FLAG_NOTENDORSED); } if (!isValid()) { @@ -1044,8 +1043,6 @@ QStringList ModInfoOverwrite::archives() const return result; } -const char ModInfoForeign::INT_IDENTIFIER[] = "__int__foreign"; - QString ModInfoForeign::name() const { return m_Name; @@ -1086,5 +1083,5 @@ ModInfoForeign::ModInfoForeign(const QString &referenceFile, const QStringList & , m_Archives(archives) { m_CreationTime = QFileInfo(referenceFile).created(); - m_Name = tr("Unmanaged") + ": " + QFileInfo(m_ReferenceFile).baseName(); + m_Name = "Unmanaged: " + QFileInfo(m_ReferenceFile).baseName(); } |