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

---
 kworldwatch/flags.cpp     |  4 ++--
 kworldwatch/flags.h       |  4 ++--
 kworldwatch/main.cpp      |  4 ++--
 kworldwatch/main.h        |  8 ++++----
 kworldwatch/mapwidget.cpp | 10 +++++-----
 kworldwatch/mapwidget.h   |  4 ++--
 kworldwatch/zoneclock.cpp |  4 ++--
 kworldwatch/zoneclock.h   |  6 +++---
 8 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'kworldwatch')

diff --git a/kworldwatch/flags.cpp b/kworldwatch/flags.cpp
index 0b726a8..26ca4e6 100644
--- a/kworldwatch/flags.cpp
+++ b/kworldwatch/flags.cpp
@@ -113,7 +113,7 @@ void FlagList::removeAllFlags()
   _flags.clear();
 }
 
-void FlagList::save(KConfig *config)
+void FlagList::save(TDEConfig *config)
 {
   config->writeEntry("Flags", _flags.count());
   
@@ -129,7 +129,7 @@ void FlagList::save(KConfig *config)
 }
 
 
-void FlagList::load(KConfig *config)
+void FlagList::load(TDEConfig *config)
 {
   _flags.clear(); 
   int num = config->readNumEntry("Flags", 0);
diff --git a/kworldwatch/flags.h b/kworldwatch/flags.h
index dcfa335..4bd2012 100644
--- a/kworldwatch/flags.h
+++ b/kworldwatch/flags.h
@@ -81,8 +81,8 @@ public:
   void removeNearestFlag(const TQPoint &target, int w, int h, int offset);
   void removeAllFlags();
 
-  void save(KConfig *config);
-  void load(KConfig *config);
+  void save(TDEConfig *config);
+  void load(TDEConfig *config);
   
 
 private:
diff --git a/kworldwatch/main.cpp b/kworldwatch/main.cpp
index 3ebdbd4..2381d9f 100644
--- a/kworldwatch/main.cpp
+++ b/kworldwatch/main.cpp
@@ -74,7 +74,7 @@ WorldWideWatch::WorldWideWatch(bool restore, TQWidget *parent, const char *name)
 }
 
 
-void WorldWideWatch::load(KConfig *config)
+void WorldWideWatch::load(TDEConfig *config)
 {
   _map->load(config);
   _clocks->load(config);
@@ -84,7 +84,7 @@ void WorldWideWatch::load(KConfig *config)
 }
 
 
-void WorldWideWatch::save(KConfig *config)
+void WorldWideWatch::save(TDEConfig *config)
 {
   _map->save(config);
   _clocks->save(config);
diff --git a/kworldwatch/main.h b/kworldwatch/main.h
index 65fb849..8ebc367 100644
--- a/kworldwatch/main.h
+++ b/kworldwatch/main.h
@@ -46,14 +46,14 @@ public:
 
   WorldWideWatch(bool restore=false, TQWidget *parent=0, const char *name=0);
 
-  void save(KConfig *config);
-  void load(KConfig *load);
+  void save(TDEConfig *config);
+  void load(TDEConfig *load);
 
 
 protected:
 
-  void readProperties(KConfig *sc) { load(sc); };
-  void saveProperties(KConfig *sc) { save(sc); };
+  void readProperties(TDEConfig *sc) { load(sc); };
+  void saveProperties(TDEConfig *sc) { save(sc); };
 
 
 private slots:
diff --git a/kworldwatch/mapwidget.cpp b/kworldwatch/mapwidget.cpp
index 3c292bd..ffa9a8e 100644
--- a/kworldwatch/mapwidget.cpp
+++ b/kworldwatch/mapwidget.cpp
@@ -69,9 +69,9 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na
 
   if (restore)
     {
-      KConfig *config = kapp->config();
+      TDEConfig *config = kapp->config();
       if (applet)
-	config = new KConfig("kwwwappletrc");
+	config = new TDEConfig("kwwwappletrc");
       _theme = config->readEntry("Theme", "depths");
       if (applet)
 	delete config;
@@ -162,7 +162,7 @@ MapWidget::~MapWidget()
 {
   if (_applet)
     {
-      KConfig *conf = new KConfig("kwwwappletrc");
+      TDEConfig *conf = new TDEConfig("kwwwappletrc");
       save(conf);
       delete conf;
     }
@@ -171,7 +171,7 @@ MapWidget::~MapWidget()
 }
 
 
-void MapWidget::load(KConfig *config)
+void MapWidget::load(TDEConfig *config)
 {
   setCities(config->readBoolEntry("Cities", true));
   setIllumination(config->readBoolEntry("Illumination", true));
@@ -190,7 +190,7 @@ void MapWidget::load(KConfig *config)
 }
 
 
-void MapWidget::save(KConfig *config)
+void MapWidget::save(TDEConfig *config)
 {
   config->writeEntry("Cities", _cities);
   config->writeEntry("Illumination", _illumination);
diff --git a/kworldwatch/mapwidget.h b/kworldwatch/mapwidget.h
index b49264a..52d0016 100644
--- a/kworldwatch/mapwidget.h
+++ b/kworldwatch/mapwidget.h
@@ -70,8 +70,8 @@ public:
   void setFlags(bool f);
   void setSize(int w, int h);
 
-  void save(KConfig *config);
-  void load(KConfig *config);
+  void save(TDEConfig *config);
+  void load(TDEConfig *config);
 
   void updateBackground();
 
diff --git a/kworldwatch/zoneclock.cpp b/kworldwatch/zoneclock.cpp
index 95bdef4..7fec82d 100644
--- a/kworldwatch/zoneclock.cpp
+++ b/kworldwatch/zoneclock.cpp
@@ -259,7 +259,7 @@ void ZoneClockPanel::addClock(const TQString &zone)
 }
 
 
-void ZoneClockPanel::save(KConfig *config)
+void ZoneClockPanel::save(TDEConfig *config)
 {
   config->writeEntry("Clocks", _clocks.count());
 
@@ -276,7 +276,7 @@ void ZoneClockPanel::save(KConfig *config)
 }
 
 
-void ZoneClockPanel::load(KConfig *config)
+void ZoneClockPanel::load(TDEConfig *config)
 {
   _clocks.clear();
 
diff --git a/kworldwatch/zoneclock.h b/kworldwatch/zoneclock.h
index 2647a97..ba8c6b6 100644
--- a/kworldwatch/zoneclock.h
+++ b/kworldwatch/zoneclock.h
@@ -37,7 +37,7 @@
 
 class TQLabel;
 class SimpleFlow;
-class KConfig;
+class TDEConfig;
 
 
 class ClockDialog;
@@ -106,8 +106,8 @@ public:
 
   void addClock(const TQString &zone, const TQString &name);
 
-  void save(KConfig *config);
-  void load(KConfig *config);
+  void save(TDEConfig *config);
+  void load(TDEConfig *config);
 
 
 public slots:
-- 
cgit v1.2.1