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

---
 lib/koproperty/editors/booledit.cpp       | 2 +-
 lib/koproperty/editors/cursoredit.cpp     | 2 +-
 lib/koproperty/editors/dateedit.cpp       | 4 ++--
 lib/koproperty/editors/datetimeedit.cpp   | 4 ++--
 lib/koproperty/editors/fontedit.cpp       | 2 +-
 lib/koproperty/editors/pixmapedit.cpp     | 2 +-
 lib/koproperty/editors/pointedit.cpp      | 2 +-
 lib/koproperty/editors/rectedit.cpp       | 2 +-
 lib/koproperty/editors/sizeedit.cpp       | 2 +-
 lib/koproperty/editors/sizepolicyedit.cpp | 2 +-
 lib/koproperty/editors/spinbox.cpp        | 4 ++--
 lib/koproperty/editors/stringlistedit.cpp | 2 +-
 lib/koproperty/editors/symbolcombo.cpp    | 2 +-
 lib/koproperty/editors/timeedit.cpp       | 4 ++--
 14 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'lib/koproperty/editors')

diff --git a/lib/koproperty/editors/booledit.cpp b/lib/koproperty/editors/booledit.cpp
index 839d6d52..e34ee5d5 100644
--- a/lib/koproperty/editors/booledit.cpp
+++ b/lib/koproperty/editors/booledit.cpp
@@ -23,7 +23,7 @@
 #include "../property.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 
diff --git a/lib/koproperty/editors/cursoredit.cpp b/lib/koproperty/editors/cursoredit.cpp
index 5ff0bb34..042256a0 100644
--- a/lib/koproperty/editors/cursoredit.cpp
+++ b/lib/koproperty/editors/cursoredit.cpp
@@ -24,7 +24,7 @@
 #include <tqvariant.h>
 #include <tqcursor.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "property.h"
diff --git a/lib/koproperty/editors/dateedit.cpp b/lib/koproperty/editors/dateedit.cpp
index d26dbb30..4b61d80f 100644
--- a/lib/koproperty/editors/dateedit.cpp
+++ b/lib/koproperty/editors/dateedit.cpp
@@ -27,8 +27,8 @@
 #include <tqvariant.h>
 #include <tqpainter.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 using namespace KoProperty;
 
diff --git a/lib/koproperty/editors/datetimeedit.cpp b/lib/koproperty/editors/datetimeedit.cpp
index 1ed2c9c6..74636c89 100644
--- a/lib/koproperty/editors/datetimeedit.cpp
+++ b/lib/koproperty/editors/datetimeedit.cpp
@@ -27,8 +27,8 @@
 #include <tqpainter.h>
 #include <tqvariant.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 using namespace KoProperty;
 
diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp
index 2de0468b..80a3d528 100644
--- a/lib/koproperty/editors/fontedit.cpp
+++ b/lib/koproperty/editors/fontedit.cpp
@@ -34,7 +34,7 @@
 #include <tdeversion.h>
 #include <tdefontrequester.h>
 #include <tdeaccelmanager.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 //! @internal
 //! reimplemented to better button and label's positioning
diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp
index a01248f2..cf7645bf 100644
--- a/lib/koproperty/editors/pixmapedit.cpp
+++ b/lib/koproperty/editors/pixmapedit.cpp
@@ -45,7 +45,7 @@
 
 #ifndef PURE_QT
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #endif
 
diff --git a/lib/koproperty/editors/pointedit.cpp b/lib/koproperty/editors/pointedit.cpp
index 7badc4de..c355c28b 100644
--- a/lib/koproperty/editors/pointedit.cpp
+++ b/lib/koproperty/editors/pointedit.cpp
@@ -27,7 +27,7 @@
 #include <tqtooltip.h>
 
 #include <kactivelabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 //"[ %1, %2 ]"
 #define POINTEDIT_MASK "%1,%2"
diff --git a/lib/koproperty/editors/rectedit.cpp b/lib/koproperty/editors/rectedit.cpp
index 2422eec8..f9a77314 100644
--- a/lib/koproperty/editors/rectedit.cpp
+++ b/lib/koproperty/editors/rectedit.cpp
@@ -26,7 +26,7 @@
 #include <tqtooltip.h>
 
 #include <kactivelabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 //	"[ %1, %2, %3, %4 ]"
 #define RECTEDIT_MASK "%1,%2 %3x%4"
diff --git a/lib/koproperty/editors/sizeedit.cpp b/lib/koproperty/editors/sizeedit.cpp
index 3e0213d9..e5a37f6d 100644
--- a/lib/koproperty/editors/sizeedit.cpp
+++ b/lib/koproperty/editors/sizeedit.cpp
@@ -27,7 +27,7 @@
 #include <tqtooltip.h>
 
 #include <kactivelabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 //"[ %1, %2 ]"
 #define SIZEEDIT_MASK "%1x%2"
diff --git a/lib/koproperty/editors/sizepolicyedit.cpp b/lib/koproperty/editors/sizepolicyedit.cpp
index ba65a92f..c027d1dd 100644
--- a/lib/koproperty/editors/sizepolicyedit.cpp
+++ b/lib/koproperty/editors/sizepolicyedit.cpp
@@ -28,7 +28,7 @@
 #include <tqmap.h>
 #include <tqtooltip.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace KoProperty;
 
diff --git a/lib/koproperty/editors/spinbox.cpp b/lib/koproperty/editors/spinbox.cpp
index 97a3177d..4743f570 100644
--- a/lib/koproperty/editors/spinbox.cpp
+++ b/lib/koproperty/editors/spinbox.cpp
@@ -28,8 +28,8 @@
 #include <tqpainter.h>
 #include <tqlineedit.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 using namespace KoProperty;
 
diff --git a/lib/koproperty/editors/stringlistedit.cpp b/lib/koproperty/editors/stringlistedit.cpp
index 54f986c5..dee5b335 100644
--- a/lib/koproperty/editors/stringlistedit.cpp
+++ b/lib/koproperty/editors/stringlistedit.cpp
@@ -30,7 +30,7 @@
 #include <keditlistbox.h>
 #include <kdialogbase.h>
 #include <kstdguiitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "property.h"
diff --git a/lib/koproperty/editors/symbolcombo.cpp b/lib/koproperty/editors/symbolcombo.cpp
index faaefdb9..98882e58 100644
--- a/lib/koproperty/editors/symbolcombo.cpp
+++ b/lib/koproperty/editors/symbolcombo.cpp
@@ -25,7 +25,7 @@
 #include <tqvariant.h>
 
 #include <kcharselect.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 
 #include "symbolcombo.h"
diff --git a/lib/koproperty/editors/timeedit.cpp b/lib/koproperty/editors/timeedit.cpp
index 767ba83d..94692a47 100644
--- a/lib/koproperty/editors/timeedit.cpp
+++ b/lib/koproperty/editors/timeedit.cpp
@@ -28,8 +28,8 @@
 #include <tqvariant.h>
 #include <tqdatetime.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 using namespace KoProperty;
 
-- 
cgit v1.2.1