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

7 files changed, 16 insertions, 16 deletions

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:
 	
 	/**