From f58c83bd2a477e1f70d9fc0c9e2dae42803dbd2b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:59:58 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 kworldwatch/applet.cpp    | 6 +++---
 kworldwatch/cities.cpp    | 2 +-
 kworldwatch/main.cpp      | 2 +-
 kworldwatch/maploader.cpp | 2 +-
 kworldwatch/mapwidget.cpp | 8 ++++----
 kworldwatch/zoneclock.cpp | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'kworldwatch')

diff --git a/kworldwatch/applet.cpp b/kworldwatch/applet.cpp
index 644fa6d..f358dac 100644
--- a/kworldwatch/applet.cpp
+++ b/kworldwatch/applet.cpp
@@ -29,11 +29,11 @@
 
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <krun.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 
 #include "mapwidget.h"
diff --git a/kworldwatch/cities.cpp b/kworldwatch/cities.cpp
index a88c3a6..8179ed3 100644
--- a/kworldwatch/cities.cpp
+++ b/kworldwatch/cities.cpp
@@ -31,7 +31,7 @@
 #include <tqpainter.h>
 
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 
diff --git a/kworldwatch/main.cpp b/kworldwatch/main.cpp
index ce56cb2..e113d3a 100644
--- a/kworldwatch/main.cpp
+++ b/kworldwatch/main.cpp
@@ -39,7 +39,7 @@
 #include <tdeconfig.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 
diff --git a/kworldwatch/maploader.cpp b/kworldwatch/maploader.cpp
index 50b6fa0..ce192f2 100644
--- a/kworldwatch/maploader.cpp
+++ b/kworldwatch/maploader.cpp
@@ -35,7 +35,7 @@
 #include <tqstringlist.h>
 
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdesktopfile.h>
 #include <kimageeffect.h>
diff --git a/kworldwatch/mapwidget.cpp b/kworldwatch/mapwidget.cpp
index 4812a97..5acc5ce 100644
--- a/kworldwatch/mapwidget.cpp
+++ b/kworldwatch/mapwidget.cpp
@@ -39,10 +39,10 @@
 #include <tdecmdlineargs.h>
 #include <kcolordialog.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include <tqcursor.h>
diff --git a/kworldwatch/zoneclock.cpp b/kworldwatch/zoneclock.cpp
index 541e8b4..a2279c2 100644
--- a/kworldwatch/zoneclock.cpp
+++ b/kworldwatch/zoneclock.cpp
@@ -43,8 +43,8 @@
 #include <tqpopupmenu.h>
 
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 
-- 
cgit v1.2.1