Rename many classes and header files to avoid conflicts with KDE4

21 files changed, 54 insertions, 54 deletions

diff --git a/tdeui/tests/CMakeLists.txt b/tdeui/tests/CMakeLists.txt
index 3d53611c4..719902623 100644
--- a/tdeui/tests/CMakeLists.txt
+++ b/tdeui/tests/CMakeLists.txt
@@ -27,21 +27,21 @@ set( test_PROGS
   kcolortest kcolordlgtest kcomboboxtest kcompletiontest
   kdatepicktest kdatewidgettest kdialogbasetest
   kdockwidgetdemo kdockwidgettest
-  kdualcolortest keditlistboxtest kfontdialogtest
+  kdualcolortest keditlistboxtest tdefontdialogtest
   kgradienttest khashtest kdesattest
   kledtest klineedittest klineeditdlgtest
   kmessageboxtest knuminputtest
   kpalettetest
-  kpopuptest kprogresstest krulertest kseparatortest
+  tdepopuptest kprogresstest krulertest kseparatortest
   kstatusbartest ktabctltest
   kunbalancedgrdtest twindowtest kwizardtest
   itemcontainertest kpanelmenutest kedittest
-  kxmlguitest kaccelgentest ksystemtraytest klistviewtest
-  ktextedittest kmainwindowtest kmainwindowrestoretest
-  kactiontest kdatetimewidgettest ktimewidgettest
+  kxmlguitest tdeaccelgentest ksystemtraytest tdelistviewtest
+  ktextedittest tdemainwindowtest tdemainwindowrestoretest
+  tdeactiontest kdatetimewidgettest ktimewidgettest
   tdespelltest kinputdialogtest ktabwidgettest kwordwraptest
   kdocktest qxembedtest ksqueezedtextlabeltest
-  kpixmapregionselectordialogtest kjanuswidgettest ktoolbarlabelactiontest
+  kpixmapregionselectordialogtest kjanuswidgettest tdetoolbarlabelactiontest
 )
 
 foreach( PROG ${test_PROGS} )
diff --git a/tdeui/tests/Makefile.am b/tdeui/tests/Makefile.am
index 9af863946..361d437a9 100644
--- a/tdeui/tests/Makefile.am
+++ b/tdeui/tests/Makefile.am
@@ -26,21 +26,21 @@ check_PROGRAMS = kaboutdialogtest kblendtest kbuttonboxtest kcharselecttest \
 	kcolortest kcolordlgtest kcomboboxtest kcompletiontest \
 	kdatepicktest kdatewidgettest kdialogbasetest \
 	kdockwidgetdemo kdockwidgettest \
-	kdualcolortest keditlistboxtest kfontdialogtest \
+	kdualcolortest keditlistboxtest tdefontdialogtest \
 	kgradienttest khashtest kdesattest\
 	kledtest klineedittest klineeditdlgtest \
 	kmessageboxtest knuminputtest \
 	kpalettetest \
-	kpopuptest kprogresstest krulertest kseparatortest \
+	tdepopuptest kprogresstest krulertest kseparatortest \
 	kstatusbartest ktabctltest \
 	kunbalancedgrdtest twindowtest kwizardtest \
 	itemcontainertest kpanelmenutest kedittest \
-	kxmlguitest kaccelgentest ksystemtraytest klistviewtest \
-	ktextedittest kmainwindowtest kmainwindowrestoretest \
-	kactiontest kdatetimewidgettest ktimewidgettest \
+	kxmlguitest tdeaccelgentest ksystemtraytest tdelistviewtest \
+	ktextedittest tdemainwindowtest tdemainwindowrestoretest \
+	tdeactiontest kdatetimewidgettest ktimewidgettest \
 	tdespelltest kinputdialogtest ktabwidgettest kwordwraptest \
 	kdocktest qxembedtest ksqueezedtextlabeltest \
