summaryrefslogtreecommitdiffstats
path: root/tdeui/tests/twindowtest.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:54 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:54 -0600
commited99a30644c19b0a3cf0d2147243532df4daa16b (patch)
tree7f3f2850e59824fdf100a642367a82b1e7f0204f /tdeui/tests/twindowtest.cpp
parente5f2d46e9caf6942f365f1b454087dda71a340f7 (diff)
downloadtdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.tar.gz
tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/tests/twindowtest.cpp')
-rw-r--r--tdeui/tests/twindowtest.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tdeui/tests/twindowtest.cpp b/tdeui/tests/twindowtest.cpp
index 3823ab46f..77e01d289 100644
--- a/tdeui/tests/twindowtest.cpp
+++ b/tdeui/tests/twindowtest.cpp
@@ -13,14 +13,14 @@
#include <kcombobox.h>
#include <khelpmenu.h>
#include <tdecmdlineargs.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <tdetoolbarradiogroup.h>
#include <kiconloader.h>
#include <tdepopupmenu.h>
#include <tqmultilineedit.h>
#include "twindowtest.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
//#include <dclock.h>