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

3 files changed, 19 insertions, 19 deletions

diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index 67e97361..d9725ba4 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -116,7 +116,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch
     m_appsInfo.setAutoDelete(true);
     m_tempFiles.setAutoDelete(true);
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
 
 	//config->setGroup("AppWizard");
 	//templates_tabwidget->setCurrentPage(config->readNumEntry("CurrentTab", 0));
@@ -139,7 +139,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch
 		info->templateFile = TDEGlobal::dirs()->findResource("apptemplates", *it);
         info->templateName = (*it);
 
-		KConfig templateConfig(info->templateFile);
+		TDEConfig templateConfig(info->templateFile);
         templateConfig.setGroup("General");
 
         info->name = templateConfig.readEntry("Name");
@@ -186,7 +186,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch
 			if( !(*include).isEmpty() )
 			{
 				TQString file = KMacroExpander::expandMacros( ( *include ), info->subMap);
-				KConfig tmpCfg( file );
+				TDEConfig tmpCfg( file );
 				tmpCfg.copyTo( "", &templateConfig);
 				kdDebug(9010) << "Merging: " << tmpCfg.name() << endl;
 			}
@@ -643,7 +643,7 @@ void AppWizardDialog::accept()
 		kdDebug( 9010 ) << "Process dir " << (*dirIt).dir  << endl;
 		if( m_pCurrentAppInfo->subMap[(*dirIt).option] != "false" )
 		{
-			if( ! KIO::NetAccess::mkdir( (*dirIt).dir, this ) )
+			if( ! TDEIO::NetAccess::mkdir( (*dirIt).dir, this ) )
 			{
 				KMessageBox::sorry(this, i18n("The directory %1 cannot be created.").arg( (*dirIt).dir ) );
 				return;
@@ -786,14 +786,14 @@ bool AppWizardDialog::copyFile( const TQString &source, const TQString &dest, bo
 	else
 	{
 		// Copy the source file to the destFile.
-		return KIO::NetAccess::copy( source, dest, this );
+		return TDEIO::NetAccess::copy( source, dest, this );
 	}
 	return true;
 }
 
 void AppWizardDialog::unpackArchive( const KArchiveDirectory *dir, const TQString &dest, bool process )
 {
-	KIO::NetAccess::mkdir( dest , this );
+	TDEIO::NetAccess::mkdir( dest , this );
 	kdDebug(9010) << "Dir : " << dir->name() << " at " << dest << endl;
 	TQStringList entries = dir->entries();
 	kdDebug(9010) << "Entries : " << entries.join(",") << endl;
@@ -913,7 +913,7 @@ void AppWizardDialog::destButtonClicked(const TQString& dir)
     if(!dir.isEmpty()) {
 
         // set new location as default project dir?
-        KConfig *config = kapp->config();
+        TDEConfig *config = kapp->config();
         config->setGroup("General Options");
         TQDir defPrjDir( config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()) );
         TQDir newDir (dir);
@@ -1158,7 +1158,7 @@ void AppWizardDialog::removeFavourite()
 
 void AppWizardDialog::populateFavourites()
 {
-	KConfig* config = kapp->config();
+	TDEConfig* config = kapp->config();
 	config->setGroup("AppWizard");
 
 	//favourites are stored in config as a list of templates and a seperate
@@ -1204,7 +1204,7 @@ void AppWizardDialog::done(int r)
 		}
 	}
 
-	KConfig* config = kapp->config();
+	TDEConfig* config = kapp->config();
 	config->setGroup("AppWizard");
 	config->writePathEntry("FavTemplates", templatesList);
 	config->writeEntry("FavNames", iconNamesList);
@@ -1234,14 +1234,14 @@ void AppWizardDialog::setPermissions(const KArchiveFile *source, TQString dest)
 	if (source->permissions() & 00100)
 	{
 		kdDebug(9010) << "source is executable" << endl;
-		KIO::UDSEntry entry;
+		TDEIO::UDSEntry entry;
 		KURL kurl = KURL::fromPathOrURL(dest);
-		if (KIO::NetAccess::stat(kurl, entry, 0))
+		if (TDEIO::NetAccess::stat(kurl, entry, 0))
 		{
 			KFileItem it(entry, kurl);
 			int mode = it.permissions();
 			kdDebug(9010) << "stat shows permissions: " << mode << endl;
-			KIO::chmod(KURL::fromPathOrURL(dest), mode | 00100 );
+			TDEIO::chmod(KURL::fromPathOrURL(dest), mode | 00100 );
 		}
 	}
 }
@@ -1251,23 +1251,23 @@ void AppWizardDialog::setPermissions(const installFile &file)
 	kdDebug(9010) << "AppWizardDialog::setPermissions(const installFile &file)" << endl;
 	kdDebug(9010) << "	dest: " << file.dest << endl;
 
-	KIO::UDSEntry sourceentry;
+	TDEIO::UDSEntry sourceentry;
 	KURL sourceurl = KURL::fromPathOrURL(file.source);
-	if (KIO::NetAccess::stat(sourceurl, sourceentry, 0))
+	if (TDEIO::NetAccess::stat(sourceurl, sourceentry, 0))
 	{
 		KFileItem sourceit(sourceentry, sourceurl);
 		int sourcemode = sourceit.permissions();
 		if (sourcemode & 00100)
 		{
 			kdDebug(9010) << "source is executable" << endl;
-			KIO::UDSEntry entry;
+			TDEIO::UDSEntry entry;
 			KURL kurl = KURL::fromPathOrURL(file.dest);
-			if (KIO::NetAccess::stat(kurl, entry, 0))
+			if (TDEIO::NetAccess::stat(kurl, entry, 0))
 			{
 				KFileItem it(entry, kurl);
 				int mode = it.permissions();
 				kdDebug(9010) << "stat shows permissions: " << mode << endl;
-				KIO::chmod(KURL::fromPathOrURL(file.dest), mode | 00100 );
+				TDEIO::chmod(KURL::fromPathOrURL(file.dest), mode | 00100 );
 			}
 		}
 	}
diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp
index 75a4487f..c0d05a77 100644
--- a/parts/appwizard/importdlg.cpp
+++ b/parts/appwizard/importdlg.cpp
@@ -67,7 +67,7 @@ ImportDialog::ImportDialog(AppWizardPart *part, TQWidget *parent, const char *na
 
     TQStringList::ConstIterator it;
     for (it = importNames.begin(); it != importNames.end(); ++it) {
-        KConfig config(TDEGlobal::dirs()->findResource("appimports", *it));
+        TDEConfig config(TDEGlobal::dirs()->findResource("appimports", *it));
         config.setGroup("General");
         TQString type = config.readEntry("Comment");
         project_combo->insertItem(type);
diff --git a/parts/appwizard/profilesupport.cpp b/parts/appwizard/profilesupport.cpp
index 40f3ba3b..3d5fcff2 100644
--- a/parts/appwizard/profilesupport.cpp
+++ b/parts/appwizard/profilesupport.cpp
@@ -32,7 +32,7 @@ ProfileSupport::ProfileSupport(KDevPlugin *parent)
     
     for (KURL::List::const_iterator it = resources.constBegin(); it != resources.constEnd(); ++it)
     {
-        KConfig config((*it).path());
+        TDEConfig config((*it).path());
         config.setGroup("General");
         m_templateList += config.readListEntry("List");
     }