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

Some more Qt deprecation

Browse Source 
s/type/typeId/

Change-Id: I403af524146f0582709c1264e7517d8769dd723b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2023-06-09 09:17:02 +02:00
parent ac77e56f3a
commit 37d2240dfc
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/json.cpp
View File

@@ -65,7 +65,7 @@ QString JsonValue::kindToString(JsonValue::Kind kind)
JsonValue *JsonValue::build(const QVariant &variant, JsonMemoryPool *pool) JsonValue *JsonValue::build(const QVariant &variant, JsonMemoryPool *pool)
{ {
switch (variant.type()) { switch (variant.typeId()) {
case QVariant::List: { case QVariant::List: {
auto newValue = new (pool) JsonArrayValue; auto newValue = new (pool) JsonArrayValue;

2
src/plugins/android/androidconfigurations.cpp
View File

@@ -191,7 +191,7 @@ void AndroidConfig::load(const QSettings &settings)
{ {
// user settings // user settings
QVariant emulatorArgs = settings.value(EmulatorArgsKey, QString("-netdelay none -netspeed full")); QVariant emulatorArgs = settings.value(EmulatorArgsKey, QString("-netdelay none -netspeed full"));
if (emulatorArgs.type() == QVariant::StringList) // Changed in 8.0 from QStringList to QString. if (emulatorArgs.typeId() == QVariant::StringList) // Changed in 8.0 from QStringList to QString.
emulatorArgs = ProcessArgs::joinArgs(emulatorArgs.toStringList()); emulatorArgs = ProcessArgs::joinArgs(emulatorArgs.toStringList());
m_emulatorArgs = emulatorArgs.toString(); m_emulatorArgs = emulatorArgs.toString();
m_sdkLocation = FilePath::fromUserInput(settings.value(SDKLocationKey).toString()).cleanPath(); m_sdkLocation = FilePath::fromUserInput(settings.value(SDKLocationKey).toString()).cleanPath();

2
src/plugins/android/androidrunnerworker.cpp
View File

@@ -280,7 +280,7 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa
m_beforeStartAdbCommands.append(QString("shell %1").arg(shellCmd)); m_beforeStartAdbCommands.append(QString("shell %1").arg(shellCmd));
if (auto aspect = runControl->aspect(Constants::ANDROID_POSTFINISHSHELLCMDLIST)) { if (auto aspect = runControl->aspect(Constants::ANDROID_POSTFINISHSHELLCMDLIST)) {
QTC_CHECK(aspect->value.type() == QVariant::String); QTC_CHECK(aspect->value.typeId() == QVariant::String);
const QStringList commands = aspect->value.toString().split('\n', Qt::SkipEmptyParts); const QStringList commands = aspect->value.toString().split('\n', Qt::SkipEmptyParts);
for (const QString &shellCmd : commands) for (const QString &shellCmd : commands)
m_afterFinishAdbCommands.append(QString("shell %1").arg(shellCmd)); m_afterFinishAdbCommands.append(QString("shell %1").arg(shellCmd));

2
src/plugins/designer/formeditor.cpp
View File

@@ -647,7 +647,7 @@ ActionContainer *FormEditorData::createPreviewStyleMenu(QActionGroup *actionGrou
QString name = menuId; QString name = menuId;
name += dot; name += dot;
const QVariant data = a->data(); const QVariant data = a->data();
const bool isDeviceProfile = data.type() == QVariant::Int; const bool isDeviceProfile = data.typeId() == QVariant::Int;
if (isDeviceProfile) { if (isDeviceProfile) {
name += deviceProfilePrefix; name += deviceProfilePrefix;
name += dot; name += dot;

6
src/plugins/qbsprojectmanager/qbsprofilemanager.cpp
View File

@@ -60,7 +60,7 @@ QString toJSLiteral(const QVariant &val)
{ {
if (!val.isValid()) if (!val.isValid())
return QString("undefined"); return QString("undefined");
if (val.type() == QVariant::List || val.type() == QVariant::StringList) { if (val.typeId() == QVariant::List || val.typeId() == QVariant::StringList) {
QString res; QString res;
const auto list = val.toList(); const auto list = val.toList();
for (const QVariant &child : list) { for (const QVariant &child : list) {
@@ -71,7 +71,7 @@ QString toJSLiteral(const QVariant &val)
res.append(']'); res.append(']');
return res; return res;
} }
if (val.type() == QVariant::Map) { if (val.typeId() == QVariant::Map) {
const QVariantMap &vm = val.toMap(); const QVariantMap &vm = val.toMap();
QString str("{"); QString str("{");
for (auto it = vm.begin(); it != vm.end(); ++it) { for (auto it = vm.begin(); it != vm.end(); ++it) {
@@ -82,7 +82,7 @@ QString toJSLiteral(const QVariant &val)
str += '}'; str += '}';
return str; return str;
} }
if (val.type() == QVariant::Bool) if (val.typeId() == QVariant::Bool)
return toJSLiteral(val.toBool()); return toJSLiteral(val.toBool());
if (val.canConvert(QVariant::String)) if (val.canConvert(QVariant::String))
return toJSLiteral(val.toString()); return toJSLiteral(val.toString());

2
src/plugins/qmljseditor/quicktoolbar.cpp
View File

@@ -255,7 +255,7 @@ void QuickToolBar::setProperty(const QString &propertyName, const QVariant &valu
{ {
QString stringValue = value.toString(); QString stringValue = value.toString();
if (value.type() == QVariant::Color) if (value.typeId() == QVariant::Color)
stringValue = QLatin1Char('\"') + value.toString() + QLatin1Char('\"'); stringValue = QLatin1Char('\"') + value.toString() + QLatin1Char('\"');
if (cast<UiObjectDefinition*>(m_node) || cast<UiObjectBinding*>(m_node)) { if (cast<UiObjectDefinition*>(m_node) || cast<UiObjectBinding*>(m_node)) {

2
src/plugins/qtsupport/qtkitinformation.cpp
View File

@@ -337,7 +337,7 @@ int QtKitAspect::qtVersionId(const Kit *k)
int id = -1; int id = -1;
QVariant data = k->value(QtKitAspect::id(), -1); QVariant data = k->value(QtKitAspect::id(), -1);
if (data.type() == QVariant::Int) { if (data.typeId() == QVariant::Int) {
bool ok; bool ok;
id = data.toInt(&ok); id = data.toInt(&ok);
if (!ok) if (!ok)

2
src/plugins/squish/squishwizardpages.cpp
View File

@@ -282,7 +282,7 @@ bool SquishFileGenerator::setup(const QVariant &data, QString *errorMessage)
if (data.isNull()) if (data.isNull())
return false; return false;
if (data.type() != QVariant::Map) { if (data.typeId() != QVariant::Map) {
*errorMessage = Tr::tr("Key is not an object."); *errorMessage = Tr::tr("Key is not an object.");
return false; return false;
} }