diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-11-19 13:53:04 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-11-19 13:53:04 (GMT) |
| commit | 4e53466f63bf05e90a69f80fda8580dabc1e9ed0 (patch) | |
| tree | 0978f427af78291d8dd16004cc4ca33dbe1af433 /examples/network/torrent/torrentserver.cpp | |
| parent | 5bd71902f97ba75dc93ccf709dbfdd2ffeb361b2 (diff) | |
| parent | fbbdf8698fb0444d5170b7d0a14e870ea789398f (diff) | |
| download | Qt-4e53466f63bf05e90a69f80fda8580dabc1e9ed0.zip Qt-4e53466f63bf05e90a69f80fda8580dabc1e9ed0.tar.gz Qt-4e53466f63bf05e90a69f80fda8580dabc1e9ed0.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'examples/network/torrent/torrentserver.cpp')
| -rw-r--r-- | examples/network/torrent/torrentserver.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/network/torrent/torrentserver.cpp b/examples/network/torrent/torrentserver.cpp index a7955c8..e9ae234 100644 --- a/examples/network/torrent/torrentserver.cpp +++ b/examples/network/torrent/torrentserver.cpp @@ -69,8 +69,8 @@ void TorrentServer::incomingConnection(int socketDescriptor) if (client->setSocketDescriptor(socketDescriptor)) { if (ConnectionManager::instance()->canAddConnection() && !clients.isEmpty()) { - connect(client, SIGNAL(infoHashReceived(const QByteArray &)), - this, SLOT(processInfoHash(const QByteArray &))); + connect(client, SIGNAL(infoHashReceived(QByteArray)), + this, SLOT(processInfoHash(QByteArray))); connect(client, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(removeClient())); RateController::instance()->addSocket(client); |