From 86d8364ac704bdc8ad2dfcf52307d9626cfac567 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:37:21 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 karm/karmstorage.cpp |  4 ++--
 karm/mainwindow.cpp  |  8 ++++----
 karm/mainwindow.h    |  4 ++--
 karm/preferences.cpp | 12 ++++++------
 4 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'karm')

diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp
index 85c1bab4..bda5831b 100644
--- a/karm/karmstorage.cpp
+++ b/karm/karmstorage.cpp
@@ -686,7 +686,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview,
       TQTextStream *stream=tmpFile.textStream();
       *stream << retval;
       tmpFile.close();
-      if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::fromLatin1("Could not upload");
+      if (!TDEIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::fromLatin1("Could not upload");
     }
   }
 
@@ -1043,7 +1043,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
       TQTextStream *stream=tmpFile.textStream();
       *stream << retval;
       tmpFile.close();
-      if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::fromLatin1("Could not upload");
+      if (!TDEIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::fromLatin1("Could not upload");
     }
   }
   return err;
diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index 73892442..c7e717e4 100644
--- a/karm/mainwindow.cpp
+++ b/karm/mainwindow.cpp
@@ -214,14 +214,14 @@ void MainWindow::starStatusBar()
   statusBar()->insertItem( i18n("Total" ), 1, 0, true );
 }
 
-void MainWindow::saveProperties( KConfig* cfg )
+void MainWindow::saveProperties( TDEConfig* cfg )
 {
   _taskView->stopAllTimers();
   _taskView->save();
   cfg->writeEntry( "WindowShown", isVisible());
 }
 
-void MainWindow::readProperties( KConfig* cfg )
+void MainWindow::readProperties( TDEConfig* cfg )
 {
   if( cfg->readBoolEntry( "WindowShown", true ))
     show();
@@ -440,7 +440,7 @@ void MainWindow::loadGeometry()
   if (initialGeometrySet()) setAutoSaveSettings();
   else
   {
-    KConfig &config = *kapp->config();
+    TDEConfig &config = *kapp->config();
 
     config.setGroup( TQString::fromLatin1("Main Window Geometry") );
     int w = config.readNumEntry( TQString::fromLatin1("Width"), 100 );
@@ -454,7 +454,7 @@ void MainWindow::loadGeometry()
 
 void MainWindow::saveGeometry()
 {
-  KConfig &config = *TDEGlobal::config();
+  TDEConfig &config = *TDEGlobal::config();
   config.setGroup( TQString::fromLatin1("Main Window Geometry"));
   config.writeEntry( TQString::fromLatin1("Width"), width());
   config.writeEntry( TQString::fromLatin1("Height"), height());
diff --git a/karm/mainwindow.h b/karm/mainwindow.h
index d5a53a20..366af3d7 100644
--- a/karm/mainwindow.h
+++ b/karm/mainwindow.h
@@ -109,8 +109,8 @@ class MainWindow : public KParts::MainWindow, virtual public KarmDCOPIface
 
   protected:
     void starStatusBar();
-    virtual void saveProperties( KConfig* );
-    virtual void readProperties( KConfig* );
+    virtual void saveProperties( TDEConfig* );
+    virtual void readProperties( TDEConfig* );
     void saveGeometry();
     void loadGeometry();
     bool queryClose();
diff --git a/karm/preferences.cpp b/karm/preferences.cpp
index 6544931a..1dd13625 100644
--- a/karm/preferences.cpp
+++ b/karm/preferences.cpp
@@ -251,7 +251,7 @@ TQString Preferences::userRealName()                  const { return _userRealNa
 //---------------------------------------------------------------------------
 void Preferences::load()
 {
-  KConfig &config = *kapp->config();
+  TDEConfig &config = *kapp->config();
 
   config.setGroup( TQString::fromLatin1("Idle detection") );
   _doIdleDetectionV = config.readBoolEntry( TQString::fromLatin1("enabled"),
@@ -286,7 +286,7 @@ void Preferences::load()
 
 void Preferences::save()
 {
-  KConfig &config = *TDEGlobal::config();
+  TDEConfig &config = *TDEGlobal::config();
 
   config.setGroup( TQString::fromLatin1("Idle detection"));
   config.writeEntry( TQString::fromLatin1("enabled"), _doIdleDetectionV);
@@ -311,23 +311,23 @@ void Preferences::save()
   config.sync();
 }
 
-// HACK: this entire config dialog should be upgraded to KConfigXT
+// HACK: this entire config dialog should be upgraded to TDEConfigXT
 bool Preferences::readBoolEntry( const TQString& key )
 {
-  KConfig &config = *TDEGlobal::config();
+  TDEConfig &config = *TDEGlobal::config();
   return config.readBoolEntry ( key, true );
 }
 
 void Preferences::writeEntry( const TQString &key, bool value)
 {
-  KConfig &config = *TDEGlobal::config();
+  TDEConfig &config = *TDEGlobal::config();
   config.writeEntry( key, value );
   config.sync();
 }
 
 void Preferences::deleteEntry( const TQString &key )
 {
-  KConfig &config = *TDEGlobal::config();
+  TDEConfig &config = *TDEGlobal::config();
   config.deleteEntry( key );
   config.sync();
 }
-- 
cgit v1.2.3