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

1 files changed, 8 insertions, 8 deletions

diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 5ac040f73..8a6a7f354 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -338,7 +338,7 @@ void MainWindow::setupActions()
                                          KStdAccel::shortcut(KStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewClicked() ),
                                          actionCollection(), "action_new" );
 
-  KConfig* const cfg = Prefs::self()->config();
+  TDEConfig* const cfg = Prefs::self()->config();
   cfg->setGroup( "Kontact Groupware Settings" );
   mSyncActionsEnabled = cfg->readBoolEntry( "GroupwareMailFoldersEnabled", true );
 
@@ -371,7 +371,7 @@ void MainWindow::slotConfigureProfiles()
 }
 
 namespace {
-    void copyConfigEntry( KConfig* source, KConfig* dest, const TQString& group, const TQString& key, const TQString& defaultValue=TQString() )
+    void copyConfigEntry( TDEConfig* source, TDEConfig* dest, const TQString& group, const TQString& key, const TQString& defaultValue=TQString() )
     {
         source->setGroup( group );
         dest->setGroup( group );
@@ -385,12 +385,12 @@ void MainWindow::slotSaveToProfile( const TQString& id )
   if ( path.isNull() )
     return;
 
-  KConfig* const cfg = Prefs::self()->config();
+  TDEConfig* const cfg = Prefs::self()->config();
   Prefs::self()->writeConfig();
   saveMainWindowSettings( cfg );
   saveSettings();
 
-  KConfig profile( path+"/kontactrc", /*read-only=*/false, /*useglobals=*/false );
+  TDEConfig profile( path+"/kontactrc", /*read-only=*/false, /*useglobals=*/false );
   ::copyConfigEntry( cfg, &profile, "MainWindow Toolbar navigatorToolBar", "Hidden", "true" );
   ::copyConfigEntry( cfg, &profile, "View", "SidePaneSplitter" );
   ::copyConfigEntry( cfg, &profile, "Icons", "Theme" );
@@ -409,12 +409,12 @@ void MainWindow::slotLoadProfile( const TQString& id )
   if ( path.isNull() )
     return;
 
-  KConfig* const cfg = Prefs::self()->config();
+  TDEConfig* const cfg = Prefs::self()->config();
   Prefs::self()->writeConfig();
   saveMainWindowSettings( cfg );
   saveSettings();
 
-  const KConfig profile( path+"/kontactrc", /*read-only=*/false, /*useglobals=*/false );
+  const TDEConfig profile( path+"/kontactrc", /*read-only=*/false, /*useglobals=*/false );
   const TQStringList groups = profile.groupList();
   for ( TQStringList::ConstIterator it = groups.begin(), end = groups.end(); it != end; ++it )
   {
@@ -1091,7 +1091,7 @@ void MainWindow::slotOpenUrl( const KURL &url )
   }
 }
 
-void MainWindow::readProperties( KConfig *config )
+void MainWindow::readProperties( TDEConfig *config )
 {
   Core::readProperties( config );
 
@@ -1109,7 +1109,7 @@ void MainWindow::readProperties( KConfig *config )
   }
 }
 
-void MainWindow::saveProperties( KConfig *config )
+void MainWindow::saveProperties( TDEConfig *config )
 {
   Core::saveProperties( config );