-	kpixmapregionselectordialogtest kjanuswidgettest ktoolbarlabelactiontest
+	kpixmapregionselectordialogtest kjanuswidgettest tdetoolbarlabelactiontest
 
 METASOURCES = AUTO
 
@@ -62,7 +62,7 @@ kdialogbasetest_SOURCES = kdialogbasetest.cpp
 kdualcolortest_SOURCES = kdualcolortest.cpp
 kedittest_SOURCES = kedittest.cpp
 keditlistboxtest_SOURCES = keditlistboxtest.cpp
-kfontdialogtest_SOURCES = kfontdialogtest.cpp
+tdefontdialogtest_SOURCES = tdefontdialogtest.cpp
 kgradienttest_SOURCES = kgradienttest.cpp
 khashtest_SOURCES = khashtest.cpp
 kledtest_SOURCES = kledtest.cpp
@@ -71,7 +71,7 @@ klineeditdlgtest_SOURCES = klineeditdlgtest.cpp
 kmessageboxtest_SOURCES = kmessageboxtest.cpp
 knuminputtest_SOURCES = knuminputtest.cpp
 kpalettetest_SOURCES = kpalettetest.cpp
-kpopuptest_SOURCES = kpopuptest.cpp
+tdepopuptest_SOURCES = tdepopuptest.cpp
 kprogresstest_SOURCES = kprogresstest.cpp
 krulertest_SOURCES = krulertest.cpp
 kseparatortest_SOURCES = kseparatortest.cpp
@@ -86,13 +86,13 @@ kpanelmenutest_SOURCES = kpanelmenutest.cpp
 kdockwidgetdemo_SOURCES = kdockwidgetdemo.cpp
 kdockwidgettest_SOURCES = kdockwidgettest.cpp
 kxmlguitest_SOURCES = kxmlguitest.cpp
-kaccelgentest_SOURCES = kaccelgentest.cpp
+tdeaccelgentest_SOURCES = tdeaccelgentest.cpp
 ksystemtraytest_SOURCES = ksystemtraytest.cpp
-klistviewtest_SOURCES = klistviewtest.cpp
+tdelistviewtest_SOURCES = tdelistviewtest.cpp
 ktextedittest_SOURCES = ktextedittest.cpp
-kmainwindowtest_SOURCES = kmainwindowtest.cpp
-kmainwindowrestoretest_SOURCES = kmainwindowrestoretest.cpp
-kactiontest_SOURCES = kactiontest.cpp
+tdemainwindowtest_SOURCES = tdemainwindowtest.cpp
+tdemainwindowrestoretest_SOURCES = tdemainwindowrestoretest.cpp
+tdeactiontest_SOURCES = tdeactiontest.cpp
 tdespelltest_SOURCES = tdespelltest.cpp
 kinputdialogtest_SOURCES = kinputdialogtest.cpp
 ktabwidgettest_SOURCES = ktabwidgettest.cpp
@@ -102,4 +102,4 @@ qxembedtest_SOURCES=qxembedtest.cpp
 ksqueezedtextlabeltest_SOURCES = ksqueezedtextlabeltest.cpp
 kjanuswidgettest_SOURCES = kjanuswidgettest.cpp
 kpixmapregionselectordialogtest_SOURCES = kpixmapregionselectordialogtest.cpp
-ktoolbarlabelactiontest_SOURCES = ktoolbarlabelactiontest.cpp
+tdetoolbarlabelactiontest_SOURCES = tdetoolbarlabelactiontest.cpp
diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp
index c3bfcbe95..76df739e8 100644
--- a/tdeui/tests/itemcontainertest.cpp
+++ b/tdeui/tests/itemcontainertest.cpp
@@ -20,8 +20,8 @@
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <kiconview.h>
-#include <klistview.h>
-#include <klistbox.h>
+#include <tdelistview.h>
+#include <tdelistbox.h>
 
 #include "itemcontainertest.h"
 
