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

17 files changed, 36 insertions, 36 deletions

diff --git a/buildtools/ada/adaglobaloptionsdlg.cpp b/buildtools/ada/adaglobaloptionsdlg.cpp
index 48493adb..33e432cf 100644
--- a/buildtools/ada/adaglobaloptionsdlg.cpp
+++ b/buildtools/ada/adaglobaloptionsdlg.cpp
@@ -98,7 +98,7 @@ void AdaGlobalOptionsDlg::readCompilerOpts( TQString compiler )
     TQString settings = configCache[compiler];
     if (settings.isEmpty())
     {
-        KConfig *config = TDEGlobal::config();
+        TDEConfig *config = TDEGlobal::config();
         config->setGroup("Ada Compiler");
         settings = config->readPathEntry(compiler);
     }
@@ -108,7 +108,7 @@ void AdaGlobalOptionsDlg::readCompilerOpts( TQString compiler )
 
 void AdaGlobalOptionsDlg::readConfigCache( )
 {
-/*    KConfig *config = TDEGlobal::config();
+/*    TDEConfig *config = TDEGlobal::config();
     config->setGroup("Ada Compiler");
 
     TQMap<TQString, TQString> settings = config->entryMap("Ada Compiler");
@@ -117,7 +117,7 @@ void AdaGlobalOptionsDlg::readConfigCache( )
 
 void AdaGlobalOptionsDlg::saveConfigCache( )
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("Ada Compiler");
 
     for (TQMap<TQString, TQString>::iterator it = configCache.begin(); it != configCache.end(); ++it)
diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp
index 02c894cd..96b01a51 100644
--- a/buildtools/ada/adaproject_part.cpp
+++ b/buildtools/ada/adaproject_part.cpp
@@ -443,7 +443,7 @@ KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name)
 
 TQString AdaProjectPart::defaultOptions( const TQString compiler )
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("Ada Compiler");
     return config->readPathEntry(compiler);
 }
diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp
index 2dfd4c63..181f7c5b 100644
--- a/buildtools/autotools/addexistingdirectoriesdlg.cpp
+++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp
@@ -141,7 +141,7 @@ void AddExistingDirectoriesDialog::importItems()
 	{
         KURL amURL = itemList.current()->url();
         amURL.addPath("Makefile.am");
-        if (KIO::NetAccess::exists(amURL))
+        if (TDEIO::NetAccess::exists(amURL))
 		{
 			importView->insertItem ( ( *itemList ) );
 		}
diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp
index 279102e4..0375c6f2 100644
--- a/buildtools/autotools/autoprojectpart.cpp
+++ b/buildtools/autotools/autoprojectpart.cpp
@@ -509,7 +509,7 @@ TQString AutoProjectPart::makeEnvironment() const
         environstr += " ";
     }
 
-    KConfigGroup grp( kapp->config(), "MakeOutputView" );
+    TDEConfigGroup grp( kapp->config(), "MakeOutputView" );
     if( grp.readBoolEntry( "ForceCLocale", true ) )
         environstr += "LC_MESSAGES="+EnvVarTools::quote("C")+" "+"LC_CTYPE="+EnvVarTools::quote("C")+" ";
 
diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp
index 29a08f0e..9e9459fd 100644
--- a/buildtools/autotools/autosubprojectview.cpp
+++ b/buildtools/autotools/autosubprojectview.cpp
@@ -304,7 +304,7 @@ void AutoSubprojectView::slotContextMenu( KListView *, TQListViewItem *item, con
 	collapseAction->plug( &popup );
 	expandAction->plug( &popup );
 
-	KConfig *config = m_part->instance()->config();
+	TDEConfig *config = m_part->instance()->config();
 	bool separate = true;
 	TQMap<TQString,TQString> customBuildCommands = config->entryMap("CustomCommands");
 	for (TQMap<TQString,TQString>::const_iterator it = customBuildCommands.constBegin();
@@ -1013,7 +1013,7 @@ void AutoSubprojectView::focusOutEvent( TQFocusEvent */* e*/ )
 
 void AutoSubprojectView::slotManageBuildCommands( )
 {
-	KConfig *config = m_part->instance()->config();
+	TDEConfig *config = m_part->instance()->config();
 	//menu item name <-> command
 	TQMap<TQString, TQString> customBuildCommands = config->entryMap("CustomCommands");
 
diff --git a/buildtools/autotools/kfilednddetailview.cpp b/buildtools/autotools/kfilednddetailview.cpp
index 745c65b0..915891dc 100644
--- a/buildtools/autotools/kfilednddetailview.cpp
+++ b/buildtools/autotools/kfilednddetailview.cpp
@@ -46,15 +46,15 @@ KFileDnDDetailView::KFileDnDDetailView(TQWidget *parent, const char *name )
 KFileDnDDetailView::~KFileDnDDetailView(){
 }
 //-----------------------------------------------
-void KFileDnDDetailView::readConfig( KConfig* config, const TQString& group ) {
-	KConfigGroupSaver cs( config, group );
+void KFileDnDDetailView::readConfig( TDEConfig* config, const TQString& group ) {
+	TDEConfigGroupSaver cs( config, group );
 	bool dnd = config->readBoolEntry("DragAndDrop", true );
 	setDnDEnabled( dnd );
 	KFileDetailView::readConfig( config, group );
 }
 //-----------------------------------------------
-void KFileDnDDetailView::writeConfig( KConfig* config, const TQString& group ) {
-	KConfigGroupSaver cs( config, group );
+void KFileDnDDetailView::writeConfig( TDEConfig* config, const TQString& group ) {
+	TDEConfigGroupSaver cs( config, group );
 	config->writeEntry("DragAndDrop", m_dndEnabled );
 	KFileDetailView::writeConfig( config, group );
 }
diff --git a/buildtools/autotools/kfilednddetailview.h b/buildtools/autotools/kfilednddetailview.h
index 839accf7..a6dd87c0 100644
--- a/buildtools/autotools/kfilednddetailview.h
+++ b/buildtools/autotools/kfilednddetailview.h
@@ -79,9 +79,9 @@ public:
 		return m_useAutoOpenTimer;
 	}
 	/** */
-	virtual void readConfig( KConfig*, const TQString& group = TQString() );
+	virtual void readConfig( TDEConfig*, const TQString& group = TQString() );
 	/** */
-	virtual void writeConfig( KConfig*, const TQString& group = TQString() );
+	virtual void writeConfig( TDEConfig*, const TQString& group = TQString() );
 signals:  // Signals
 	/**
 	* Emitted whenever an decodable item is dropped in the view.
diff --git a/buildtools/autotools/kfiledndiconview.cpp b/buildtools/autotools/kfiledndiconview.cpp
index 7bf8a852..c68a1f58 100644
--- a/buildtools/autotools/kfiledndiconview.cpp
+++ b/buildtools/autotools/kfiledndiconview.cpp
@@ -46,15 +46,15 @@ KFileDnDIconView::KFileDnDIconView( TQWidget *parent, const char *name )
 KFileDnDIconView::~KFileDnDIconView(){
 }
 //-----------------------------------------------
-void KFileDnDIconView::readConfig( KConfig* config, const TQString& group ) {
-	KConfigGroupSaver cs( config, group );
+void KFileDnDIconView::readConfig( TDEConfig* config, const TQString& group ) {
+	TDEConfigGroupSaver cs( config, group );
 	bool dnd = config->readBoolEntry("EnableDND", true );
 	setDnDEnabled( dnd );
 	KFileIconView::readConfig( config, group );
 }
 //-----------------------------------------------
-void KFileDnDIconView::writeConfig( KConfig* config, const TQString& group ) {
-	KConfigGroupSaver cs( config, group );
+void KFileDnDIconView::writeConfig( TDEConfig* config, const TQString& group ) {
+	TDEConfigGroupSaver cs( config, group );
 	config->writeEntry("EnableDND", m_dndEnabled );
 	KFileIconView::writeConfig( config, group );
 }
diff --git a/buildtools/autotools/kfiledndiconview.h b/buildtools/autotools/kfiledndiconview.h
index b92e8e32..0e45d174 100644
--- a/buildtools/autotools/kfiledndiconview.h
+++ b/buildtools/autotools/kfiledndiconview.h
@@ -78,8 +78,8 @@ public:  // Public methods
 		return m_useAutoOpenTimer;
 	}
 
-	virtual void readConfig( KConfig*, const TQString& group = TQString() );
-	virtual void writeConfig( KConfig*, const TQString& group = TQString() );
+	virtual void readConfig( TDEConfig*, const TQString& group = TQString() );
+	virtual void writeConfig( TDEConfig*, const TQString& group = TQString() );
 signals:
 	
 	/**
diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp
index 09996b05..e7883961 100644
--- a/buildtools/custommakefiles/customprojectpart.cpp
+++ b/buildtools/custommakefiles/customprojectpart.cpp
@@ -884,7 +884,7 @@ TQString CustomProjectPart::makeEnvironment() const
         environstr += " ";
     }
 
-    KConfigGroup grp( kapp->config(), "MakeOutputView" );
+    TDEConfigGroup grp( kapp->config(), "MakeOutputView" );
     if( grp.readBoolEntry( "ForceCLocale", true ) )
         environstr += "LC_MESSAGES=" + EnvVarTools::quote( "C" )+" "+" "+"LC_CTYPE="+EnvVarTools::quote("C")+" ";
 
diff --git a/buildtools/lib/parsers/autotools/autotoolsdriver.cpp b/buildtools/lib/parsers/autotools/autotoolsdriver.cpp
index 5a1de34c..a9620598 100644
--- a/buildtools/lib/parsers/autotools/autotoolsdriver.cpp
+++ b/buildtools/lib/parsers/autotools/autotoolsdriver.cpp
@@ -58,9 +58,9 @@ int Driver::parseFile(KURL fileName, ProjectAST **ast)
 {
 	TQString tmpFile;
 	int ret = 0;
-	if (KIO::NetAccess::download(fileName, tmpFile, 0))
+	if (TDEIO::NetAccess::download(fileName, tmpFile, 0))
 		ret = parseFile(tmpFile, ast);
-	KIO::NetAccess::removeTempFile(tmpFile);
+	TDEIO::NetAccess::removeTempFile(tmpFile);
 	return ret;
 }
 
diff --git a/buildtools/lib/parsers/qmake/qmakedriver.cpp b/buildtools/lib/parsers/qmake/qmakedriver.cpp
index 21023017..e5a8f994 100644
--- a/buildtools/lib/parsers/qmake/qmakedriver.cpp
+++ b/buildtools/lib/parsers/qmake/qmakedriver.cpp
@@ -75,9 +75,9 @@ int Driver::parseFile(KURL fileName, ProjectAST **ast, int debug)
 {
     TQString tmpFile;
     int ret = 0;
-    if (KIO::NetAccess::download(fileName, tmpFile, 0))
+    if (TDEIO::NetAccess::download(fileName, tmpFile, 0))
         ret = parseFile(tmpFile, ast, debug);
-    KIO::NetAccess::removeTempFile(tmpFile);
+    TDEIO::NetAccess::removeTempFile(tmpFile);
     return ret;
 }
 
diff --git a/buildtools/lib/widgets/addfilesdialog.cpp b/buildtools/lib/widgets/addfilesdialog.cpp
index f5a1fa92..2a83c5d1 100644
--- a/buildtools/lib/widgets/addfilesdialog.cpp
+++ b/buildtools/lib/widgets/addfilesdialog.cpp
@@ -28,7 +28,7 @@ AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter,
     TQWidget *parent, const char *name, bool modal):
     KFileDialog(startDir, filter, parent, name, modal)
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("Add Files Dialog");
 
     m_extraWidget = new TQComboBox(false, this);
@@ -48,7 +48,7 @@ AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter,
     TQWidget *parent, const char *name, bool modal, TQComboBox *extraWidget):
     KFileDialog(startDir, filter, parent, name, modal, extraWidget), m_extraWidget(extraWidget)
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("Add Files Dialog");
 
     m_extraWidget->insertItem(i18n("Copy File(s)"), 0);
@@ -72,7 +72,7 @@ AddFilesDialog::Mode AddFilesDialog::mode( )
 
 void AddFilesDialog::storePreferred( int index )
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("Add Files Dialog");
     config->writeEntry("Mode", index);
 }
diff --git a/buildtools/pascal/pascalglobaloptionsdlg.cpp b/buildtools/pascal/pascalglobaloptionsdlg.cpp
index 327ecc67..62facc8d 100644
--- a/buildtools/pascal/pascalglobaloptionsdlg.cpp
+++ b/buildtools/pascal/pascalglobaloptionsdlg.cpp
@@ -101,7 +101,7 @@ void PascalGlobalOptionsDlg::readCompilerOpts( TQString compiler )
     TQString settings = configCache[compiler];
     if (settings.isEmpty())
     {
-        KConfig *config = TDEGlobal::config();
+        TDEConfig *config = TDEGlobal::config();
         config->setGroup("Pascal Compiler");
         settings = config->readPathEntry(compiler);
     }
@@ -111,7 +111,7 @@ void PascalGlobalOptionsDlg::readCompilerOpts( TQString compiler )
 
 void PascalGlobalOptionsDlg::readConfigCache( )
 {
-/*    KConfig *config = TDEGlobal::config();
+/*    TDEConfig *config = TDEGlobal::config();
     config->setGroup("Pascal Compiler");
 
     TQMap<TQString, TQString> settings = config->entryMap("Pascal Compiler");
@@ -120,7 +120,7 @@ void PascalGlobalOptionsDlg::readConfigCache( )
 
 void PascalGlobalOptionsDlg::saveConfigCache( )
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("Pascal Compiler");
 
     for (TQMap<TQString, TQString>::iterator it = configCache.begin(); it != configCache.end(); ++it)
diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp
index e8fd8a65..a2cb5723 100644
--- a/buildtools/pascal/pascalproject_part.cpp
+++ b/buildtools/pascal/pascalproject_part.cpp
@@ -471,7 +471,7 @@ KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &na
 
 TQString PascalProjectPart::defaultOptions( const TQString compiler ) const
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("Pascal Compiler");
     return config->readPathEntry(compiler);
 }
diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp
index e83ed8a9..7086ae1e 100644
--- a/buildtools/qmake/trollprojectpart.cpp
+++ b/buildtools/qmake/trollprojectpart.cpp
@@ -260,7 +260,7 @@ TQString TrollProjectPart::makeEnvironment()
          environstr += TQString( "QTDIR=" ) + EnvVarTools::quote( DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "") ) + TQString( " PATH=$TQTDIR/bin:$PATH " );
     }
 
-    KConfigGroup grp( kapp->config(), "MakeOutputView" );
+    TDEConfigGroup grp( kapp->config(), "MakeOutputView" );
     if( grp.readBoolEntry( "ForceCLocale", true ) )
         environstr += "LC_MESSAGES="+EnvVarTools::quote("C")+" "+" "+"LC_CTYPE="+EnvVarTools::quote("C")+" ";
 
diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp
index 3c17a951..86a485f6 100644
--- a/buildtools/qmake/trollprojectwidget.cpp
+++ b/buildtools/qmake/trollprojectwidget.cpp
@@ -1287,7 +1287,7 @@ void TrollProjectWidget::slotAddFiles()
                     // Copy selected files to current subproject folder
                     // and add them to the filelist
                     TQString filename = KURL( files[ i ] ).fileName();
-                    KIO::NetAccess::file_copy( files[ i ], cleanSubprojectDir + TQString( TQChar( TQDir::separator() ) ) + filename, -1, false, false, this );
+                    TDEIO::NetAccess::file_copy( files[ i ], cleanSubprojectDir + TQString( TQChar( TQDir::separator() ) ) + filename, -1, false, false, this );
                     TQFile testExist( cleanSubprojectDir + TQString( TQChar( TQDir::separator() ) ) + filename );
 
                     if ( testExist.exists() )
@@ -1631,7 +1631,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
                             // Copy selected files to current subproject folder
                             // and add them to the filelist
                             TQString filename = KURL( files[ i ] ).fileName();
-                            KIO::NetAccess::file_copy( files[ i ], cleanSubprojectPath + TQString( TQChar( TQDir::separator() ) ) + filename, -1, false, false, this );
+                            TDEIO::NetAccess::file_copy( files[ i ], cleanSubprojectPath + TQString( TQChar( TQDir::separator() ) ) + filename, -1, false, false, this );
                             TQFile testExist( cleanSubprojectPath + TQString( TQChar( TQDir::separator() ) ) + filename );
 
                             if ( testExist.exists() )
@@ -1943,7 +1943,7 @@ void TrollProjectWidget::removeFile( QMakeScopeItem *spitem, FileItem *fitem )
     }else
     {
         kdDebug(9024) << "Deleting file as the user wished: " << spitem->scope->projectDir() + TQString( TQChar( TQDir::separator() ) ) + realfilename << endl;
-        KIO::NetAccess::del( KURL::fromPathOrURL( spitem->scope->projectDir() + TQString( TQChar( TQDir::separator() ) ) + realfilename ), 0 );
+        TDEIO::NetAccess::del( KURL::fromPathOrURL( spitem->scope->projectDir() + TQString( TQChar( TQDir::separator() ) ) + realfilename ), 0 );
     }
 
     if ( gitem->groupType != GroupItem::InstallObject )