summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dist/changes-5.0.02
-rw-r--r--doc/src/snippets/code/src_network_ssl_qsslsocket.cpp2
-rw-r--r--examples/network/network-chat/server.cpp2
-rw-r--r--examples/network/network-chat/server.h2
-rw-r--r--examples/network/threadedfortuneserver/fortuneserver.cpp2
-rw-r--r--examples/network/threadedfortuneserver/fortuneserver.h2
-rw-r--r--examples/network/torrent/torrentserver.cpp2
-rw-r--r--examples/network/torrent/torrentserver.h2
-rw-r--r--tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp6
-rw-r--r--tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp2
-rw-r--r--tests/auto/network/socket/qtcpsocket/stressTest/Test.h2
-rw-r--r--tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp8
-rw-r--r--tests/baselineserver/src/baselineserver.cpp2
-rw-r--r--tests/baselineserver/src/baselineserver.h2
14 files changed, 20 insertions, 18 deletions
diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0
index f45e112e50..e8709430d6 100644
--- a/dist/changes-5.0.0
+++ b/dist/changes-5.0.0
@@ -155,6 +155,8 @@ information about a particular change.
- QAbstractSocket's connectToHost() and disconnectFromHost() are now virtual and
connectToHostImplementation() and disconnectFromHostImplementation() don't exist.
+- QTcpServer::incomingConnection() now takes a qintptr instead of an int.
+
****************************************************************************
* General *
diff --git a/doc/src/snippets/code/src_network_ssl_qsslsocket.cpp b/doc/src/snippets/code/src_network_ssl_qsslsocket.cpp
index 0088a0f43f..24365a3005 100644
--- a/doc/src/snippets/code/src_network_ssl_qsslsocket.cpp
+++ b/doc/src/snippets/code/src_network_ssl_qsslsocket.cpp
@@ -47,7 +47,7 @@ socket->connectToHostEncrypted("imap.example.com", 993);
//! [1]
-void SslServer::incomingConnection(int socketDescriptor)
+void SslServer::incomingConnection(qintptr socketDescriptor)
{
QSslSocket *serverSocket = new QSslSocket;
if (serverSocket->setSocketDescriptor(socketDescriptor)) {
diff --git a/examples/network/network-chat/server.cpp b/examples/network/network-chat/server.cpp
index 5f545d3819..f27cfa3894 100644
--- a/examples/network/network-chat/server.cpp
+++ b/examples/network/network-chat/server.cpp
@@ -49,7 +49,7 @@ Server::Server(QObject *parent)
listen(QHostAddress::Any);
}
-void Server::incomingConnection(int socketDescriptor)
+void Server::incomingConnection(qintptr socketDescriptor)
{
Connection *connection = new Connection(this);
connection->setSocketDescriptor(socketDescriptor);
diff --git a/examples/network/network-chat/server.h b/examples/network/network-chat/server.h
index feb57dc392..8222bd3c50 100644
--- a/examples/network/network-chat/server.h
+++ b/examples/network/network-chat/server.h
@@ -56,7 +56,7 @@ signals:
void newConnection(Connection *connection);
protected:
- void incomingConnection(int socketDescriptor);
+ void incomingConnection(qintptr socketDescriptor);
};
#endif
diff --git a/examples/network/threadedfortuneserver/fortuneserver.cpp b/examples/network/threadedfortuneserver/fortuneserver.cpp
index 90fba144e1..9363497f76 100644
--- a/examples/network/threadedfortuneserver/fortuneserver.cpp
+++ b/examples/network/threadedfortuneserver/fortuneserver.cpp
@@ -58,7 +58,7 @@ FortuneServer::FortuneServer(QObject *parent)
//! [0]
//! [1]
-void FortuneServer::incomingConnection(int socketDescriptor)
+void FortuneServer::incomingConnection(qintptr socketDescriptor)
{
QString fortune = fortunes.at(qrand() % fortunes.size());
FortuneThread *thread = new FortuneThread(socketDescriptor, fortune, this);
diff --git a/examples/network/threadedfortuneserver/fortuneserver.h b/examples/network/threadedfortuneserver/fortuneserver.h
index 470e868965..8d1a6ed151 100644
--- a/examples/network/threadedfortuneserver/fortuneserver.h
+++ b/examples/network/threadedfortuneserver/fortuneserver.h
@@ -53,7 +53,7 @@ public:
FortuneServer(QObject *parent = 0);
protected:
- void incomingConnection(int socketDescriptor);
+ void incomingConnection(qintptr socketDescriptor);
private:
QStringList fortunes;
diff --git a/examples/network/torrent/torrentserver.cpp b/examples/network/torrent/torrentserver.cpp
index b9f76c40f8..ecc7ba098c 100644
--- a/examples/network/torrent/torrentserver.cpp
+++ b/examples/network/torrent/torrentserver.cpp
@@ -61,7 +61,7 @@ void TorrentServer::removeClient(TorrentClient *client)
clients.removeAll(client);
}
-void TorrentServer::incomingConnection(int socketDescriptor)
+void TorrentServer::incomingConnection(qintptr socketDescriptor)
{
PeerWireClient *client =
new PeerWireClient(ConnectionManager::instance()->clientId(), this);
diff --git a/examples/network/torrent/torrentserver.h b/examples/network/torrent/torrentserver.h
index abe48f8e18..fd939ae641 100644
--- a/examples/network/torrent/torrentserver.h
+++ b/examples/network/torrent/torrentserver.h
@@ -58,7 +58,7 @@ public:
void removeClient(TorrentClient *client);
protected:
- void incomingConnection(int socketDescriptor);
+ void incomingConnection(qintptr socketDescriptor);
private slots:
void removeClient();
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index a20a5763a3..6fae97dc6d 100644
--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -485,7 +485,7 @@ public:
}
protected:
- void incomingConnection(int socketDescriptor)
+ void incomingConnection(qintptr socketDescriptor)
{
//qDebug() << "incomingConnection" << socketDescriptor << "doSsl:" << doSsl << "ipv6:" << ipv6;
if (!doSsl) {
@@ -807,7 +807,7 @@ public:
return nextPendingConnection();
}
}
- virtual void incomingConnection(int socketDescriptor)
+ virtual void incomingConnection(qintptr socketDescriptor)
{
#ifndef QT_NO_OPENSSL
if (doSsl) {
@@ -4277,7 +4277,7 @@ class SslServer : public QTcpServer {
Q_OBJECT
public:
SslServer() : socket(0) {};
- void incomingConnection(int socketDescriptor) {
+ void incomingConnection(qintptr socketDescriptor) {
QSslSocket *serverSocket = new QSslSocket;
serverSocket->setParent(this);
diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp b/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp
index e17a167512..a112966b41 100644
--- a/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp
+++ b/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp
@@ -107,7 +107,7 @@ My4Server::My4Server(QObject *parent)
}
//------------------------------------------------------------------------------
-void My4Server::incomingConnection(int socketId)
+void My4Server::incomingConnection(qintptr socketId)
{
m_socket = new My4Socket(this);
m_socket->setSocketDescriptor(socketId);
diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/Test.h b/tests/auto/network/socket/qtcpsocket/stressTest/Test.h
index c619454a3a..3adcbe4e5c 100644
--- a/tests/auto/network/socket/qtcpsocket/stressTest/Test.h
+++ b/tests/auto/network/socket/qtcpsocket/stressTest/Test.h
@@ -69,7 +69,7 @@ public:
My4Server(QObject *parent = 0);
protected:
- void incomingConnection(int socket);
+ void incomingConnection(qintptr socket);
private slots:
void stopServer();
diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
index 73d3754078..c2c234f608 100644
--- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
@@ -912,7 +912,7 @@ public:
QString m_certFile;
protected:
- void incomingConnection(int socketDescriptor)
+ void incomingConnection(qintptr socketDescriptor)
{
socket = new QSslSocket(this);
socket->setProtocol(protocol);
@@ -1332,7 +1332,7 @@ void tst_QSslSocket::wildcard()
class SslServer2 : public QTcpServer
{
protected:
- void incomingConnection(int socketDescriptor)
+ void incomingConnection(qintptr socketDescriptor)
{
QSslSocket *socket = new QSslSocket(this);
socket->ignoreSslErrors();
@@ -1558,7 +1558,7 @@ public:
QSslSocket *socket;
protected:
- void incomingConnection(int socketDescriptor)
+ void incomingConnection(qintptr socketDescriptor)
{
socket = new QSslSocket(this);
connect(socket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(ignoreErrorSlot()));
@@ -1730,7 +1730,7 @@ public:
QSslSocket *socket;
protected:
- void incomingConnection(int socketDescriptor)
+ void incomingConnection(qintptr socketDescriptor)
{
socket = new QSslSocket(this);
diff --git a/tests/baselineserver/src/baselineserver.cpp b/tests/baselineserver/src/baselineserver.cpp
index 533ed5d9d9..7adc335fb2 100644
--- a/tests/baselineserver/src/baselineserver.cpp
+++ b/tests/baselineserver/src/baselineserver.cpp
@@ -101,7 +101,7 @@ QString BaselineServer::settingsFilePath()
return settingsFile;
}
-void BaselineServer::incomingConnection(int socketDescriptor)
+void BaselineServer::incomingConnection(qintptr socketDescriptor)
{
QString runId = QDateTime::currentDateTime().toString(QLS("MMMdd-hhmmss"));
if (runId == lastRunId) {
diff --git a/tests/baselineserver/src/baselineserver.h b/tests/baselineserver/src/baselineserver.h
index b9b08b29b4..a6065cc099 100644
--- a/tests/baselineserver/src/baselineserver.h
+++ b/tests/baselineserver/src/baselineserver.h
@@ -69,7 +69,7 @@ public:
static QString settingsFilePath();
protected:
- void incomingConnection(int socketDescriptor);
+ void incomingConnection(qintptr socketDescriptor);
private slots:
void heartbeat();
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 09:50:05 +0000