summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforminputcontexts
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2020-01-04 15:32:34 +0100
committerLiang Qi <liang.qi@qt.io>2020-01-04 15:32:34 +0100
commita503bf54705d89204007e8f887b668fe5ef519fc (patch)
treeb2d1a452da39450eac78a1aeb1df116a73f64b23 /src/plugins/platforminputcontexts
parente65c43fd0ffa57248e7d750570b7deae171a82f5 (diff)
parent1f87fb359fdff14e42662384a9c8a0bcb3837671 (diff)
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts: src/corelib/tools/qvector.h Make QVector(DataPointer dd) public to be able to properly merge 5b4b437b30b320e2cd7c9a566999a39772e5d431 from 5.15 into dev. src/widgets/kernel/qapplication.cpp tests/auto/tools/moc/allmocs_baseline_in.json Done-With: Christian Ehrlicher <ch.ehrlicher@gmx.de> Change-Id: I929ba7c036d570382d0454c2c75f6f0d96ddbc01
Diffstat (limited to 'src/plugins/platforminputcontexts')
-rw-r--r--src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp4
-rw-r--r--src/plugins/platforminputcontexts/ibus/qibusproxy.cpp4
-rw-r--r--src/plugins/platforminputcontexts/ibus/qibustypes.cpp6
3 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
index f2429f24ff..47ac54927b 100644
--- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
+++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
@@ -285,7 +285,7 @@ void QIBusPlatformInputContext::commitText(const QDBusVariant &text)
if (!input)
return;
- const QDBusArgument arg = text.variant().value<QDBusArgument>();
+ const QDBusArgument arg = qvariant_cast<QDBusArgument>(text.variant());
QIBusText t;
if (debug)
@@ -311,7 +311,7 @@ void QIBusPlatformInputContext::updatePreeditText(const QDBusVariant &text, uint
if (!input)
return;
- const QDBusArgument arg = text.variant().value<QDBusArgument>();
+ const QDBusArgument arg = qvariant_cast<QDBusArgument>(text.variant());
QIBusText t;
arg >> t;
diff --git a/src/plugins/platforminputcontexts/ibus/qibusproxy.cpp b/src/plugins/platforminputcontexts/ibus/qibusproxy.cpp
index 156e9b7c90..6b46e106ab 100644
--- a/src/plugins/platforminputcontexts/ibus/qibusproxy.cpp
+++ b/src/plugins/platforminputcontexts/ibus/qibusproxy.cpp
@@ -83,10 +83,10 @@ QIBusEngineDesc QIBusProxy::getGlobalEngine()
QVariant variant = reply.value().variant();
if (!variant.isValid())
return desc;
- QVariant child = variant.value<QDBusVariant>().variant();
+ QVariant child = qvariant_cast<QDBusVariant>(variant).variant();
if (!child.isValid())
return desc;
- const QDBusArgument argument = child.value<QDBusArgument>();
+ const QDBusArgument argument = qvariant_cast<QDBusArgument>(child);
argument >> desc;
return desc;
}
diff --git a/src/plugins/platforminputcontexts/ibus/qibustypes.cpp b/src/plugins/platforminputcontexts/ibus/qibustypes.cpp
index a2551f1320..443df271a8 100644
--- a/src/plugins/platforminputcontexts/ibus/qibustypes.cpp
+++ b/src/plugins/platforminputcontexts/ibus/qibustypes.cpp
@@ -62,7 +62,7 @@ void QIBusSerializable::deserializeFrom(const QDBusArgument &argument)
argument >> key;
argument >> value;
argument.endMapEntry();
- attachments[key] = value.variant().value<QDBusArgument>();
+ attachments[key] = qvariant_cast<QDBusArgument>(value.variant());
}
argument.endMap();
}
@@ -201,7 +201,7 @@ void QIBusAttributeList::deserializeFrom(const QDBusArgument &arg)
arg >> var;
QIBusAttribute attr;
- var.variant().value<QDBusArgument>() >> attr;
+ qvariant_cast<QDBusArgument>(var.variant()) >> attr;
attributes.append(std::move(attr));
}
arg.endArray();
@@ -268,7 +268,7 @@ void QIBusText::deserializeFrom(const QDBusArgument &argument)
argument >> text;
QDBusVariant variant;
argument >> variant;
- variant.variant().value<QDBusArgument>() >> attributes;
+ qvariant_cast<QDBusArgument>(variant.variant()) >> attributes;
argument.endStructure();
}