Reuse the queuedInvoke method for less boilerplate

2 files changed, 3 insertions, 7 deletions

diff --git a/common/resourceaccess.cpp b/common/resourceaccess.cpp
index 483d83f..c78993b 100644
--- a/common/resourceaccess.cpp
+++ b/common/resourceaccess.cpp
@@ -534,7 +534,9 @@ bool ResourceAccess::processMessageBuffer()
 
             d->completeCommands << buffer->id();
             //The callbacks can result in this object getting destroyed directly, so we need to ensure we finish our work first
-            QMetaObject::invokeMethod(this, "callCallbacks", Qt::QueuedConnection);
+            queuedInvoke([=]() {
+                d->callCallbacks();
+            });
             break;
         }
         case Commands::NotificationCommand: {
@@ -575,11 +577,6 @@ bool ResourceAccess::processMessageBuffer()
     return d->partialMessageBuffer.size() >= headerSize;
 }
 
-void ResourceAccess::callCallbacks()
-{
-    d->callCallbacks();
-}
-
 void ResourceAccess::log(const QString &message)
 {
     Log(d->resourceInstanceIdentifier) << this << message;
diff --git a/common/resourceaccess.h b/common/resourceaccess.h
index fe3fa99..e1c01d7 100644
--- a/common/resourceaccess.h
+++ b/common/resourceaccess.h
@@ -97,7 +97,6 @@ private Q_SLOTS:
     void connectionError(QLocalSocket::LocalSocketError error);
     void readResourceMessage();
     bool processMessageBuffer();
-    void callCallbacks();
 
 private:
     void connected();