Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit ba3b5b77e1a430dc7197df20872ba46ce2fb6fa7)

24 files changed, 232 insertions, 232 deletions

diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp
index 4837fe119..7226eb6f5 100644
--- a/tdeui/tests/itemcontainertest.cpp
+++ b/tdeui/tests/itemcontainertest.cpp
@@ -74,8 +74,8 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
     m_pbgMode->setExclusive( true );
     vBox->addWidget( m_pbgMode );
 
-    connect( m_pbgMode, TQT_SIGNAL( clicked( int ) ),
-	     this, TQT_SLOT( slotSwitchMode( int ) ) );
+    connect( m_pbgMode, TQ_SIGNAL( clicked( int ) ),
+	     this, TQ_SLOT( slotSwitchMode( int ) ) );
 
     //Signal labels
     TQGroupBox* gbWiget = new TQGroupBox( 1, TQt::Horizontal, "Widget", this);
@@ -91,8 +91,8 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
     TQButtonGroup* bgListView = new TQButtonGroup( 1, TQt::Horizontal, "TDEListView", this);
     TQCheckBox* cbListView = new TQCheckBox("Single Column", bgListView);
     vBox->addWidget( bgListView );
-    connect( cbListView, TQT_SIGNAL( toggled( bool ) ),
-	     this, TQT_SLOT( slotToggleSingleColumn( bool ) ) );
+    connect( cbListView, TQ_SIGNAL( toggled( bool ) ),
+	     this, TQ_SLOT( slotToggleSingleColumn( bool ) ) );
 
     TDEGlobal::config()->reparseConfiguration();
 
@@ -101,8 +101,8 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
     m_pIconView = new TDEIconView( gbIconView );
     hBox->addWidget( gbIconView );
     hBox->addSpacing( 5 );
-    connect( m_pIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ),
-	     this, TQT_SLOT( slotIconViewExec( TQIconViewItem* ) ) );
+    connect( m_pIconView, TQ_SIGNAL( executed( TQIconViewItem* ) ),
+	     this, TQ_SLOT( slotIconViewExec( TQIconViewItem* ) ) );
 
     //Create ListView
     TQGroupBox* gbListView = new TQGroupBox( 1, TQt::Horizontal, "TDEListView", this);
@@ -111,15 +111,15 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
     m_pListView->addColumn("Text");
     hBox->addWidget( gbListView );
     hBox->addSpacing( 5 );
-    connect( m_pListView, TQT_SIGNAL( executed( TQListViewItem* ) ),
-	     this, TQT_SLOT( slotListViewExec( TQListViewItem* ) ) );
+    connect( m_pListView, TQ_SIGNAL( executed( TQListViewItem* ) ),
+	     this, TQ_SLOT( slotListViewExec( TQListViewItem* ) ) );
 
     //Create ListBox
     TQGroupBox* gbListBox = new TQGroupBox( 1, TQt::Horizontal, "TDEListBox", this);
     m_pListBox = new TDEListBox( gbListBox );
     hBox->addWidget( gbListBox );
-    connect( m_pListBox, TQT_SIGNAL( executed( TQListBoxItem* ) ),
-	     this, TQT_SLOT( slotListBoxExec( TQListBoxItem* ) ) );
+    connect( m_pListBox, TQ_SIGNAL( executed( TQListBoxItem* ) ),
+	     this, TQ_SLOT( slotListBoxExec( TQListBoxItem* ) ) );
 
     //Initialize buttons
     cbListView->setChecked( !m_pListView->allColumnsShowFocus() );
@@ -137,10 +137,10 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
       new TQListBoxPixmap( m_pListBox, TQPixmap(item_xpm), TQString("Item%1").arg(i));
     }
 
-    connect( m_pIconView, TQT_SIGNAL( clicked( TQIconViewItem* ) ),
-	     this, TQT_SLOT( slotClicked( TQIconViewItem* ) ) );
-    connect( m_pIconView, TQT_SIGNAL( doubleClicked( TQIconViewItem* ) ),
-	     this, TQT_SLOT( slotDoubleClicked( TQIconViewItem* ) ) );
+    connect( m_pIconView, TQ_SIGNAL( clicked( TQIconViewItem* ) ),
+	     this, TQ_SLOT( slotClicked( TQIconViewItem* ) ) );
+    connect( m_pIconView, TQ_SIGNAL( doubleClicked( TQIconViewItem* ) ),
+	     this, TQ_SLOT( slotDoubleClicked( TQIconViewItem* ) ) );
 }
 
 void TopLevel::slotSwitchMode( int id ) 
diff --git a/tdeui/tests/kbuttonboxtest.cpp b/tdeui/tests/kbuttonboxtest.cpp
index a44175b68..3390ce5f3 100644
--- a/tdeui/tests/kbuttonboxtest.cpp
+++ b/tdeui/tests/kbuttonboxtest.cpp
@@ -43,10 +43,10 @@ int main(int argc, char **argv) {
     KButtonBox *bbox = new KButtonBox(w);
     TQPushButton *b = bbox->addButton("OK");
     b->setDefault(true);
-    w->connect(b, TQT_SIGNAL(clicked()),
-	       w, TQT_SLOT(accept()));
-    w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()),
-	       w, TQT_SLOT(accept()));
+    w->connect(b, TQ_SIGNAL(clicked()),
+	       w, TQ_SLOT(accept()));
+    w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()),
+	       w, TQ_SLOT(accept()));
     
     bbox->addStretch(1);
     bbox->addButton("Help");
@@ -72,10 +72,10 @@ int main(int argc, char **argv) {
     bbox->addStretch(1);
     TQPushButton *b = bbox->addButton("OK");
     b->setDefault(true);
-    w->connect(b, TQT_SIGNAL(clicked()),
-	       w, TQT_SLOT(accept()));
-    w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()),
-	       w, TQT_SLOT(accept()));
+    w->connect(b, TQ_SIGNAL(clicked()),
+	       w, TQ_SLOT(accept()));
+    w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()),
+	       w, TQ_SLOT(accept()));
     bbox->layout();
     tl->addWidget(bbox,0);
     tl->activate();  
@@ -98,10 +98,10 @@ int main(int argc, char **argv) {
     bbox->addStretch(1);
     TQPushButton *b = bbox->addButton("OK");
     b->setDefault(true);
-    w->connect(b, TQT_SIGNAL(clicked()),
-	       w, TQT_SLOT(accept()));
-    w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()),
-	       w, TQT_SLOT(accept()));
+    w->connect(b, TQ_SIGNAL(clicked()),
+	       w, TQ_SLOT(accept()));
+    w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()),
+	       w, TQ_SLOT(accept()));
     bbox->addStretch(1);
     bbox->layout();
     tl->addWidget(bbox,0);
@@ -127,10 +127,10 @@ int main(int argc, char **argv) {
     bbox->addStretch(1);
     TQPushButton *b = bbox->addButton("OK");
     b->setDefault(true);
-    w->connect(b, TQT_SIGNAL(clicked()),
-	       w, TQT_SLOT(accept()));
-    w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()),
-	       w, TQT_SLOT(accept()));
+    w->connect(b, TQ_SIGNAL(clicked()),
+	       w, TQ_SLOT(accept()));
+    w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()),
+	       w, TQ_SLOT(accept()));
 
     bbox->addButton("Push me and I give you a banana");
     bbox->addStretch(1);
@@ -159,10 +159,10 @@ int main(int argc, char **argv) {
     bbox->addStretch(1);
     TQPushButton *b = bbox->addButton("OK");
     b->setDefault(true);
-    w->connect(b, TQT_SIGNAL(clicked()),
-	       w, TQT_SLOT(accept()));
-    w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()),
-	       w, TQT_SLOT(accept()));
+    w->connect(b, TQ_SIGNAL(clicked()),
+	       w, TQ_SLOT(accept()));
+    w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()),
+	       w, TQ_SLOT(accept()));
 
     bbox->addButton("Push me and I give you a banana", true);
     bbox->addStretch(1);
@@ -188,10 +188,10 @@ int main(int argc, char **argv) {
     KButtonBox *bbox = new KButtonBox(w, KButtonBox::Vertical);
     TQPushButton *b = bbox->addButton("OK");
     b->setDefault(true);
-    w->connect(b, TQT_SIGNAL(clicked()),
-	       w, TQT_SLOT(accept()));
-    w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()),
-	       w, TQT_SLOT(accept()));
+    w->connect(b, TQ_SIGNAL(clicked()),
+	       w, TQ_SLOT(accept()));
+    w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()),
+	       w, TQ_SLOT(accept()));
 
     bbox->addStretch(1);
     bbox->layout();
diff --git a/tdeui/tests/kcomboboxtest.cpp b/tdeui/tests/kcomboboxtest.cpp
index d2b59a4c2..7e51396c1 100644
--- a/tdeui/tests/kcomboboxtest.cpp
+++ b/tdeui/tests/kcomboboxtest.cpp
@@ -40,8 +40,8 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   
   m_qc = new TQComboBox(hbox, "QtReadOnlyCombo" );
   lbl->setBuddy (m_qc);  
