From 27fd576acbb8b9453dadd7d1ae949396eef8fc12 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 1 Jan 2024 17:47:34 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro --- libktorrent/torrent/authenticatebase.cpp | 2 +- libktorrent/torrent/chunkdownload.cpp | 12 +++++------ libktorrent/torrent/chunkmanager.cpp | 8 ++++---- libktorrent/torrent/downloader.cpp | 8 ++++---- libktorrent/torrent/httptracker.cpp | 6 +++--- libktorrent/torrent/movedatafilesjob.cpp | 8 ++++---- libktorrent/torrent/peerdownloader.cpp | 4 ++-- libktorrent/torrent/peermanager.cpp | 14 ++++++------- libktorrent/torrent/peersourcemanager.cpp | 34 +++++++++++++++---------------- libktorrent/torrent/queuemanager.cpp | 4 ++-- libktorrent/torrent/torrentcontrol.cpp | 30 +++++++++++++-------------- libktorrent/torrent/tracker.cpp | 4 ++-- libktorrent/torrent/udptracker.cpp | 16 +++++++-------- libktorrent/torrent/udptrackersocket.cpp | 2 +- 14 files changed, 76 insertions(+), 76 deletions(-) (limited to 'libktorrent/torrent') diff --git a/libktorrent/torrent/authenticatebase.cpp b/libktorrent/torrent/authenticatebase.cpp index c00e87f..51d3f26 100644 --- a/libktorrent/torrent/authenticatebase.cpp +++ b/libktorrent/torrent/authenticatebase.cpp @@ -32,7 +32,7 @@ namespace bt AuthenticateBase::AuthenticateBase(mse::StreamSocket* s) : sock(s),finished(false),local(false) { - connect(&timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(onTimeout())); + connect(&timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(onTimeout())); timer.start(20000,true); memset(handshake,0x00,68); bytes_of_handshake_recieved = 0; diff --git a/libktorrent/torrent/chunkdownload.cpp b/libktorrent/torrent/chunkdownload.cpp index 76638ce..6f21fcf 100644 --- a/libktorrent/torrent/chunkdownload.cpp +++ b/libktorrent/torrent/chunkdownload.cpp @@ -155,8 +155,8 @@ namespace bt { PeerDownloader* pd = pdown.at(i); pd->release(); - disconnect(pd,TQT_SIGNAL(timedout(const Request& )),this,TQT_SLOT(onTimeout(const Request& ))); - disconnect(pd,TQT_SIGNAL(rejected( const Request& )),this,TQT_SLOT(onRejected( const Request& ))); + disconnect(pd,TQ_SIGNAL(timedout(const Request& )),this,TQ_SLOT(onTimeout(const Request& ))); + disconnect(pd,TQ_SIGNAL(rejected( const Request& )),this,TQ_SLOT(onRejected( const Request& ))); } dstatus.clear(); pdown.clear(); @@ -171,8 +171,8 @@ namespace bt pdown.append(pd); dstatus.insert(pd->getPeer()->getID(),new DownloadStatus()); sendRequests(pd); - connect(pd,TQT_SIGNAL(timedout(const Request& )),this,TQT_SLOT(onTimeout(const Request& ))); - connect(pd,TQT_SIGNAL(rejected( const Request& )),this,TQT_SLOT(onRejected( const Request& ))); + connect(pd,TQ_SIGNAL(timedout(const Request& )),this,TQ_SLOT(onTimeout(const Request& ))); + connect(pd,TQ_SIGNAL(rejected( const Request& )),this,TQ_SLOT(onRejected( const Request& ))); return true; } @@ -305,8 +305,8 @@ namespace bt dstatus.erase(pd->getPeer()->getID()); pdown.remove(pd); - disconnect(pd,TQT_SIGNAL(timedout(const Request& )),this,TQT_SLOT(onTimeout(const Request& ))); - disconnect(pd,TQT_SIGNAL(rejected( const Request& )),this,TQT_SLOT(onRejected( const Request& ))); + disconnect(pd,TQ_SIGNAL(timedout(const Request& )),this,TQ_SLOT(onTimeout(const Request& ))); + disconnect(pd,TQ_SIGNAL(rejected( const Request& )),this,TQ_SLOT(onRejected( const Request& ))); } diff --git a/libktorrent/torrent/chunkmanager.cpp b/libktorrent/torrent/chunkmanager.cpp index 67359ba..fe40850 100644 --- a/libktorrent/torrent/chunkmanager.cpp +++ b/libktorrent/torrent/chunkmanager.cpp @@ -79,8 +79,8 @@ namespace bt for (Uint32 i = 0;i < tor.getNumFiles();i++) { TorrentFile & tf = tor.getFile(i); - connect(&tf,TQT_SIGNAL(downloadPriorityChanged(TorrentFile*, Priority, Priority )), - this,TQT_SLOT(downloadPriorityChanged(TorrentFile*, Priority, Priority ))); + connect(&tf,TQ_SIGNAL(downloadPriorityChanged(TorrentFile*, Priority, Priority )), + this,TQ_SLOT(downloadPriorityChanged(TorrentFile*, Priority, Priority ))); if (tf.getPriority() != NORMAL_PRIORITY) { @@ -232,8 +232,8 @@ namespace bt for (Uint32 i = 0;i < tor.getNumFiles();i++) { TorrentFile & tf = tor.getFile(i); - connect(&tf,TQT_SIGNAL(downloadPriorityChanged(TorrentFile*, Priority, Priority )), - this,TQT_SLOT(downloadPriorityChanged(TorrentFile*, Priority, Priority ))); + connect(&tf,TQ_SIGNAL(downloadPriorityChanged(TorrentFile*, Priority, Priority )), + this,TQ_SLOT(downloadPriorityChanged(TorrentFile*, Priority, Priority ))); if (tf.getPriority() != NORMAL_PRIORITY) { diff --git a/libktorrent/torrent/downloader.cpp b/libktorrent/torrent/downloader.cpp index 582fa7e..dc00927 100644 --- a/libktorrent/torrent/downloader.cpp +++ b/libktorrent/torrent/downloader.cpp @@ -52,8 +52,8 @@ namespace bt unnecessary_data = 0; current_chunks.setAutoDelete(true); - connect(&pman,TQT_SIGNAL(newPeer(Peer* )),this,TQT_SLOT(onNewPeer(Peer* ))); - connect(&pman,TQT_SIGNAL(peerKilled(Peer* )),this,TQT_SLOT(onPeerKilled(Peer*))); + connect(&pman,TQ_SIGNAL(newPeer(Peer* )),this,TQ_SLOT(onNewPeer(Peer* ))); + connect(&pman,TQ_SIGNAL(peerKilled(Peer* )),this,TQ_SLOT(onPeerKilled(Peer*))); } @@ -360,8 +360,8 @@ namespace bt void Downloader::onNewPeer(Peer* peer) { PeerDownloader* pd = peer->getPeerDownloader(); - connect(pd,TQT_SIGNAL(downloaded(const Piece& )), - this,TQT_SLOT(pieceRecieved(const Piece& ))); + connect(pd,TQ_SIGNAL(downloaded(const Piece& )), + this,TQ_SLOT(pieceRecieved(const Piece& ))); } void Downloader::onPeerKilled(Peer* peer) diff --git a/libktorrent/torrent/httptracker.cpp b/libktorrent/torrent/httptracker.cpp index 2367ca0..c6dd983 100644 --- a/libktorrent/torrent/httptracker.cpp +++ b/libktorrent/torrent/httptracker.cpp @@ -124,7 +124,7 @@ namespace bt j->setMetaData(md); TDEIO::Scheduler::scheduleJob(j); - connect(j,TQT_SIGNAL(result(TDEIO::Job* )),this,TQT_SLOT(onScrapeResult( TDEIO::Job* ))); + connect(j,TQ_SIGNAL(result(TDEIO::Job* )),this,TQ_SLOT(onScrapeResult( TDEIO::Job* ))); } void HTTPTracker::onScrapeResult(TDEIO::Job* j) @@ -188,7 +188,7 @@ namespace bt if (!url.isValid()) { requestPending(); - TQTimer::singleShot(500,this,TQT_SLOT(emitInvalidURLFailure())); + TQTimer::singleShot(500,this,TQ_SLOT(emitInvalidURLFailure())); return; } @@ -453,7 +453,7 @@ namespace bt j->setMetaData(md); TDEIO::Scheduler::scheduleJob(j); - connect(j,TQT_SIGNAL(result(TDEIO::Job* )),this,TQT_SLOT(onAnnounceResult( TDEIO::Job* ))); + connect(j,TQ_SIGNAL(result(TDEIO::Job* )),this,TQ_SLOT(onAnnounceResult( TDEIO::Job* ))); active_job = j; requestPending(); diff --git a/libktorrent/torrent/movedatafilesjob.cpp b/libktorrent/torrent/movedatafilesjob.cpp index 7fc3fa6..7db1472 100644 --- a/libktorrent/torrent/movedatafilesjob.cpp +++ b/libktorrent/torrent/movedatafilesjob.cpp @@ -81,8 +81,8 @@ namespace bt active_src = i.key(); active_dst = i.data(); Out(SYS_GEN|LOG_DEBUG) << "Moving " << active_src << " -> " << active_dst << endl; - connect(active_job,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(onJobDone(TDEIO::Job*))); - connect(active_job,TQT_SIGNAL(canceled(TDEIO::Job*)),this,TQT_SLOT(onCanceled(TDEIO::Job*))); + connect(active_job,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(onJobDone(TDEIO::Job*))); + connect(active_job,TQ_SIGNAL(canceled(TDEIO::Job*)),this,TQ_SLOT(onCanceled(TDEIO::Job*))); todo.erase(i); } @@ -95,8 +95,8 @@ namespace bt } TQMap::iterator i = success.begin(); active_job = TDEIO::move(KURL::fromPathOrURL(i.data()),KURL::fromPathOrURL(i.key()),false); - connect(active_job,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(onJobDone(TDEIO::Job*))); - connect(active_job,TQT_SIGNAL(canceled(TDEIO::Job*)),this,TQT_SLOT(onCanceled(TDEIO::Job*))); + connect(active_job,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(onJobDone(TDEIO::Job*))); + connect(active_job,TQ_SIGNAL(canceled(TDEIO::Job*)),this,TQ_SLOT(onCanceled(TDEIO::Job*))); success.erase(i); } } diff --git a/libktorrent/torrent/peerdownloader.cpp b/libktorrent/torrent/peerdownloader.cpp index 6f0738f..4909c5a 100644 --- a/libktorrent/torrent/peerdownloader.cpp +++ b/libktorrent/torrent/peerdownloader.cpp @@ -70,8 +70,8 @@ namespace bt PeerDownloader::PeerDownloader(Peer* peer,Uint32 chunk_size) : peer(peer),grabbed(0),chunk_size(chunk_size / MAX_PIECE_LEN) { - connect(peer,TQT_SIGNAL(piece(const Piece& )),this,TQT_SLOT(piece(const Piece& ))); - connect(peer,TQT_SIGNAL(destroyed()),this,TQT_SLOT(peerDestroyed())); + connect(peer,TQ_SIGNAL(piece(const Piece& )),this,TQ_SLOT(piece(const Piece& ))); + connect(peer,TQ_SIGNAL(destroyed()),this,TQ_SLOT(peerDestroyed())); nearly_done = false; max_wait_queue_size = 25; } diff --git a/libktorrent/torrent/peermanager.cpp b/libktorrent/torrent/peermanager.cpp index 3f542c8..ee0cd38 100644 --- a/libktorrent/torrent/peermanager.cpp +++ b/libktorrent/torrent/peermanager.cpp @@ -239,7 +239,7 @@ namespace bt if (auth->isLocal()) st->setLocal(true); - connect(this,TQT_SIGNAL(stopped()),st,TQT_SLOT(onPeerManagerDestroyed())); + connect(this,TQ_SIGNAL(stopped()),st,TQ_SLOT(onPeerManagerDestroyed())); AuthenticationMonitor::instance().add(st); num_pending++; total_connections++; @@ -259,11 +259,11 @@ namespace bt { Peer* peer = new Peer(sock,peer_id,tor.getNumChunks(),tor.getChunkSize(),support,local); - connect(peer,TQT_SIGNAL(haveChunk(Peer*, Uint32 )),this,TQT_SLOT(onHave(Peer*, Uint32 ))); - connect(peer,TQT_SIGNAL(bitSetRecieved(const BitSet& )), - this,TQT_SLOT(onBitSetRecieved(const BitSet& ))); - connect(peer,TQT_SIGNAL(rerunChoker()),this,TQT_SLOT(onRerunChoker())); - connect(peer,TQT_SIGNAL(pex( const TQByteArray& )),this,TQT_SLOT(pex( const TQByteArray& ))); + connect(peer,TQ_SIGNAL(haveChunk(Peer*, Uint32 )),this,TQ_SLOT(onHave(Peer*, Uint32 ))); + connect(peer,TQ_SIGNAL(bitSetRecieved(const BitSet& )), + this,TQ_SLOT(onBitSetRecieved(const BitSet& ))); + connect(peer,TQ_SIGNAL(rerunChoker()),this,TQ_SLOT(onRerunChoker())); + connect(peer,TQ_SIGNAL(pex( const TQByteArray& )),this,TQ_SLOT(pex( const TQByteArray& ))); peer_list.append(peer); peer_map.insert(peer->getID(),peer); @@ -356,7 +356,7 @@ namespace bt if (pp.local) auth->setLocal(true); - connect(this,TQT_SIGNAL(stopped()),auth,TQT_SLOT(onPeerManagerDestroyed())); + connect(this,TQ_SIGNAL(stopped()),auth,TQ_SLOT(onPeerManagerDestroyed())); AuthenticationMonitor::instance().add(auth); num_pending++; diff --git a/libktorrent/torrent/peersourcemanager.cpp b/libktorrent/torrent/peersourcemanager.cpp index a48ccb0..c85c144 100644 --- a/libktorrent/torrent/peersourcemanager.cpp +++ b/libktorrent/torrent/peersourcemanager.cpp @@ -65,7 +65,7 @@ namespace bt //load custom trackers loadCustomURLs(); - connect(&timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(updateCurrentManually())); + connect(&timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(updateCurrentManually())); } PeerSourceManager::~PeerSourceManager() @@ -85,21 +85,21 @@ namespace bt void PeerSourceManager::addTracker(Tracker* trk) { trackers.insert(trk->trackerURL(),trk); - connect(trk,TQT_SIGNAL(peersReady( kt::PeerSource* )), - pman,TQT_SLOT(peerSourceReady( kt::PeerSource* ))); + connect(trk,TQ_SIGNAL(peersReady( kt::PeerSource* )), + pman,TQ_SLOT(peerSourceReady( kt::PeerSource* ))); } void PeerSourceManager::addPeerSource(kt::PeerSource* ps) { additional.append(ps); - connect(ps,TQT_SIGNAL(peersReady( kt::PeerSource* )), - pman,TQT_SLOT(peerSourceReady( kt::PeerSource* ))); + connect(ps,TQ_SIGNAL(peersReady( kt::PeerSource* )), + pman,TQ_SLOT(peerSourceReady( kt::PeerSource* ))); } void PeerSourceManager::removePeerSource(kt::PeerSource* ps) { - disconnect(ps,TQT_SIGNAL(peersReady( kt::PeerSource* )), - pman,TQT_SLOT(peerSourceReady( kt::PeerSource* ))); + disconnect(ps,TQ_SIGNAL(peersReady( kt::PeerSource* )), + pman,TQ_SLOT(peerSourceReady( kt::PeerSource* ))); additional.remove(ps); } @@ -477,10 +477,10 @@ namespace bt if (curr) { - disconnect(curr,TQT_SIGNAL(requestFailed( const TQString& )), - this,TQT_SLOT(onTrackerError( const TQString& ))); - disconnect(curr,TQT_SIGNAL(requestOK()),this,TQT_SLOT(onTrackerOK())); - disconnect(curr,TQT_SIGNAL(requestPending()),this,TQT_SLOT(onTrackerRequestPending())); + disconnect(curr,TQ_SIGNAL(requestFailed( const TQString& )), + this,TQ_SLOT(onTrackerError( const TQString& ))); + disconnect(curr,TQ_SIGNAL(requestOK()),this,TQ_SLOT(onTrackerOK())); + disconnect(curr,TQ_SIGNAL(requestPending()),this,TQ_SLOT(onTrackerRequestPending())); curr = 0; } @@ -488,14 +488,14 @@ namespace bt if (curr) { Out(SYS_TRK|LOG_NOTICE) << "Switching to tracker " << trk->trackerURL() << endl; - TQObject::connect(curr,TQT_SIGNAL(requestFailed( const TQString& )), - this,TQT_SLOT(onTrackerError( const TQString& ))); + TQObject::connect(curr,TQ_SIGNAL(requestFailed( const TQString& )), + this,TQ_SLOT(onTrackerError( const TQString& ))); - TQObject::connect(curr,TQT_SIGNAL(requestOK()), - this,TQT_SLOT(onTrackerOK())); + TQObject::connect(curr,TQ_SIGNAL(requestOK()), + this,TQ_SLOT(onTrackerOK())); - TQObject::connect(curr,TQT_SIGNAL(requestPending()), - this,TQT_SLOT(onTrackerRequestPending())); + TQObject::connect(curr,TQ_SIGNAL(requestPending()), + this,TQ_SLOT(onTrackerRequestPending())); } } diff --git a/libktorrent/torrent/queuemanager.cpp b/libktorrent/torrent/queuemanager.cpp index bc04f9f..e4d063c 100644 --- a/libktorrent/torrent/queuemanager.cpp +++ b/libktorrent/torrent/queuemanager.cpp @@ -61,8 +61,8 @@ namespace bt downloads.append(tc); downloads.sort(); - connect(tc, TQT_SIGNAL(diskSpaceLow(kt::TorrentInterface*, bool)), this, TQT_SLOT(onLowDiskSpace(kt::TorrentInterface*, bool))); - connect(tc, TQT_SIGNAL(torrentStopped(kt::TorrentInterface*)), this, TQT_SLOT(torrentStopped(kt::TorrentInterface*))); + connect(tc, TQ_SIGNAL(diskSpaceLow(kt::TorrentInterface*, bool)), this, TQ_SLOT(onLowDiskSpace(kt::TorrentInterface*, bool))); + connect(tc, TQ_SIGNAL(torrentStopped(kt::TorrentInterface*)), this, TQ_SLOT(torrentStopped(kt::TorrentInterface*))); } void QueueManager::remove(kt::TorrentInterface* tc) diff --git a/libktorrent/torrent/torrentcontrol.cpp b/libktorrent/torrent/torrentcontrol.cpp index 14ff2c6..9771e80 100644 --- a/libktorrent/torrent/torrentcontrol.cpp +++ b/libktorrent/torrent/torrentcontrol.cpp @@ -613,8 +613,8 @@ namespace bt pman = new PeerManager(*tor); //Out() << "Tracker url " << url << " " << url.protocol() << " " << url.prettyURL() << endl; psman = new PeerSourceManager(this,pman); - connect(psman,TQT_SIGNAL(statusChanged( const TQString& )), - this,TQT_SLOT(trackerStatusChanged( const TQString& ))); + connect(psman,TQ_SIGNAL(statusChanged( const TQString& )), + this,TQ_SLOT(trackerStatusChanged( const TQString& ))); // Create chunkmanager, load the index file if it exists @@ -626,7 +626,7 @@ namespace bt // store the outputdir into the output_path variable, so others can access it - connect(cman,TQT_SIGNAL(updateStats()),this,TQT_SLOT(updateStats())); + connect(cman,TQ_SIGNAL(updateStats()),this,TQ_SLOT(updateStats())); if (bt::Exists(datadir + "index")) cman->loadIndexFile(); @@ -634,17 +634,17 @@ namespace bt // create downloader,uploader and choker down = new Downloader(*tor,*pman,*cman); - connect(down,TQT_SIGNAL(ioError(const TQString& )), - this,TQT_SLOT(onIOError(const TQString& ))); + connect(down,TQ_SIGNAL(ioError(const TQString& )), + this,TQ_SLOT(onIOError(const TQString& ))); up = new Uploader(*cman,*pman); choke = new Choker(*pman,*cman); - connect(pman,TQT_SIGNAL(newPeer(Peer* )),this,TQT_SLOT(onNewPeer(Peer* ))); - connect(pman,TQT_SIGNAL(peerKilled(Peer* )),this,TQT_SLOT(onPeerRemoved(Peer* ))); - connect(cman,TQT_SIGNAL(excluded(Uint32, Uint32 )),down,TQT_SLOT(onExcluded(Uint32, Uint32 ))); - connect(cman,TQT_SIGNAL(included( Uint32, Uint32 )),down,TQT_SLOT(onIncluded( Uint32, Uint32 ))); - connect(cman,TQT_SIGNAL(corrupted( Uint32 )),this,TQT_SLOT(corrupted( Uint32 ))); + connect(pman,TQ_SIGNAL(newPeer(Peer* )),this,TQ_SLOT(onNewPeer(Peer* ))); + connect(pman,TQ_SIGNAL(peerKilled(Peer* )),this,TQ_SLOT(onPeerRemoved(Peer* ))); + connect(cman,TQ_SIGNAL(excluded(Uint32, Uint32 )),down,TQ_SLOT(onExcluded(Uint32, Uint32 ))); + connect(cman,TQ_SIGNAL(included( Uint32, Uint32 )),down,TQ_SLOT(onIncluded( Uint32, Uint32 ))); + connect(cman,TQ_SIGNAL(corrupted( Uint32 )),this,TQ_SLOT(corrupted( Uint32 ))); } void TorrentControl::initInternal(QueueManager* qman, @@ -731,8 +731,8 @@ namespace bt void TorrentControl::onNewPeer(Peer* p) { - connect(p,TQT_SIGNAL(gotPortPacket( const TQString&, Uint16 )), - this,TQT_SLOT(onPortPacket( const TQString&, Uint16 ))); + connect(p,TQ_SIGNAL(gotPortPacket( const TQString&, Uint16 )), + this,TQ_SLOT(onPortPacket( const TQString&, Uint16 ))); if (p->getStats().fast_extensions) { @@ -772,8 +772,8 @@ namespace bt void TorrentControl::onPeerRemoved(Peer* p) { - disconnect(p,TQT_SIGNAL(gotPortPacket( const TQString&, Uint16 )), - this,TQT_SLOT(onPortPacket( const TQString&, Uint16 ))); + disconnect(p,TQ_SIGNAL(gotPortPacket( const TQString&, Uint16 )), + this,TQ_SLOT(onPortPacket( const TQString&, Uint16 ))); if (tmon) tmon->peerRemoved(p); } @@ -855,7 +855,7 @@ namespace bt move_data_files_destination_path = nd; if (j) { - connect(j,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(moveDataFilesJobDone(TDEIO::Job*))); + connect(j,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(moveDataFilesJobDone(TDEIO::Job*))); return true; } else diff --git a/libktorrent/torrent/tracker.cpp b/libktorrent/torrent/tracker.cpp index 4878a16..4848765 100644 --- a/libktorrent/torrent/tracker.cpp +++ b/libktorrent/torrent/tracker.cpp @@ -84,8 +84,8 @@ namespace bt void Tracker::timedDelete(int ms) { - TQTimer::singleShot(ms,this,TQT_SLOT(deleteLater())); - connect(this,TQT_SIGNAL(stopDone()),this,TQT_SLOT(deleteLater())); + TQTimer::singleShot(ms,this,TQ_SLOT(deleteLater())); + connect(this,TQ_SIGNAL(stopDone()),this,TQ_SLOT(deleteLater())); } } diff --git a/libktorrent/torrent/udptracker.cpp b/libktorrent/torrent/udptracker.cpp index 6f8a4e0..89f58b8 100644 --- a/libktorrent/torrent/udptracker.cpp +++ b/libktorrent/torrent/udptracker.cpp @@ -51,15 +51,15 @@ namespace bt transaction_id = 0; interval = 0; - connect(&conn_timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(onConnTimeout())); - connect(socket,TQT_SIGNAL(announceRecieved(Int32, const TQByteArray &)), - this,TQT_SLOT(announceRecieved(Int32, const TQByteArray& ))); - connect(socket,TQT_SIGNAL(connectRecieved(Int32, Int64 )), - this,TQT_SLOT(connectRecieved(Int32, Int64 ))); - connect(socket,TQT_SIGNAL(error(Int32, const TQString& )), - this,TQT_SLOT(onError(Int32, const TQString& ))); + connect(&conn_timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(onConnTimeout())); + connect(socket,TQ_SIGNAL(announceRecieved(Int32, const TQByteArray &)), + this,TQ_SLOT(announceRecieved(Int32, const TQByteArray& ))); + connect(socket,TQ_SIGNAL(connectRecieved(Int32, Int64 )), + this,TQ_SLOT(connectRecieved(Int32, Int64 ))); + connect(socket,TQ_SIGNAL(error(Int32, const TQString& )), + this,TQ_SLOT(onError(Int32, const TQString& ))); - KResolver::resolveAsync(this,TQT_SLOT(onResolverResults(KResolverResults )), + KResolver::resolveAsync(this,TQ_SLOT(onResolverResults(KResolverResults )), url.host(),TQString::number(url.port())); } diff --git a/libktorrent/torrent/udptrackersocket.cpp b/libktorrent/torrent/udptrackersocket.cpp index 6df3cdf..eb8dc8b 100644 --- a/libktorrent/torrent/udptrackersocket.cpp +++ b/libktorrent/torrent/udptrackersocket.cpp @@ -42,7 +42,7 @@ namespace bt { sock = new KNetwork::KDatagramSocket(this); sock->setAddressReuseable(true); - connect(sock,TQT_SIGNAL(readyRead()),this,TQT_SLOT(dataReceived())); + connect(sock,TQ_SIGNAL(readyRead()),this,TQ_SLOT(dataReceived())); int i = 0; if (port == 0) port = 4444; -- cgit v1.2.1