vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Port away from deprecated qVariantFromValue 

Summary:
qVariantFromValue is deprecated since Qt 5.14. It's advised to use
QVariant::fromValue instead.

Test Plan: Compiles.

Reviewers: #kwin, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D24042
icc-effect-5.17.5
Vlad Zahorodnii 2019-09-18 11:08:17 +03:00
parent 09b47b5250
commit 5ad3c0ee13
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripting/scripting.cpp
View File

@ -207,7 +207,7 @@ QScriptValue kwinCallDBus(QScriptContext *context, QScriptEngine *engine)
for (int i=4; i<argumentsCount; ++i) {
if (context->argument(i).isArray()) {
QStringList stringArray = engine->fromScriptValue<QStringList>(context->argument(i));
arguments << qVariantFromValue(stringArray);
arguments << QVariant::fromValue(stringArray);
} else {
arguments << context->argument(i).toVariant();
}

2
scripting/scripting_model.cpp
View File

@ -699,7 +699,7 @@ QVariant ClientModel::data(const QModelIndex &index, int role) const
}
if (role == Qt::DisplayRole || role == ClientRole) {
if (AbstractClient *client = m_root->clientForId(index.internalId())) {
return qVariantFromValue(client);
return QVariant::fromValue(client);
}
}
return QVariant();

2
tabbox/clientmodel.cpp
View File

@ -71,7 +71,7 @@ QVariant ClientModel::data(const QModelIndex& index, int role) const
return caption;
}
case ClientRole:
return qVariantFromValue((void*)client.data());
return QVariant::fromValue<void *>(client.data());
case DesktopNameRole: {
return tabBox->desktopName(client.data());
}

2
tabbox/desktopmodel.cpp
View File

@ -61,7 +61,7 @@ QVariant DesktopModel::data(const QModelIndex& index, int role) const
case DesktopRole:
return m_desktopList[ desktopIndex ];
case ClientModelRole:
return qVariantFromValue((void*)m_clientModels[ m_desktopList[ desktopIndex ] ]);
return QVariant::fromValue<void *>(m_clientModels[m_desktopList[desktopIndex]]);
default:
return QVariant();
}