diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:12:44 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:12:44 -0600 |
| commit | d46a1fe34693137bbc38a0a79593af420ea0914b (patch) | |
| tree | 038dbf461083bda9b7a6398908572591a80012d3 /plugins/upnp | |
| parent | 604bf3f969d880708ea9a1affce0b304c29e6ff5 (diff) | |
| download | ktorrent-d46a1fe34693137bbc38a0a79593af420ea0914b.tar.gz ktorrent-d46a1fe34693137bbc38a0a79593af420ea0914b.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'plugins/upnp')
| -rw-r--r-- | plugins/upnp/upnpmcastsocket.cpp | 2 | ||||
| -rw-r--r-- | plugins/upnp/upnprouter.cpp | 8 | ||||
| -rw-r--r-- | plugins/upnp/upnprouter.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/plugins/upnp/upnpmcastsocket.cpp b/plugins/upnp/upnpmcastsocket.cpp index 809d934..3b8be45 100644 --- a/plugins/upnp/upnpmcastsocket.cpp +++ b/plugins/upnp/upnpmcastsocket.cpp @@ -222,7 +222,7 @@ namespace kt void UPnPMCastSocket::onError(int) { - Out(SYS_PNP|LOG_IMPORTANT) << "UPnPMCastSocket Error : " << KSocketBase::errorString() << endl; + Out(SYS_PNP|LOG_IMPORTANT) << "UPnPMCastSocket Error : " << TDESocketBase::errorString() << endl; } void UPnPMCastSocket::saveRouters(const TQString & file) diff --git a/plugins/upnp/upnprouter.cpp b/plugins/upnp/upnprouter.cpp index a5d1212..d924526 100644 --- a/plugins/upnp/upnprouter.cpp +++ b/plugins/upnp/upnprouter.cpp @@ -140,7 +140,7 @@ namespace kt services.append(s); } - void UPnPRouter::downloadFinished(KIO::Job* j) + void UPnPRouter::downloadFinished(TDEIO::Job* j) { if (j->error()) { @@ -156,7 +156,7 @@ namespace kt { Out(SYS_PNP|LOG_IMPORTANT) << "Error parsing router description !" << endl; TQString dest = TDEGlobal::dirs()->saveLocation("data","ktorrent") + "upnp_failure"; - KIO::file_copy(target,dest,-1,true,false,false); + TDEIO::file_copy(target,dest,-1,true,false,false); } else { @@ -170,8 +170,8 @@ namespace kt void UPnPRouter::downloadXMLFile() { // downlaod XML description into a temporary file in /tmp - KIO::Job* job = KIO::file_copy(location,tmp_file,-1,true,false,false); - connect(job,TQT_SIGNAL(result(KIO::Job *)),this,TQT_SLOT(downloadFinished( KIO::Job* ))); + TDEIO::Job* job = TDEIO::file_copy(location,tmp_file,-1,true,false,false); + connect(job,TQT_SIGNAL(result(TDEIO::Job *)),this,TQT_SLOT(downloadFinished( TDEIO::Job* ))); } void UPnPRouter::debugPrintData() diff --git a/plugins/upnp/upnprouter.h b/plugins/upnp/upnprouter.h index 1cbac0b..081d958 100644 --- a/plugins/upnp/upnprouter.h +++ b/plugins/upnp/upnprouter.h @@ -33,7 +33,7 @@ namespace bt class WaitJob; } -namespace KIO +namespace TDEIO { class Job; } @@ -191,7 +191,7 @@ namespace kt void onReplyOK(bt::HTTPRequest* r,const TQString &); void onReplyError(bt::HTTPRequest* r,const TQString &); void onError(bt::HTTPRequest* r,bool); - void downloadFinished(KIO::Job* j); + void downloadFinished(TDEIO::Job* j); |