-  TQObject::connect (m_qc, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
-  TQObject::connect (m_qc, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT (slotActivated(const TQString&)));
+  TQObject::connect (m_qc, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
+  TQObject::connect (m_qc, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT (slotActivated(const TQString&)));
   vbox->addWidget (hbox);
   
   // Read-only combobox
@@ -53,8 +53,8 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   m_ro = new KComboBox(hbox, "ReadOnlyCombo" );
   lbl->setBuddy (m_ro);
   m_ro->setCompletionMode( TDEGlobalSettings::CompletionAuto );
-  TQObject::connect (m_ro, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
-  TQObject::connect (m_ro, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT (slotActivated(const TQString&)));
+  TQObject::connect (m_ro, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
+  TQObject::connect (m_ro, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT (slotActivated(const TQString&)));
   vbox->addWidget (hbox);
 
   // Read-write combobox
@@ -68,10 +68,10 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   m_rw->setDuplicatesEnabled( true );
   m_rw->setInsertionPolicy( TQComboBox::NoInsertion );
   m_rw->setTrapReturnKey( true );
-  TQObject::connect (m_rw, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
-  TQObject::connect (m_rw, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotActivated(const TQString&)));
-  TQObject::connect (m_rw, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()));
-  TQObject::connect (m_rw, TQT_SIGNAL(returnPressed(const TQString&)), TQT_SLOT(slotReturnPressed(const TQString&)));
+  TQObject::connect (m_rw, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
+  TQObject::connect (m_rw, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotActivated(const TQString&)));
+  TQObject::connect (m_rw, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()));
+  TQObject::connect (m_rw, TQ_SIGNAL(returnPressed(const TQString&)), TQ_SLOT(slotReturnPressed(const TQString&)));
   vbox->addWidget (hbox);
 
   // History combobox...
@@ -84,9 +84,9 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   lbl->setBuddy (m_hc);
   m_hc->setDuplicatesEnabled( true );
   m_hc->setInsertionPolicy( TQComboBox::NoInsertion );
-  TQObject::connect (m_hc, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
-  TQObject::connect (m_hc, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotActivated(const TQString&)));
-  TQObject::connect (m_hc, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()));  
+  TQObject::connect (m_hc, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
+  TQObject::connect (m_hc, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotActivated(const TQString&)));
+  TQObject::connect (m_hc, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()));  
   vbox->addWidget (hbox);
   m_hc->setTrapReturnKey(true);
 
@@ -99,19 +99,19 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   m_konqc = new KComboBox( true, hbox, "KonqyCombo" );
   lbl->setBuddy (m_konqc);
   m_konqc->setMaxCount( 10 );
-  TQObject::connect (m_konqc, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
-  TQObject::connect (m_konqc, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT (slotActivated(const TQString&)));
-  TQObject::connect (m_konqc, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()));
+  TQObject::connect (m_konqc, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
+  TQObject::connect (m_konqc, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT (slotActivated(const TQString&)));
+  TQObject::connect (m_konqc, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()));
   vbox->addWidget (hbox);
 
   // Create an exit button
   hbox = new TQHBox (this);
   m_btnExit = new TQPushButton( "E&xit", hbox );
-  TQObject::connect( m_btnExit, TQT_SIGNAL(clicked()), TQT_SLOT(quitApp()) );
+  TQObject::connect( m_btnExit, TQ_SIGNAL(clicked()), TQ_SLOT(quitApp()) );
 
   // Create a disable button...
   m_btnEnable = new TQPushButton( "Disa&ble", hbox );
-  TQObject::connect (m_btnEnable, TQT_SIGNAL(clicked()), TQT_SLOT(slotDisable()));
+  TQObject::connect (m_btnEnable, TQ_SIGNAL(clicked()), TQ_SLOT(slotDisable()));
 
   vbox->addWidget (hbox);
 
@@ -150,7 +150,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   m_konqc->setCurrentItem( m_konqc->count()-1 );
 
   m_timer = new TQTimer (this);
-  connect (m_timer, TQT_SIGNAL (timeout()), TQT_SLOT (slotTimeout()));
+  connect (m_timer, TQ_SIGNAL (timeout()), TQ_SLOT (slotTimeout()));
 }
 
 KComboBoxTest::~KComboBoxTest()
diff --git a/tdeui/tests/kcompletiontest.cpp b/tdeui/tests/kcompletiontest.cpp
index ff477e027..a6c010fc7 100644
--- a/tdeui/tests/kcompletiontest.cpp
+++ b/tdeui/tests/kcompletiontest.cpp
@@ -74,8 +74,8 @@ Form1::Form1( TQWidget* parent,  const char* name )
     combo->setCompletionObject( edit->completionObject() );
     // combo->setMaxCount( 5 );
     combo->setHistoryItems( defaultItems(), true );
-    connect( combo, TQT_SIGNAL( activated( const TQString& )),
-	     combo, TQT_SLOT( addToHistory( const TQString& )));
+    connect( combo, TQ_SIGNAL( activated( const TQString& )),
+	     combo, TQ_SLOT( addToHistory( const TQString& )));
     TQToolTip::add( combo, "KHistoryCombo" );
     Layout2->addWidget( combo );
 
@@ -84,7 +84,7 @@ Form1::Form1( TQWidget* parent,  const char* name )
 
     PushButton1 = new TQPushButton( GroupBox1, "PushButton1" );
     PushButton1->setText( "Add" );
-    connect( PushButton1, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdd() ));
+    connect( PushButton1, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAdd() ));
     Layout2->addWidget( PushButton1 );
     Layout9->addLayout( Layout2 );
 
@@ -96,7 +96,7 @@ Form1::Form1( TQWidget* parent,  const char* name )
 
     PushButton1_4 = new TQPushButton( GroupBox1, "PushButton1_4" );
     PushButton1_4->setText( "Remove" );
-    connect( PushButton1_4, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemove() ));
+    connect( PushButton1_4, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemove() ));
     Layout3->addWidget( PushButton1_4 );
     Layout9->addLayout( Layout3 );
 
@@ -106,8 +106,8 @@ Form1::Form1( TQWidget* parent,  const char* name )
 
     ListBox1 = new TQListBox( GroupBox1, "ListBox1" );
     Layout8->addWidget( ListBox1 );
-    connect( ListBox1, TQT_SIGNAL( highlighted( const TQString& )),
-	     TQT_SLOT( slotHighlighted( const TQString& )));
+    connect( ListBox1, TQ_SIGNAL( highlighted( const TQString& )),
+	     TQ_SLOT( slotHighlighted( const TQString& )));
     TQToolTip::add( ListBox1, "Contains the contents of the completion object.\n:x is the weighting, i.e. how often an item has been inserted");
 
     Layout7 = new TQVBoxLayout;
@@ -116,13 +116,13 @@ Form1::Form1( TQWidget* parent,  const char* name )
 
     PushButton1_3 = new TQPushButton( GroupBox1, "PushButton1_3" );
     PushButton1_3->setText( "Completion items" );
-    connect( PushButton1_3, TQT_SIGNAL( clicked() ), TQT_SLOT( slotList() ));
+    connect( PushButton1_3, TQ_SIGNAL( clicked() ), TQ_SLOT( slotList() ));
     Layout7->addWidget( PushButton1_3 );
 
     PushButton1_2 = new TQPushButton( GroupBox1, "PushButton1_2" );
     PushButton1_2->setText( "Clear" );
-    connect( PushButton1_2, TQT_SIGNAL( clicked() ),
-	     edit->completionObject(), TQT_SLOT( clear() ));
+    connect( PushButton1_2, TQ_SIGNAL( clicked() ),
+	     edit->completionObject(), TQ_SLOT( clear() ));
     Layout7->addWidget( PushButton1_2 );
     Layout8->addLayout( Layout7 );
     Layout9->addLayout( Layout8 );
diff --git a/tdeui/tests/kdesattest.cpp b/tdeui/tests/kdesattest.cpp
index a986ce026..3daf22b08 100644
--- a/tdeui/tests/kdesattest.cpp
+++ b/tdeui/tests/kdesattest.cpp
@@ -15,7 +15,7 @@ KDesatWidget::KDesatWidget(TQWidget *parent, const char *name)
     slide = new KDoubleNumInput(700, this, "desat");
     slide->setRange(0, 1, 0.001);
     slide->setLabel("Desaturate: ", AlignVCenter | AlignLeft);
-    connect(slide,TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(change(double)));
+    connect(slide,TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(change(double)));
 
     resize(image.width()*2, image.height() + slide->height());
     slide->setGeometry(0, image.height(), image.width()*2, slide->height());
diff --git a/tdeui/tests/kdockwidgetdemo.cpp b/tdeui/tests/kdockwidgetdemo.cpp
index a922acf2d..ba3f97d74 100644
--- a/tdeui/tests/kdockwidgetdemo.cpp
+++ b/tdeui/tests/kdockwidgetdemo.cpp
@@ -116,8 +116,8 @@ SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const
   fd->reparent(d_fd, TQPoint(0,0));
   d_fd->setWidget( fd );
 
-  connect( dirView, TQT_SIGNAL( folderSelected( const TQString & ) ), fd, TQT_SLOT( setDir2( const TQString & ) ) );
-  connect( fd, TQT_SIGNAL( dirEntered( const TQString & ) ), dirView, TQT_SLOT( setDir( const TQString & ) ) );
+  connect( dirView, TQ_SIGNAL( folderSelected( const TQString & ) ), fd, TQ_SLOT( setDir2( const TQString & ) ) );
+  connect( fd, TQ_SIGNAL( dirEntered( const TQString & ) ), dirView, TQ_SLOT( setDir( const TQString & ) ) );
 
   d_fd->setDockSite( KDockWidget::DockTop|KDockWidget::DockLeft|KDockWidget::DockRight|KDockWidget::DockBottom );
   d_fd->setEnableDocking(KDockWidget::DockNone);
