From 6c1373684f10d07347aba3a5b790e8a9599a6276 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:05:45 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 kweather/CMakeLists.txt          | 4 ++--
 kweather/kcmweather.cpp          | 2 +-
 kweather/kweather.cpp            | 2 +-
 kweather/reportview.cpp          | 2 +-
 kweather/serviceconfigwidget.cpp | 2 +-
 kweather/weatherbar.cpp          | 2 +-
 kweather/weatherlib.cpp          | 2 +-
 kweather/weatherservice.cpp      | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'kweather')

diff --git a/kweather/CMakeLists.txt b/kweather/CMakeLists.txt
index 4c93de2..bddf208 100644
--- a/kweather/CMakeLists.txt
+++ b/kweather/CMakeLists.txt
@@ -40,7 +40,7 @@ tde_add_executable( kweatherservice AUTOMOC
     weatherlib.cpp weatherservice.cpp
     weatherservice.skel stationdatabase.cpp
     sun.cpp weatherservice.stub
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
@@ -94,7 +94,7 @@ tde_add_kpart( weather_panelapplet AUTOMOC
 tde_add_kpart( kcm_weather AUTOMOC
   SOURCES kcmweather.cpp prefdialogdata.ui
     weatherservice.stub
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kweather/kcmweather.cpp b/kweather/kcmweather.cpp
index 650dae8..2d15ca8 100644
--- a/kweather/kcmweather.cpp
+++ b/kweather/kcmweather.cpp
@@ -28,7 +28,7 @@
 
 #include <kaboutdata.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kurlrequester.h>
diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp
index 584f6b3..18ab953 100644
--- a/kweather/kweather.cpp
+++ b/kweather/kweather.cpp
@@ -24,7 +24,7 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksettings/dialog.h>
 #include <ksettings/dispatcher.h>
 #include <dcopclient.h>
diff --git a/kweather/reportview.cpp b/kweather/reportview.cpp
index 4825489..29a3d5b 100644
--- a/kweather/reportview.cpp
+++ b/kweather/reportview.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/kweather/serviceconfigwidget.cpp b/kweather/serviceconfigwidget.cpp
index 537354c..a4fb2f7 100644
--- a/kweather/serviceconfigwidget.cpp
+++ b/kweather/serviceconfigwidget.cpp
@@ -23,7 +23,7 @@
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kglobal.h>
 #include <klistview.h>
diff --git a/kweather/weatherbar.cpp b/kweather/weatherbar.cpp
index e7f074e..5111748 100644
--- a/kweather/weatherbar.cpp
+++ b/kweather/weatherbar.cpp
@@ -30,7 +30,7 @@
 #include <tqgroupbox.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <dcopref.h>
diff --git a/kweather/weatherlib.cpp b/kweather/weatherlib.cpp
index a595cae..c0313ad 100644
--- a/kweather/weatherlib.cpp
+++ b/kweather/weatherlib.cpp
@@ -27,7 +27,7 @@ email                : geiseri@msoe.edu
 #include <kdebug.h>
 #include <math.h>
 #include <krfcdate.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 #include <knotifyclient.h>
 #include <ktempfile.h>
diff --git a/kweather/weatherservice.cpp b/kweather/weatherservice.cpp
index 2c018b9..7fa3b0c 100644
--- a/kweather/weatherservice.cpp
+++ b/kweather/weatherservice.cpp
@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-- 
cgit v1.2.1