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

sdktool: Fix MSVC warnings about comparison (!<int> == number).

Browse Source 
Change-Id: I74be70ed1693160acab5c4be5da09d004bf0801c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Friedemann Kleint
2012-09-28 09:50:06 +02:00
committed by Tobias Hunger
parent 154f6c859e
commit 6dad4586c6
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/sdktool/addkeysoperation.cpp
View File

@@ -113,7 +113,7 @@ bool AddKeysOperation::test() const
data.append(KeyValuePair(QLatin1String("newsub/1/2.1/3/qbytearray"), QString::fromLatin1("QByteArray:test array."))); data.append(KeyValuePair(QLatin1String("newsub/1/2.1/3/qbytearray"), QString::fromLatin1("QByteArray:test array.")));
QVariantMap result = addKeys(testMap, data); QVariantMap result = addKeys(testMap, data);
if (!result.count() == 8) if (result.count() != 8)
return false; return false;
// subkeys: // subkeys:

10
src/tools/sdktool/addkitoperation.cpp
View File

@@ -216,7 +216,7 @@ bool AddKitOperation::test() const
{ {
QVariantMap map = initializeKits(); QVariantMap map = initializeKits();
if (!map.count() == 3 if (map.count() != 3
|| !map.contains(QLatin1String(VERSION)) || !map.contains(QLatin1String(VERSION))
|| map.value(QLatin1String(VERSION)).toInt() != 1 || map.value(QLatin1String(VERSION)).toInt() != 1
|| !map.contains(QLatin1String(COUNT)) || !map.contains(QLatin1String(COUNT))
@@ -231,7 +231,7 @@ bool AddKitOperation::test() const
QLatin1String("{some-tc-id}"), QLatin1String("{some-qt-id}"), QLatin1String("unsupported/mkspec"), QLatin1String("{some-tc-id}"), QLatin1String("{some-qt-id}"), QLatin1String("unsupported/mkspec"),
KeyValuePairList() << KeyValuePair(QLatin1String("PE.Profile.Data/extraData"), QVariant(QLatin1String("extraValue")))); KeyValuePairList() << KeyValuePair(QLatin1String("PE.Profile.Data/extraData"), QVariant(QLatin1String("extraValue"))));
if (!map.count() == 4 if (map.count() != 4
|| !map.contains(QLatin1String(VERSION)) || !map.contains(QLatin1String(VERSION))
|| map.value(QLatin1String(VERSION)).toInt() != 1 || map.value(QLatin1String(VERSION)).toInt() != 1
|| !map.contains(QLatin1String(COUNT)) || !map.contains(QLatin1String(COUNT))
@@ -242,7 +242,7 @@ bool AddKitOperation::test() const
return false; return false;
QVariantMap profile0 = map.value(QLatin1String("Profile.0")).toMap(); QVariantMap profile0 = map.value(QLatin1String("Profile.0")).toMap();
if (!profile0.count() == 6 if (profile0.count() != 6
|| !profile0.contains(QLatin1String(ID)) || !profile0.contains(QLatin1String(ID))
|| profile0.value(QLatin1String(ID)).toString() != QLatin1String("testId") || profile0.value(QLatin1String(ID)).toString() != QLatin1String("testId")
|| !profile0.contains(QLatin1String(DISPLAYNAME)) || !profile0.contains(QLatin1String(DISPLAYNAME))
@@ -266,7 +266,7 @@ bool AddKitOperation::test() const
QLatin1String("Desktop"), QString(), QLatin1String("Desktop"), QString(),
QLatin1String("{some-tc-id2}"), QLatin1String("{some-qt-id2}"), QLatin1String("unsupported/mkspec2"), QLatin1String("{some-tc-id2}"), QLatin1String("{some-qt-id2}"), QLatin1String("unsupported/mkspec2"),
KeyValuePairList() << KeyValuePair(QLatin1String("PE.Profile.Data/extraData"), QVariant(QLatin1String("extraValue2")))); KeyValuePairList() << KeyValuePair(QLatin1String("PE.Profile.Data/extraData"), QVariant(QLatin1String("extraValue2"))));
if (!map.count() == 5 if (map.count() != 5
|| !map.contains(QLatin1String(VERSION)) || !map.contains(QLatin1String(VERSION))
|| map.value(QLatin1String(VERSION)).toInt() != 1 || map.value(QLatin1String(VERSION)).toInt() != 1
|| !map.contains(QLatin1String(COUNT)) || !map.contains(QLatin1String(COUNT))
@@ -280,7 +280,7 @@ bool AddKitOperation::test() const
return false; return false;
QVariantMap profile1 = map.value(QLatin1String("Profile.1")).toMap(); QVariantMap profile1 = map.value(QLatin1String("Profile.1")).toMap();
if (!profile1.count() == 6 if (profile1.count() != 6
|| !profile1.contains(QLatin1String(ID)) || !profile1.contains(QLatin1String(ID))
|| profile1.value(QLatin1String(ID)).toString() != QLatin1String("testId2") || profile1.value(QLatin1String(ID)).toString() != QLatin1String("testId2")
|| !profile1.contains(QLatin1String(DISPLAYNAME)) || !profile1.contains(QLatin1String(DISPLAYNAME))

8
src/tools/sdktool/addqtoperation.cpp
View File

@@ -149,14 +149,14 @@ bool AddQtOperation::test() const
QLatin1String("/tmp/test/qmake"), QLatin1String("/tmp/test/qmake"),
KeyValuePairList() << KeyValuePair(QLatin1String("extraData"), QVariant(QLatin1String("extraValue")))); KeyValuePairList() << KeyValuePair(QLatin1String("extraData"), QVariant(QLatin1String("extraValue"))));
if (!map.count() == 2 if (map.count() != 2
|| !map.contains(QLatin1String(VERSION)) || !map.contains(QLatin1String(VERSION))
|| map.value(QLatin1String(VERSION)).toInt() != 1 || map.value(QLatin1String(VERSION)).toInt() != 1
|| !map.contains(QLatin1String("QtVersion.0"))) || !map.contains(QLatin1String("QtVersion.0")))
return false; return false;
QVariantMap version0 = map.value(QLatin1String("QtVersion.0")).toMap(); QVariantMap version0 = map.value(QLatin1String("QtVersion.0")).toMap();
if (!version0.count() == 6 if (version0.count() != 6
|| !version0.contains(QLatin1String(ID)) || !version0.contains(QLatin1String(ID))
|| version0.value(QLatin1String(ID)).toInt() != -1 || version0.value(QLatin1String(ID)).toInt() != -1
|| !version0.contains(QLatin1String(DISPLAYNAME)) || !version0.contains(QLatin1String(DISPLAYNAME))
@@ -184,7 +184,7 @@ bool AddQtOperation::test() const
map = addQt(map, QLatin1String("testId2"), QLatin1String("Test Qt Version"), QLatin1String("testType3"), map = addQt(map, QLatin1String("testId2"), QLatin1String("Test Qt Version"), QLatin1String("testType3"),
QLatin1String("/tmp/test/qmake2"), QLatin1String("/tmp/test/qmake2"),
KeyValuePairList() << KeyValuePair(QLatin1String("extraData"), QVariant(QLatin1String("extraValue")))); KeyValuePairList() << KeyValuePair(QLatin1String("extraData"), QVariant(QLatin1String("extraValue"))));
if (!map.count() == 3 if (map.count() != 3
|| !map.contains(QLatin1String(VERSION)) || !map.contains(QLatin1String(VERSION))
|| map.value(QLatin1String(VERSION)).toInt() != 1 || map.value(QLatin1String(VERSION)).toInt() != 1
|| !map.contains(QLatin1String("QtVersion.0")) || !map.contains(QLatin1String("QtVersion.0"))
@@ -195,7 +195,7 @@ bool AddQtOperation::test() const
return false; return false;
QVariantMap version1 = map.value(QLatin1String("QtVersion.1")).toMap(); QVariantMap version1 = map.value(QLatin1String("QtVersion.1")).toMap();
if (!version1.count() == 6 if (version1.count() != 6
|| !version1.contains(QLatin1String(ID)) || !version1.contains(QLatin1String(ID))
|| version1.value(QLatin1String(ID)).toInt() != -1 || version1.value(QLatin1String(ID)).toInt() != -1
|| !version1.contains(QLatin1String(DISPLAYNAME)) || !version1.contains(QLatin1String(DISPLAYNAME))

2
src/tools/sdktool/addtoolchainoperation.cpp
View File

@@ -183,7 +183,7 @@ bool AddToolChainOperation::test() const
map = addToolChain(map, QLatin1String("testId2"), QLatin1String("name"), QLatin1String("/tmp/test"), map = addToolChain(map, QLatin1String("testId2"), QLatin1String("name"), QLatin1String("/tmp/test"),
QLatin1String("test-abi"), QLatin1String("test-abi,test-abi2"), QLatin1String("test-abi"), QLatin1String("test-abi,test-abi2"),
KeyValuePairList() << KeyValuePair(QLatin1String("ExtraKey"), QVariant(QLatin1String("ExtraValue")))); KeyValuePairList() << KeyValuePair(QLatin1String("ExtraKey"), QVariant(QLatin1String("ExtraValue"))));
if (!map.value(QLatin1String(COUNT)).toInt() == 2 if (map.value(QLatin1String(COUNT)).toInt() != 2
|| !map.contains(QString::fromLatin1(PREFIX) + QLatin1Char('0')) || !map.contains(QString::fromLatin1(PREFIX) + QLatin1Char('0'))
|| !map.contains(QString::fromLatin1(PREFIX) + QLatin1Char('1'))) || !map.contains(QString::fromLatin1(PREFIX) + QLatin1Char('1')))
return false; return false;