Rename a number of classes to enhance compatibility with KDE4

18 files changed, 87 insertions, 87 deletions

diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp
index bb0c0338b..c3bfcbe95 100644
--- a/tdeui/tests/itemcontainertest.cpp
+++ b/tdeui/tests/itemcontainertest.cpp
@@ -1,5 +1,5 @@
 /*
-* Tests the item container widgets KIconView, KListView, KListBox
+* Tests the item container widgets KIconView, TDEListView, TDEListBox
 *
 * Copyright (c) 2000 by Michael Reiher <michael.reiher@gmx.de>
 *
@@ -88,7 +88,7 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
     m_plblItem = new TQLabel( gbItem );
     vBox->addWidget( gbItem );
 
-    TQButtonGroup* bgListView = new TQButtonGroup( 1, Qt::Horizontal, "KListView", this);
+    TQButtonGroup* bgListView = new TQButtonGroup( 1, Qt::Horizontal, "TDEListView", this);
     TQCheckBox* cbListView = new TQCheckBox("Single Column", bgListView);
     vBox->addWidget( bgListView );
     connect( cbListView, TQT_SIGNAL( toggled( bool ) ),
@@ -105,8 +105,8 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
 	     this, TQT_SLOT( slotIconViewExec( TQIconViewItem* ) ) );
 
     //Create ListView
-    TQGroupBox* gbListView = new TQGroupBox( 1, Qt::Horizontal, "KListView", this);
-    m_pListView = new KListView( gbListView );
+    TQGroupBox* gbListView = new TQGroupBox( 1, Qt::Horizontal, "TDEListView", this);
+    m_pListView = new TDEListView( gbListView );
     m_pListView->addColumn("Item");
     m_pListView->addColumn("Text");
     hBox->addWidget( gbListView );
@@ -115,8 +115,8 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
 	     this, TQT_SLOT( slotListViewExec( TQListViewItem* ) ) );
 
     //Create ListBox
-    TQGroupBox* gbListBox = new TQGroupBox( 1, Qt::Horizontal, "KListBox", this);
-    m_pListBox = new KListBox( gbListBox );
+    TQGroupBox* gbListBox = new TQGroupBox( 1, Qt::Horizontal, "TDEListBox", this);
+    m_pListBox = new TDEListBox( gbListBox );
     hBox->addWidget( gbListBox );
     connect( m_pListBox, TQT_SIGNAL( executed( TQListBoxItem* ) ),
 	     this, TQT_SLOT( slotListBoxExec( TQListBoxItem* ) ) );
@@ -153,22 +153,22 @@ void TopLevel::slotSwitchMode( int id )
   case TopLevel::NoSelection:
     m_pIconView->setSelectionMode( KIconView::NoSelection );
     m_pListView->setSelectionMode( TQListView::NoSelection );
-    m_pListBox->setSelectionMode( KListBox::NoSelection );
+    m_pListBox->setSelectionMode( TDEListBox::NoSelection );
     break;
   case TopLevel::Single:
     m_pIconView->setSelectionMode( KIconView::Single );
     m_pListView->setSelectionMode( TQListView::Single );
-    m_pListBox->setSelectionMode( KListBox::Single );
+    m_pListBox->setSelectionMode( TDEListBox::Single );
     break;
   case TopLevel::Multi:
     m_pIconView->setSelectionMode( KIconView::Multi );
     m_pListView->setSelectionMode( TQListView::Multi );
-    m_pListBox->setSelectionMode( KListBox::Multi );
+    m_pListBox->setSelectionMode( TDEListBox::Multi );
     break;
   case TopLevel::Extended:
     m_pIconView->setSelectionMode( KIconView::Extended );
     m_pListView->setSelectionMode( TQListView::Extended );
-    m_pListBox->setSelectionMode( KListBox::Extended );
+    m_pListBox->setSelectionMode( TDEListBox::Extended );
     break;
   default:
     Q_ASSERT(0);
@@ -187,7 +187,7 @@ void TopLevel::slotIconViewExec( TQIconViewItem* item )
 
 void TopLevel::slotListViewExec( TQListViewItem* item )
 {
-  m_plblWidget->setText("KListView");
+  m_plblWidget->setText("TDEListView");
   m_plblSignal->setText("executed");
   if( item ) 
     m_plblItem->setText( item->text(0) );
@@ -197,7 +197,7 @@ void TopLevel::slotListViewExec( TQListViewItem* item )
 
 void TopLevel::slotListBoxExec( TQListBoxItem* item )
 {
-  m_plblWidget->setText("KListBox");
+  m_plblWidget->setText("TDEListBox");
   m_plblSignal->setText("executed");
   if( item ) 
     m_plblItem->setText( item->text() );
diff --git a/tdeui/tests/itemcontainertest.h b/tdeui/tests/itemcontainertest.h
index 86a356ab3..3abc0e0a0 100644
--- a/tdeui/tests/itemcontainertest.h
+++ b/tdeui/tests/itemcontainertest.h
@@ -4,8 +4,8 @@
 #include <tqwidget.h>
 
 class KIconView;
-class KListView;
-class KListBox;
+class TDEListView;
+class TDEListBox;
 class TQButtonGroup;
 class TQLabel;
 
@@ -32,8 +32,8 @@ public slots:
     void slotDoubleClicked( TQIconViewItem* ) { tqDebug("DOUBLE CLICK");}
 protected:
     KIconView* m_pIconView;
-    KListView* m_pListView;
-    KListBox* m_pListBox;
+    TDEListView* m_pListView;
+    TDEListBox* m_pListBox;
 
     TQButtonGroup* m_pbgView;
     TQButtonGroup* m_pbgMode;
diff --git a/tdeui/tests/kaccelgentest.cpp b/tdeui/tests/kaccelgentest.cpp
index f5f95ac57..783a0f36f 100644
--- a/tdeui/tests/kaccelgentest.cpp
+++ b/tdeui/tests/kaccelgentest.cpp
@@ -30,7 +30,7 @@ int main()
 	         << "&yoyo && dyne";
 
     TQStringList output;
-    KAccelGen::generate( input, output );
+    TDEAccelGen::generate( input, output );
     check( "TQStringList value generation", expected, output );
 
     TQMap<TQString,TQString> map;
@@ -39,13 +39,13 @@ int main()
     }
     input.sort();
     expected.clear();
-    KAccelGen::generate( input, expected );
+    TDEAccelGen::generate( input, expected );
 
     output.clear();
-    KAccelGen::generateFromValues( map, output );
+    TDEAccelGen::generateFromValues( map, output );
     check( "map value generation", expected, output );
 
     output.clear();
-    KAccelGen::generateFromKeys( map, output );
+    TDEAccelGen::generateFromKeys( map, output );
     check( "map key generation", expected, output );
 }
diff --git a/tdeui/tests/kactiontest.cpp b/tdeui/tests/kactiontest.cpp
index 238f912c5..73a108ab0 100644
--- a/tdeui/tests/kactiontest.cpp
+++ b/tdeui/tests/kactiontest.cpp
@@ -10,15 +10,15 @@ int main( int argc, char **argv )
 {
     TDEApplication app( argc, argv, "kactiontest" );
 
-    KActionCollection coll( static_cast<TQObject *>( 0 ) );
-
-    TQGuardedPtr<KAction> action1 = new KRadioAction("test",0, &coll);
-    TQGuardedPtr<KAction> action2 = new KRadioAction("test",0, &coll);
-    TQGuardedPtr<KAction> action3 = new KRadioAction("test",0, &coll);
-    TQGuardedPtr<KAction> action4 = new KRadioAction("test",0, &coll);
-    TQGuardedPtr<KAction> action5 = new KRadioAction("test",0, &coll);
-    TQGuardedPtr<KAction> action6 = new KRadioAction("test",0, &coll);
-    TQGuardedPtr<KAction> action7 = new KRadioAction("test",0, &coll);
+    TDEActionCollection coll( static_cast<TQObject *>( 0 ) );
+
+    TQGuardedPtr<TDEAction> action1 = new TDERadioAction("test",0, &coll);
+    TQGuardedPtr<TDEAction> action2 = new TDERadioAction("test",0, &coll);
+    TQGuardedPtr<TDEAction> action3 = new TDERadioAction("test",0, &coll);
+    TQGuardedPtr<TDEAction> action4 = new TDERadioAction("test",0, &coll);
+    TQGuardedPtr<TDEAction> action5 = new TDERadioAction("test",0, &coll);
+    TQGuardedPtr<TDEAction> action6 = new TDERadioAction("test",0, &coll);
+    TQGuardedPtr<TDEAction> action7 = new TDERadioAction("test",0, &coll);
    
     coll.clear();
     assert( coll.isEmpty() );
diff --git a/tdeui/tests/kdockwidgettest.cpp b/tdeui/tests/kdockwidgettest.cpp
index dfe9bfff7..bfed1bdd2 100644
--- a/tdeui/tests/kdockwidgettest.cpp
+++ b/tdeui/tests/kdockwidgettest.cpp
@@ -184,7 +184,7 @@ void DockApplication::initMenuBar()
 void DockApplication::initToolBars()
 {
   TQPixmap p(folder);
-  KToolBar* tool_bar_0 = toolBar(0);
+  TDEToolBar* tool_bar_0 = toolBar(0);
   tool_bar_0->setFullSize(false);
   tool_bar_0->insertButton( p, 1 );
   tool_bar_0->insertButton(p, 2 );
diff --git a/tdeui/tests/kfontdialogtest.cpp b/tdeui/tests/kfontdialogtest.cpp
index 0b3d4eb30..66f0b3664 100644
--- a/tdeui/tests/kfontdialogtest.cpp
+++ b/tdeui/tests/kfontdialogtest.cpp
@@ -31,19 +31,19 @@
 
  int main( int argc, char **argv )
 {
-  TDEApplication app( argc, argv, "KFontDialogTest" );
+  TDEApplication app( argc, argv, "TDEFontDialogTest" );
 
   TDEConfig aConfig;
-  aConfig.setGroup( "KFontDialog-test" );
+  aConfig.setGroup( "TDEFontDialog-test" );
 
   app.setFont(TQFont("Helvetica",12));
 
   //  TQFont font = TQFont("Times",18,TQFont::Bold);
 
   TQFont font = aConfig.readFontEntry( "Chosen" );
-  int nRet = KFontDialog::getFont(font);
+  int nRet = TDEFontDialog::getFont(font);
   int flags;
-  nRet = KFontDialog::getFontDiff(font, flags);
+  nRet = TDEFontDialog::getFontDiff(font, flags);
   aConfig.writeEntry( "Chosen", font, true );
 
   aConfig.sync();
diff --git a/tdeui/tests/klistviewtest.cpp b/tdeui/tests/klistviewtest.cpp
index 9fc108e52..4be086af6 100644
--- a/tdeui/tests/klistviewtest.cpp
+++ b/tdeui/tests/klistviewtest.cpp
@@ -8,8 +8,8 @@ int main( int argc, char **argv )
 {
 	TDEApplication app( argc, argv, "klistviewtest" );
 	KDialogBase dialog;
-	KListView *view = new KListView( dialog.makeVBoxMainWidget() );
-	view->setSelectionModeExt( KListView::FileManager );
+	TDEListView *view = new TDEListView( dialog.makeVBoxMainWidget() );
+	view->setSelectionModeExt( TDEListView::FileManager );
 	view->setDragEnabled( true );
 	view->setItemsMovable( false );
 	view->setAcceptDrops( true );
@@ -17,20 +17,20 @@ int main( int argc, char **argv )
 	view->addColumn("Column 2");
 	view->addColumn("Column 3");
 
-	new KListViewItem( view, "Item 1");
-	new KListViewItem( view, "Item 1");
-	new KListViewItem( view, "Item 1");
-	new KListViewItem( view, "Item 1");
-	new KListViewItem( view, "Item 1");
-	new KListViewItem( view, "Item 1");
-	new KListViewItem( view, "Item 1");
-	new KListViewItem( view, "Item 1");
-	new KListViewItem( view, "Item 1");
-	new KListViewItem( view, "Item 2", "Some more", "Hi Mom :)" );
+	new TDEListViewItem( view, "Item 1");
+	new TDEListViewItem( view, "Item 1");
+	new TDEListViewItem( view, "Item 1");
+	new TDEListViewItem( view, "Item 1");
+	new TDEListViewItem( view, "Item 1");
+	new TDEListViewItem( view, "Item 1");
+	new TDEListViewItem( view, "Item 1");
+	new TDEListViewItem( view, "Item 1");
+	new TDEListViewItem( view, "Item 1");
+	new TDEListViewItem( view, "Item 2", "Some more", "Hi Mom :)" );
 
 	view->restoreLayout( TDEGlobal::config(), "ListView" );
 
-	new KListViewItem( view, "Item 3" );
+	new TDEListViewItem( view, "Item 3" );
 
 	dialog.exec();
 	view->saveLayout( TDEGlobal::config(), "ListView" );
diff --git a/tdeui/tests/kmainwindowrestoretest.h b/tdeui/tests/kmainwindowrestoretest.h
index f29ae2fca..938311461 100644
--- a/tdeui/tests/kmainwindowrestoretest.h
+++ b/tdeui/tests/kmainwindowrestoretest.h
@@ -3,45 +3,45 @@
 
 #include <kmainwindow.h>
 
-class MainWin1 : public KMainWindow {
+class MainWin1 : public TDEMainWindow {
   Q_OBJECT
 public:
-  MainWin1() : KMainWindow() {}
+  MainWin1() : TDEMainWindow() {}
   virtual ~MainWin1() {}
 };
 
-class MainWin2 : public KMainWindow {
+class MainWin2 : public TDEMainWindow {
   Q_OBJECT
 public:
-  MainWin2() : KMainWindow() {}
+  MainWin2() : TDEMainWindow() {}
   virtual ~MainWin2() {}
 };
 
-class MainWin3 : public KMainWindow {
+class MainWin3 : public TDEMainWindow {
   Q_OBJECT
 public:
-  MainWin3() : KMainWindow() {}
+  MainWin3() : TDEMainWindow() {}
   virtual ~MainWin3() {}
 };
 
-class MainWin4 : public KMainWindow {
+class MainWin4 : public TDEMainWindow {
   Q_OBJECT
 public:
-  MainWin4() : KMainWindow() {}
+  MainWin4() : TDEMainWindow() {}
   virtual ~MainWin4() {}
 };
 
-class MainWin5 : public KMainWindow {
+class MainWin5 : public TDEMainWindow {
   Q_OBJECT
 public:
-  MainWin5() : KMainWindow() {}
+  MainWin5() : TDEMainWindow() {}
   virtual ~MainWin5() {}
 };
 
-class MainWin6 : public KMainWindow {
+class MainWin6 : public TDEMainWindow {
   Q_OBJECT
 public:
-  MainWin6() : KMainWindow() {}
+  MainWin6() : TDEMainWindow() {}
   virtual ~MainWin6() {}
 };
 
diff --git a/tdeui/tests/kmainwindowtest.h b/tdeui/tests/kmainwindowtest.h
index 4fb426ac5..21ca2fe7e 100644
--- a/tdeui/tests/kmainwindowtest.h
+++ b/tdeui/tests/kmainwindowtest.h
@@ -3,7 +3,7 @@
 
 #include <kmainwindow.h>
 
-class MainWindow : public KMainWindow
+class MainWindow : public TDEMainWindow
 {
     Q_OBJECT
 public:
diff --git a/tdeui/tests/kpopuptest.cpp b/tdeui/tests/kpopuptest.cpp
index e5d01c985..89c932f46 100644
--- a/tdeui/tests/kpopuptest.cpp
+++ b/tdeui/tests/kpopuptest.cpp
@@ -5,7 +5,7 @@
 
 class DemoWidget : public TQWidget {
 private:
-    KPopupMenu *menu;
+    TDEPopupMenu *menu;
     
 void mousePressEvent(TQMouseEvent *)
 {
@@ -20,7 +20,7 @@ void paintEvent(TQPaintEvent *)
 public:
     DemoWidget() : TQWidget()
     {
-        menu = new KPopupMenu("Popup Menu:");
+        menu = new TDEPopupMenu("Popup Menu:");
         menu->insertItem("Item1");
         menu->insertItem("Item2");
         menu->insertSeparator();
diff --git a/tdeui/tests/krulertest.cpp b/tdeui/tests/krulertest.cpp
index f227301b9..628c5096e 100644
--- a/tdeui/tests/krulertest.cpp
+++ b/tdeui/tests/krulertest.cpp
@@ -51,7 +51,7 @@ MouseWidget::resizeEvent( TQResizeEvent *r )
 
 
 KRulerTest::KRulerTest( const char *name )
-  : KMainWindow(0, name)
+  : TDEMainWindow(0, name)
 {
   mainframe = new TQFrame(this);
 
diff --git a/tdeui/tests/krulertest.h b/tdeui/tests/krulertest.h
index d180e93a0..67a9ae7e0 100644
--- a/tdeui/tests/krulertest.h
+++ b/tdeui/tests/krulertest.h
@@ -42,7 +42,7 @@ private:
 };
 
 
-class KRulerTest : public KMainWindow
+class KRulerTest : public TDEMainWindow
 {
 Q_OBJECT
 public:
diff --git a/tdeui/tests/kstatusbartest.cpp b/tdeui/tests/kstatusbartest.cpp
index 742490aae..507604480 100644
--- a/tdeui/tests/kstatusbartest.cpp
+++ b/tdeui/tests/kstatusbartest.cpp
@@ -16,7 +16,7 @@
 #include "kstatusbartest.h"
 
 testWindow::testWindow (TQWidget *, const char *name)
-    : KMainWindow (0, name)
+    : TDEMainWindow (0, name)
  {
     // Setup Menus
     menuBar = new KMenuBar (this);
diff --git a/tdeui/tests/kstatusbartest.h b/tdeui/tests/kstatusbartest.h
index 37f500334..809f3f643 100644
--- a/tdeui/tests/kstatusbartest.h
+++ b/tdeui/tests/kstatusbartest.h
@@ -8,7 +8,7 @@
 
 class TQMultiLineEdit;
 
-class testWindow  : public KMainWindow
+class testWindow  : public TDEMainWindow
 {
     Q_OBJECT
 
diff --git a/tdeui/tests/ktoolbarlabelactiontest.cpp b/tdeui/tests/ktoolbarlabelactiontest.cpp
index 617808f40..9596e9d32 100644
--- a/tdeui/tests/ktoolbarlabelactiontest.cpp
+++ b/tdeui/tests/ktoolbarlabelactiontest.cpp
@@ -30,7 +30,7 @@
 
 #include <assert.h>
 
-class MainWindow : public KMainWindow
+class MainWindow : public TDEMainWindow
 {
 public:
   MainWindow()
@@ -47,7 +47,7 @@ public:
 
 
     // first constructor
-    KToolBarLabelAction* label1 = new KToolBarLabelAction("&Label 1", 0,
+    TDEToolBarLabelAction* label1 = new TDEToolBarLabelAction("&Label 1", 0,
 							  0, 0,
 							  actionCollection(),
 							  "label1");
@@ -55,8 +55,8 @@ public:
     KLineEdit* lineEdit = new KLineEdit(this);
     new KWidgetAction(lineEdit, "Line Edit", 0, this, 0,
 		      actionCollection(), "lineEdit");
-    KToolBarLabelAction* label2 = 
-      new KToolBarLabelAction(lineEdit, "L&abel 2", 0, 0, 0,
+    TDEToolBarLabelAction* label2 = 
+      new TDEToolBarLabelAction(lineEdit, "L&abel 2", 0, 0, 0,
 			      actionCollection(),
 			      "label2");
 
@@ -69,7 +69,7 @@ public:
       ("&Really long, long, long and boring text goes here", this, 
         "kde toolbar widget");
 
-    KToolBarLabelAction* label3 = new KToolBarLabelAction(customLabel, 0, 0, 0,
+    TDEToolBarLabelAction* label3 = new TDEToolBarLabelAction(customLabel, 0, 0, 0,
  							  actionCollection(),
 							  "label3");
   
diff --git a/tdeui/tests/kxmlguitest.cpp b/tdeui/tests/kxmlguitest.cpp
index 4c9e83bc1..17f7daac9 100644
--- a/tdeui/tests/kxmlguitest.cpp
+++ b/tdeui/tests/kxmlguitest.cpp
@@ -24,7 +24,7 @@ int main( int argc, char **argv )
     // Let's add $PWD (ideally $srcdir instead...) to it
     TDEGlobal::dirs()->addResourceDir( "data", TQDir::currentDirPath() );
 
-    KMainWindow *mainwindow = new KMainWindow;
+    TDEMainWindow *mainwindow = new TDEMainWindow;
 
     TQLineEdit* line = new TQLineEdit( mainwindow );
     mainwindow->setCentralWidget( line );
@@ -39,7 +39,7 @@ int main( int argc, char **argv )
     shell->setInstance( new TDEInstance( "konqueror" ) );
     shell->instance()->dirs()->addResourceDir( "data", TQDir::currentDirPath() );
 
-    (void)new KAction( "Split", "view_left_right", 0, 0, 0, shell->actionCollection(), "splitviewh" );
+    (void)new TDEAction( "Split", "view_left_right", 0, 0, 0, shell->actionCollection(), "splitviewh" );
 
     shell->setXMLFile( "./kxmlguitest_shell.rc" );
 
@@ -47,8 +47,8 @@ int main( int argc, char **argv )
 
     Client *part = new Client;
 
-    (void)new KAction( "decfont", "viewmag-", 0, 0, 0, part->actionCollection(), "decFontSizes" );
-    (void)new KAction( "sec", "unlock", Qt::ALT + Qt::Key_1, part, TQT_SLOT( slotSec() ), part->actionCollection(), "security" );
+    (void)new TDEAction( "decfont", "viewmag-", 0, 0, 0, part->actionCollection(), "decFontSizes" );
+    (void)new TDEAction( "sec", "unlock", Qt::ALT + Qt::Key_1, part, TQT_SLOT( slotSec() ), part->actionCollection(), "security" );
 
     part->setXMLFile( "./kxmlguitest_part.rc" );
 
diff --git a/tdeui/tests/twindowtest.cpp b/tdeui/tests/twindowtest.cpp
index 32027bce1..0ad1b726b 100644
--- a/tdeui/tests/twindowtest.cpp
+++ b/tdeui/tests/twindowtest.cpp
@@ -26,19 +26,19 @@
 //#include <dclock.h>
 
 /*
- Ok this is a constructor of our top widget. It inherits KMainWindow.
+ Ok this is a constructor of our top widget. It inherits TDEMainWindow.
  In constructor wi will create all of our interface elements:
  menubar, toolbar(s), statusbar, and main widget. Non of those
  interface is obligatory, i.e. you don't have to use menubar,
  toolbars or statusbar if you don't want to. Theoreticly, you
  don't need even main widget (but in that case, you'll get blank
- KMainWindow).
+ TDEMainWindow).
  */
 
 static int itemId = 0;
 
 testWindow::testWindow (TQWidget *parent, const char *name)
