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

6 files changed, 18 insertions, 18 deletions

diff --git a/kcontrol/keys/kaccelaction.h b/kcontrol/keys/kaccelaction.h
index ef8ff9f33..a50d7a41d 100644
--- a/kcontrol/keys/kaccelaction.h
+++ b/kcontrol/keys/kaccelaction.h
@@ -33,8 +33,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /*
 	KAccelAction holds information an a given action, such as "Run Command"
@@ -156,7 +156,7 @@ class KAccelActions
 
 	void clear();
 	bool init( const KAccelActions& );
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	void updateShortcuts( KAccelActions& );
 
@@ -176,8 +176,8 @@ class KAccelActions
 	KAccelAction* insert( const TQString& sName, const TQString& sLabel );
 	bool remove( const TQString& sAction );
 
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	void emitKeycodeChanged();
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index 539c67215..88f3aabe0 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -179,7 +179,7 @@ KKeyModule::~KKeyModule (){
     delete sFileList;
 }
 
-bool KKeyModule::writeSettings( const TQString& sGroup, KConfig* pConfig )
+bool KKeyModule::writeSettings( const TQString& sGroup, TDEConfig* pConfig )
 {
 	kc->commitChanges();
 	actions.writeActions( sGroup, pConfig, true, false );
@@ -279,8 +279,8 @@ void KKeyModule::readScheme( int index )
   //else if( index == 2 )
   //  kc->allDefault( true );
   else {
-    KConfigBase* config = 0;
-    if( index == 0 )	config = new KConfig( "kdeglobals" );
+    TDEConfigBase* config = 0;
+    if( index == 0 )	config = new TDEConfig( "kdeglobals" );
     //else		config = new KSimpleConfig( *sFileList->at( index ), true );
 
     actions.readActions( (index == 0) ? KeySet : KeyScheme, config );
@@ -472,7 +472,7 @@ void KKeyModule::init()
   kdDebug(125) << "KKeyModule::init()\n";
 
   /*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n";
-  KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
+  TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
   TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
   KAccel::useFourModifierKeys( fourMods == "true" );
   bool bUseFourModifierKeys = KAccel::useFourModifierKeys();
diff --git a/kcontrol/keys/keyconfig.h b/kcontrol/keys/keyconfig.h
index cecadf328..5595e76e2 100644
--- a/kcontrol/keys/keyconfig.h
+++ b/kcontrol/keys/keyconfig.h
@@ -41,7 +41,7 @@ public:
         virtual void defaults();
         static void init();
 
-	bool writeSettings( const TQString& sGroup, KConfig* pConfig );
+	bool writeSettings( const TQString& sGroup, TDEConfig* pConfig );
 	bool writeSettingsGlobal( const TQString& sGroup );
 
 public slots:
diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp
index 456818bed..0c6d13c4d 100644
--- a/kcontrol/keys/main.cpp
+++ b/kcontrol/keys/main.cpp
@@ -49,7 +49,7 @@ o Pre-set scheme   <Remove Scheme>
 Global Shortcuts
 */
 KeyModule::KeyModule( TQWidget *parent, const char *name )
-: KCModule( parent, name )
+: TDECModule( parent, name )
 {
     setQuickHelp( i18n("<h1>Keyboard Shortcuts</h1> Using shortcuts you can configure certain actions to be"
     " triggered when you press a key or a combination of keys, e.g. Ctrl+C is normally bound to"
@@ -129,7 +129,7 @@ void KeyModule::resizeEvent( TQResizeEvent * )
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_keys(TQWidget *parent, const char * /*name*/)
+  KDE_EXPORT TDECModule *create_keys(TQWidget *parent, const char * /*name*/)
   {
 	// What does this do?  Why not insert klipper and kxkb, too? --ellis, 2002/01/15
 	TDEGlobal::locale()->insertCatalogue("twin");
@@ -142,7 +142,7 @@ extern "C"
   {
 	kdDebug(125) << "KeyModule::initModifiers()" << endl;
 
-	KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
+	TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
 	bool bMacSwap = TDEGlobal::config()->readBoolEntry( "Mac Modifier Swap", false );
 	if( bMacSwap )
 		ModifiersModule::setupMacModifierKeys();
@@ -153,7 +153,7 @@ extern "C"
 	kdDebug(125) << "KeyModule::init()\n";
 
 	/*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n";
-	KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
+	TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
 	TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
 	KAccel::useFourModifierKeys( fourMods == "true" );
 	bool bUseFourModifierKeys = KAccel::useFourModifierKeys();
@@ -179,7 +179,7 @@ extern "C"
   // This is needed to be able to check for conflicts with global keys in app's keyconfig
   // dialogs, kdeglobals is empty as long as you don't apply any change in controlcenter/keys.
   // However, avoid writing at every KDE startup, just update them after every rebuild of this file.
-        KConfigGroup group( TDEGlobal::config(), "Global Shortcuts" );
+        TDEConfigGroup group( TDEGlobal::config(), "Global Shortcuts" );
         if( group.readEntry( "Defaults timestamp" ) != __DATE__ __TIME__ ) {
 	    kdDebug(125) << "KeyModule::init() - Read Config Bindings\n";
 	    // Check for old group,
diff --git a/kcontrol/keys/main.h b/kcontrol/keys/main.h
index f0b18c43d..eec44060f 100644
--- a/kcontrol/keys/main.h
+++ b/kcontrol/keys/main.h
@@ -31,7 +31,7 @@ class CommandShortcutsModule;
 class ShortcutsModule;
 class ModifiersModule;
 
-class KeyModule : public KCModule
+class KeyModule : public TDECModule
 {
 	Q_OBJECT
  public:
diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index 05802de74..6da5c94f1 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -61,7 +61,7 @@ ModifiersModule::ModifiersModule( TQWidget *parent, const char *name )
 
 void ModifiersModule::load( bool useDefaults )
 {
-   KConfig *c = TDEGlobal::config();
+   TDEConfig *c = TDEGlobal::config();
 
    c->setReadDefaults( useDefaults );
 
@@ -82,7 +82,7 @@ void ModifiersModule::save()
 {
 	kdDebug(125) << "ModifiersModule::save()" << endl;
 
-	KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
+	TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
 
 	if( m_plblCtrl->text() != "Ctrl" )
 		TDEGlobal::config()->writeEntry( "Label Ctrl", m_plblCtrl->text(), true, true );