Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
mirror of https://github.com/strawberrymusicplayer/strawberry synced 2024-12-18 11:39:31 +01:00
Code Issues Releases Wiki Activity

Remove emit from slots

Browse Source
This commit is contained in:
Jonas Kvinge 2021-03-21 04:36:54 +01:00
parent 20c5a79efa
commit 645da2713d
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
3rdparty/singleapplication/singleapplication_p.cpp vendored
View File

@ -326,17 +326,17 @@ void SingleApplicationPrivate::slotConnectionEstablished() {
QLocalSocket *nextConnSocket = server_->nextPendingConnection(); QLocalSocket *nextConnSocket = server_->nextPendingConnection();
connectionMap_.insert(nextConnSocket, ConnectionInfo()); connectionMap_.insert(nextConnSocket, ConnectionInfo());
QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, [nextConnSocket, this]() { QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, this, [nextConnSocket, this]() {
auto &info = connectionMap_[nextConnSocket]; 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); connectionMap_.remove(nextConnSocket);
nextConnSocket->deleteLater(); nextConnSocket->deleteLater();
}); });
QObject::connect(nextConnSocket, &QLocalSocket::readyRead, [nextConnSocket, this]() { QObject::connect(nextConnSocket, &QLocalSocket::readyRead, this, [nextConnSocket, this]() {
auto &info = connectionMap_[nextConnSocket]; auto &info = connectionMap_[nextConnSocket];
switch (info.stage) { switch (info.stage) {
case StageHeader: case StageHeader:
@ -346,7 +346,7 @@ void SingleApplicationPrivate::slotConnectionEstablished() {
readInitMessageBody(nextConnSocket); readInitMessageBody(nextConnSocket);
break; break;
case StageConnected: case StageConnected:
Q_EMIT this->slotDataAvailable(nextConnSocket, info.instanceId); slotDataAvailable(nextConnSocket, info.instanceId);
break; break;
default: default:
break; break;
@ -438,7 +438,7 @@ void SingleApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
} }
if (sock->bytesAvailable() > 0) { 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) { void SingleApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSocket, const quint32 instanceId) {
if (closedSocket->bytesAvailable() > 0) { if (closedSocket->bytesAvailable() > 0) {
Q_EMIT slotDataAvailable(closedSocket, instanceId); slotDataAvailable(closedSocket, instanceId);
} }
} }

14
3rdparty/singleapplication/singlecoreapplication_p.cpp vendored
View File

@ -326,17 +326,17 @@ void SingleCoreApplicationPrivate::slotConnectionEstablished() {
QLocalSocket *nextConnSocket = server_->nextPendingConnection(); QLocalSocket *nextConnSocket = server_->nextPendingConnection();
connectionMap_.insert(nextConnSocket, ConnectionInfo()); connectionMap_.insert(nextConnSocket, ConnectionInfo());
QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, [nextConnSocket, this]() { QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, this, [nextConnSocket, this]() {
auto &info = connectionMap_[nextConnSocket]; 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); connectionMap_.remove(nextConnSocket);
nextConnSocket->deleteLater(); nextConnSocket->deleteLater();
}); });
QObject::connect(nextConnSocket, &QLocalSocket::readyRead, [nextConnSocket, this]() { QObject::connect(nextConnSocket, &QLocalSocket::readyRead, this, [nextConnSocket, this]() {
auto &info = connectionMap_[nextConnSocket]; auto &info = connectionMap_[nextConnSocket];
switch (info.stage) { switch (info.stage) {
case StageHeader: case StageHeader:
@ -346,7 +346,7 @@ void SingleCoreApplicationPrivate::slotConnectionEstablished() {
readInitMessageBody(nextConnSocket); readInitMessageBody(nextConnSocket);
break; break;
case StageConnected: case StageConnected:
Q_EMIT this->slotDataAvailable(nextConnSocket, info.instanceId); slotDataAvailable(nextConnSocket, info.instanceId);
break; break;
default: default:
break; break;
@ -438,7 +438,7 @@ void SingleCoreApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
} }
if (sock->bytesAvailable() > 0) { 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) { void SingleCoreApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSocket, const quint32 instanceId) {
if (closedSocket->bytesAvailable() > 0) { if (closedSocket->bytesAvailable() > 0) {
Q_EMIT slotDataAvailable(closedSocket, instanceId); slotDataAvailable(closedSocket, instanceId);
} }
} }