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

2 files changed, 27 insertions, 27 deletions

diff --git a/kioslave/svn/svnhelper/kio_svn_helper.cpp b/kioslave/svn/svnhelper/kio_svn_helper.cpp
index ec938c39..64b51d1a 100644
--- a/kioslave/svn/svnhelper/kio_svn_helper.cpp
+++ b/kioslave/svn/svnhelper/kio_svn_helper.cpp
@@ -66,9 +66,9 @@ SvnHelper::SvnHelper():TDEApplication() {
 			int rev = -1;
 			kdDebug(7128) << "updating : " << (*it).prettyURL() << endl;
 			s << cmd << *it << rev << TQString( "HEAD" );
-			KIO::SimpleJob * job = KIO::special(servURL, parms, true);
-			connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
-			KIO::NetAccess::synchronousRun( job, 0 );
+			TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true);
+			connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+			TDEIO::NetAccess::synchronousRun( job, 0 );
 		}
 	} else if (args->isSet("c")) {
 		kdDebug(7128) << "commit " << list << endl;
@@ -81,9 +81,9 @@ SvnHelper::SvnHelper():TDEApplication() {
 			kdDebug(7128) << "commiting : " << (*it).prettyURL() << endl;
 			s << *it;
 		}
-		KIO::SimpleJob * job = KIO::special(servURL, parms, true);
-		connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
-		KIO::NetAccess::synchronousRun( job, 0 );
+		TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true);
+		connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+		TDEIO::NetAccess::synchronousRun( job, 0 );
 	} else if (args->isSet("a")) {
 		kdDebug(7128) << "add " << list << endl;
 		KURL servURL = "svn+http://this_is_a_fake_URL_and_this_is_normal/";
@@ -93,9 +93,9 @@ SvnHelper::SvnHelper():TDEApplication() {
 			int cmd = 6;
 			kdDebug(7128) << "adding : " << (*it).prettyURL() << endl;
 			s << cmd << *it;
-			KIO::SimpleJob * job = KIO::special(servURL, parms, true);
-			connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
-			KIO::NetAccess::synchronousRun( job, 0 );
+			TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true);
+			connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+			TDEIO::NetAccess::synchronousRun( job, 0 );
 		}
 	} else if (args->isSet("D")) {
 		kdDebug(7128) << "diff " << list << endl;
@@ -110,9 +110,9 @@ SvnHelper::SvnHelper():TDEApplication() {
 			TQString revkind1 = "BASE";
 			TQString revkind2 = "WORKING";
 			s << cmd << *it << *it << rev1 << revkind1 << rev2 << revkind2 << true ;
-			KIO::SimpleJob * job = KIO::special(servURL, parms, true);
-			connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
-			KIO::NetAccess::synchronousRun( job, 0 );
+			TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true);
+			connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+			TDEIO::NetAccess::synchronousRun( job, 0 );
 			if ( diffresult.count() > 0 ) {
 				//check kompare is available
 				if ( !KStandardDirs::findExe( "kompare" ).isNull() ) {
@@ -151,9 +151,9 @@ SvnHelper::SvnHelper():TDEApplication() {
 			kdDebug(7128) << "deleting : " << (*it).prettyURL() << endl;
 			s << *it;
 		}
-		KIO::SimpleJob * job = KIO::special(servURL, parms, true);
-		connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
-		KIO::NetAccess::synchronousRun( job, 0 );
+		TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true);
+		connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+		TDEIO::NetAccess::synchronousRun( job, 0 );
 	} else if (args->isSet("s")) {
 		kdDebug(7128) << "switch " << list << endl;
 		SubversionSwitch d;
@@ -178,9 +178,9 @@ SvnHelper::SvnHelper():TDEApplication() {
 				s << recurse;
 				s << revnumber;
 				s << revkind;
-				KIO::SimpleJob * job = KIO::special(servURL, parms, true);
-				connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
-				KIO::NetAccess::synchronousRun( job, 0 );
+				TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true);
+				connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+				TDEIO::NetAccess::synchronousRun( job, 0 );
 			}
 		}
 	} else if (args->isSet("r")) {
@@ -194,9 +194,9 @@ SvnHelper::SvnHelper():TDEApplication() {
 			kdDebug(7128) << "reverting : " << (*it).prettyURL() << endl;
 			s << *it;
 		}
-		KIO::SimpleJob * job = KIO::special(servURL, parms, true);
-		connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
-		KIO::NetAccess::synchronousRun( job, 0 );
+		TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true);
+		connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+		TDEIO::NetAccess::synchronousRun( job, 0 );
 	} else if (args->isSet("C")) {
 		kdDebug(7128) << "checkout " << list << endl;
 		SubversionCheckout d;
@@ -219,9 +219,9 @@ SvnHelper::SvnHelper():TDEApplication() {
 				s << rev;
 				s << revkind;
 				kdDebug(7128) << "checkouting : " << d.url->url() << " into " << (*it).prettyURL() << " at rev : " << rev << " or " << revkind << endl;
-				KIO::SimpleJob * job = KIO::special(servURL, parms, true);
-				connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
-				KIO::NetAccess::synchronousRun( job, 0 );
+				TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true);
+				connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+				TDEIO::NetAccess::synchronousRun( job, 0 );
 			}
 		}
 	} else {
@@ -230,11 +230,11 @@ SvnHelper::SvnHelper():TDEApplication() {
 	TQTimer::singleShot( 0, this, TQT_SLOT( finished() ) );
 }
 
-void SvnHelper::slotResult( KIO::Job* job ) {
+void SvnHelper::slotResult( TDEIO::Job* job ) {
 	if ( job->error() )
 		job->showErrorDialog( );
 
-	KIO::MetaData ma = job->metaData();
+	TDEIO::MetaData ma = job->metaData();
 	TQValueList<TQString> keys = ma.keys();
 	qHeapSort( keys );
 	TQValueList<TQString>::Iterator begin = keys.begin(), end = keys.end(), it;
diff --git a/kioslave/svn/svnhelper/kio_svn_helper.h b/kioslave/svn/svnhelper/kio_svn_helper.h
index 4ee9239b..b10dcaaf 100644
--- a/kioslave/svn/svnhelper/kio_svn_helper.h
+++ b/kioslave/svn/svnhelper/kio_svn_helper.h
@@ -33,7 +33,7 @@ public:
 	SvnHelper();
 private slots:
 	void finished();
-	void slotResult( KIO::Job *);
+	void slotResult( TDEIO::Job *);
 private:
 	WId m_id;
 	TQStringList diffresult; //for diff commands ;)