-    : KMainWindow (parent,name)
+    : TDEMainWindow (parent,name)
 {
     ena=false;
     setCaption("test window");
@@ -153,7 +153,7 @@ setAutoSaveSettings();
     tb->alignItemRight (6);
 
     // Another toolbar
-    tb1 = new KToolBar(this, TQMainWindow::DockTop); // this one is normal and has separators
+    tb1 = new TDEToolBar(this, TQMainWindow::DockTop); // this one is normal and has separators
 
 
     pix = BarIcon("filenew");
@@ -194,7 +194,7 @@ setAutoSaveSettings();
     tb1->setToggle(7);
 
     //Create
-    rg = new KToolBarRadioGroup (tb1);
+    rg = new TDEToolBarRadioGroup (tb1);
 
     rg->addButton(4);
     rg->addButton(5);
@@ -230,7 +230,7 @@ setAutoSaveSettings();
     //... and main widget
     setCentralWidget (widget);
 
-    // This is not strictly related to toolbars, menubars or KMainWindow.
+    // This is not strictly related to toolbars, menubars or TDEMainWindow.
     // Setup popup for completions
     completions = new TQPopupMenu;
   
@@ -328,7 +328,7 @@ void testWindow::slotCompletion()
   completions->popup(TQCursor::pos()); // This popup should understunf keys up and down
 
   /* This is just an example. KLined automatically sets cursor at end of string
-   when ctrl-d or ctrl-s is pressed. KToolBar will also put cursor at end of text in Lined
+   when ctrl-d or ctrl-s is pressed. TDEToolBar will also put cursor at end of text in Lined
    after inserting text with setLinedText (...).
   */
 
diff --git a/tdeui/tests/twindowtest.h b/tdeui/tests/twindowtest.h
index 14e2a6da8..f0dad1537 100644
--- a/tdeui/tests/twindowtest.h
+++ b/tdeui/tests/twindowtest.h
@@ -10,10 +10,10 @@
 #include <kmainwindow.h>
 
 class TQMultiLineEdit;
-class KToolBarRadioGroup;
+class TDEToolBarRadioGroup;
 class KHelpMenu;
 
-class testWindow  : public KMainWindow
+class testWindow  : public TDEMainWindow
 {
     Q_OBJECT
 
@@ -56,8 +56,8 @@ protected:
     TQPopupMenu *toolBarMenu;
     KStatusBar *statusBar;
     KHelpMenu *helpMenu;
-    KToolBar *tb;
-    KToolBar *tb1;
+    TDEToolBar *tb;
+    TDEToolBar *tb1;
     bool lineL;
     bool exitB;
     bool greenF;
@@ -65,7 +65,7 @@ protected:
     TQMultiLineEdit *widget;
     TQTimer *timer;
     TQProgressBar *pr;
-    KToolBarRadioGroup *rg;
+    TDEToolBarRadioGroup *rg;
 };
 #endif