summaryrefslogtreecommitdiffstats
path: root/tdeui/tests
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
parente5f2d46e9caf6942f365f1b454087dda71a340f7 (diff)
downloadtdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.tar.gz
tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/tests')
-rw-r--r--tdeui/tests/itemcontainertest.cpp2
-rw-r--r--tdeui/tests/kaboutdialogtest.cpp2
-rw-r--r--tdeui/tests/kcharselecttest.cpp2
-rw-r--r--tdeui/tests/kcolordlgtest.cpp2
-rw-r--r--tdeui/tests/kcomboboxtest.cpp2
-rw-r--r--tdeui/tests/kcompletiontest.cpp2
-rw-r--r--tdeui/tests/kdatepicktest.cpp2
-rw-r--r--tdeui/tests/kdatetimewidgettest.cpp2
-rw-r--r--tdeui/tests/kdatewidgettest.cpp2
-rw-r--r--tdeui/tests/kdockwidgettest.cpp2
-rw-r--r--tdeui/tests/kdualcolortest.cpp2
-rw-r--r--tdeui/tests/klineedittest.cpp4
-rw-r--r--tdeui/tests/kmessageboxtest.cpp4
-rw-r--r--tdeui/tests/kstatusbartest.cpp2
-rw-r--r--tdeui/tests/kstatusbartest.h2
-rw-r--r--tdeui/tests/ktimewidgettest.cpp2
-rw-r--r--tdeui/tests/tdemainwindowtest.cpp2
-rw-r--r--tdeui/tests/twindowtest.cpp4
-rw-r--r--tdeui/tests/twindowtest.h2
19 files changed, 22 insertions, 22 deletions
diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp
index c96d6a4eb..c3b6d1ddc 100644
--- a/tdeui/tests/itemcontainertest.cpp
+++ b/tdeui/tests/itemcontainertest.cpp
@@ -17,7 +17,7 @@
#include <tqlabel.h>
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <kiconview.h>
#include <tdelistview.h>
diff --git a/tdeui/tests/kaboutdialogtest.cpp b/tdeui/tests/kaboutdialogtest.cpp
index c3be2de25..e0680b52f 100644
--- a/tdeui/tests/kaboutdialogtest.cpp
+++ b/tdeui/tests/kaboutdialogtest.cpp
@@ -12,7 +12,7 @@
// #include <kimgio.h>
#include <tqimage.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
int main(int argc, char** argv)
{
diff --git a/tdeui/tests/kcharselecttest.cpp b/tdeui/tests/kcharselecttest.cpp
index ccd6cd10a..5ee4ee381 100644
--- a/tdeui/tests/kcharselecttest.cpp
+++ b/tdeui/tests/kcharselecttest.cpp
@@ -1,5 +1,5 @@
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kcharselect.h"
int main (int argc,char **argv)
diff --git a/tdeui/tests/kcolordlgtest.cpp b/tdeui/tests/kcolordlgtest.cpp
index f45df0de7..dbe39484c 100644
--- a/tdeui/tests/kcolordlgtest.cpp
+++ b/tdeui/tests/kcolordlgtest.cpp
@@ -20,7 +20,7 @@
#include <tdeapplication.h>
#include "kcolordialog.h"
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
int main( int argc, char *argv[] )
{
diff --git a/tdeui/tests/kcomboboxtest.cpp b/tdeui/tests/kcomboboxtest.cpp
index 225c80c0f..d2b59a4c2 100644
--- a/tdeui/tests/kcomboboxtest.cpp
+++ b/tdeui/tests/kcomboboxtest.cpp
@@ -9,7 +9,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <ksimpleconfig.h>
diff --git a/tdeui/tests/kcompletiontest.cpp b/tdeui/tests/kcompletiontest.cpp
index 12e3835dc..261534465 100644
--- a/tdeui/tests/kcompletiontest.cpp
+++ b/tdeui/tests/kcompletiontest.cpp
@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
/****************************************************************************
** Form implementation generated from reading ui file './kcompletiontest.ui'
**
diff --git a/tdeui/tests/kdatepicktest.cpp b/tdeui/tests/kdatepicktest.cpp
index abcfeb24a..8bdab90a4 100644
--- a/tdeui/tests/kdatepicktest.cpp
+++ b/tdeui/tests/kdatepicktest.cpp
@@ -1,7 +1,7 @@
#include "kdatepicker.h"
#include <tqlineedit.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
int main(int argc, char** argv)
{
diff --git a/tdeui/tests/kdatetimewidgettest.cpp b/tdeui/tests/kdatetimewidgettest.cpp
index 721f86492..f94a2a9f7 100644
--- a/tdeui/tests/kdatetimewidgettest.cpp
+++ b/tdeui/tests/kdatetimewidgettest.cpp
@@ -1,6 +1,6 @@
#include "kdatetimewidget.h"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
int main(int argc, char** argv)
{
diff --git a/tdeui/tests/kdatewidgettest.cpp b/tdeui/tests/kdatewidgettest.cpp
index 11fb243f3..22340b4c9 100644
--- a/tdeui/tests/kdatewidgettest.cpp
+++ b/tdeui/tests/kdatewidgettest.cpp
@@ -1,7 +1,7 @@
#include "kdatewidget.h"
#include <tqlineedit.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
int main(int argc, char** argv)
{
diff --git a/tdeui/tests/kdockwidgettest.cpp b/tdeui/tests/kdockwidgettest.cpp
index 683d42acd..aacac19a0 100644
--- a/tdeui/tests/kdockwidgettest.cpp
+++ b/tdeui/tests/kdockwidgettest.cpp
@@ -18,7 +18,7 @@
#include <tdeapplication.h>
#include <kiconloader.h>
#include <kstatusbar.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <tdetoolbar.h>
#include <tqvbox.h>
diff --git a/tdeui/tests/kdualcolortest.cpp b/tdeui/tests/kdualcolortest.cpp
index e52d6e671..512bfc610 100644
--- a/tdeui/tests/kdualcolortest.cpp
+++ b/tdeui/tests/kdualcolortest.cpp
@@ -1,7 +1,7 @@
#include "kdualcolortest.h"
#include <kdualcolorbutton.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqpalette.h>
diff --git a/tdeui/tests/klineedittest.cpp b/tdeui/tests/klineedittest.cpp
index 793988968..20e9b6ca8 100644
--- a/tdeui/tests/klineedittest.cpp
+++ b/tdeui/tests/klineedittest.cpp
@@ -9,9 +9,9 @@
#include <tdeapplication.h>
#include <kdebug.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdecompletionbox.h>
#include "klineedittest.h"
diff --git a/tdeui/tests/kmessageboxtest.cpp b/tdeui/tests/kmessageboxtest.cpp
index ce333edee..2a56a7ead 100644
--- a/tdeui/tests/kmessageboxtest.cpp
+++ b/tdeui/tests/kmessageboxtest.cpp
@@ -1,4 +1,4 @@
-#include "kmessagebox.h"
+#include "tdemessagebox.h"
#include <tqdialog.h>
#include <tqlayout.h>
@@ -10,7 +10,7 @@
#include <kstatusbar.h>
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
class ExampleWidget : public QLabel
{
diff --git a/tdeui/tests/kstatusbartest.cpp b/tdeui/tests/kstatusbartest.cpp
index 82c03e271..0a8c6d10c 100644
--- a/tdeui/tests/kstatusbartest.cpp
+++ b/tdeui/tests/kstatusbartest.cpp
@@ -12,7 +12,7 @@
#include "kstatusbar.h"
#include <tdeapplication.h>
#include <tdemainwindow.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include "kstatusbartest.h"
testWindow::testWindow (TQWidget *, const char *name)
diff --git a/tdeui/tests/kstatusbartest.h b/tdeui/tests/kstatusbartest.h
index 34dd6df81..712f24352 100644
--- a/tdeui/tests/kstatusbartest.h
+++ b/tdeui/tests/kstatusbartest.h
@@ -1,7 +1,7 @@
#ifndef test_kstatusbar_h
#define test_kstatusbar_h
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <tqpopupmenu.h>
#include <kstatusbar.h>
#include <tdemainwindow.h>
diff --git a/tdeui/tests/ktimewidgettest.cpp b/tdeui/tests/ktimewidgettest.cpp
index bbff45648..731dc3219 100644
--- a/tdeui/tests/ktimewidgettest.cpp
+++ b/tdeui/tests/ktimewidgettest.cpp
@@ -1,6 +1,6 @@
#include "ktimewidget.h"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
int main(int argc, char** argv)
{
diff --git a/tdeui/tests/tdemainwindowtest.cpp b/tdeui/tests/tdemainwindowtest.cpp
index c8ace159e..b19818d4c 100644
--- a/tdeui/tests/tdemainwindowtest.cpp
+++ b/tdeui/tests/tdemainwindowtest.cpp
@@ -3,7 +3,7 @@
#include <tdeapplication.h>
#include <kstatusbar.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include "tdemainwindowtest.h"
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>
diff --git a/tdeui/tests/twindowtest.h b/tdeui/tests/twindowtest.h
index 83a0d75bf..d1d9d460e 100644
--- a/tdeui/tests/twindowtest.h
+++ b/tdeui/tests/twindowtest.h
@@ -4,7 +4,7 @@
#include <tqpopupmenu.h>
#include <tqtimer.h>
#include <tqprogressbar.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kstatusbar.h>
#include <tdetoolbar.h>
#include <tdemainwindow.h>