aboutsummaryrefslogtreecommitdiffstats
path: root/src/ipc
diff options
context:
space:
mode:
Diffstat (limited to 'src/ipc')
-rw-r--r--src/ipc/ipcclient.cpp42
-rw-r--r--src/ipc/ipcconnection.cpp7
-rw-r--r--src/ipc/ipcserver.cpp15
3 files changed, 40 insertions, 24 deletions
diff --git a/src/ipc/ipcclient.cpp b/src/ipc/ipcclient.cpp
index 50ef363..ada2511 100644
--- a/src/ipc/ipcclient.cpp
+++ b/src/ipc/ipcclient.cpp
@@ -84,13 +84,14 @@ IpcClient::IpcClient(QObject *parent)
, m_written(0)
, m_connection(new IpcConnection(m_socket))
{
- connect(m_socket, SIGNAL(connected()), this, SIGNAL(connected()));
- connect(m_socket, SIGNAL(connected()), this, SLOT(processQueue()));
- connect(m_socket, SIGNAL(disconnected()), this, SIGNAL(disconnected()));
- connect(m_socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(onError(QAbstractSocket::SocketError)));
- connect(m_socket, SIGNAL(bytesWritten(qint64)), this , SLOT(onBytesWritten(qint64)));
-
- connect(m_connection, SIGNAL(received(QString,QByteArray)), this, SIGNAL(received(QString,QByteArray)));
+ connect(m_socket, &QAbstractSocket::connected, this, &IpcClient::connected);
+ connect(m_socket, &QAbstractSocket::connected, this, &IpcClient::processQueue);
+ connect(m_socket, &QAbstractSocket::disconnected, this, &IpcClient::disconnected);
+ void (QAbstractSocket::*QAbstractSocket__error)(QAbstractSocket::SocketError) = &QAbstractSocket::error;
+ connect(m_socket, QAbstractSocket__error, this, &IpcClient::onError);
+ connect(m_socket, &QAbstractSocket::bytesWritten, this, &IpcClient::onBytesWritten);
+
+ connect(m_connection, &IpcConnection::received, this, &IpcClient::received);
}
IpcClient::IpcClient(QTcpSocket *socket, QObject *parent)
@@ -100,10 +101,11 @@ IpcClient::IpcClient(QTcpSocket *socket, QObject *parent)
, m_written(0)
, m_connection(0)
{
- connect(m_socket, SIGNAL(connected()), this, SIGNAL(connected()));
- connect(m_socket, SIGNAL(disconnected()), this, SIGNAL(disconnected()));
- connect(m_socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(onError(QAbstractSocket::SocketError)));
- connect(m_socket, SIGNAL(bytesWritten(qint64)), this , SLOT(onBytesWritten(qint64)));
+ connect(m_socket, &QAbstractSocket::connected, this, &IpcClient::connected);
+ connect(m_socket, &QAbstractSocket::disconnected, this, &IpcClient::disconnected);
+ void (QAbstractSocket::*QAbstractSocket__error)(QAbstractSocket::SocketError) = &QAbstractSocket::error;
+ connect(m_socket, QAbstractSocket__error, this, &IpcClient::onError);
+ connect(m_socket, &QAbstractSocket::bytesWritten, this, &IpcClient::onBytesWritten);
}
/*!
@@ -115,7 +117,7 @@ QAbstractSocket::SocketState IpcClient::state() const
}
/*!
- * Sets the Ip-Address to \a hostName and port to \a port to be used for a ipc call.
+ * Sets the Ip-Address to \a hostName and port to \a port to be used for a IPC call.
*/
void IpcClient::connectToServer(const QString &hostName, int port)
{
@@ -140,7 +142,11 @@ QUuid IpcClient::send(const QString &method, const QByteArray &data)
pkg->m_tries = 0;
m_queue.enqueue(pkg);
+#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
QTimer::singleShot(0, this, SLOT(processQueue()));
+#else
+ QTimer::singleShot(0, this, &IpcClient::processQueue);
+#endif
return pkg->m_uuid;
}
@@ -295,7 +301,11 @@ void IpcClient::processQueue()
DEBUG << "Tried to sent the package" << m_current->m_tries << "times, but didn't succeed";
m_queue.dequeue();
onError(QAbstractSocket::ConnectionRefusedError);
+#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
QTimer::singleShot(0, this, SLOT(processQueue()));
+#else
+ QTimer::singleShot(0, this, &IpcClient::processQueue);
+#endif
return;
}
@@ -305,7 +315,11 @@ void IpcClient::processQueue()
m_queue.dequeue();
m_current->m_bytes = size;
} else {
+#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
QTimer::singleShot(1000, this, SLOT(processQueue()));
+#else
+ QTimer::singleShot(1000, this, &IpcClient::processQueue);
+#endif
m_current = 0;
}
}
@@ -335,7 +349,11 @@ void IpcClient::onError(QAbstractSocket::SocketError socketError)
delete m_current;
m_current = 0;
+#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
QTimer::singleShot(0, this, SLOT(processQueue()));
+#else
+ QTimer::singleShot(0, this, &IpcClient::processQueue);
+#endif
}
if ((m_socket->state() != QAbstractSocket::ConnectedState &&
diff --git a/src/ipc/ipcconnection.cpp b/src/ipc/ipcconnection.cpp
index 8d35e07..32c038e 100644
--- a/src/ipc/ipcconnection.cpp
+++ b/src/ipc/ipcconnection.cpp
@@ -54,9 +54,10 @@ IpcConnection::IpcConnection(QTcpSocket *socket, QObject *parent)
{
DEBUG << "IpcConnection()";
- connect(m_socket, SIGNAL(disconnected()), this, SLOT(close()));
- connect(m_socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(closeWithError()));
- connect(m_socket, SIGNAL(readyRead()), this, SLOT(readData()));
+ connect(m_socket, &QAbstractSocket::disconnected, this, &IpcConnection::close);
+ void (QAbstractSocket::*QAbstractSocket__error)(QAbstractSocket::SocketError) = &QAbstractSocket::error;
+ connect(m_socket, QAbstractSocket__error, this, &IpcConnection::closeWithError);
+ connect(m_socket, &QAbstractSocket::readyRead, this, &IpcConnection::readData);
}
/**
diff --git a/src/ipc/ipcserver.cpp b/src/ipc/ipcserver.cpp
index f23aaa6..3d8288c 100644
--- a/src/ipc/ipcserver.cpp
+++ b/src/ipc/ipcserver.cpp
@@ -49,10 +49,7 @@
*
* \code{.cpp}
* m_server = new IpcServer(this);
- * connect(
- * m_server, SIGNAL(received(QString,QByteArray)),
- * this, SLOT(handleCall(QString, QByteArray))
- * );
+ * connect(m_server, &IpcServer::received, this, &MyHandler::handleCall);
* m_server->listen(10234);
*
* ...
@@ -75,7 +72,7 @@ IpcServer::IpcServer(QObject *parent)
: QObject(parent)
, m_server(new QTcpServer(this))
{
- connect(m_server, SIGNAL(newConnection()), this, SLOT(newConnection()));
+ connect(m_server, &QTcpServer::newConnection, this, &IpcServer::newConnection);
}
/*!
@@ -98,8 +95,8 @@ void IpcServer::newConnection()
emit clientConnected(socket->peerAddress());
emit clientConnected(socket);
IpcConnection *connection = new IpcConnection(socket, this);
- connect(connection, SIGNAL(connectionClosed()), this, SLOT(onConnectionClosed()));
- connect(connection, SIGNAL(received(QString,QByteArray)), this, SIGNAL(received(QString,QByteArray)));
+ connect(connection, &IpcConnection::connectionClosed, this, &IpcServer::onConnectionClosed);
+ connect(connection, &IpcConnection::received, this, &IpcServer::received);
}
}
@@ -126,9 +123,9 @@ void IpcServer::setMaxConnections(int num)
/*!
* \fn void IpcServer::received(const QString& method, const QByteArray& content)
- * \brief signals a ipc call has arrived
+ * \brief signals a IPC call has arrived
*
- * A ipc call requesting \a method and using \a content a the parameters for the method
+ * A IPC call requesting \a method and using \a content a the parameters for the method
*/
/*!
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 17:51:58 +0000