@@ -128,16 +128,16 @@ SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const
   d_dirView->manualDock( d_fd, KDockWidget::DockLeft, 20 );
   d_preview->manualDock( d_fd, KDockWidget::DockBottom, 70 );
 
-  connect(fd, TQT_SIGNAL(fileHighlighted(const TQString&)), preview, TQT_SLOT(showPreview(const TQString&)));
-  connect(fd, TQT_SIGNAL(signalDone(int)), this, TQT_SLOT(done(int)));
+  connect(fd, TQ_SIGNAL(fileHighlighted(const TQString&)), preview, TQ_SLOT(showPreview(const TQString&)));
+  connect(fd, TQ_SIGNAL(signalDone(int)), this, TQ_SLOT(done(int)));
 
-  connect(fd, TQT_SIGNAL(dirEntered(const TQString&)), this, TQT_SLOT(changeDir(const TQString&)));
-  connect(dirView, TQT_SIGNAL(folderSelected(const TQString&)), this, TQT_SLOT(changeDir(const TQString&)));
+  connect(fd, TQ_SIGNAL(dirEntered(const TQString&)), this, TQ_SLOT(changeDir(const TQString&)));
+  connect(dirView, TQ_SIGNAL(folderSelected(const TQString&)), this, TQ_SLOT(changeDir(const TQString&)));
 
   b_tree = new TQToolButton( fd );
   TQToolTip::add( b_tree, "Show/Hide Tree" );
   b_tree->setPixmap( TQPixmap( dir_tree_xpm ) );
-  connect( b_tree, TQT_SIGNAL(clicked()), d_dirView, TQT_SLOT(changeHideShowState()) );
+  connect( b_tree, TQ_SIGNAL(clicked()), d_dirView, TQ_SLOT(changeHideShowState()) );
   b_tree->setToggleButton(true);
   b_tree->setOn(true);
   fd->addToolButton( b_tree, true );
@@ -145,13 +145,13 @@ SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const
   b_preview = new TQToolButton( fd );
   TQToolTip::add( b_preview, "Show/Hide Preview" );
   b_preview->setPixmap( TQPixmap( preview_xpm ) );
-  connect( b_preview, TQT_SIGNAL(clicked()), d_preview, TQT_SLOT(changeHideShowState()) );
+  connect( b_preview, TQ_SIGNAL(clicked()), d_preview, TQ_SLOT(changeHideShowState()) );
   b_preview->setToggleButton(true);
   b_preview->setOn(true);
   fd->addToolButton( b_preview );
 
-  connect( dockManager, TQT_SIGNAL(change()), this, TQT_SLOT(dockChange()));
-  connect( dockManager, TQT_SIGNAL(setDockDefaultPos(KDockWidget*)), this, TQT_SLOT(setDockDefaultPos(KDockWidget*)));
+  connect( dockManager, TQ_SIGNAL(change()), this, TQ_SLOT(dockChange()));
+  connect( dockManager, TQ_SIGNAL(setDockDefaultPos(KDockWidget*)), this, TQ_SLOT(setDockDefaultPos(KDockWidget*)));
   setCaption("Open File");
   resize(550,450);
   tqDebug("read config");
@@ -403,7 +403,7 @@ CustomFileDialog::CustomFileDialog( TQWidget* parent )
   TQToolTip::add( p, tr( "Bookmarks" ) );
 
   bookmarkMenu = new TQPopupMenu( this );
-  connect( bookmarkMenu, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( bookmarkChosen( int ) ) );
+  connect( bookmarkMenu, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( bookmarkChosen( int ) ) );
   addId = bookmarkMenu->insertItem( "Add bookmark" );
   clearId = bookmarkMenu->insertItem( TQPixmap(folder_trash), "Clear bookmarks" );
   bookmarkMenu->insertSeparator();
@@ -416,7 +416,7 @@ CustomFileDialog::CustomFileDialog( TQWidget* parent )
   TQToolTip::add( b, tr( "Go Home!" ) );
 
   b->setPixmap( TQPixmap( homepage_xpm ) );
-  connect( b, TQT_SIGNAL( clicked() ), this, TQT_SLOT( goHome() ) );
+  connect( b, TQ_SIGNAL( clicked() ), this, TQ_SLOT( goHome() ) );
 
   addToolButton( b );
 }
@@ -695,12 +695,12 @@ TQString Directory::text( int column ) const
 DirectoryView::DirectoryView( TQWidget *parent, const char *name )
 :TQListView( parent, name )
 {
-  connect( this, TQT_SIGNAL( clicked( TQListViewItem * ) ),
-           this, TQT_SLOT( slotFolderSelected( TQListViewItem * ) ) );
-  connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
-           this, TQT_SLOT( slotFolderSelected( TQListViewItem * ) ) );
-  connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ),
-           this, TQT_SLOT( slotFolderSelected( TQListViewItem * ) ) );
+  connect( this, TQ_SIGNAL( clicked( TQListViewItem * ) ),
+           this, TQ_SLOT( slotFolderSelected( TQListViewItem * ) ) );
+  connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ),
+           this, TQ_SLOT( slotFolderSelected( TQListViewItem * ) ) );
+  connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ),
+           this, TQ_SLOT( slotFolderSelected( TQListViewItem * ) ) );
 
   setAcceptDrops( true );
   viewport()->setAcceptDrops( true );
diff --git a/tdeui/tests/kdockwidgettest.cpp b/tdeui/tests/kdockwidgettest.cpp
index f27fd0b4e..154d02463 100644
--- a/tdeui/tests/kdockwidgettest.cpp
+++ b/tdeui/tests/kdockwidgettest.cpp
@@ -120,12 +120,12 @@ DockApplication::DockApplication( const char* name )
   TQPushButton* b1 = new TQPushButton(mainW);
   b1->setGeometry(10, 10, 250, 25);
   b1->setText("write dock config");
-  connect(b1, TQT_SIGNAL(clicked()), TQT_SLOT(wConfig()));
+  connect(b1, TQ_SIGNAL(clicked()), TQ_SLOT(wConfig()));
 
   TQPushButton* b2 = new TQPushButton(mainW);
   b2->setGeometry(10, 35, 250, 25);
   b2->setText("read dock config");
-  connect(b2, TQT_SIGNAL(clicked()), TQT_SLOT(rConfig()));
+  connect(b2, TQ_SIGNAL(clicked()), TQ_SLOT(rConfig()));
 
   m_bname = new TQPushButton(mainW);
   m_bname->setGeometry(10, 60, 250, 25);
@@ -134,12 +134,12 @@ DockApplication::DockApplication( const char* name )
   TQPushButton *b3 = new TQPushButton(mainW);
   b3->setGeometry(10,95,250,25);
   b3->setText("change the icon of the green widget");
-  connect(b3,TQT_SIGNAL(clicked()), TQT_SLOT(gSetPix1()));
+  connect(b3,TQ_SIGNAL(clicked()), TQ_SLOT(gSetPix1()));
 
   TQPushButton *b4 = new TQPushButton(mainW);
   b4->setGeometry(10,130,250,25);
   b4->setText("remove icon ");
-  connect(b4,TQT_SIGNAL(clicked()), TQT_SLOT(gSetPix2()));
+  connect(b4,TQ_SIGNAL(clicked()), TQ_SLOT(gSetPix2()));
 
   setGeometry(200, 100, 500, 300);
 
@@ -170,11 +170,11 @@ void DockApplication::initMenuBar()
   TQPixmap p(folder);
   TQPopupMenu *file_menu = new TQPopupMenu();
 
-  file_menu->insertItem(p, "Change Green Widget Caption", this, TQT_SLOT(cap()) );
+  file_menu->insertItem(p, "Change Green Widget Caption", this, TQ_SLOT(cap()) );
   file_menu->insertSeparator();
-  file_menu->insertItem(p, "Set Green Widget as MainDockWidget", this, TQT_SLOT(greenMain()) );
-  file_menu->insertItem(p, "Set Blue Widget as MainDockWidget", this, TQT_SLOT(blueMain()) );
-  file_menu->insertItem(p, "Set NULL as MainDockWidget", this, TQT_SLOT(nullMain()) );
+  file_menu->insertItem(p, "Set Green Widget as MainDockWidget", this, TQ_SLOT(greenMain()) );
+  file_menu->insertItem(p, "Set Blue Widget as MainDockWidget", this, TQ_SLOT(blueMain()) );
+  file_menu->insertItem(p, "Set NULL as MainDockWidget", this, TQ_SLOT(nullMain()) );
 
   KMenuBar* menu_bar = menuBar();
   menu_bar->insertItem( "&Test", file_menu );
diff --git a/tdeui/tests/kdualcolortest.cpp b/tdeui/tests/kdualcolortest.cpp
index 512bfc610..a9be04cac 100644
--- a/tdeui/tests/kdualcolortest.cpp
+++ b/tdeui/tests/kdualcolortest.cpp
@@ -12,12 +12,12 @@ KDualColorWidget::KDualColorWidget(TQWidget *parent, const char *name)
     KDualColorButton *colorBtn =
         new KDualColorButton(lbl->colorGroup().text(),
                              lbl->colorGroup().background(), this);
