From 645da2713d2af0f8ed56d72e3a6ea76042014bfd Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Sun, 21 Mar 2021 04:36:54 +0100
Subject: [PATCH] Remove emit from slots

---
 3rdparty/singleapplication/singleapplication_p.cpp | 14 +++++++-------
 .../singleapplication/singlecoreapplication_p.cpp  | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/3rdparty/singleapplication/singleapplication_p.cpp b/3rdparty/singleapplication/singleapplication_p.cpp
index 10965af40..1a3733013 100644
--- a/3rdparty/singleapplication/singleapplication_p.cpp
+++ b/3rdparty/singleapplication/singleapplication_p.cpp
@@ -326,17 +326,17 @@ void SingleApplicationPrivate::slotConnectionEstablished() {
   QLocalSocket *nextConnSocket = server_->nextPendingConnection();
   connectionMap_.insert(nextConnSocket, ConnectionInfo());
 
-  QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, [nextConnSocket, this]() {
+  QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, this, [nextConnSocket, this]() {
     auto &info = connectionMap_[nextConnSocket];
-    Q_EMIT this->slotClientConnectionClosed(nextConnSocket, info.instanceId);
+    slotClientConnectionClosed(nextConnSocket, info.instanceId);
   });
 
-  QObject::connect(nextConnSocket, &QLocalSocket::disconnected, [nextConnSocket, this]() {
+  QObject::connect(nextConnSocket, &QLocalSocket::disconnected, this, [nextConnSocket, this]() {
     connectionMap_.remove(nextConnSocket);
     nextConnSocket->deleteLater();
   });
 
-  QObject::connect(nextConnSocket, &QLocalSocket::readyRead, [nextConnSocket, this]() {
+  QObject::connect(nextConnSocket, &QLocalSocket::readyRead, this, [nextConnSocket, this]() {
     auto &info = connectionMap_[nextConnSocket];
     switch (info.stage) {
       case StageHeader:
@@ -346,7 +346,7 @@ void SingleApplicationPrivate::slotConnectionEstablished() {
         readInitMessageBody(nextConnSocket);
         break;
       case StageConnected:
-        Q_EMIT this->slotDataAvailable(nextConnSocket, info.instanceId);
+        slotDataAvailable(nextConnSocket, info.instanceId);
         break;
       default:
         break;
@@ -438,7 +438,7 @@ void SingleApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
   }
 
   if (sock->bytesAvailable() > 0) {
-    Q_EMIT this->slotDataAvailable(sock, instanceId);
+    slotDataAvailable(sock, instanceId);
   }
 
 }
@@ -453,7 +453,7 @@ void SingleApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, const
 void SingleApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSocket, const quint32 instanceId) {
 
   if (closedSocket->bytesAvailable() > 0) {
-    Q_EMIT slotDataAvailable(closedSocket, instanceId);
+    slotDataAvailable(closedSocket, instanceId);
   }
 
 }
diff --git a/3rdparty/singleapplication/singlecoreapplication_p.cpp b/3rdparty/singleapplication/singlecoreapplication_p.cpp
index 1ba8ef2bb..a09166d16 100644
--- a/3rdparty/singleapplication/singlecoreapplication_p.cpp
+++ b/3rdparty/singleapplication/singlecoreapplication_p.cpp
@@ -326,17 +326,17 @@ void SingleCoreApplicationPrivate::slotConnectionEstablished() {
   QLocalSocket *nextConnSocket = server_->nextPendingConnection();
   connectionMap_.insert(nextConnSocket, ConnectionInfo());
 
-  QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, [nextConnSocket, this]() {
+  QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, this, [nextConnSocket, this]() {
     auto &info = connectionMap_[nextConnSocket];
-    Q_EMIT this->slotClientConnectionClosed(nextConnSocket, info.instanceId);
+    slotClientConnectionClosed(nextConnSocket, info.instanceId);
   });
 
-  QObject::connect(nextConnSocket, &QLocalSocket::disconnected, [nextConnSocket, this]() {
+  QObject::connect(nextConnSocket, &QLocalSocket::disconnected, this, [nextConnSocket, this]() {
     connectionMap_.remove(nextConnSocket);
     nextConnSocket->deleteLater();
   });
 
-  QObject::connect(nextConnSocket, &QLocalSocket::readyRead, [nextConnSocket, this]() {
+  QObject::connect(nextConnSocket, &QLocalSocket::readyRead, this, [nextConnSocket, this]() {
     auto &info = connectionMap_[nextConnSocket];
     switch (info.stage) {
       case StageHeader:
@@ -346,7 +346,7 @@ void SingleCoreApplicationPrivate::slotConnectionEstablished() {
         readInitMessageBody(nextConnSocket);
         break;
       case StageConnected:
-        Q_EMIT this->slotDataAvailable(nextConnSocket, info.instanceId);
+        slotDataAvailable(nextConnSocket, info.instanceId);
         break;
       default:
         break;
@@ -438,7 +438,7 @@ void SingleCoreApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
   }
 
   if (sock->bytesAvailable() > 0) {
-    Q_EMIT this->slotDataAvailable(sock, instanceId);
+    slotDataAvailable(sock, instanceId);
   }
 
 }
@@ -453,7 +453,7 @@ void SingleCoreApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, c
 void SingleCoreApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSocket, const quint32 instanceId) {
 
   if (closedSocket->bytesAvailable() > 0) {
-    Q_EMIT slotDataAvailable(closedSocket, instanceId);
+    slotDataAvailable(closedSocket, instanceId);
   }
 
 }