diff --git a/tdeui/tests/kdockwidgettest.cpp b/tdeui/tests/kdockwidgettest.cpp
index bfed1bdd2..144391f50 100644
--- a/tdeui/tests/kdockwidgettest.cpp
+++ b/tdeui/tests/kdockwidgettest.cpp
@@ -19,7 +19,7 @@
 #include <kiconloader.h>
 #include <kstatusbar.h>
 #include <kmenubar.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <tqvbox.h>
 
 static const char*folder[]={
diff --git a/tdeui/tests/krulertest.h b/tdeui/tests/krulertest.h
index 67a9ae7e0..cf1abc155 100644
--- a/tdeui/tests/krulertest.h
+++ b/tdeui/tests/krulertest.h
@@ -4,7 +4,7 @@
 #define krulertest_h
 
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqwidget.h>
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
diff --git a/tdeui/tests/kstatusbartest.cpp b/tdeui/tests/kstatusbartest.cpp
index 507604480..c06f18b51 100644
--- a/tdeui/tests/kstatusbartest.cpp
+++ b/tdeui/tests/kstatusbartest.cpp
@@ -11,7 +11,7 @@
 
 #include "kstatusbar.h"
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmenubar.h>
 #include "kstatusbartest.h"
 
diff --git a/tdeui/tests/kstatusbartest.h b/tdeui/tests/kstatusbartest.h
index 809f3f643..34dd6df81 100644
--- a/tdeui/tests/kstatusbartest.h
+++ b/tdeui/tests/kstatusbartest.h
@@ -4,7 +4,7 @@
 #include <kmenubar.h>
 #include <tqpopupmenu.h>
 #include <kstatusbar.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class TQMultiLineEdit;
 
diff --git a/tdeui/tests/kxmlguitest.cpp b/tdeui/tests/kxmlguitest.cpp
index 17f7daac9..89c5caf30 100644
--- a/tdeui/tests/kxmlguitest.cpp
+++ b/tdeui/tests/kxmlguitest.cpp
@@ -1,10 +1,10 @@
 #include "kxmlguitest.h"
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kxmlguifactory.h>
 #include <kxmlguiclient.h>
 #include <kxmlguibuilder.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
diff --git a/tdeui/tests/tdeaccelgentest.cpp b/tdeui/tests/tdeaccelgentest.cpp
index 783a0f36f..bd456aefd 100644
--- a/tdeui/tests/tdeaccelgentest.cpp
+++ b/tdeui/tests/tdeaccelgentest.cpp
@@ -1,4 +1,4 @@
-#include "kaccelgen.h"
+#include "tdeaccelgen.h"
 
 #include <tqstringlist.h>
 
diff --git a/tdeui/tests/tdeactiontest.cpp b/tdeui/tests/tdeactiontest.cpp
index 73a108ab0..d62d9c3fc 100644
--- a/tdeui/tests/tdeactiontest.cpp
+++ b/tdeui/tests/tdeactiontest.cpp
@@ -2,13 +2,13 @@
 #include <tqguardedptr.h>
 
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <assert.h>
 
 int main( int argc, char **argv )
 {
-    TDEApplication app( argc, argv, "kactiontest" );
+    TDEApplication app( argc, argv, "tdeactiontest" );
 
     TDEActionCollection coll( static_cast<TQObject *>( 0 ) );
 
diff --git a/tdeui/tests/tdefontdialogtest.cpp b/tdeui/tests/tdefontdialogtest.cpp
index 66f0b3664..2d4e187b2 100644
--- a/tdeui/tests/tdefontdialogtest.cpp
+++ b/tdeui/tests/tdefontdialogtest.cpp
@@ -25,7 +25,7 @@
 
 
 #include <kapplication.h>
-#include "kfontdialog.h"
+#include "tdefontdialog.h"
 #include <tdeconfig.h>
 
 
diff --git a/tdeui/tests/tdelistviewtest.cpp b/tdeui/tests/tdelistviewtest.cpp
index 4be086af6..d73baf087 100644
--- a/tdeui/tests/tdelistviewtest.cpp
+++ b/tdeui/tests/tdelistviewtest.cpp
@@ -1,4 +1,4 @@
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kapplication.h>
 #include <kdialogbase.h>
 #include <tqvbox.h>
@@ -6,7 +6,7 @@
 
 int main( int argc, char **argv )
 {
-	TDEApplication app( argc, argv, "klistviewtest" );
+	TDEApplication app( argc, argv, "tdelistviewtest" );
 	KDialogBase dialog;
 	TDEListView *view = new TDEListView( dialog.makeVBoxMainWidget() );
 	view->setSelectionModeExt( TDEListView::FileManager );
diff --git a/tdeui/tests/tdemainwindowrestoretest.cpp b/tdeui/tests/tdemainwindowrestoretest.cpp
index 1ef265d92..7b477f8f7 100644
--- a/tdeui/tests/tdemainwindowrestoretest.cpp
+++ b/tdeui/tests/tdemainwindowrestoretest.cpp
@@ -1,5 +1,5 @@
 
-#include "kmainwindowrestoretest.h"
+#include "tdemainwindowrestoretest.h"
 
 #include <kapplication.h>
 
@@ -14,7 +14,7 @@
 
 int main( int argc, char * argv[] ) {
 
-  TDEApplication app( argc, argv, "kmainwindowrestoretest" );
+  TDEApplication app( argc, argv, "tdemainwindowrestoretest" );
 
   if ( kapp->isRestored() ) {
     kRestoreMainWindows< MainWin1, MainWin2, MainWin3 >();
@@ -38,4 +38,4 @@ int main( int argc, char * argv[] ) {
   return app.exec();
 }
 
-#include "kmainwindowrestoretest.moc"
+#include "tdemainwindowrestoretest.moc"
diff --git a/tdeui/tests/tdemainwindowrestoretest.h b/tdeui/tests/tdemainwindowrestoretest.h
index 938311461..7d02e4aca 100644
--- a/tdeui/tests/tdemainwindowrestoretest.h
+++ b/tdeui/tests/tdemainwindowrestoretest.h
@@ -1,7 +1,7 @@
 #ifndef _TDEUI_TESTS_KMAINWINDOWRESTORETEST_H_
 #define _TDEUI_TESTS_KMAINWINDOWRESTORETEST_H_
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class MainWin1 : public TDEMainWindow {
   Q_OBJECT
diff --git a/tdeui/tests/tdemainwindowtest.cpp b/tdeui/tests/tdemainwindowtest.cpp
index 6606680e9..b83123dde 100644
--- a/tdeui/tests/tdemainwindowtest.cpp
+++ b/tdeui/tests/tdemainwindowtest.cpp
@@ -5,7 +5,7 @@
 #include <kstatusbar.h>
 #include <kmenubar.h>
 
-#include "kmainwindowtest.h"
+#include "tdemainwindowtest.h"
 
 MainWindow::MainWindow()
 {
@@ -24,7 +24,7 @@ void MainWindow::showMessage()
 
 int main( int argc, char **argv )
 {
-    TDEApplication app( argc, argv, "kmainwindowtest" );
+    TDEApplication app( argc, argv, "tdemainwindowtest" );
 
     MainWindow* mw = new MainWindow; // deletes itself when closed
     mw->show();
@@ -32,7 +32,7 @@ int main( int argc, char **argv )
     return app.exec();
 }
 
-#include "kmainwindowtest.moc"
+#include "tdemainwindowtest.moc"
 
 /* vim: et sw=4 ts=4
  */
diff --git a/tdeui/tests/tdemainwindowtest.h b/tdeui/tests/tdemainwindowtest.h
index 21ca2fe7e..b7c5d9e3c 100644
--- a/tdeui/tests/tdemainwindowtest.h
+++ b/tdeui/tests/tdemainwindowtest.h
@@ -1,7 +1,7 @@
 #ifndef KMAINWINDOWTEST_H
 #define KMAINWINDOWTEST_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class MainWindow : public TDEMainWindow
 {
diff --git a/tdeui/tests/tdepopuptest.cpp b/tdeui/tests/tdepopuptest.cpp
index 89c932f46..c830525f1 100644
--- a/tdeui/tests/tdepopuptest.cpp
+++ b/tdeui/tests/tdepopuptest.cpp
@@ -1,7 +1,7 @@
 #include <kapplication.h>
 #include <tqwidget.h>
 #include <tqcursor.h>
-#include "kpopupmenu.h"
+#include "tdepopupmenu.h"
 
 class DemoWidget : public TQWidget {
 private:
@@ -30,7 +30,7 @@ public:
 
 int main(int argc, char **argv)
 {
-    TDEApplication app(argc, argv, "kpopupmenutest");
+    TDEApplication app(argc, argv, "tdepopupmenutest");
     DemoWidget w;
     app.setMainWidget(&w);
     w.setFont(TQFont("helvetica", 12, TQFont::Bold), true);
diff --git a/tdeui/tests/tdetoolbarlabelactiontest.cpp b/tdeui/tests/tdetoolbarlabelactiontest.cpp
index 9596e9d32..ae12e56d8 100644
--- a/tdeui/tests/tdetoolbarlabelactiontest.cpp
+++ b/tdeui/tests/tdetoolbarlabelactiontest.cpp
@@ -19,11 +19,11 @@
 #include <tqguardedptr.h>
 
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kstandarddirs.h>
-#include <ktoolbarlabelaction.h>
+#include <tdetoolbarlabelaction.h>
 #include <ksqueezedtextlabel.h> 
 #include <kdebug.h>
 #include <tqvbox.h>
@@ -78,13 +78,13 @@ public:
 
     // customLabel->setText("&test me again some time soon");
     
-    createGUI("ktoolbarlabelactiontestui.rc");
+    createGUI("tdetoolbarlabelactiontestui.rc");
   }
 };
 
 int main( int argc, char **argv )
 {
-  TDEApplication app( argc, argv, "ktoolbarlabelactiontest" );
+  TDEApplication app( argc, argv, "tdetoolbarlabelactiontest" );
 
   TDEGlobal::instance()->dirs()->addResourceDir("data", ".");
 
diff --git a/tdeui/tests/tdetoolbarlabelactiontestui.rc b/tdeui/tests/tdetoolbarlabelactiontestui.rc
index 75d02e54e..0a0e03091 100644
--- a/tdeui/tests/tdetoolbarlabelactiontestui.rc
+++ b/tdeui/tests/tdetoolbarlabelactiontestui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="ktoolbarlabelactiontest" version="0.1">
+<kpartgui name="tdetoolbarlabelactiontest" version="0.1">
 <ToolBar>
 <Action name="label1"/>
 <Action name="label2"/>
diff --git a/tdeui/tests/twindowtest.cpp b/tdeui/tests/twindowtest.cpp
index 0ad1b726b..d45bc2554 100644
--- a/tdeui/tests/twindowtest.cpp
+++ b/tdeui/tests/twindowtest.cpp
@@ -14,9 +14,9 @@
 #include <khelpmenu.h>
 #include <kcmdlineargs.h>
 #include <kmenubar.h>
-#include <ktoolbarradiogroup.h>
+#include <tdetoolbarradiogroup.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqmultilineedit.h>
 #include "twindowtest.h"
 
diff --git a/tdeui/tests/twindowtest.h b/tdeui/tests/twindowtest.h
index f0dad1537..83a0d75bf 100644
--- a/tdeui/tests/twindowtest.h
+++ b/tdeui/tests/twindowtest.h
@@ -6,8 +6,8 @@
 #include <tqprogressbar.h>
 #include <kmenubar.h>
 #include <kstatusbar.h>
-#include <ktoolbar.h>
-#include <kmainwindow.h>
+#include <tdetoolbar.h>
+#include <tdemainwindow.h>
 
 class TQMultiLineEdit;
 class TDEToolBarRadioGroup;