diff options
author | Nikita Baryshnikov <nib952051@gmail.com> | 2014-06-16 18:25:52 +0400 |
---|---|---|
committer | hjk <hjk121@nokiamail.com> | 2014-06-19 14:00:32 +0200 |
commit | 12103e0f676f762658310b885f8d427cdd755a18 (patch) | |
tree | 1f6ea995e86e0895fee3776e84fe75ffd717c881 /src/plugins/coreplugin/mimetypesettings.cpp | |
parent | eefd0f43320bccfeecf162bf398b50ccad7e90dc (diff) | |
download | qt-creator-12103e0f676f762658310b885f8d427cdd755a18.tar.gz |
Reinvent deprecated qSort as Utils::sort
Change-Id: I4f6011cc2b6127037249aabc2426a88ad7108ebf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/plugins/coreplugin/mimetypesettings.cpp')
-rw-r--r-- | src/plugins/coreplugin/mimetypesettings.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/plugins/coreplugin/mimetypesettings.cpp b/src/plugins/coreplugin/mimetypesettings.cpp index f2a589168a..e4aa08a6fa 100644 --- a/src/plugins/coreplugin/mimetypesettings.cpp +++ b/src/plugins/coreplugin/mimetypesettings.cpp @@ -36,6 +36,7 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditorfactory.h> #include <coreplugin/editormanager/iexternaleditor.h> +#include <utils/algorithm.h> #include <utils/headerviewstretcher.h> #include <QAbstractTableModel> @@ -47,19 +48,10 @@ #include <QSet> #include <QStringList> #include <QSortFilterProxyModel> -#include <QtAlgorithms> - -#include <algorithm> namespace Core { namespace Internal { -struct MimeTypeComp -{ - bool operator()(const MimeType &a, const MimeType &b) - { return a.type().compare(b.type(), Qt::CaseInsensitive) < 0; } -}; - // MimeTypeSettingsModel class MimeTypeSettingsModel : public QAbstractTableModel { @@ -125,7 +117,9 @@ QVariant MimeTypeSettingsModel::data(const QModelIndex &modelIndex, int role) co void MimeTypeSettingsModel::load() { m_mimeTypes = MimeDatabase::mimeTypes(); - qSort(m_mimeTypes.begin(), m_mimeTypes.end(), MimeTypeComp()); + Utils::sort(m_mimeTypes, [](const MimeType &a, const MimeType &b) { + return a.type().compare(b.type(), Qt::CaseInsensitive) < 0; + }); m_knownPatterns = QSet<QString>::fromList( MimeDatabase::fromGlobPatterns(MimeDatabase::globPatterns())); @@ -498,7 +492,7 @@ void MimeTypeSettingsPrivate::updateMimeDatabase() // For this case it is a better approach to simply use a list and to remove duplicates // afterwards than to keep a more complex data structure like a hash table. - qSort(m_modifiedMimeTypes.begin(), m_modifiedMimeTypes.end()); + Utils::sort(m_modifiedMimeTypes); m_modifiedMimeTypes.erase(std::unique(m_modifiedMimeTypes.begin(), m_modifiedMimeTypes.end()), m_modifiedMimeTypes.end()); |