diff options
| author | Jonas M. Gastal <jgastal@profusion.mobi> | 2012-01-11 13:06:14 -0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-13 20:55:00 +0100 |
| commit | bdce61002255b5f8b3213e93175cefdfebfde2cc (patch) | |
| tree | 216a8fe598b426f1a3184534c33a3800ad34a652 /examples | |
| parent | 14b929e9c448f2cc74fa047aaf8af283b81fbaf9 (diff) | |
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 <peter.hartmann@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/network/network-chat/server.cpp | 2 | ||||
| -rw-r--r-- | examples/network/network-chat/server.h | 2 | ||||
| -rw-r--r-- | examples/network/threadedfortuneserver/fortuneserver.cpp | 2 | ||||
| -rw-r--r-- | examples/network/threadedfortuneserver/fortuneserver.h | 2 | ||||
| -rw-r--r-- | examples/network/torrent/torrentserver.cpp | 2 | ||||
| -rw-r--r-- | examples/network/torrent/torrentserver.h | 2 |
6 files changed, 6 insertions, 6 deletions
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(); |