diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 13:16:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 13:16:17 -0600 |
| commit | 748e86c67717d8262d7125e7b71d7440fd0a88a4 (patch) | |
| tree | 4377ccca40952d12aae2ba2210ef83449d72fad6 | |
| parent | de9a6aa007626eba4e333ac4080cbdfcb9f98386 (diff) | |
| download | tdemultimedia-748e86c67717d8262d7125e7b71d7440fd0a88a4.tar.gz tdemultimedia-748e86c67717d8262d7125e7b71d7440fd0a88a4.zip | |
Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4
| -rw-r--r-- | kmid/history.txt | 2 | ||||
| -rw-r--r-- | kmid/main.cpp | 2 | ||||
| -rw-r--r-- | libkcddb/asynccddbplookup.cpp | 2 | ||||
| -rw-r--r-- | libkcddb/cddbplookup.h | 2 | ||||
| -rw-r--r-- | libkcddb/synccddbplookup.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/kmid/history.txt b/kmid/history.txt index 3723e854..b6ed3407 100644 --- a/kmid/history.txt +++ b/kmid/history.txt @@ -460,7 +460,7 @@ Tuesday 26-1-99 - Removed ; after QOBJECT and fixed default midi map in consolekmid (not kmid) Sunday 21-2-99 -- Made a quick hack (no more than 15 lines) and kmid uses KIOJob to be +- Made a quick hack (no more than 15 lines) and kmid uses TDEIOJob to be net transparent (now it can download files using an http or ftp protocol just using dnd from a kfm window or using the open file dialog) diff --git a/kmid/main.cpp b/kmid/main.cpp index c368e523..21b0198a 100644 --- a/kmid/main.cpp +++ b/kmid/main.cpp @@ -80,7 +80,7 @@ int main(int argc, char **argv) kmidframe->show(); - //CT KIOJob::initStatic(); + //CT TDEIOJob::initStatic(); /* if (app->isRestored()) diff --git a/libkcddb/asynccddbplookup.cpp b/libkcddb/asynccddbplookup.cpp index 0f29ae53..85c55519 100644 --- a/libkcddb/asynccddbplookup.cpp +++ b/libkcddb/asynccddbplookup.cpp @@ -44,7 +44,7 @@ namespace KCDDB const TrackOffsetList & trackOffsetList ) { - socket_ = new KNetwork::KBufferedSocket(hostname,TQString::number(port)); + socket_ = new KNetwork::TDEBufferedSocket(hostname,TQString::number(port)); socket_->setBlocking( false ); diff --git a/libkcddb/cddbplookup.h b/libkcddb/cddbplookup.h index de20e532..0d55407e 100644 --- a/libkcddb/cddbplookup.h +++ b/libkcddb/cddbplookup.h @@ -47,7 +47,7 @@ namespace KCDDB bool isConnected() { return KNetwork::KClientSocketBase::Connected == socket_->state(); } - KNetwork::KBufferedSocket* socket_; + KNetwork::TDEBufferedSocket* socket_; }; } diff --git a/libkcddb/synccddbplookup.cpp b/libkcddb/synccddbplookup.cpp index ed102b9d..f215716b 100644 --- a/libkcddb/synccddbplookup.cpp +++ b/libkcddb/synccddbplookup.cpp @@ -49,7 +49,7 @@ namespace KCDDB trackOffsetList_ = trackOffsetList; - socket_ = new KNetwork::KBufferedSocket(hostName, TQString::number(port)); + socket_ = new KNetwork::TDEBufferedSocket(hostName, TQString::number(port)); socket_->setTimeout( 30000 ); socket_->setOutputBuffering(false); |