From bdce61002255b5f8b3213e93175cefdfebfde2cc Mon Sep 17 00:00:00 2001 From: "Jonas M. Gastal" Date: Wed, 11 Jan 2012 13:06:14 -0200 Subject: Fixes examples/tests to use qinptr in QTcpServer::incomingConnection. This is a fix for problems introduced by bf7f170. Change-Id: If5dd8e031ef2efea578b3efb188c2e950e1ba41a Reviewed-by: Peter Hartmann Reviewed-by: Bradley T. Hughes --- examples/network/network-chat/server.cpp | 2 +- examples/network/network-chat/server.h | 2 +- examples/network/threadedfortuneserver/fortuneserver.cpp | 2 +- examples/network/threadedfortuneserver/fortuneserver.h | 2 +- examples/network/torrent/torrentserver.cpp | 2 +- examples/network/torrent/torrentserver.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'examples/network') 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(); -- cgit v1.2.3