summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChris Bessent <lost.dragonist@gmail.com>2021-01-18 06:43:02 -0700
committerChris Bessent <lost.dragonist@gmail.com>2021-01-18 06:43:02 -0700
commit9f96a88989395acb702ffc6f34a6928cb81be97a (patch)
tree9ba23b52a645745f55f24502727bda0f8ac9c183 /src
parente69cb90dbef5c5c82f9ae860ccbdeb7f034f885e (diff)
Use existing comparator from MOBase
Diffstat (limited to 'src')
-rw-r--r--src/modinfo.cpp2
-rw-r--r--src/modinfo.h9
2 files changed, 3 insertions, 8 deletions
diff --git a/src/modinfo.cpp b/src/modinfo.cpp
index 254fbda3..59026262 100644
--- a/src/modinfo.cpp
+++ b/src/modinfo.cpp
@@ -52,7 +52,7 @@ using namespace MOShared;
const std::set<unsigned int> ModInfo::s_EmptySet;
std::vector<ModInfo::Ptr> ModInfo::s_Collection;
ModInfo::Ptr ModInfo::s_Overwrite;
-std::map<QString, unsigned int, ModNameCompare> ModInfo::s_ModsByName;
+std::map<QString, unsigned int, MOBase::FileNameComparator> ModInfo::s_ModsByName;
std::map<std::pair<QString, int>, std::vector<unsigned int>> ModInfo::s_ModsByModID;
int ModInfo::s_NextID;
QMutex ModInfo::s_Mutex(QMutex::Recursive);
diff --git a/src/modinfo.h b/src/modinfo.h
index f18bd347..c9b74a66 100644
--- a/src/modinfo.h
+++ b/src/modinfo.h
@@ -21,6 +21,7 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
#define MODINFO_H
#include "imodinterface.h"
+#include "ifiletree.h"
#include "versioninfo.h"
class OrganizerCore;
@@ -43,12 +44,6 @@ class QDateTime;
namespace MOBase { class IPluginGame; }
namespace MOShared { class DirectoryEntry; }
-struct ModNameCompare {
- bool operator()(const QString& lhs, const QString& rhs) const {
- return QString::compare(lhs, rhs, Qt::CaseInsensitive) < 0;
- }
-};
-
/**
* @brief Represents meta information about a single mod.
*
@@ -995,7 +990,7 @@ protected:
static QMutex s_Mutex;
static std::vector<ModInfo::Ptr> s_Collection;
static ModInfo::Ptr s_Overwrite;
- static std::map<QString, unsigned int, ModNameCompare> s_ModsByName;
+ static std::map<QString, unsigned int, MOBase::FileNameComparator> s_ModsByName;
static std::map<std::pair<QString, int>, std::vector<unsigned int>> s_ModsByModID;
static int s_NextID;