diff --git a/scripting/scripting.cpp b/scripting/scripting.cpp index 8aa6eabffb..ba18792fda 100644 --- a/scripting/scripting.cpp +++ b/scripting/scripting.cpp @@ -207,7 +207,7 @@ QScriptValue kwinCallDBus(QScriptContext *context, QScriptEngine *engine) for (int i=4; iargument(i).isArray()) { QStringList stringArray = engine->fromScriptValue(context->argument(i)); - arguments << qVariantFromValue(stringArray); + arguments << QVariant::fromValue(stringArray); } else { arguments << context->argument(i).toVariant(); } diff --git a/scripting/scripting_model.cpp b/scripting/scripting_model.cpp index 911aeda781..77417851d7 100644 --- a/scripting/scripting_model.cpp +++ b/scripting/scripting_model.cpp @@ -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(); diff --git a/tabbox/clientmodel.cpp b/tabbox/clientmodel.cpp index 19741fb2a5..6ea6f5fc87 100644 --- a/tabbox/clientmodel.cpp +++ b/tabbox/clientmodel.cpp @@ -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(client.data()); case DesktopNameRole: { return tabBox->desktopName(client.data()); } diff --git a/tabbox/desktopmodel.cpp b/tabbox/desktopmodel.cpp index ececb20058..8d8338aea9 100644 --- a/tabbox/desktopmodel.cpp +++ b/tabbox/desktopmodel.cpp @@ -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(m_clientModels[m_desktopList[desktopIndex]]); default: return QVariant(); }