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

---
 tdewallet/backend/tdewalletbackend.cc | 4 ++--
 tdewallet/tests/tdewalletasync.cpp    | 2 +-
 tdewallet/tests/tdewalletboth.cpp     | 2 +-
 tdewallet/tests/tdewalletsync.cpp     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'tdewallet')

diff --git a/tdewallet/backend/tdewalletbackend.cc b/tdewallet/backend/tdewalletbackend.cc
index 9871b9d7b..17fecae0c 100644
--- a/tdewallet/backend/tdewalletbackend.cc
+++ b/tdewallet/backend/tdewalletbackend.cc
@@ -23,8 +23,8 @@
 #include <stdlib.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
diff --git a/tdewallet/tests/tdewalletasync.cpp b/tdewallet/tests/tdewalletasync.cpp
index 7668b90a7..75d475b97 100644
--- a/tdewallet/tests/tdewalletasync.cpp
+++ b/tdewallet/tests/tdewalletasync.cpp
@@ -5,7 +5,7 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
 #include <tdewallet.h>
diff --git a/tdewallet/tests/tdewalletboth.cpp b/tdewallet/tests/tdewalletboth.cpp
index a5ba26711..efeeebc98 100644
--- a/tdewallet/tests/tdewalletboth.cpp
+++ b/tdewallet/tests/tdewalletboth.cpp
@@ -5,7 +5,7 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
 #include <tdewallet.h>
diff --git a/tdewallet/tests/tdewalletsync.cpp b/tdewallet/tests/tdewalletsync.cpp
index 4774e289e..9ee39e4d4 100644
--- a/tdewallet/tests/tdewalletsync.cpp
+++ b/tdewallet/tests/tdewalletsync.cpp
@@ -5,7 +5,7 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
 #include <tdewallet.h>
-- 
cgit v1.2.3