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

2 files changed, 12 insertions, 12 deletions

diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp
index 6fa576f5..b6d8e6eb 100644
--- a/noatun/modules/kjofol-skin/kjprefs.cpp
+++ b/noatun/modules/kjofol-skin/kjprefs.cpp
@@ -425,7 +425,7 @@ void KJPrefs::installNewSkin( void )
 		// FIXME: Do I have to wait for the job to finish?
 		// I'd say no because I don't care about the temp-dir
 		// anyway after leaving this method :)
-		KIO::del( tmpUnpackPath );
+		TDEIO::del( tmpUnpackPath );
 		return;
 	}
 
@@ -471,10 +471,10 @@ void KJPrefs::installNewSkin( void )
 				KMessageBox::error ( this,
 					i18n("Installing new skin failed: Destination path is invalid.\n"
 						"Please report a bug to the K-Jöfol maintainer") );
-				KIO::del( tmpUnpackPath );
+				TDEIO::del( tmpUnpackPath );
 				return;
 			}
-			KIO::mkdir( dst );
+			TDEIO::mkdir( dst );
 		}
 
 		if ( !src.isValid() || !dst.isValid() )
@@ -487,8 +487,8 @@ void KJPrefs::installNewSkin( void )
 		{
 			kdDebug(66666) << "src: " << src.path().latin1() << endl;
 			kdDebug(66666) << "dst: " << dst.path().latin1() << endl;
-			KIO::Job *job = KIO::copy(src,dst);
-			connect ( job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotResult(KIO::Job*)) );
+			TDEIO::Job *job = TDEIO::copy(src,dst);
+			connect ( job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotResult(TDEIO::Job*)) );
 			skinInstalled = true;
 		}
 	} // END iterate trough dirList
@@ -502,7 +502,7 @@ void KJPrefs::installNewSkin( void )
 		KMessageBox::information ( this, i18n("The new skin has been successfully installed") );
 	}
 
-	KIO::del( tmpUnpackPath );
+	TDEIO::del( tmpUnpackPath );
 }
 
 
@@ -554,8 +554,8 @@ void KJPrefs::removeSelectedSkin( void )
 	if ( dirToDelete.length() != 0 )
 	{
 		kdDebug(66666) << "Deleting Skindir: " << dirToDelete.latin1() << endl;
-		KIO::Job *job = KIO::del( dirToDelete, false, true );
-		connect ( job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotResult(KIO::Job*)) );
+		TDEIO::Job *job = TDEIO::del( dirToDelete, false, true );
+		connect ( job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotResult(TDEIO::Job*)) );
 	}
 
 	int item = -1;
@@ -579,7 +579,7 @@ void KJPrefs::removeSelectedSkin( void )
 		save();
 }
 
-void KJPrefs::slotResult(KIO::Job *job )
+void KJPrefs::slotResult(TDEIO::Job *job )
 {
 	if ( job->error() )
 	{
diff --git a/noatun/modules/kjofol-skin/kjprefs.h b/noatun/modules/kjofol-skin/kjprefs.h
index 218e20cb..0bb4540d 100644
--- a/noatun/modules/kjofol-skin/kjprefs.h
+++ b/noatun/modules/kjofol-skin/kjprefs.h
@@ -19,7 +19,7 @@ class TQComboBox;
 class TQLabel;
 class TQPushButton;
 class TQTabWidget;
-class KConfig;
+class TDEConfig;
 class KJLoader;
 
 class KJPrefs : public CModule
@@ -72,14 +72,14 @@ public slots:
 
 	// gets called after a KIO-action has finished
 	// KIO is used for installing/removing skins
-	void slotResult(KIO::Job *job);
+	void slotResult(TDEIO::Job *job);
 
 signals:
 	void configChanged();
 
 private:
 	TQPixmap mPixmap; // preview Pixmap
-	KConfig *cfg;
+	TDEConfig *cfg;
 
 	// Dialog-Widgets
 	TQTabWidget *mTabWidget;