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

SdkTool: Fix compile with msvc

Browse Source 
after f4d30a6798

Change-Id: Ie8985470800b668c2b3ed834884dfad1008efddc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2019-08-23 07:24:47 +02:00
committed by Christian Stenger
parent 8fd89a9a34
commit e5cfd9c563
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/tools/sdktool/addvalueoperation.cpp
View File

@@ -35,7 +35,7 @@
namespace { namespace {
constexpr auto SUCCESS = 0; constexpr auto SUCCESS = 0;
constexpr auto FAILURE = not SUCCESS; constexpr auto FAILURE = !SUCCESS;
} // namespace } // namespace
QString AddValueOperation::name() const QString AddValueOperation::name() const
@@ -78,7 +78,7 @@ bool AddValueOperation::setArguments(const QStringList &args)
m_key = tempArgs.takeFirst(); m_key = tempArgs.takeFirst();
for (const auto &arg : tempArgs) { for (const auto &arg : tempArgs) {
const auto val = Operation::valueFromString(arg); const auto val = Operation::valueFromString(arg);
if (not val.isValid() or val.isNull()) { if (!val.isValid() || val.isNull()) {
std::cerr << "Error: " << std::quoted(arg.toStdString()) std::cerr << "Error: " << std::quoted(arg.toStdString())
<< " is not a valid QVariant like string Type:Value.\n" << " is not a valid QVariant like string Type:Value.\n"
<< std::endl; << std::endl;
@@ -143,20 +143,20 @@ bool AddValueOperation::test() const
testMap = AddKeysOperation::addKeys(testMap, testKvpList); testMap = AddKeysOperation::addKeys(testMap, testKvpList);
// quick sanity check // quick sanity check
if (testMap.count() != 3 and testDataList.count() != 2 and testKvpList.count() != 3) if (testMap.count() != 3 && testDataList.count() != 2 && testKvpList.count() != 3)
return false; return false;
// successful adding of values // successful adding of values
result = appendListToMap(testMap, "test/bar", valueList); result = appendListToMap(testMap, "test/bar", valueList);
if (not result) if (!result)
return false; return false;
const auto newList = qvariant_cast<QVariantList>(GetOperation::get(testMap, "test/bar")); const auto newList = qvariant_cast<QVariantList>(GetOperation::get(testMap, "test/bar"));
if (newList.count() != (testDataList.count() + valueList.count())) if (newList.count() != (testDataList.count() + valueList.count()))
return false; return false;
if (not newList.contains(1860) or not newList.contains(QString("Some String")) if (!newList.contains(1860) || !newList.contains(QString("Some String"))
or not newList.contains("ELIL") or not newList.contains(-1)) || !newList.contains("ELIL") || !newList.contains(-1))
return false; return false;
return true; return true;
@@ -169,13 +169,13 @@ bool AddValueOperation::appendListToMap(QVariantMap &map,
{ {
const auto data = GetOperation::get(map, key); const auto data = GetOperation::get(map, key);
if (not data.isValid() or data.isNull()) { if (!data.isValid() || data.isNull()) {
std::cerr << "Error: Could not retrieve value for key " << std::quoted(key.toStdString()) std::cerr << "Error: Could not retrieve value for key " << std::quoted(key.toStdString())
<< std::endl; << std::endl;
return false; return false;
} }
if (not data.canConvert<QVariantList>()) { if (!data.canConvert<QVariantList>()) {
std::cerr << "Error: Data stored in " << std::quoted(key.toStdString()) std::cerr << "Error: Data stored in " << std::quoted(key.toStdString())
<< " can not be converted into QVariantList." << std::endl; << " can not be converted into QVariantList." << std::endl;
return false; return false;