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

---
 tdewallet/allyourbase.cpp      | 6 +++---
 tdewallet/kwmapeditor.cpp      | 2 +-
 tdewallet/main.cpp             | 4 ++--
 tdewallet/tdewalleteditor.cpp  | 6 +++---
 tdewallet/tdewalletmanager.cpp | 4 ++--
 tdewallet/tdewalletpopup.cpp   | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'tdewallet')

diff --git a/tdewallet/allyourbase.cpp b/tdewallet/allyourbase.cpp
index 27ff44e..1aac8e1 100644
--- a/tdewallet/allyourbase.cpp
+++ b/tdewallet/allyourbase.cpp
@@ -22,10 +22,10 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <kurldrag.h>
diff --git a/tdewallet/kwmapeditor.cpp b/tdewallet/kwmapeditor.cpp
index c7b17ae..a6c09b4 100644
--- a/tdewallet/kwmapeditor.cpp
+++ b/tdewallet/kwmapeditor.cpp
@@ -21,7 +21,7 @@
 
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kstdaction.h>
 #include <twin.h>
diff --git a/tdewallet/main.cpp b/tdewallet/main.cpp
index f58a36c..3ecba8f 100644
--- a/tdewallet/main.cpp
+++ b/tdewallet/main.cpp
@@ -20,8 +20,8 @@
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>
 #include <kuniqueapplication.h>
diff --git a/tdewallet/tdewalleteditor.cpp b/tdewallet/tdewalleteditor.cpp
index 885391e..6075c42 100644
--- a/tdewallet/tdewalleteditor.cpp
+++ b/tdewallet/tdewalleteditor.cpp
@@ -35,15 +35,15 @@
 #include <kinputdialog.h>
 #include <tdeio/netaccess.h>
 #include <tdelistviewsearchline.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <ksqueezedtextlabel.h>
 #include <kstandarddirs.h>
 #include <kstdaction.h>
 #include <kstringhandler.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
diff --git a/tdewallet/tdewalletmanager.cpp b/tdewallet/tdewalletmanager.cpp
index c406e01..df1e5b1 100644
--- a/tdewallet/tdewalletmanager.cpp
+++ b/tdewallet/tdewalletmanager.cpp
@@ -32,8 +32,8 @@
 #include <kiconloader.h>
 #include <kiconview.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kstdaction.h>
 #include <ksystemtray.h>
diff --git a/tdewallet/tdewalletpopup.cpp b/tdewallet/tdewalletpopup.cpp
index d95ac73..b3c0d1b 100644
--- a/tdewallet/tdewalletpopup.cpp
+++ b/tdewallet/tdewalletpopup.cpp
@@ -23,8 +23,8 @@
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kiconview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdewallet.h>
 #include <kstdguiitem.h>
 
-- 
cgit v1.2.1