Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent de9a6aa007
commit 748e86c677

@ -460,7 +460,7 @@ Tuesday 26-1-99
- Removed ; after QOBJECT and fixed default midi map in consolekmid (not kmid) - Removed ; after QOBJECT and fixed default midi map in consolekmid (not kmid)
Sunday 21-2-99 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 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) using dnd from a kfm window or using the open file dialog)

@ -80,7 +80,7 @@ int main(int argc, char **argv)
kmidframe->show(); kmidframe->show();
//CT KIOJob::initStatic(); //CT TDEIOJob::initStatic();
/* /*
if (app->isRestored()) if (app->isRestored())

@ -44,7 +44,7 @@ namespace KCDDB
const TrackOffsetList & trackOffsetList const TrackOffsetList & trackOffsetList
) )
{ {
socket_ = new KNetwork::KBufferedSocket(hostname,TQString::number(port)); socket_ = new KNetwork::TDEBufferedSocket(hostname,TQString::number(port));
socket_->setBlocking( false ); socket_->setBlocking( false );

@ -47,7 +47,7 @@ namespace KCDDB
bool isConnected() bool isConnected()
{ return KNetwork::KClientSocketBase::Connected == socket_->state(); } { return KNetwork::KClientSocketBase::Connected == socket_->state(); }
KNetwork::KBufferedSocket* socket_; KNetwork::TDEBufferedSocket* socket_;
}; };
} }

@ -49,7 +49,7 @@ namespace KCDDB
trackOffsetList_ = trackOffsetList; trackOffsetList_ = trackOffsetList;
socket_ = new KNetwork::KBufferedSocket(hostName, TQString::number(port)); socket_ = new KNetwork::TDEBufferedSocket(hostName, TQString::number(port));
socket_->setTimeout( 30000 ); socket_->setTimeout( 30000 );
socket_->setOutputBuffering(false); socket_->setOutputBuffering(false);

Loading…
Cancel
Save