1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QtDBus: Use QMetaObject::invokeMethod instead of QTimer::singleShot

Browse Source 
Change-Id: I1a9ecdcb8df7804d13fdcf676fc12b1e0f6bddae
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Ievgenii Meshcheriakov 2023-04-28 13:38:39 +02:00 committed by Thiago Macieira
parent 90d3c5b951
commit 3ef514f8d3
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/dbus/qdbusconnection.cpp
View File

@ -153,7 +153,8 @@ QDBusConnectionPrivate *QDBusConnectionManager::connectToBus(QDBusConnection::Bu
if (suspendedDelivery && data.result->connection) { if (suspendedDelivery && data.result->connection) {
data.result->ref.ref(); data.result->ref.ref();
QDBusConnectionDispatchEnabler *o = new QDBusConnectionDispatchEnabler(data.result); QDBusConnectionDispatchEnabler *o = new QDBusConnectionDispatchEnabler(data.result);
QTimer::singleShot(0, o, SLOT(execute())); QMetaObject::invokeMethod(o, &QDBusConnectionDispatchEnabler::execute,
Qt::QueuedConnection);
o->moveToThread(qApp->thread()); // qApp was checked in the caller o->moveToThread(qApp->thread()); // qApp was checked in the caller
} }
return data.result; return data.result;

2
src/dbus/qdbusintegrator.cpp
View File

@ -296,7 +296,7 @@ static void qDBusNewConnection(DBusServer *server, DBusConnection *connection, v
newConnection->ref.ref(); newConnection->ref.ref();
QReadLocker serverLock(&serverConnection->lock); QReadLocker serverLock(&serverConnection->lock);
QDBusConnectionDispatchEnabler *o = new QDBusConnectionDispatchEnabler(newConnection); QDBusConnectionDispatchEnabler *o = new QDBusConnectionDispatchEnabler(newConnection);
QTimer::singleShot(0, o, SLOT(execute())); QMetaObject::invokeMethod(o, &QDBusConnectionDispatchEnabler::execute, Qt::QueuedConnection);
if (serverConnection->serverObject) if (serverConnection->serverObject)
o->moveToThread(serverConnection->serverObject->thread()); o->moveToThread(serverConnection->serverObject->thread());
} }