-    connect(colorBtn, TQT_SIGNAL(fgChanged(const TQColor &)),
-            TQT_SLOT(slotFgChanged(const TQColor &)));
-    connect(colorBtn, TQT_SIGNAL(bgChanged(const TQColor &)),
-            TQT_SLOT(slotBgChanged(const TQColor &)));
-    connect(colorBtn, TQT_SIGNAL(currentChanged(KDualColorButton::DualColor)),
-            TQT_SLOT(slotCurrentChanged(KDualColorButton::DualColor)));
+    connect(colorBtn, TQ_SIGNAL(fgChanged(const TQColor &)),
+            TQ_SLOT(slotFgChanged(const TQColor &)));
+    connect(colorBtn, TQ_SIGNAL(bgChanged(const TQColor &)),
+            TQ_SLOT(slotBgChanged(const TQColor &)));
+    connect(colorBtn, TQ_SIGNAL(currentChanged(KDualColorButton::DualColor)),
+            TQ_SLOT(slotCurrentChanged(KDualColorButton::DualColor)));
     
     TQHBoxLayout *layout = new TQHBoxLayout(this, 5);
     layout->addWidget(colorBtn, 0);
diff --git a/tdeui/tests/kjanuswidgettest.cpp b/tdeui/tests/kjanuswidgettest.cpp
index 71e72fb13..798145f47 100644
--- a/tdeui/tests/kjanuswidgettest.cpp
+++ b/tdeui/tests/kjanuswidgettest.cpp
@@ -18,7 +18,7 @@ int main(int argc, char** argv)
   TQCheckBox* cb2 = new TQCheckBox( "a", page2 );
 
   janus->show();
-  TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) );
+  TQObject::connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) );
 
   return app.exec();
 }
diff --git a/tdeui/tests/kledtest.cpp b/tdeui/tests/kledtest.cpp
index 564d4d2f2..4694bd2c9 100644
--- a/tdeui/tests/kledtest.cpp
+++ b/tdeui/tests/kledtest.cpp
@@ -42,9 +42,9 @@ KLedTest::KLedTest(TQWidget* parent)
     t_toggle.start(1000, false);
     t_color.start(3500, false);
     t_look.start(3500, false);
-    TQObject::connect(&t_toggle, TQT_SIGNAL(timeout()), l, TQT_SLOT(toggle()));
-    TQObject::connect(&t_color, TQT_SIGNAL(timeout()), this, TQT_SLOT(nextColor()));
-    TQObject::connect(&t_look, TQT_SIGNAL(timeout()), this, TQT_SLOT(nextLook()));
+    TQObject::connect(&t_toggle, TQ_SIGNAL(timeout()), l, TQ_SLOT(toggle()));
+    TQObject::connect(&t_color, TQ_SIGNAL(timeout()), this, TQ_SLOT(nextColor()));
+    TQObject::connect(&t_look, TQ_SIGNAL(timeout()), this, TQ_SLOT(nextLook()));
     l->show();
     resize(240,140);
   }
@@ -66,7 +66,7 @@ KLedTest::KLedTest(TQWidget* parent)
       y+=Grid+LedHeight;
       }
     setFixedSize(x+Grid, y+Grid);
-    connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()));
+    connect(&timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()));
     timer.start(500);
   }
 }
diff --git a/tdeui/tests/klineedittest.cpp b/tdeui/tests/klineedittest.cpp
index 20e9b6ca8..e9601ccec 100644
--- a/tdeui/tests/klineedittest.cpp
+++ b/tdeui/tests/klineedittest.cpp
@@ -31,28 +31,28 @@ KLineEditTest::KLineEditTest (TQWidget* widget, const char* name )
     m_lineedit->completionObject()->setItems( list );
     m_lineedit->setFixedSize(500,30);
     m_lineedit->setEnableSqueezedText( true );
-    connect( m_lineedit, TQT_SIGNAL( returnPressed() ), TQT_SLOT( slotReturnPressed() ) );
-    connect( m_lineedit, TQT_SIGNAL( returnPressed(const TQString&) ), 
-             TQT_SLOT( slotReturnPressed(const TQString&) ) );
+    connect( m_lineedit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( slotReturnPressed() ) );
+    connect( m_lineedit, TQ_SIGNAL( returnPressed(const TQString&) ), 
+             TQ_SLOT( slotReturnPressed(const TQString&) ) );
 
     TQHBox *hbox = new TQHBox (this);
     m_btnExit = new TQPushButton( "E&xit", hbox );
     m_btnExit->setFixedSize(100,30);
-    connect( m_btnExit, TQT_SIGNAL( clicked() ), TQT_SLOT( quitApp() ) );
+    connect( m_btnExit, TQ_SIGNAL( clicked() ), TQ_SLOT( quitApp() ) );
     
     m_btnReadOnly = new TQPushButton( "&Read Only", hbox );
     m_btnReadOnly->setToggleButton (true);
     m_btnReadOnly->setFixedSize(100,30);
-    connect( m_btnReadOnly, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotReadOnly(bool) ) );
+    connect( m_btnReadOnly, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotReadOnly(bool) ) );
     
     m_btnEnable = new TQPushButton( "Dis&able", hbox );
     m_btnEnable->setToggleButton (true);
     m_btnEnable->setFixedSize(100,30);
-    connect( m_btnEnable, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotEnable(bool) ) );
+    connect( m_btnEnable, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotEnable(bool) ) );
     
     m_btnHide = new TQPushButton( "Hi&de", hbox );
      m_btnHide->setFixedSize(100,30);
-    connect( m_btnHide, TQT_SIGNAL( clicked() ), TQT_SLOT( slotHide() ) );
+    connect( m_btnHide, TQ_SIGNAL( clicked() ), TQ_SLOT( slotHide() ) );
 
     layout->addWidget( m_lineedit );
     layout->addWidget( hbox );
@@ -113,7 +113,7 @@ void KLineEditTest::slotHide()
     m_btnHide->setEnabled( false );      
     m_lineedit->setText( "My dog ate the homework, whaaaaaaaaaaaaaaaaaaaaaaa"
                           "aaaaaaaaaaaaaaaaaaaaaaaaa! I want my mommy!" );
-    TQTimer::singleShot( 1000, this, TQT_SLOT(show()) );
+    TQTimer::singleShot( 1000, this, TQ_SLOT(show()) );
 }
 
 int main ( int argc, char **argv)
diff --git a/tdeui/tests/knuminputtest.cpp b/tdeui/tests/knuminputtest.cpp
index 9a333dfda..8e99df1b9 100644
--- a/tdeui/tests/knuminputtest.cpp
+++ b/tdeui/tests/knuminputtest.cpp
@@ -26,7 +26,7 @@ void TopLevel::slotPrint( double n ) {
   kdDebug() << "slotPrint( " << n << " )" << endl;
 }
 
-#define conn(x,y) connect( x, TQT_SIGNAL(valueChanged(y)), TQT_SLOT(slotPrint(y)))
+#define conn(x,y) connect( x, TQ_SIGNAL(valueChanged(y)), TQ_SLOT(slotPrint(y)))
 TopLevel::TopLevel(TQWidget *parent, const char *name)
     : TQWidget(parent, name)
 {
@@ -67,10 +67,10 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
     i6->setLabel("Height (should be 2xWidth):");
     i6->setRange(0, 200, 1, false);
     i6->setReferencePoint( 10 );
-    connect( i5, TQT_SIGNAL(relativeValueChanged(double)),
-	     i6, TQT_SLOT(setRelativeValue(double)) );
-    connect( i6, TQT_SIGNAL(relativeValueChanged(double)),
-	     i5, TQT_SLOT(setRelativeValue(double)) );
+    connect( i5, TQ_SIGNAL(relativeValueChanged(double)),
+	     i6, TQ_SLOT(setRelativeValue(double)) );
+    connect( i6, TQ_SIGNAL(relativeValueChanged(double)),
+	     i5, TQ_SLOT(setRelativeValue(double)) );
 
     i7 = new KIntNumInput(i6, 0, b1, 10);
     i7->setLabel("math test:", AlignVCenter|AlignLeft );
@@ -119,10 +119,10 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
     d7 = new KDoubleNumInput(d6, -30, 30, 0, 0.001, 3, b2, "d7");
     d7->setReferencePoint( -3 );
 
-    connect( d6, TQT_SIGNAL(relativeValueChanged(double)),
-	     d7, TQT_SLOT(setRelativeValue(double)) );
-    connect( d7, TQT_SIGNAL(relativeValueChanged(double)),
-	     d6, TQT_SLOT(setRelativeValue(double)) );
+    connect( d6, TQ_SIGNAL(relativeValueChanged(double)),
+	     d7, TQ_SLOT(setRelativeValue(double)) );
+    connect( d7, TQ_SIGNAL(relativeValueChanged(double)),
+	     d6, TQ_SLOT(setRelativeValue(double)) );
 
     l->addWidget(b2);
 }
diff --git a/tdeui/tests/kpanelmenutest.cpp b/tdeui/tests/kpanelmenutest.cpp
index a14cb3366..c08c03a8c 100644
--- a/tdeui/tests/kpanelmenutest.cpp
+++ b/tdeui/tests/kpanelmenutest.cpp
@@ -15,8 +15,8 @@ TestWidget::TestWidget(TQWidget *parent, const char *name)
 
     KPanelAppMenu *ssub = subMenu->insertMenu(locate("mini", "x.png"), "One more");
    
