Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

4 files changed, 19 insertions, 19 deletions

diff --git a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp
index c3a39253..cffb672f 100644
--- a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp
+++ b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp
@@ -102,7 +102,7 @@ void KNetworkByteStream::slotConnectionClosed()
 	if ( mClosing )
 	{
 		kdDebug( 14151 ) << "..by ourselves!" << endl;
-		kdDebug( 14151 ) << "socket error is " << socket()->KSocketBase::errorString( socket()->error() ) << endl;
+		kdDebug( 14151 ) << "socket error is " << socket()->TDESocketBase::errorString( socket()->error() ) << endl;
 		emit connectionClosed ();
 	}
 	else
diff --git a/kopete/protocols/oscar/liboscar/oscarconnector.cpp b/kopete/protocols/oscar/liboscar/oscarconnector.cpp
index 98d56237..16fcaff1 100644
--- a/kopete/protocols/oscar/liboscar/oscarconnector.cpp
+++ b/kopete/protocols/oscar/liboscar/oscarconnector.cpp
@@ -29,7 +29,7 @@ KNetworkConnector::KNetworkConnector( TQObject *parent, const char */*name*/ )
 {
 	kdDebug( 14151 ) << k_funcinfo << "New KNetwork connector." << endl;
 
-	mErrorCode = KNetwork::KSocketBase::NoError;
+	mErrorCode = KNetwork::TDESocketBase::NoError;
 
 	mByteStream = new KNetworkByteStream( this );
 
@@ -49,7 +49,7 @@ void KNetworkConnector::connectToServer( const TQString &server )
 	Q_ASSERT( !mHost.isNull() );
 	Q_ASSERT( mPort );
 
-	mErrorCode = KNetwork::KSocketBase::NoError;
+	mErrorCode = KNetwork::TDESocketBase::NoError;
 
 	if ( !mByteStream->connect ( mHost, TQString::number ( mPort ) ) )
 	{
diff --git a/kopete/protocols/oscar/oscarversionupdater.cpp b/kopete/protocols/oscar/oscarversionupdater.cpp
index d79e47fc..bcaf454e 100644
--- a/kopete/protocols/oscar/oscarversionupdater.cpp
+++ b/kopete/protocols/oscar/oscarversionupdater.cpp
@@ -66,15 +66,15 @@ bool OscarVersionUpdater::update( unsigned int stamp )
 	{
 		mVersionData.resize( 0 );
 		
-		KConfigGroup config( TDEGlobal::config(), "Oscar" );
+		TDEConfigGroup config( TDEGlobal::config(), "Oscar" );
 		TQString url = config.readEntry( "NewVersionURL", "http://kopete.kde.org/oscarversions.xml" );
-		mTransferJob = KIO::get ( url );
+		mTransferJob = TDEIO::get ( url );
 		kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Download version info from server."<< endl;
 		
-		connect ( mTransferJob, TQT_SIGNAL ( result ( KIO::Job* ) ),
-		          this, TQT_SLOT ( slotTransferResult ( KIO::Job* ) ) );
-		connect ( mTransferJob, TQT_SIGNAL ( data ( KIO::Job*, const TQByteArray& ) ),
-		          this, TQT_SLOT ( slotTransferData ( KIO::Job*, const TQByteArray& ) ) );
+		connect ( mTransferJob, TQT_SIGNAL ( result ( TDEIO::Job* ) ),
+		          this, TQT_SLOT ( slotTransferResult ( TDEIO::Job* ) ) );
+		connect ( mTransferJob, TQT_SIGNAL ( data ( TDEIO::Job*, const TQByteArray& ) ),
+		          this, TQT_SLOT ( slotTransferData ( TDEIO::Job*, const TQByteArray& ) ) );
 	}
 	return isUpdating;
 }
@@ -87,7 +87,7 @@ unsigned int OscarVersionUpdater::stamp() const
 void OscarVersionUpdater::initICQVersionInfo()
 {
 	kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl;
-	KConfigGroup config( TDEGlobal::config(), "ICQVersion" );
+	TDEConfigGroup config( TDEGlobal::config(), "ICQVersion" );
 
 	mICQVersion.clientString = config.readEntry( "ClientString", "ICQ Client" );
 	mICQVersion.clientId = config.readEntry( "ClientId", "0x010A" ).toUShort( 0, 0 );
@@ -104,7 +104,7 @@ void OscarVersionUpdater::initAIMVersionInfo()
 {
 	kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl;
 	
-	KConfigGroup config( TDEGlobal::config(), "AIMVersion" );
+	TDEConfigGroup config( TDEGlobal::config(), "AIMVersion" );
 	
 	mAIMVersion.clientString = config.readEntry( "ClientString", "AOL Instant Messenger (SM), version 5.1.3036/WIN32" );
 	mAIMVersion.clientId = config.readEntry( "ClientId", "0x0109" ).toUShort( 0, 0 );
@@ -144,7 +144,7 @@ void OscarVersionUpdater::printDebug()
 	kdDebug(OSCAR_RAW_DEBUG) << "************************************************" << endl;
 }
 
-void OscarVersionUpdater::slotTransferData ( KIO::Job */*job*/, const TQByteArray &data )
+void OscarVersionUpdater::slotTransferData ( TDEIO::Job */*job*/, const TQByteArray &data )
 {
 	unsigned oldSize = mVersionData.size();
 	mVersionData.resize ( oldSize + data.size() );
@@ -153,7 +153,7 @@ void OscarVersionUpdater::slotTransferData ( KIO::Job */*job*/, const TQByteArra
 	kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Data size " << mVersionData.size() << endl;
 }
 
-void OscarVersionUpdater::slotTransferResult ( KIO::Job *job )
+void OscarVersionUpdater::slotTransferResult ( TDEIO::Job *job )
 {
 	bool bUpdate = false;
 	if ( job->error() || mTransferJob->isErrorPage() )
@@ -264,7 +264,7 @@ bool OscarVersionUpdater::parseVersion( Oscar::ClientVersion& version, TQDomElem
 void OscarVersionUpdater::storeVersionInfo( const TQString& group, const Oscar::ClientVersion& version ) const
 {
 	kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Storing version info to group: " << group << endl;
-	KConfigGroup config( TDEGlobal::config(), group );
+	TDEConfigGroup config( TDEGlobal::config(), group );
 	
 	config.writeEntry( "ClientString", version.clientString );
 	config.writeEntry( "ClientId", version.clientId );
diff --git a/kopete/protocols/oscar/oscarversionupdater.h b/kopete/protocols/oscar/oscarversionupdater.h
index 117734c8..de2a2fea 100644
--- a/kopete/protocols/oscar/oscarversionupdater.h
+++ b/kopete/protocols/oscar/oscarversionupdater.h
@@ -21,7 +21,7 @@
 
 #include <oscartypes.h>
 
-namespace KIO
+namespace TDEIO
 {
 class Job;
 class TransferJob;
@@ -85,15 +85,15 @@ public:
 	void printDebug();
 
 private slots:
-	void slotTransferData( KIO::Job *job, const TQByteArray &data );
-	void slotTransferResult( KIO::Job *job );
+	void slotTransferData( TDEIO::Job *job, const TQByteArray &data );
+	void slotTransferResult( TDEIO::Job *job );
 	
 private:
 	void parseDocument( TQDomDocument& doc );
 	bool parseVersion( Oscar::ClientVersion& version, TQDomElement& element );
 	
 	/**
-	 * Store version info structure to KConfigGroup
+	 * Store version info structure to TDEConfigGroup
 	 * @param group is the group name.
 	 * @param version is version info structure.
 	 */
@@ -111,7 +111,7 @@ private:
 	Oscar::ClientVersion mICQVersion;
 	Oscar::ClientVersion mAIMVersion;
 	
-	KIO::TransferJob *mTransferJob;
+	TDEIO::TransferJob *mTransferJob;
 	TQByteArray mVersionData;
 	
 	unsigned int mStamp;