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

ProjectExplorer: Handle more Qt deprecation warnings

Browse Source 
Change-Id: I6b6c24e17fce369324749a47ae2aa8a1ab4afb31
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2023-06-09 12:12:04 +02:00
parent a1bf748e95
commit 37095e0f96
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
View File

@@ -218,14 +218,14 @@ QString JsonWizard::stringValue(const QString &n) const
if (!v.isValid()) if (!v.isValid())
return QString(); return QString();
if (v.type() == QVariant::String) { if (v.typeId() == QVariant::String) {
QString tmp = m_expander.expand(v.toString()); QString tmp = m_expander.expand(v.toString());
if (tmp.isEmpty()) if (tmp.isEmpty())
tmp = QString::fromLatin1(""); // Make sure isNull() is *not* true. tmp = QString::fromLatin1(""); // Make sure isNull() is *not* true.
return tmp; return tmp;
} }
if (v.type() == QVariant::StringList) if (v.typeId() == QVariant::StringList)
return stringListToArrayString(v.toStringList(), &m_expander); return stringListToArrayString(v.toStringList(), &m_expander);
return v.toString(); return v.toString();
@@ -276,7 +276,7 @@ QVariant JsonWizard::value(const QString &n) const
bool JsonWizard::boolFromVariant(const QVariant &v, MacroExpander *expander) bool JsonWizard::boolFromVariant(const QVariant &v, MacroExpander *expander)
{ {
if (v.type() == QVariant::String) { if (v.typeId() == QVariant::String) {
const QString tmp = expander->expand(v.toString()); const QString tmp = expander->expand(v.toString());
return !(tmp.isEmpty() || tmp == QLatin1String("false")); return !(tmp.isEmpty() || tmp == QLatin1String("false"));
} }
@@ -410,7 +410,7 @@ void JsonWizard::handleError(const QString &message)
QString JsonWizard::stringify(const QVariant &v) const QString JsonWizard::stringify(const QVariant &v) const
{ {
if (v.type() == QVariant::StringList) if (v.typeId() == QVariant::StringList)
return stringListToArrayString(v.toStringList(), &m_expander); return stringListToArrayString(v.toStringList(), &m_expander);
return Wizard::stringify(v); return Wizard::stringify(v);
} }

24
src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
View File

@@ -102,7 +102,7 @@ static JsonWizardFactory::Generator parseGenerator(const QVariant &value, QStrin
{ {
JsonWizardFactory::Generator gen; JsonWizardFactory::Generator gen;
if (value.type() != QVariant::Map) { if (value.typeId() != QVariant::Map) {
*errorMessage = Tr::tr("Generator is not a object."); *errorMessage = Tr::tr("Generator is not a object.");
return gen; return gen;
} }
@@ -236,8 +236,8 @@ QVariant JsonWizardFactory::getDataValue(const QLatin1String &key, const QVarian
{ {
QVariant retVal = {}; QVariant retVal = {};
if ((valueSet.contains(key) && valueSet.value(key).type() == QVariant::Map) || if ((valueSet.contains(key) && valueSet.value(key).typeId() == QVariant::Map) ||
(defaultValueSet.contains(key) && defaultValueSet.value(key).type() == QVariant::Map)) { (defaultValueSet.contains(key) && defaultValueSet.value(key).typeId() == QVariant::Map)) {
retVal = mergeDataValueMaps(valueSet.value(key), defaultValueSet.value(key)); retVal = mergeDataValueMaps(valueSet.value(key), defaultValueSet.value(key));
} else { } else {
QVariant defaultValue = defaultValueSet.value(key, notExistValue); QVariant defaultValue = defaultValueSet.value(key, notExistValue);
@@ -263,7 +263,7 @@ std::pair<int, QStringList> JsonWizardFactory::screenSizeInfoFromPage(const QStr
return {}; return {};
const QVariant data = it->data; const QVariant data = it->data;
if (data.type() != QVariant::List) if (data.typeId() != QVariant::List)
return {}; return {};
const QVariant screenFactorField = Utils::findOrDefault(data.toList(), const QVariant screenFactorField = Utils::findOrDefault(data.toList(),
@@ -272,11 +272,11 @@ std::pair<int, QStringList> JsonWizardFactory::screenSizeInfoFromPage(const QStr
return "ScreenFactor" == m["name"]; return "ScreenFactor" == m["name"];
}); });
if (screenFactorField.type() != QVariant::Map) if (screenFactorField.typeId() != QVariant::Map)
return {}; return {};
const QVariant screenFactorData = screenFactorField.toMap()["data"]; const QVariant screenFactorData = screenFactorField.toMap()["data"];
if (screenFactorData.type() != QVariant::Map) if (screenFactorData.typeId() != QVariant::Map)
return {}; return {};
const QVariantMap screenFactorDataMap = screenFactorData.toMap(); const QVariantMap screenFactorDataMap = screenFactorData.toMap();
@@ -304,7 +304,7 @@ JsonWizardFactory::Page JsonWizardFactory::parsePage(const QVariant &value, QStr
{ {
JsonWizardFactory::Page p; JsonWizardFactory::Page p;
if (value.type() != QVariant::Map) { if (value.typeId() != QVariant::Map) {
*errorMessage = Tr::tr("Page is not an object."); *errorMessage = Tr::tr("Page is not an object.");
return p; return p;
} }
@@ -351,9 +351,9 @@ JsonWizardFactory::Page JsonWizardFactory::parsePage(const QVariant &value, QStr
if (specifiedSubData.isNull()) if (specifiedSubData.isNull())
subData = defaultSubData; subData = defaultSubData;
else if (specifiedSubData.type() == QVariant::Map) else if (specifiedSubData.typeId() == QVariant::Map)
subData = mergeDataValueMaps(specifiedSubData.toMap(), defaultSubData.toMap()); subData = mergeDataValueMaps(specifiedSubData.toMap(), defaultSubData.toMap());
else if (specifiedSubData.type() == QVariant::List) else if (specifiedSubData.typeId() == QVariant::List)
subData = specifiedSubData; subData = specifiedSubData;
if (!factory->validateData(typeId, subData, errorMessage)) if (!factory->validateData(typeId, subData, errorMessage))
@@ -648,9 +648,9 @@ QList<QVariant> JsonWizardFactory::objectOrList(const QVariant &data, QString *e
QList<QVariant> result; QList<QVariant> result;
if (data.isNull()) if (data.isNull())
*errorMessage = Tr::tr("key not found."); *errorMessage = Tr::tr("key not found.");
else if (data.type() == QVariant::Map) else if (data.typeId() == QVariant::Map)
result.append(data); result.append(data);
else if (data.type() == QVariant::List) else if (data.typeId() == QVariant::List)
result = data.toList(); result = data.toList();
else else
*errorMessage = Tr::tr("Expected an object or a list."); *errorMessage = Tr::tr("Expected an object or a list.");
@@ -661,7 +661,7 @@ QString JsonWizardFactory::localizedString(const QVariant &value)
{ {
if (value.isNull()) if (value.isNull())
return QString(); return QString();
if (value.type() == QVariant::Map) { if (value.typeId() == QVariant::Map) {
QVariantMap tmp = value.toMap(); QVariantMap tmp = value.toMap();
const QString locale = languageSetting().toLower(); const QString locale = languageSetting().toLower();
QStringList locales; QStringList locales;

8
src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp
View File

@@ -96,7 +96,7 @@ Utils::WizardPage *FilePageFactory::create(JsonWizard *wizard, Utils::Id typeId,
bool FilePageFactory::validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) bool FilePageFactory::validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage)
{ {
QTC_ASSERT(canCreate(typeId), return false); QTC_ASSERT(canCreate(typeId), return false);
if (!data.isNull() && (data.type() != QVariant::Map || !data.toMap().isEmpty())) { if (!data.isNull() && (data.typeId() != QVariant::Map || !data.toMap().isEmpty())) {
*errorMessage = Tr::tr("\"data\" for a \"File\" page needs to be unset or an empty object."); *errorMessage = Tr::tr("\"data\" for a \"File\" page needs to be unset or an empty object.");
return false; return false;
} }
@@ -147,7 +147,7 @@ bool KitsPageFactory::validateData(Utils::Id typeId, const QVariant &data, QStri
{ {
QTC_ASSERT(canCreate(typeId), return false); QTC_ASSERT(canCreate(typeId), return false);
if (data.isNull() || data.type() != QVariant::Map) { if (data.isNull() || data.typeId() != QVariant::Map) {
*errorMessage = Tr::tr("\"data\" must be a JSON object for \"Kits\" pages."); *errorMessage = Tr::tr("\"data\" must be a JSON object for \"Kits\" pages.");
return false; return false;
} }
@@ -206,7 +206,7 @@ bool ProjectPageFactory::validateData(Utils::Id typeId, const QVariant &data, QS
Q_UNUSED(errorMessage) Q_UNUSED(errorMessage)
QTC_ASSERT(canCreate(typeId), return false); QTC_ASSERT(canCreate(typeId), return false);
if (!data.isNull() && data.type() != QVariant::Map) { if (!data.isNull() && data.typeId() != QVariant::Map) {
*errorMessage = Tr::tr("\"data\" must be empty or a JSON object for \"Project\" pages."); *errorMessage = Tr::tr("\"data\" must be empty or a JSON object for \"Project\" pages.");
return false; return false;
} }
@@ -252,7 +252,7 @@ Utils::WizardPage *SummaryPageFactory::create(JsonWizard *wizard, Utils::Id type
bool SummaryPageFactory::validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) bool SummaryPageFactory::validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage)
{ {
QTC_ASSERT(canCreate(typeId), return false); QTC_ASSERT(canCreate(typeId), return false);
if (!data.isNull() && (data.type() != QVariant::Map)) { if (!data.isNull() && (data.typeId() != QVariant::Map)) {
*errorMessage = Tr::tr("\"data\" for a \"Summary\" page can be unset or needs to be an object."); *errorMessage = Tr::tr("\"data\" for a \"Summary\" page can be unset or needs to be an object.");
return false; return false;
} }

2
src/plugins/projectexplorer/kitinformation.cpp
View File

@@ -387,7 +387,7 @@ void ToolChainKitAspect::upgrade(Kit *k)
const QVariant value = k->value(oldIdV2); const QVariant value = k->value(oldIdV2);
if (value.isNull() && !oldValue.isNull()) { if (value.isNull() && !oldValue.isNull()) {
QVariantMap newValue; QVariantMap newValue;
if (oldValue.type() == QVariant::Map) { if (oldValue.typeId() == QVariant::Map) {
// Used between 4.1 and 4.2: // Used between 4.1 and 4.2:
newValue = oldValue.toMap(); newValue = oldValue.toMap();
} else { } else {