aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorItay Grudev <itay+github.com@grudev.com>2021-03-26 09:59:27 +0200
committerGitHub <noreply@github.com>2021-03-26 09:59:27 +0200
commit9f65e9c7fe5c2bff50740a4d1fa72350e88e831d (patch)
tree5825ee8c1950ab1cc73cfb4c8fb24d8323909099
parentMark getters as const (diff)
parentFix signal-slot issues (diff)
downloadsingleapplication-9f65e9c7fe5c2bff50740a4d1fa72350e88e831d.tar.xz
Merge pull request #129 from jonaski/signalslots
Fix signal-slot issues
-rw-r--r--singleapplication_p.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/singleapplication_p.cpp b/singleapplication_p.cpp
index e65bd95..0bde5ef 100644
--- a/singleapplication_p.cpp
+++ b/singleapplication_p.cpp
@@ -321,22 +321,22 @@ void SingleApplicationPrivate::slotConnectionEstablished()
QLocalSocket *nextConnSocket = server->nextPendingConnection();
connectionMap.insert(nextConnSocket, ConnectionInfo());
- QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose,
+ QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, this,
[nextConnSocket, this](){
auto &info = connectionMap[nextConnSocket];
- Q_EMIT this->slotClientConnectionClosed( nextConnSocket, info.instanceId );
+ this->slotClientConnectionClosed( nextConnSocket, info.instanceId );
}
);
QObject::connect(nextConnSocket, &QLocalSocket::disconnected, nextConnSocket, &QLocalSocket::deleteLater);
- QObject::connect(nextConnSocket, &QLocalSocket::destroyed,
+ QObject::connect(nextConnSocket, &QLocalSocket::destroyed, this,
[nextConnSocket, this](){
connectionMap.remove(nextConnSocket);
}
);
- QObject::connect(nextConnSocket, &QLocalSocket::readyRead,
+ QObject::connect(nextConnSocket, &QLocalSocket::readyRead, this,
[nextConnSocket, this](){
auto &info = connectionMap[nextConnSocket];
switch(info.stage){
@@ -347,7 +347,7 @@ void SingleApplicationPrivate::slotConnectionEstablished()
readInitMessageBody(nextConnSocket);
break;
case StageConnected:
- Q_EMIT this->slotDataAvailable( nextConnSocket, info.instanceId );
+ this->slotDataAvailable( nextConnSocket, info.instanceId );
break;
default:
break;
@@ -449,7 +449,7 @@ void SingleApplicationPrivate::readInitMessageBody( QLocalSocket *sock )
}
if (sock->bytesAvailable() > 0){
- Q_EMIT this->slotDataAvailable( sock, instanceId );
+ this->slotDataAvailable( sock, instanceId );
}
}
@@ -462,7 +462,7 @@ void SingleApplicationPrivate::slotDataAvailable( QLocalSocket *dataSocket, quin
void SingleApplicationPrivate::slotClientConnectionClosed( QLocalSocket *closedSocket, quint32 instanceId )
{
if( closedSocket->bytesAvailable() > 0 )
- Q_EMIT slotDataAvailable( closedSocket, instanceId );
+ slotDataAvailable( closedSocket, instanceId );
}
void SingleApplicationPrivate::randomSleep()