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

---
 kgeography/src/answersdialog.cpp        | 2 +-
 kgeography/src/askwidget.cpp            | 4 ++--
 kgeography/src/boxasker.cpp             | 2 +-
 kgeography/src/capitaldivisionasker.cpp | 2 +-
 kgeography/src/divisioncapitalasker.cpp | 2 +-
 kgeography/src/divisionflagasker.cpp    | 2 +-
 kgeography/src/flagdivisionasker.cpp    | 2 +-
 kgeography/src/kgeography.cpp           | 6 +++---
 kgeography/src/map.cpp                  | 2 +-
 kgeography/src/mapasker.cpp             | 4 ++--
 kgeography/src/mapchooser.cpp           | 6 +++---
 kgeography/src/mapparser.cpp            | 2 +-
 kgeography/src/mapwidget.cpp            | 2 +-
 13 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'kgeography/src')

diff --git a/kgeography/src/answersdialog.cpp b/kgeography/src/answersdialog.cpp
index 9477c8fc..64d72ba5 100644
--- a/kgeography/src/answersdialog.cpp
+++ b/kgeography/src/answersdialog.cpp
@@ -8,7 +8,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/kgeography/src/askwidget.cpp b/kgeography/src/askwidget.cpp
index 87d1d09a..ca92ed8b 100644
--- a/kgeography/src/askwidget.cpp
+++ b/kgeography/src/askwidget.cpp
@@ -8,8 +8,8 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqlabel.h>
 
diff --git a/kgeography/src/boxasker.cpp b/kgeography/src/boxasker.cpp
index f3642b19..7becc6c1 100644
--- a/kgeography/src/boxasker.cpp
+++ b/kgeography/src/boxasker.cpp
@@ -12,7 +12,7 @@
 
 #include <tdeaccelmanager.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 #include <tqlabel.h>
diff --git a/kgeography/src/capitaldivisionasker.cpp b/kgeography/src/capitaldivisionasker.cpp
index ffea1407..1e21e9eb 100644
--- a/kgeography/src/capitaldivisionasker.cpp
+++ b/kgeography/src/capitaldivisionasker.cpp
@@ -8,7 +8,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqradiobutton.h>
  
diff --git a/kgeography/src/divisioncapitalasker.cpp b/kgeography/src/divisioncapitalasker.cpp
index b87437a2..c4060137 100644
--- a/kgeography/src/divisioncapitalasker.cpp
+++ b/kgeography/src/divisioncapitalasker.cpp
@@ -8,7 +8,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqradiobutton.h>
  
diff --git a/kgeography/src/divisionflagasker.cpp b/kgeography/src/divisionflagasker.cpp
index 79641b25..789c2740 100644
--- a/kgeography/src/divisionflagasker.cpp
+++ b/kgeography/src/divisionflagasker.cpp
@@ -8,7 +8,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqimage.h>
 #include <tqradiobutton.h>
diff --git a/kgeography/src/flagdivisionasker.cpp b/kgeography/src/flagdivisionasker.cpp
index 125fc64d..171f8ae1 100644
--- a/kgeography/src/flagdivisionasker.cpp
+++ b/kgeography/src/flagdivisionasker.cpp
@@ -8,7 +8,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqimage.h>
 #include <tqlayout.h>
diff --git a/kgeography/src/kgeography.cpp b/kgeography/src/kgeography.cpp
index 67762cd9..a1387a00 100644
--- a/kgeography/src/kgeography.cpp
+++ b/kgeography/src/kgeography.cpp
@@ -10,12 +10,12 @@
 
 #include <tdeaction.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstdaction.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/kgeography/src/map.cpp b/kgeography/src/map.cpp
index 99861e4a..6c54db69 100644
--- a/kgeography/src/map.cpp
+++ b/kgeography/src/map.cpp
@@ -11,7 +11,7 @@
 #include <stdlib.h> // for RAND_MAX
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
diff --git a/kgeography/src/mapasker.cpp b/kgeography/src/mapasker.cpp
index daf4ed6d..12ed0f53 100644
--- a/kgeography/src/mapasker.cpp
+++ b/kgeography/src/mapasker.cpp
@@ -8,8 +8,8 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/kgeography/src/mapchooser.cpp b/kgeography/src/mapchooser.cpp
index 09e64bce..50f720d9 100644
--- a/kgeography/src/mapchooser.cpp
+++ b/kgeography/src/mapchooser.cpp
@@ -8,9 +8,9 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include <tqhbox.h>
diff --git a/kgeography/src/mapparser.cpp b/kgeography/src/mapparser.cpp
index f50e1b5d..018bfd18 100644
--- a/kgeography/src/mapparser.cpp
+++ b/kgeography/src/mapparser.cpp
@@ -8,7 +8,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "division.h"
 #include "map.h"
diff --git a/kgeography/src/mapwidget.cpp b/kgeography/src/mapwidget.cpp
index 578ef8b4..81f55d82 100644
--- a/kgeography/src/mapwidget.cpp
+++ b/kgeography/src/mapwidget.cpp
@@ -12,7 +12,7 @@
 #include <stdlib.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqcursor.h>
 #include <tqpainter.h>
-- 
cgit v1.2.1