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

4 files changed, 13 insertions, 13 deletions

diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp
index 8cac3182e..fbf4cf95d 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -203,7 +203,7 @@ static TQString cleanSummary( const TQString &summary )
 
 void AlarmDialog::readLayout()
 {
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup( "Layout" );
   TQValueList<int> sizes = config->readIntListEntry( "SplitterSizes" );
   if ( sizes.count() == 2 ) {
@@ -215,7 +215,7 @@ void AlarmDialog::readLayout()
 
 void AlarmDialog::writeLayout()
 {
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup( "Layout" );
   TQValueList<int> list = mSplitter->sizes();
   config->writeEntry( "SplitterSizes", list );
@@ -552,7 +552,7 @@ void AlarmDialog::wakeUp()
 
 void AlarmDialog::slotSave()
 {
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   KLockFile::Ptr lock = config->lockFile();
   if ( lock.data()->lock() != KLockFile::LockOK )
     return;
diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp
index 301f058a8..d5d8dddb9 100644
--- a/korganizer/korgac/alarmdockwindow.cpp
+++ b/korganizer/korgac/alarmdockwindow.cpp
@@ -48,7 +48,7 @@ AlarmDockWindow::AlarmDockWindow( const char *name )
   : KSystemTray( 0, name )
 {
   // Read the autostart status from the config file
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup("General");
   bool autostart = config->readBoolEntry( "Autostart", true );
   bool alarmsEnabled = config->readBoolEntry( "Enabled", true );
@@ -110,7 +110,7 @@ void AlarmDockWindow::resizeEvent ( TQResizeEvent * )
 	mPixmapEnabled  = loadSizedIcon( "korgac", width() );
 	mPixmapDisabled = loadSizedIcon( "korgac_disabled", width() );
 
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	bool alarmsEnabled = config->readBoolEntry( "Enabled", true );
 	setPixmap( alarmsEnabled ? mPixmapEnabled : mPixmapDisabled );
 }
@@ -137,7 +137,7 @@ void AlarmDockWindow::toggleAlarmsEnabled()
 {
   kdDebug(5890) << "AlarmDockWindow::toggleAlarmsEnabled()" << endl;
 
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup( "General" );
 
   bool enabled = !contextMenu()->isItemChecked( mAlarmsEnabledId );
@@ -167,7 +167,7 @@ void AlarmDockWindow::slotDismissAll()
 
 void AlarmDockWindow::enableAutostart( bool enable )
 {
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup( "General" );
   config->writeEntry( "Autostart", enable );
   config->sync();
diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp
index a2eacaf0d..be9205bea 100644
--- a/korganizer/korgac/koalarmclient.cpp
+++ b/korganizer/korgac/koalarmclient.cpp
@@ -49,7 +49,7 @@ KOAlarmClient::KOAlarmClient( TQObject *parent, const char *name )
   connect( this, TQT_SIGNAL( reminderCount( int ) ), mDocker, TQT_SLOT( slotUpdate( int ) ) );
   connect( mDocker, TQT_SIGNAL( quitSignal() ), TQT_SLOT( slotQuit() ) );
 
-  KConfig c( locate( "config", "korganizerrc" ) );
+  TDEConfig c( locate( "config", "korganizerrc" ) );
   c.setGroup( "Time & Date" );
   TQString tz = c.readEntry( "TimeZoneId" );
   kdDebug(5890) << "TimeZone: " << tz << endl;
@@ -60,7 +60,7 @@ KOAlarmClient::KOAlarmClient( TQObject *parent, const char *name )
 
   connect( &mCheckTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkAlarms() ) );
 
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup( "Alarms" );
   int interval = config->readNumEntry( "Interval", 60 );
   kdDebug(5890) << "KOAlarmClient check interval: " << interval << " seconds."
@@ -102,7 +102,7 @@ KOAlarmClient::~KOAlarmClient()
 
 void KOAlarmClient::checkAlarms()
 {
-  KConfig *cfg = kapp->config();
+  TDEConfig *cfg = kapp->config();
 
   cfg->setGroup( "General" );
   if ( !cfg->readBoolEntry( "Enabled", true ) ) return;
@@ -152,7 +152,7 @@ void KOAlarmClient::slotQuit()
 
 void KOAlarmClient::saveLastCheckTime()
 {
-  KConfigGroup cg( TDEGlobal::config(), "Alarms");
+  TDEConfigGroup cg( TDEGlobal::config(), "Alarms");
   cg.writeEntry( "CalendarsLastChecked", mLastChecked );
   TDEGlobal::config()->sync();
 }
@@ -178,7 +178,7 @@ void KOAlarmClient::forceAlarmCheck()
 
 void KOAlarmClient::dumpDebug()
 {
-  KConfig *cfg = kapp->config();
+  TDEConfig *cfg = kapp->config();
 
   cfg->setGroup( "Alarms" );
   TQDateTime lastChecked = cfg->readDateTimeEntry( "CalendarsLastChecked" );
diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp
index 833e6b34f..f3f6493dc 100644
--- a/korganizer/korgac/testalarmdlg.cpp
+++ b/korganizer/korgac/testalarmdlg.cpp
@@ -41,7 +41,7 @@ int main(int argc,char **argv)
 
   TDEApplication app;
 
-  KConfig c( locate( "config", "korganizerrc" ) );
+  TDEConfig c( locate( "config", "korganizerrc" ) );
   c.setGroup( "Time & Date" );
   TQString tz = c.readEntry( "TimeZoneId" );
   CalendarResources *mCalendar = new CalendarResources( tz );