-    connect(testMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotMenuCalled(int)));
-    connect(subMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSubMenuCalled(int)));
+    connect(testMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotMenuCalled(int)));
+    connect(subMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSubMenuCalled(int)));
     init();
     
     setText("We added \"Client Test\" to kicker. Click the TDE Menu to check.");
diff --git a/tdeui/tests/krulertest.cpp b/tdeui/tests/krulertest.cpp
index 628c5096e..28bc2a362 100644
--- a/tdeui/tests/krulertest.cpp
+++ b/tdeui/tests/krulertest.cpp
@@ -76,14 +76,14 @@ KRulerTest::KRulerTest( const char *name )
   vruler->setOffset( 0 );
   vruler->setRange( 0, 1000 );
 
-  connect( bigwidget, TQT_SIGNAL(newXPos(int)),
-	   hruler, TQT_SLOT(slotNewValue(int)) );
-  connect( bigwidget, TQT_SIGNAL(newYPos(int)),
-	   vruler, TQT_SLOT(slotNewValue(int)) );
-  connect( bigwidget, TQT_SIGNAL(newWidth(int)),
-	   TQT_SLOT(slotNewWidth(int)) );
-  connect( bigwidget, TQT_SIGNAL(newHeight(int)),
-	   TQT_SLOT(slotNewHeight(int)) );
+  connect( bigwidget, TQ_SIGNAL(newXPos(int)),
+	   hruler, TQ_SLOT(slotNewValue(int)) );
+  connect( bigwidget, TQ_SIGNAL(newYPos(int)),
+	   vruler, TQ_SLOT(slotNewValue(int)) );
+  connect( bigwidget, TQ_SIGNAL(newWidth(int)),
+	   TQ_SLOT(slotNewWidth(int)) );
+  connect( bigwidget, TQ_SIGNAL(newHeight(int)),
+	   TQ_SLOT(slotNewHeight(int)) );
 
   layout->addWidget(miniwidget, 0, 0);
   layout->addWidget(hruler, 0, 1);
@@ -101,38 +101,38 @@ KRulerTest::KRulerTest( const char *name )
   showTM->adjustSize();
   showTM->move(5,15);
   showTM->setChecked(true);
-  connect(showTM, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetTinyMarks(bool)) );
+  connect(showTM, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetTinyMarks(bool)) );
   showLM = new TQCheckBox("show little marks", showMarks);
   showLM->adjustSize();
   showLM->move(5,35);
   showLM->setChecked(true);
-  connect(showLM, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetLittleMarks(bool)) );
+  connect(showLM, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetLittleMarks(bool)) );
   showMM = new TQCheckBox("show medium marks", showMarks);
   showMM->adjustSize();
   showMM->move(5,55);
   showMM->setChecked(true);
-  connect(showMM, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetMediumMarks(bool)) );
+  connect(showMM, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetMediumMarks(bool)) );
   showBM = new TQCheckBox("show big marks", showMarks);
   showBM->adjustSize();
   showBM->move(5,75);
   showBM->setChecked(true);
-  connect(showBM, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetBigMarks(bool)) );
+  connect(showBM, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetBigMarks(bool)) );
   showEM = new TQCheckBox("show end marks", showMarks);
   showEM->adjustSize();
   showEM->move(5,95);
   showEM->setChecked(true);
-  connect(showEM, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetEndMarks(bool)) );
+  connect(showEM, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetEndMarks(bool)) );
   showPT = new TQCheckBox("show ruler pointer", showMarks);
   showPT->adjustSize();
   showPT->move(5,115);
   showPT->setChecked(true);
-  connect(showPT, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetRulerPointer(bool)) );
+  connect(showPT, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetRulerPointer(bool)) );
   fixLen = new TQCheckBox("fix ruler length", showMarks);
   fixLen->adjustSize();
   fixLen->move(5,135);
   fixLen->setChecked(true);
-  connect(fixLen, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotFixRulerLength(bool)) );
-  connect(fixLen, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCheckLength(bool)) );
+  connect(fixLen, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotFixRulerLength(bool)) );
+  connect(fixLen, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotCheckLength(bool)) );
 
   lineEdit = new TQGroupBox("Value of begin/end", bigwidget);
   lineEdit->setFixedSize(140, 80);
@@ -141,26 +141,26 @@ KRulerTest::KRulerTest( const char *name )
   beginMark->setRange(-1000, 1000, 1, false);
   beginMark->move(5, 15);
   beginMark->setFixedSize(beginMark->sizeHint());
-  connect(beginMark, TQT_SIGNAL(valueChanged(int)), 
-	  hruler, TQT_SLOT(slotNewOffset(int)) );
-  connect(beginMark, TQT_SIGNAL(valueChanged(int)), 
-	  vruler, TQT_SLOT(slotNewOffset(int)) );
+  connect(beginMark, TQ_SIGNAL(valueChanged(int)), 
+	  hruler, TQ_SLOT(slotNewOffset(int)) );
+  connect(beginMark, TQ_SIGNAL(valueChanged(int)), 
+	  vruler, TQ_SLOT(slotNewOffset(int)) );
   endMark = new KIntNumInput(0, lineEdit);
   endMark->setRange(-1000, 1000, 1, false);
   endMark->move(5, 35);
   endMark->setFixedSize(endMark->sizeHint());
-  connect(endMark, TQT_SIGNAL(valueChanged(int)), 
-	  hruler, TQT_SLOT(slotEndOffset(int)) );
-  connect(endMark, TQT_SIGNAL(valueChanged(int)), 
-	  vruler, TQT_SLOT(slotEndOffset(int)) );
+  connect(endMark, TQ_SIGNAL(valueChanged(int)), 
+	  hruler, TQ_SLOT(slotEndOffset(int)) );
+  connect(endMark, TQ_SIGNAL(valueChanged(int)), 
+	  vruler, TQ_SLOT(slotEndOffset(int)) );
   lengthInput = new KIntNumInput(0, lineEdit);
   lengthInput->setRange(-1000, 1000, 1, false);
   lengthInput->move(5, 55);
   lengthInput->setFixedSize(lengthInput->sizeHint());
-  connect(lengthInput, TQT_SIGNAL(valueChanged(int)), 
-	  hruler, TQT_SLOT(slotEndOffset(int)) );
-  connect(lengthInput, TQT_SIGNAL(valueChanged(int)), 
-	  vruler, TQT_SLOT(slotEndOffset(int)) );
+  connect(lengthInput, TQ_SIGNAL(valueChanged(int)), 
+	  hruler, TQ_SLOT(slotEndOffset(int)) );
+  connect(lengthInput, TQ_SIGNAL(valueChanged(int)), 
+	  vruler, TQ_SLOT(slotEndOffset(int)) );
 
 
   vertrot = new TQGroupBox("Value of rotate translate for Vert.", bigwidget);
@@ -171,22 +171,22 @@ KRulerTest::KRulerTest( const char *name )
   transX->move(5, 15);
   transX->setFixedSize(transX->sizeHint());
   //transX->setLabel("transx", AlignLeft);
-  connect(transX, TQT_SIGNAL(valueChanged(double)), 
-	  TQT_SLOT(slotSetXTrans(double)) );
+  connect(transX, TQ_SIGNAL(valueChanged(double)), 
+	  TQ_SLOT(slotSetXTrans(double)) );
   transY = new KDoubleNumInput(-12.0, vertrot);
   transY->setRange(-1000, 1000, 1, false);
   transY->move(5, 35);
   transY->setFixedSize(transY->sizeHint());
   //transY->setLabel("transy", AlignLeft);
-  connect(transY, TQT_SIGNAL(valueChanged(double)), 
-	  TQT_SLOT(slotSetYTrans(double)) );
+  connect(transY, TQ_SIGNAL(valueChanged(double)), 
+	  TQ_SLOT(slotSetYTrans(double)) );
   rotV = new KDoubleNumInput(90.0, vertrot);
   rotV->setRange(-1000, 1000, 1, false);
   rotV->move(5, 55);
   rotV->setFixedSize(rotV->sizeHint());
   //rotV->setLabel("rot", AlignLeft);
-  connect(rotV, TQT_SIGNAL(valueChanged(double)), 
-	  TQT_SLOT(slotSetRotate(double)) );
+  connect(rotV, TQ_SIGNAL(valueChanged(double)), 
+	  TQ_SLOT(slotSetRotate(double)) );
   
 
   metricstyle = new TQButtonGroup("metric styles", bigwidget);
@@ -212,7 +212,7 @@ KRulerTest::KRulerTest( const char *name )
   mmetric->adjustSize();
   mmetric->move(5,95);
   metricstyle->insert(mmetric, (int)KRuler::Metres);
-  connect ( metricstyle, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotSetMStyle(int)) );
+  connect ( metricstyle, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotSetMStyle(int)) );
 
   setCentralWidget(mainframe);
 
diff --git a/tdeui/tests/kstatusbartest.cpp b/tdeui/tests/kstatusbartest.cpp
index 0a8c6d10c..a2bb2b6e8 100644
--- a/tdeui/tests/kstatusbartest.cpp
+++ b/tdeui/tests/kstatusbartest.cpp
@@ -23,7 +23,7 @@ testWindow::testWindow (TQWidget *, const char *name)
     fileMenu = new TQPopupMenu;
     menuBar->insertItem ("&File", fileMenu);
     fileMenu->insertItem ("&Exit", TDEApplication::kApplication(),
-                          TQT_SLOT( quit() ), ALT + Key_Q );
+                          TQ_SLOT( quit() ), ALT + Key_Q );
     statusbar = new KStatusBar (this);
     statusbar->insertItem("Zoom: XXXX", 0);
     statusbar->insertItem("XXX", 1);
