diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index df23121c5c..e17449aa24 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -515,7 +515,7 @@ set (ESM_UI ${CMAKE_CURRENT_SOURCE_DIR}/contentselector/contentselector.ui if (USE_QT) add_component_qt_dir (contentselector model/modelitem model/esmfile - model/naturalsort model/contentmodel + model/contentmodel model/loadordererror view/combobox view/contentselector ) diff --git a/components/contentselector/model/naturalsort.cpp b/components/contentselector/model/naturalsort.cpp deleted file mode 100644 index b090137d97..0000000000 --- a/components/contentselector/model/naturalsort.cpp +++ /dev/null @@ -1,112 +0,0 @@ -/* - * This file contains code found in the QtGui module of the Qt Toolkit. - * See Qt's qfilesystemmodel source files for more information - */ - -#include "naturalsort.hpp" - -static inline QChar getNextChar(const QString& s, int location) -{ - return (location < s.length()) ? s.at(location) : QChar(); -} - -/*! - * Natural number sort, skips spaces. - * - * Examples: - * 1, 2, 10, 55, 100 - * 01.jpg, 2.jpg, 10.jpg - * - * Note on the algorithm: - * Only as many characters as necessary are looked at and at most they all - * are looked at once. - * - * Slower then QString::compare() (of course) - */ -int naturalCompare(const QString& s1, const QString& s2, Qt::CaseSensitivity cs) -{ - for (int l1 = 0, l2 = 0; l1 <= s1.count() && l2 <= s2.count(); ++l1, ++l2) - { - // skip spaces, tabs and 0's - QChar c1 = getNextChar(s1, l1); - while (c1.isSpace()) - c1 = getNextChar(s1, ++l1); - QChar c2 = getNextChar(s2, l2); - while (c2.isSpace()) - c2 = getNextChar(s2, ++l2); - - if (c1.isDigit() && c2.isDigit()) - { - while (c1.digitValue() == 0) - c1 = getNextChar(s1, ++l1); - while (c2.digitValue() == 0) - c2 = getNextChar(s2, ++l2); - - int lookAheadLocation1 = l1; - int lookAheadLocation2 = l2; - int currentReturnValue = 0; - // find the last digit, setting currentReturnValue as we go if it isn't equal - for (QChar lookAhead1 = c1, lookAhead2 = c2; - (lookAheadLocation1 <= s1.length() && lookAheadLocation2 <= s2.length()); - lookAhead1 = getNextChar(s1, ++lookAheadLocation1), lookAhead2 = getNextChar(s2, ++lookAheadLocation2)) - { - bool is1ADigit = !lookAhead1.isNull() && lookAhead1.isDigit(); - bool is2ADigit = !lookAhead2.isNull() && lookAhead2.isDigit(); - if (!is1ADigit && !is2ADigit) - break; - if (!is1ADigit) - return -1; - if (!is2ADigit) - return 1; - if (currentReturnValue == 0) - { - if (lookAhead1 < lookAhead2) - { - currentReturnValue = -1; - } - else if (lookAhead1 > lookAhead2) - { - currentReturnValue = 1; - } - } - } - if (currentReturnValue != 0) - return currentReturnValue; - } - - if (cs == Qt::CaseInsensitive) - { - if (!c1.isLower()) - c1 = c1.toLower(); - if (!c2.isLower()) - c2 = c2.toLower(); - } - int r = QString::localeAwareCompare(c1, c2); - if (r < 0) - return -1; - if (r > 0) - return 1; - } - // The two strings are the same (02 == 2) so fall back to the normal sort - return QString::compare(s1, s2, cs); -} - -bool naturalSortLessThanCS(const QString& left, const QString& right) -{ - return (naturalCompare(left, right, Qt::CaseSensitive) < 0); -} - -bool naturalSortLessThanCI(const QString& left, const QString& right) -{ - return (naturalCompare(left, right, Qt::CaseInsensitive) < 0); -} - -bool naturalSortGreaterThanCS(const QString& left, const QString& right) -{ - return (naturalCompare(left, right, Qt::CaseSensitive) > 0); -} - -bool naturalSortGreaterThanCI(const QString& left, const QString& right) -{ - return (naturalCompare(left, right, Qt::CaseInsensitive) > 0); -} diff --git a/components/contentselector/model/naturalsort.hpp b/components/contentselector/model/naturalsort.hpp deleted file mode 100644 index 6973c55c2e..0000000000 --- a/components/contentselector/model/naturalsort.hpp +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef NATURALSORT_H -#define NATURALSORT_H - -#include - -bool naturalSortLessThanCS(const QString& left, const QString& right); -bool naturalSortLessThanCI(const QString& left, const QString& right); -bool naturalSortGreaterThanCS(const QString& left, const QString& right); -bool naturalSortGreaterThanCI(const QString& left, const QString& right); - -#endif