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

---
 tdeio/tdefile/tests/kcustommenueditortest.cpp | 2 +-
 tdeio/tdefile/tests/kdirselectdialogtest.cpp  | 2 +-
 tdeio/tdefile/tests/kfdtest.cpp               | 2 +-
 tdeio/tdefile/tests/kfstest.cpp               | 4 ++--
 tdeio/tdefile/tests/tdefiletreeviewtest.cpp   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'tdeio/tdefile/tests')

diff --git a/tdeio/tdefile/tests/kcustommenueditortest.cpp b/tdeio/tdefile/tests/kcustommenueditortest.cpp
index 3d95b6c9f..9e2189406 100644
--- a/tdeio/tdefile/tests/kcustommenueditortest.cpp
+++ b/tdeio/tdefile/tests/kcustommenueditortest.cpp
@@ -1,6 +1,6 @@
 #include "kcustommenueditor.h"
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 int main(int argc, char** argv)
diff --git a/tdeio/tdefile/tests/kdirselectdialogtest.cpp b/tdeio/tdefile/tests/kdirselectdialogtest.cpp
index 0c2209d31..c1178c3bc 100644
--- a/tdeio/tdefile/tests/kdirselectdialogtest.cpp
+++ b/tdeio/tdefile/tests/kdirselectdialogtest.cpp
@@ -1,6 +1,6 @@
 #include <tdeapplication.h>
 #include <kdirselectdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 
 int main( int argc, char **argv )
diff --git a/tdeio/tdefile/tests/kfdtest.cpp b/tdeio/tdefile/tests/kfdtest.cpp
index baf82725f..ce7127d9e 100644
--- a/tdeio/tdefile/tests/kfdtest.cpp
+++ b/tdeio/tdefile/tests/kfdtest.cpp
@@ -3,7 +3,7 @@
 #include <tqstringlist.h>
 #include <tdefiledialog.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqtimer.h>
 
 KFDTest::KFDTest( const TQString& startDir, TQObject *parent, const char *name )
diff --git a/tdeio/tdefile/tests/kfstest.cpp b/tdeio/tdefile/tests/kfstest.cpp
index c57e3678e..ada8d825e 100644
--- a/tdeio/tdefile/tests/kfstest.cpp
+++ b/tdeio/tdefile/tests/kfstest.cpp
@@ -30,12 +30,12 @@
 
 #include <tdefiledialog.h>
 #include <tdefileiconview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 #include <kurl.h>
 #include <kurlbar.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <tdefile.h>
 #include <kdebug.h>
 #include <kicondialog.h>
diff --git a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
index 529d12dda..9ff0199dc 100644
--- a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
+++ b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
@@ -19,7 +19,7 @@
 
 #include <tqdir.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdemainwindow.h>
 #include <tdeapplication.h>
-- 
cgit v1.2.3