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

---
 kexi/formeditor/test/kfd_mainwindow.cpp | 4 ++--
 kexi/formeditor/test/kfd_part.cpp       | 4 ++--
 kexi/formeditor/test/main.cpp           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'kexi/formeditor/test')

diff --git a/kexi/formeditor/test/kfd_mainwindow.cpp b/kexi/formeditor/test/kfd_mainwindow.cpp
index d1a3edfd..455fd311 100644
--- a/kexi/formeditor/test/kfd_mainwindow.cpp
+++ b/kexi/formeditor/test/kfd_mainwindow.cpp
@@ -21,8 +21,8 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 #include "kfd_mainwindow.h"
diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp
index 649c2fe9..401bfd20 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -28,7 +28,7 @@
 #include <tdeversion.h>
 #include <tdeaction.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <kstdaction.h>
@@ -36,7 +36,7 @@
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "form.h"
 #include "formIO.h"
diff --git a/kexi/formeditor/test/main.cpp b/kexi/formeditor/test/main.cpp
index 3f0727b7..53aa5720 100644
--- a/kexi/formeditor/test/main.cpp
+++ b/kexi/formeditor/test/main.cpp
@@ -22,7 +22,7 @@
 #include <kiconloader.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char *description =
     I18N_NOOP("KFormDesigner");
-- 
cgit v1.2.1