@@ -34,8 +34,8 @@ testWindow::testWindow (TQWidget *, const char *name)
     insert = true;
     statusbar->changeItem("Line: 13567", 2);
 
-    connect (statusbar, TQT_SIGNAL(pressed(int)), this, TQT_SLOT(slotPress(int)));
-    connect (statusbar, TQT_SIGNAL(released(int)), this, TQT_SLOT(slotClick(int)));
+    connect (statusbar, TQ_SIGNAL(pressed(int)), this, TQ_SLOT(slotPress(int)));
+    connect (statusbar, TQ_SIGNAL(released(int)), this, TQ_SLOT(slotClick(int)));
 
     widget = new TQMultiLineEdit (this);
 
@@ -53,7 +53,7 @@ testWindow::testWindow (TQWidget *, const char *name)
     smenu->insertItem("400%");
     smenu->insertItem("oo%");
 
-    connect (smenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenu(int)));
+    connect (smenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenu(int)));
 }
 
 void testWindow::slotClick(int id)
diff --git a/tdeui/tests/ktabctltest.cpp b/tdeui/tests/ktabctltest.cpp
index 05fe2aeb3..27229e436 100644
--- a/tdeui/tests/ktabctltest.cpp
+++ b/tdeui/tests/ktabctltest.cpp
@@ -43,10 +43,10 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
      */
     
     test = new KTabCtl(this, "test");
-    connect(test, TQT_SIGNAL(tabSelected(int)), this, TQT_SLOT(tabChanged(int)));
+    connect(test, TQ_SIGNAL(tabSelected(int)), this, TQ_SLOT(tabChanged(int)));
     TQWidget *w = new TQWidget(test, "_page1");
     TQPushButton *bt = new TQPushButton("Click me to quit", w, "_bt1");
-    connect(bt, TQT_SIGNAL(clicked()), this, TQT_SLOT(okPressed()));
+    connect(bt, TQ_SIGNAL(clicked()), this, TQ_SLOT(okPressed()));
     bt->adjustSize();
     bt->move(20, 20);
     test->addTab(w, "Seite 1");
diff --git a/tdeui/tests/ktabwidgettest.cpp b/tdeui/tests/ktabwidgettest.cpp
index 01bafd192..362df8558 100644
--- a/tdeui/tests/ktabwidgettest.cpp
+++ b/tdeui/tests/ktabwidgettest.cpp
@@ -24,18 +24,18 @@ Test::Test( TQWidget* parent, const char *name )
   mWidget->setTabColor( mWidget->page(0), TQt::red );
   mWidget->setTabColor( mWidget->page(1), TQt::blue );
 
-  connect( mWidget, TQT_SIGNAL( currentChanged( TQWidget * ) ), TQT_SLOT( currentChanged( TQWidget * ) ) );
-  connect( mWidget, TQT_SIGNAL( contextMenu( TQWidget *, const TQPoint & )), TQT_SLOT(contextMenu( TQWidget *, const TQPoint & )));
-  connect( mWidget, TQT_SIGNAL( contextMenu( const TQPoint & )), TQT_SLOT(tabbarContextMenu( const TQPoint & )));
-  connect( mWidget, TQT_SIGNAL( mouseDoubleClick( TQWidget * )), TQT_SLOT(mouseDoubleClick( TQWidget * )));
-  connect( mWidget, TQT_SIGNAL( mouseMiddleClick() ), TQT_SLOT(addTab() ));
-  connect( mWidget, TQT_SIGNAL( mouseMiddleClick( TQWidget * )), TQT_SLOT(mouseMiddleClick( TQWidget * )));
-  connect( mWidget, TQT_SIGNAL( closeRequest( TQWidget * )), TQT_SLOT(mouseMiddleClick( TQWidget * )));
-  connect( mWidget, TQT_SIGNAL( testCanDecode(const TQDragMoveEvent *, bool & )), TQT_SLOT(testCanDecode(const TQDragMoveEvent *, bool & )));
-  connect( mWidget, TQT_SIGNAL( receivedDropEvent( TQDropEvent * )), TQT_SLOT(receivedDropEvent( TQDropEvent * )));
-  connect( mWidget, TQT_SIGNAL( receivedDropEvent( TQWidget *, TQDropEvent * )), TQT_SLOT(receivedDropEvent( TQWidget *, TQDropEvent * )));
-  connect( mWidget, TQT_SIGNAL( initiateDrag( TQWidget * )), TQT_SLOT(initiateDrag( TQWidget * )));
-  connect( mWidget, TQT_SIGNAL( movedTab( int, int )), TQT_SLOT(movedTab( int, int )));
+  connect( mWidget, TQ_SIGNAL( currentChanged( TQWidget * ) ), TQ_SLOT( currentChanged( TQWidget * ) ) );
+  connect( mWidget, TQ_SIGNAL( contextMenu( TQWidget *, const TQPoint & )), TQ_SLOT(contextMenu( TQWidget *, const TQPoint & )));
+  connect( mWidget, TQ_SIGNAL( contextMenu( const TQPoint & )), TQ_SLOT(tabbarContextMenu( const TQPoint & )));
+  connect( mWidget, TQ_SIGNAL( mouseDoubleClick( TQWidget * )), TQ_SLOT(mouseDoubleClick( TQWidget * )));
+  connect( mWidget, TQ_SIGNAL( mouseMiddleClick() ), TQ_SLOT(addTab() ));
+  connect( mWidget, TQ_SIGNAL( mouseMiddleClick( TQWidget * )), TQ_SLOT(mouseMiddleClick( TQWidget * )));
+  connect( mWidget, TQ_SIGNAL( closeRequest( TQWidget * )), TQ_SLOT(mouseMiddleClick( TQWidget * )));
+  connect( mWidget, TQ_SIGNAL( testCanDecode(const TQDragMoveEvent *, bool & )), TQ_SLOT(testCanDecode(const TQDragMoveEvent *, bool & )));
+  connect( mWidget, TQ_SIGNAL( receivedDropEvent( TQDropEvent * )), TQ_SLOT(receivedDropEvent( TQDropEvent * )));
+  connect( mWidget, TQ_SIGNAL( receivedDropEvent( TQWidget *, TQDropEvent * )), TQ_SLOT(receivedDropEvent( TQWidget *, TQDropEvent * )));
+  connect( mWidget, TQ_SIGNAL( initiateDrag( TQWidget * )), TQ_SLOT(initiateDrag( TQWidget * )));
+  connect( mWidget, TQ_SIGNAL( movedTab( int, int )), TQ_SLOT(movedTab( int, int )));
   mWidget->setTabReorderingEnabled( true );
 
   TQWidget * grid = new TQWidget(this);
@@ -43,48 +43,48 @@ Test::Test( TQWidget* parent, const char *name )
 
   TQPushButton * addTab = new TQPushButton( "Add Tab", grid );
   gridlayout->addWidget( addTab, 0, 0 );
-  connect( addTab, TQT_SIGNAL( clicked() ), TQT_SLOT( addTab() ) );
+  connect( addTab, TQ_SIGNAL( clicked() ), TQ_SLOT( addTab() ) );
 
   TQPushButton * removeTab = new TQPushButton( "Remove Current Tab", grid );
   gridlayout->addWidget( removeTab, 0, 1 );
-  connect( removeTab, TQT_SIGNAL( clicked() ), TQT_SLOT( removeCurrentTab() ) );
+  connect( removeTab, TQ_SIGNAL( clicked() ), TQ_SLOT( removeCurrentTab() ) );
 
   mLeftButton = new TQCheckBox( "Show left button", grid );
   gridlayout->addWidget( mLeftButton, 1, 0 );
-  connect( mLeftButton, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleLeftButton(bool) ) );
+  connect( mLeftButton, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleLeftButton(bool) ) );
   mLeftButton->setChecked(true);
 
   TQCheckBox * leftPopup = new TQCheckBox( "Enable left popup", grid );
   gridlayout->addWidget( leftPopup, 2, 0 );
-  connect( leftPopup, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleLeftPopup(bool) ) );
+  connect( leftPopup, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleLeftPopup(bool) ) );
   leftPopup->setChecked(true);
 
   mRightButton = new TQCheckBox( "Show right button", grid );
   gridlayout->addWidget( mRightButton, 1, 1 );
-  connect( mRightButton, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleRightButton(bool) ) );
+  connect( mRightButton, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleRightButton(bool) ) );
   mRightButton->setChecked(true);
 
   TQCheckBox * rightPopup = new TQCheckBox( "Enable right popup", grid );
   gridlayout->addWidget( rightPopup, 2, 1 );
-  connect( rightPopup, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleRightPopup(bool) ) );
+  connect( rightPopup, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleRightPopup(bool) ) );
   rightPopup->setChecked(true);
 
   mTabsBottom = new TQCheckBox( "Show tabs at bottom", grid );
   gridlayout->addWidget( mTabsBottom, 3, 0 );
-  connect( mTabsBottom, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabPosition(bool) ) );
+  connect( mTabsBottom, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleTabPosition(bool) ) );
 
   TQCheckBox * tabshape = new TQCheckBox( "Triangular tab shape", grid );
   gridlayout->addWidget( tabshape, 3, 1 );
