feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Simplify CMakeConfigItem::sortOperator

Browse Source 
A simple function is faster and less code.

Change-Id: Ibea38936bb0866bb7a8f884d44551e2c4d1bf6a3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2021-07-06 11:37:38 +02:00
parent bb77053e6d
commit 1e19786312
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp
View File

@@ -203,9 +203,9 @@ QString CMakeConfigItem::expandedValue(const Utils::MacroExpander *expander) con
return expander ? expander->expand(QString::fromUtf8(value)) : QString::fromUtf8(value); return expander ? expander->expand(QString::fromUtf8(value)) : QString::fromUtf8(value);
} }
std::function<bool (const CMakeConfigItem &a, const CMakeConfigItem &b)> CMakeConfigItem::sortOperator() bool CMakeConfigItem::less(const CMakeConfigItem &a, const CMakeConfigItem &b)
{ {
return [](const CMakeConfigItem &a, const CMakeConfigItem &b) { return a.key < b.key; }; return a.key < b.key;
} }
CMakeConfigItem CMakeConfigItem::fromString(const QString &s) CMakeConfigItem CMakeConfigItem::fromString(const QString &s)
@@ -393,7 +393,7 @@ QList<CMakeConfigItem> CMakeConfigItem::itemsFromFile(const Utils::FilePath &cac
} }
} }
Utils::sort(result, CMakeConfigItem::sortOperator()); Utils::sort(result, &CMakeConfigItem::less);
return result; return result;

2
src/plugins/cmakeprojectmanager/cmakeconfigitem.h
View File

@@ -62,7 +62,7 @@ public:
QString expandedValue(const ProjectExplorer::Kit *k) const; QString expandedValue(const ProjectExplorer::Kit *k) const;
QString expandedValue(const Utils::MacroExpander *expander) const; QString expandedValue(const Utils::MacroExpander *expander) const;
static std::function<bool(const CMakeConfigItem &a, const CMakeConfigItem &b)> sortOperator(); static bool less(const CMakeConfigItem &a, const CMakeConfigItem &b);
static CMakeConfigItem fromString(const QString &s); static CMakeConfigItem fromString(const QString &s);
static QList<CMakeConfigItem> itemsFromArguments(const QStringList &list); static QList<CMakeConfigItem> itemsFromArguments(const QStringList &list);
static QList<CMakeConfigItem> itemsFromFile(const Utils::FilePath &input, QString *errorMessage); static QList<CMakeConfigItem> itemsFromFile(const Utils::FilePath &input, QString *errorMessage);