port use of tcp server to Qt5

This commit is contained in:
wmayer
2016-12-23 10:38:27 +01:00
parent abad29c2a0
commit 8da9d86b0b
4 changed files with 16 additions and 0 deletions

View File

@@ -238,7 +238,11 @@ HttpServer::HttpServer(QObject* parent)
{
}
#if QT_VERSION >=0x050000
void HttpServer::incomingConnection(qintptr socket)
#else
void HttpServer::incomingConnection(int socket)
#endif
{
if (disabled)
return;

View File

@@ -61,7 +61,11 @@ class HttpServer : public QTcpServer
public:
HttpServer(QObject* parent = 0);
#if QT_VERSION >=0x050000
void incomingConnection(qintptr socket);
#else
void incomingConnection(int socket);
#endif
void pause();
void resume();

View File

@@ -114,7 +114,11 @@ AppServer::AppServer(QObject* parent)
{
}
#if QT_VERSION >=0x050000
void AppServer::incomingConnection(qintptr socket)
#else
void AppServer::incomingConnection(int socket)
#endif
{
QTcpSocket* s = new QTcpSocket(this);
connect(s, SIGNAL(readyRead()), this, SLOT(readClient()));

View File

@@ -84,7 +84,11 @@ class AppServer : public QTcpServer
public:
AppServer(QObject* parent = 0);
#if QT_VERSION >=0x050000
void incomingConnection(qintptr socket);
#else
void incomingConnection(int socket);
#endif
protected:
void customEvent(QEvent* e);