-  connect( tabshape, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabShape(bool) ) );
+  connect( tabshape, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleTabShape(bool) ) );
 
   TQCheckBox *tabClose = new TQCheckBox( "Close button on icon hover", grid );
   gridlayout->addWidget( tabClose, 4, 0 );
-  connect( tabClose, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleCloseButtons(bool) ) );
+  connect( tabClose, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleCloseButtons(bool) ) );
   tabClose->setChecked(true);
 
   TQCheckBox * showlabels = new TQCheckBox( "Show labels", grid );
   gridlayout->addWidget( showlabels, 4, 1 );
-  connect( showlabels, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( toggleLabels(bool) ) );
+  connect( showlabels, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( toggleLabels(bool) ) );
 }
 
 void Test::currentChanged(TQWidget* w)
@@ -137,7 +137,7 @@ void Test::toggleLeftButton(bool state)
   if (state) {
     if (!mLeftWidget) {
       mLeftWidget = new TQToolButton( mWidget );
-      connect( mLeftWidget, TQT_SIGNAL( clicked() ), TQT_SLOT( addTab() ) );
+      connect( mLeftWidget, TQ_SIGNAL( clicked() ), TQ_SLOT( addTab() ) );
       mLeftWidget->setIconSet( SmallIcon( "tab_new" ) );
       mLeftWidget->setTextLabel("New");
       mLeftWidget->setTextPosition(TQToolButton::Right);
@@ -162,7 +162,7 @@ void Test::toggleLeftPopup(bool state)
       mLeftPopup->insertSeparator();
       mLeftPopup->insertItem(SmallIcon( "tab_new" ), "Button Tab", 1);
       mLeftPopup->insertItem(SmallIcon( "tab_new" ), "Label Tab", 2);
-      connect(mLeftPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(leftPopupActivated(int)));
+      connect(mLeftPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(leftPopupActivated(int)));
     }
     mLeftWidget->setPopup(mLeftPopup);
   }
@@ -188,7 +188,7 @@ void Test::toggleRightButton(bool state)
 if (state) {
     if ( !mRightWidget) {
       mRightWidget = new TQToolButton( mWidget );
-      TQObject::connect( mRightWidget, TQT_SIGNAL( clicked() ), TQT_SLOT( removeCurrentTab() ) );
+      TQObject::connect( mRightWidget, TQ_SIGNAL( clicked() ), TQ_SLOT( removeCurrentTab() ) );
       mRightWidget->setIconSet( SmallIcon( "tab_remove" ) );
       mRightWidget->setTextLabel("Close");
       mRightWidget->setTextPosition(TQToolButton::Right);
@@ -212,7 +212,7 @@ void Test::toggleRightPopup(bool state)
       mRightPopup->insertSeparator();
       mRightPopup->insertItem(SmallIcon( "tab_remove" ), "Most Left Tab", 0);
       mRightPopup->insertItem(SmallIcon( "tab_remove" ), "Most Right Tab", 2);
-      connect(mRightPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(rightPopupActivated(int)));
+      connect(mRightPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(rightPopupActivated(int)));
     }
     mRightWidget->setPopup(mRightPopup);
   }
@@ -264,7 +264,7 @@ void Test::contextMenu(TQWidget *w, const TQPoint &p)
   mContextPopup->insertSeparator();
   mContextPopup->insertItem( mWidget->isTabEnabled(w) ? "Disable Tab" : "Enable Tab", 2);
   mContextPopup->insertItem( mWidget->tabToolTip(w).isEmpty() ? "Set Tooltip" : "Remove Tooltip", 3);
-  connect(mContextPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
+  connect(mContextPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int)));
 
   mContextWidget = w;
   mContextPopup->popup(p);
@@ -300,7 +300,7 @@ void Test::tabbarContextMenu(const TQPoint &p)
   mTabbarContextPopup->insertItem(SmallIcon( "tab_remove" ), mRightWidget->isVisible() ? "Hide \"Remove\" Button" : "Show \"Remove\" Button", 1);
   mTabbarContextPopup->insertSeparator();
   mTabbarContextPopup->insertItem(mWidget->tabPosition()==TQTabWidget::Top ? "Put Tabbar to Bottom" : "Put Tabbar to Top", 2);
-  connect(mTabbarContextPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(tabbarContextMenuActivated(int)));
+  connect(mTabbarContextPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(tabbarContextMenuActivated(int)));
 
   mTabbarContextPopup->popup(p);
 }
diff --git a/tdeui/tests/kunbalancedgrdtest.cpp b/tdeui/tests/kunbalancedgrdtest.cpp
index cf76e7980..839a9c71a 100644
--- a/tdeui/tests/kunbalancedgrdtest.cpp
+++ b/tdeui/tests/kunbalancedgrdtest.cpp
@@ -138,8 +138,8 @@ myTopWidget::myTopWidget (TQWidget *parent, const char *name)
   ySlider = new TQSlider ( -200, 200, 1, 100, TQSlider::Horizontal, this);
   lay->addWidget(ySlider, 1, 2);
 
-  connect(xSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(rebalance()));
-  connect(ySlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(rebalance()));
+  connect(xSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(rebalance()));
+  connect(ySlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(rebalance()));
 
   rebalance();
 
diff --git a/tdeui/tests/kwizardtest.cpp b/tdeui/tests/kwizardtest.cpp
index bbe028a1a..591e71d7e 100644
--- a/tdeui/tests/kwizardtest.cpp
+++ b/tdeui/tests/kwizardtest.cpp
@@ -27,10 +27,10 @@ int main(int argc, char **argv)
 {
   TDEApplication a(argc,argv,"kwizardtest");
   KWizard *wiz = new KWizard(0, "kwizardtest", false);
-  TQObject::connect((TQObject*) wiz->cancelButton(), TQT_SIGNAL(clicked()),
-		   &a, TQT_SLOT(quit()));
-  TQObject::connect((TQObject*) wiz->finishButton(), TQT_SIGNAL(clicked()),
-		   &a, TQT_SLOT(quit()));
+  TQObject::connect((TQObject*) wiz->cancelButton(), TQ_SIGNAL(clicked()),
+		   &a, TQ_SLOT(quit()));
+  TQObject::connect((TQObject*) wiz->finishButton(), TQ_SIGNAL(clicked()),
+		   &a, TQ_SLOT(quit()));
   for(int i = 1; i < 11; i++)
   {
     TQWidget *p = new TQWidget;
diff --git a/tdeui/tests/kxmlguitest.cpp b/tdeui/tests/kxmlguitest.cpp
index 7c224db8d..d32593094 100644
--- a/tdeui/tests/kxmlguitest.cpp
+++ b/tdeui/tests/kxmlguitest.cpp
@@ -48,7 +48,7 @@ int main( int argc, char **argv )
     Client *part = new Client;
 
     (void)new TDEAction( "decfont", "zoom-out", 0, 0, 0, part->actionCollection(), "decFontSizes" );
-    (void)new TDEAction( "sec", "unlock", TQt::ALT + TQt::Key_1, part, TQT_SLOT( slotSec() ), part->actionCollection(), "security" );
+    (void)new TDEAction( "sec", "unlock", TQt::ALT + TQt::Key_1, part, TQ_SLOT( slotSec() ), part->actionCollection(), "security" );
 
     part->setXMLFile( "./kxmlguitest_part.rc" );
 
diff --git a/tdeui/tests/qxembedtest.cpp b/tdeui/tests/qxembedtest.cpp
index 2ee3d7907..fe6c9aef9 100644
--- a/tdeui/tests/qxembedtest.cpp
+++ b/tdeui/tests/qxembedtest.cpp
@@ -28,7 +28,7 @@ main(int argc, char**argv)
   TQWidget *main = new TQVBox(NULL,"main",TQt::WDestructiveClose);
   TQWidget *top = new TQHBox(main);
   TQPushButton *quit = new TQPushButton("Quit", top);
-  TQObject::connect( quit, TQT_SIGNAL(clicked()), main, TQT_SLOT(close()) );
+  TQObject::connect( quit, TQ_SIGNAL(clicked()), main, TQ_SLOT(close()) );
   TQLineEdit *edit = new TQLineEdit(top);
   edit->setText( "Just to see focus changes");
   QXEmbed *embed = new QXEmbed(main);
diff --git a/tdeui/tests/tdemainwindowtest.cpp b/tdeui/tests/tdemainwindowtest.cpp
index bf92dc11c..ffaaa8862 100644
--- a/tdeui/tests/tdemainwindowtest.cpp
+++ b/tdeui/tests/tdemainwindowtest.cpp
@@ -9,7 +9,7 @@
 
 MainWindow::MainWindow()
 {
-    TQTimer::singleShot( 2*1000, this, TQT_SLOT( showMessage() ) );
+    TQTimer::singleShot( 2*1000, this, TQ_SLOT( showMessage() ) );
 
     setCentralWidget( new TQLabel( "foo", this ) );
 
diff --git a/tdeui/tests/tdepopuptest.cpp b/tdeui/tests/tdepopuptest.cpp
index f9a97bad4..637031443 100644
--- a/tdeui/tests/tdepopuptest.cpp
+++ b/tdeui/tests/tdepopuptest.cpp
@@ -24,7 +24,7 @@ public:
         menu->insertItem("Item1");
         menu->insertItem("Item2");
         menu->insertSeparator();
-        menu->insertItem("Quit", tqApp, TQT_SLOT(quit()));
+        menu->insertItem("Quit", tqApp, TQ_SLOT(quit()));
     }       
 };
 
diff --git a/tdeui/tests/twindowtest.cpp b/tdeui/tests/twindowtest.cpp
index f826f13b0..8fd5170e0 100644
--- a/tdeui/tests/twindowtest.cpp
+++ b/tdeui/tests/twindowtest.cpp
@@ -56,13 +56,13 @@ setAutoSaveSettings();
     // We insert item "Exit" with accelerator ALT-Q, and connect
     // it to application's exit-slot.
     fileMenu->insertItem ("&Exit", TDEApplication::kApplication(),
-                          TQT_SLOT( quit() ), ALT + Key_Q );
+                          TQ_SLOT( quit() ), ALT + Key_Q );
 
     // Another popup...
     toolBarMenu = new TQPopupMenu;
     menuBar->insertItem ("&Toolbars", toolBarMenu);
