Rename additional header files to avoid conflicts with KDE4

14 files changed, 24 insertions, 24 deletions

diff --git a/kweather/dockwidget.cpp b/kweather/dockwidget.cpp
index 1e223bd..69ef98c 100644
--- a/kweather/dockwidget.cpp
+++ b/kweather/dockwidget.cpp
@@ -27,8 +27,8 @@
 #include <tqobjectlist.h>
 
 #include <kdebug.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 
 dockwidget::dockwidget(const TQString &location, TQWidget *parent,
         const char *name) : TQWidget(parent,name), m_locationCode( location ), m_orientation(Qt::Horizontal )
diff --git a/kweather/kcmweather.cpp b/kweather/kcmweather.cpp
index 366a346..9251737 100644
--- a/kweather/kcmweather.cpp
+++ b/kweather/kcmweather.cpp
@@ -30,7 +30,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <kcombobox.h>
 #include <kcolorbutton.h>
diff --git a/kweather/kcmweatherservice.cpp b/kweather/kcmweatherservice.cpp
index 8f06982..81639df 100644
--- a/kweather/kcmweatherservice.cpp
+++ b/kweather/kcmweatherservice.cpp
@@ -25,7 +25,7 @@
 
 #include <tdeaboutdata.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "serviceconfigwidget.h"
 
diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp
index 704dbe1..ab176f3 100644
--- a/kweather/kweather.cpp
+++ b/kweather/kweather.cpp
@@ -20,9 +20,9 @@
 #include <tdeapplication.h>
 #include <kcmultidialog.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tdeconfig.h>
 #include <ksettings/dialog.h>
diff --git a/kweather/main.cpp b/kweather/main.cpp
index 864b551..5c8d494 100644
--- a/kweather/main.cpp
+++ b/kweather/main.cpp
@@ -2,7 +2,7 @@
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include "weatherservice.h"
 
diff --git a/kweather/metar_parser.h b/kweather/metar_parser.h
index 3b0b180..772fe11 100644
--- a/kweather/metar_parser.h
+++ b/kweather/metar_parser.h
@@ -18,8 +18,8 @@ email                : jratke@comcast.net
 #ifndef METAR_PARSER_H
 #define METAR_PARSER_H
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <krfcdate.h>
 
 #include <tqdatetime.h>
diff --git a/kweather/reportmain.cpp b/kweather/reportmain.cpp
index 3e1926f..0055ab4 100644
--- a/kweather/reportmain.cpp
+++ b/kweather/reportmain.cpp
@@ -5,8 +5,8 @@
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <tdeaboutdata.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 
 static TDECmdLineOptions options[] =
diff --git a/kweather/reportview.cpp b/kweather/reportview.cpp
index 7434823..5891f82 100644
--- a/kweather/reportview.cpp
+++ b/kweather/reportview.cpp
@@ -17,11 +17,11 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqvbox.h>
 #include <tqpixmap.h>
diff --git a/kweather/serviceconfigwidget.cpp b/kweather/serviceconfigwidget.cpp
index 7457049..d6f85e2 100644
--- a/kweather/serviceconfigwidget.cpp
+++ b/kweather/serviceconfigwidget.cpp
@@ -25,9 +25,9 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 
diff --git a/kweather/stationdatabase.h b/kweather/stationdatabase.h
index f1fabe8..d1f414a 100644
--- a/kweather/stationdatabase.h
+++ b/kweather/stationdatabase.h
@@ -16,7 +16,7 @@
 #include <tqmap.h>
 #include <tqstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 /**
diff --git a/kweather/weatherbar.cpp b/kweather/weatherbar.cpp
index 5111748..dcc5d37 100644
--- a/kweather/weatherbar.cpp
+++ b/kweather/weatherbar.cpp
@@ -28,11 +28,11 @@
 #include <tqlayout.h>
 #include <tqscrollview.h>
 #include <tqgroupbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <dcopref.h>
 
 
diff --git a/kweather/weatherbutton.cpp b/kweather/weatherbutton.cpp
index 2b3bf9f..36ab8c9 100644
--- a/kweather/weatherbutton.cpp
+++ b/kweather/weatherbutton.cpp
@@ -23,7 +23,7 @@
 
 #include <tdeapplication.h>
 #include <kcursor.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconeffect.h>
 #include <kicontheme.h>
 #include <kipc.h>
diff --git a/kweather/weatherlib.cpp b/kweather/weatherlib.cpp
index c4c5128..95e12b3 100644
--- a/kweather/weatherlib.cpp
+++ b/kweather/weatherlib.cpp
@@ -22,15 +22,15 @@ email                : geiseri@msoe.edu
 #include <tqfile.h>
 #include <tqdatetime.h>
 #include <tqtextstream.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <math.h>
 #include <krfcdate.h>
 #include <tdeio/job.h>
 #include <kurl.h>
 #include <knotifyclient.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <unistd.h>
 #include <tdeapplication.h>
 #include <kpassivepopup.h>
diff --git a/kweather/weatherservice.cpp b/kweather/weatherservice.cpp
index 7416976..60ad1b2 100644
--- a/kweather/weatherservice.cpp
+++ b/kweather/weatherservice.cpp
@@ -22,8 +22,8 @@
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "weatherlib.h"