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

CMake: Small improvements to the CMakeConfigItem

Browse Source 
* Add a method to more easily get values from list of ConfigItems
* Cleanup message signature

Change-Id: I728b7c8f5c382fe4a9bf2e3b8636d63db3d07881
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-03-10 17:27:20 +01:00
parent 05ade413ce
commit 859b218059
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,7 @@ CMakeConfigItem::CMakeConfigItem(const CMakeConfigItem &other) :
value(other.value), documentation(other.documentation) value(other.value), documentation(other.documentation)
{ } { }
CMakeConfigItem::CMakeConfigItem(const QByteArray &k, CMakeConfigItem::Type &t, CMakeConfigItem::CMakeConfigItem(const QByteArray &k, Type t,
const QByteArray &d, const QByteArray &v) : const QByteArray &d, const QByteArray &v) :
key(k), type(t), value(v), documentation(d) key(k), type(t), value(v), documentation(d)
{ } { }
@@ -51,6 +51,15 @@ CMakeConfigItem::CMakeConfigItem(const QByteArray &k, const QByteArray &v) :
key(k), value(v) key(k), value(v)
{ } { }
QByteArray CMakeConfigItem::valueOf(const QByteArray &key, const QList<CMakeConfigItem> &input)
{
for (auto it = input.constBegin(); it != input.constEnd(); ++it) {
if (it->key == key)
return it->value;
}
return QByteArray();
}
std::function<bool (const CMakeConfigItem &a, const CMakeConfigItem &b)> CMakeConfigItem::sortOperator() std::function<bool (const CMakeConfigItem &a, const CMakeConfigItem &b)> CMakeConfigItem::sortOperator()
{ {
return [](const CMakeConfigItem &a, const CMakeConfigItem &b) { return a.key < b.key; }; return [](const CMakeConfigItem &a, const CMakeConfigItem &b) { return a.key < b.key; };

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

@@ -37,9 +37,11 @@ public:
enum Type { FILEPATH, PATH, BOOL, STRING, INTERNAL }; enum Type { FILEPATH, PATH, BOOL, STRING, INTERNAL };
CMakeConfigItem(); CMakeConfigItem();
CMakeConfigItem(const CMakeConfigItem &other); CMakeConfigItem(const CMakeConfigItem &other);
CMakeConfigItem(const QByteArray &k, Type &t, const QByteArray &d, const QByteArray &v); CMakeConfigItem(const QByteArray &k, Type t, const QByteArray &d, const QByteArray &v);
CMakeConfigItem(const QByteArray &k, const QByteArray &v); CMakeConfigItem(const QByteArray &k, const QByteArray &v);
static QByteArray valueOf(const QByteArray &key, const QList<CMakeConfigItem> &input);
bool isNull() const { return key.isEmpty(); } bool isNull() const { return key.isEmpty(); }
static std::function<bool(const CMakeConfigItem &a, const CMakeConfigItem &b)> sortOperator(); static std::function<bool(const CMakeConfigItem &a, const CMakeConfigItem &b)> sortOperator();