-    toolBarMenu->insertItem ("(Un)Hide tollbar 1", this, TQT_SLOT(slotHide1()));
-    toolBarMenu->insertItem ("(Un)Hide tollbar 2", this, TQT_SLOT(slotHide2()));
+    toolBarMenu->insertItem ("(Un)Hide tollbar 1", this, TQ_SLOT(slotHide1()));
+    toolBarMenu->insertItem ("(Un)Hide tollbar 2", this, TQ_SLOT(slotHide2()));
 
     itemsMenu = new TQPopupMenu;
     menuBar->insertItem ("&Items", itemsMenu);
@@ -71,15 +71,15 @@ setAutoSaveSettings();
     lineL = true;   // Lined is enabled
     greenF = false;  // Frame not inserted
     
-    itemsMenu->insertItem ("delete/insert exit button", this, TQT_SLOT(slotExit()));
-    itemsMenu->insertItem ("insert/delete green frame!", this, TQT_SLOT(slotFrame()));
-    itemsMenu->insertItem ("enable/disable Lined", this, TQT_SLOT(slotLined()));
-    itemsMenu->insertItem ("Toggle fileNew", this, TQT_SLOT(slotNew()));
-    itemsMenu->insertItem ("Clear comboBox", this, TQT_SLOT(slotClearCombo()));
-    itemsMenu->insertItem ("Insert List in Combo", this, TQT_SLOT(slotInsertListInCombo()));
-    itemsMenu->insertItem ("Make item 3 curent", this, TQT_SLOT(slotMakeItem3Current()));
-    //itemsMenu->insertItem ("Insert clock!", this, TQT_SLOT(slotInsertClock()));
-    itemsMenu->insertItem ("Important!", this, TQT_SLOT(slotImportant()));
+    itemsMenu->insertItem ("delete/insert exit button", this, TQ_SLOT(slotExit()));
+    itemsMenu->insertItem ("insert/delete green frame!", this, TQ_SLOT(slotFrame()));
+    itemsMenu->insertItem ("enable/disable Lined", this, TQ_SLOT(slotLined()));
+    itemsMenu->insertItem ("Toggle fileNew", this, TQ_SLOT(slotNew()));
+    itemsMenu->insertItem ("Clear comboBox", this, TQ_SLOT(slotClearCombo()));
+    itemsMenu->insertItem ("Insert List in Combo", this, TQ_SLOT(slotInsertListInCombo()));
+    itemsMenu->insertItem ("Make item 3 curent", this, TQ_SLOT(slotMakeItem3Current()));
+    //itemsMenu->insertItem ("Insert clock!", this, TQ_SLOT(slotInsertClock()));
+    itemsMenu->insertItem ("Important!", this, TQ_SLOT(slotImportant()));
 
     menuBar->insertSeparator();
     helpMenu = new KHelpMenu(this, "KWindowTest was programmed by Sven Radej");
@@ -113,30 +113,30 @@ setAutoSaveSettings();
     
     // First four  buttons
     pix = BarIcon("document-new");
-    itemId = tb->insertButton(pix, 0, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNew()),
+    itemId = tb->insertButton(pix, 0, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNew()),
                          true, "Create.. (toggles upper button)", 50);
     pix = BarIcon("document-open");
-    tb->insertButton(pix, 1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpen()),
+    tb->insertButton(pix, 1, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOpen()),
                          false, "Open");
     pix = BarIcon("filefloppy");
-    tb->insertButton(pix, 2, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSave()),
+    tb->insertButton(pix, 2, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSave()),
                           true, "Save (beep or delayed popup)");
     tb->setDelayedPopup(2, itemsMenu);
     pix = BarIcon("document-print");
-    tb->insertButton(pix, 3, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrint()),
+    tb->insertButton(pix, 3, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPrint()),
                          true, "Print (enables/disables open)");
 
     // And a combobox
     // arguments: text (or strList), ID, writable, signal, object, slot, enabled,
     //            tooltiptext, size
-    tb->insertCombo (TQString("one"), 4, true, TQT_SIGNAL(activated(const TQString&)), this,
-                          TQT_SLOT(slotList(const TQString&)), true, "ComboBox", 150);
+    tb->insertCombo (TQString("one"), 4, true, TQ_SIGNAL(activated(const TQString&)), this,
+                          TQ_SLOT(slotList(const TQString&)), true, "ComboBox", 150);
 
 
     // Then one line editor
     // arguments: text, id, signal, object (this), slot, enabled, tooltiptext, size
-    tb->insertLined ("ftp://ftp.kde.org/pub/kde", 5, TQT_SIGNAL(returnPressed()), this,
-                          TQT_SLOT(slotReturn()), true, "Location", 200);
+    tb->insertLined ("ftp://ftp.kde.org/pub/kde", 5, TQ_SIGNAL(returnPressed()), this,
+                          TQ_SLOT(slotReturn()), true, "Location", 200);
 
     // Set this Lined to auto size itself. Note that only one item (Lined or Combo)
     // Can be set to autosize; If you specify more of them only last (according to
@@ -148,8 +148,8 @@ setAutoSaveSettings();
 
     // Now add another button and align it right
     pix = BarIcon("system-log-out");
-    tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), TDEApplication::kApplication(),
-                          TQT_SLOT( quit() ), true, "Exit");
+    tb->insertButton(pix, 6, TQ_SIGNAL(clicked()), TDEApplication::kApplication(),
+                          TQ_SLOT( quit() ), true, "Exit");
     tb->alignItemRight (6);
 
     // Another toolbar
@@ -159,16 +159,16 @@ setAutoSaveSettings();
     pix = BarIcon("document-new");
     tb1->insertButton(pix, 0, true, "Create new file2 (Toggle)");
     tb1->setToggle(0);
-    tb1->addConnection (0, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggle(bool)));
+    tb1->addConnection (0, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggle(bool)));
 
     pix = BarIcon("document-open");
-    tb1->insertButton(pix, 1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpen()),
+    tb1->insertButton(pix, 1, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOpen()),
                           true, "Open (starts progres in sb)");
 
     tb1->insertSeparator ();
     
     pix = BarIcon("filefloppy");
-    tb1->insertButton(pix, 2, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSave()),
+    tb1->insertButton(pix, 2, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSave()),
                       true, "Save file2 (autorepeat)");
     tb1->setAutoRepeat(2);
     
@@ -201,7 +201,7 @@ setAutoSaveSettings();
     rg->addButton(6);
     rg->addButton(7);
 
-    connect (tb1, TQT_SIGNAL(toggled(int)), this, TQT_SLOT(slotToggled(int)));
+    connect (tb1, TQ_SIGNAL(toggled(int)), this, TQ_SLOT(slotToggled(int)));
     
     // Set caption for floating toolbars
     tb->setTitle ("Toolbar 1");
@@ -216,8 +216,8 @@ setAutoSaveSettings();
     //addToolBar (tb1);
     //addToolBar (tb);
 
-    connect (tb, TQT_SIGNAL(highlighted(int,bool)), this, TQT_SLOT(slotMessage(int, bool)));
-    connect (tb1, TQT_SIGNAL(highlighted(int, bool)), this, TQT_SLOT(slotMessage(int, bool)));
+    connect (tb, TQ_SIGNAL(highlighted(int,bool)), this, TQ_SLOT(slotMessage(int, bool)));
+    connect (tb1, TQ_SIGNAL(highlighted(int, bool)), this, TQ_SLOT(slotMessage(int, bool)));
 
     // Floating is enabled by default, so you don't need this.
     // tb->enableFloating(true);
@@ -243,7 +243,7 @@ setAutoSaveSettings();
     completions->insertItem("/home/");
     completions->insertItem("/vmlinuz :-)");
 
-    connect (completions, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotCompletionsMenu(int)));
+    connect (completions, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotCompletionsMenu(int)));
     pr = 0;
 }
 /***********************************/
@@ -273,7 +273,7 @@ void testWindow::slotOpen()
 //  statusBar->message(pr);
   timer = new TQTimer (pr);
 
-  connect (timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotGoGoGoo()));
+  connect (timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotGoGoGoo()));
   timer->start(100);
 }
 
@@ -408,8 +408,8 @@ void testWindow::slotExit ()
    {
      TQPixmap pix;
      pix = BarIcon("system-log-out");
-     tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), TDEApplication::kApplication(),
-                           TQT_SLOT( quit() ), true, "Exit");
+     tb->insertButton(pix, 6, TQ_SIGNAL(clicked()), TDEApplication::kApplication(),
+                           TQ_SLOT( quit() ), true, "Exit");
      tb->alignItemRight (6);
      exitB = true;
    }