Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

13 files changed, 162 insertions, 162 deletions

diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp
index c921ef64d..ed0dfbc01 100644
--- a/kcontrol/konqhtml/appearance.cpp
+++ b/kcontrol/konqhtml/appearance.cpp
@@ -48,16 +48,16 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   m_minSize = new KIntNumInput( fMinSize, gb );
   m_minSize->setLabel( i18n( "M&inimum font size:" ) );
   m_minSize->setRange( 2, 30 );
-  connect( m_minSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotMinimumFontSize( int ) ) );
-  connect( m_minSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changed() ) );
+  connect( m_minSize, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotMinimumFontSize( int ) ) );
+  connect( m_minSize, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( changed() ) );
   TQWhatsThis::add( m_minSize, i18n( "Konqueror will never display text smaller than "
                                     "this size,<br>overriding any other settings" ) );
 
   m_MedSize = new KIntNumInput( m_minSize, fSize, gb );
   m_MedSize->setLabel( i18n( "&Medium font size:" ) );
   m_MedSize->setRange( 2, 30 );
-  connect( m_MedSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotFontSize( int ) ) );
-  connect( m_MedSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changed() ) );
+  connect( m_MedSize, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotFontSize( int ) ) );
+  connect( m_MedSize, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( changed() ) );
   TQWhatsThis::add( m_MedSize,
                    i18n("This is the relative font size Konqueror uses "
                         "to display web sites.") );
@@ -76,14 +76,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   TQWhatsThis::add( label, wtstr );
   TQWhatsThis::add( m_pFonts[0], wtstr );
 
-  connect( m_pFonts[0], TQT_SIGNAL( activated(const TQString&) ),
-	   TQT_SLOT( slotStandardFont(const TQString&) ) );
-  connect( m_pFonts[0], TQT_SIGNAL( activated(const TQString&) ),
-	   TQT_SLOT(changed() ) );
-  connect( m_pFonts[0]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT( slotStandardFont(const TQString&) ) );
-  connect( m_pFonts[0], TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT(changed() ) );
+  connect( m_pFonts[0], TQ_SIGNAL( activated(const TQString&) ),
+	   TQ_SLOT( slotStandardFont(const TQString&) ) );
+  connect( m_pFonts[0], TQ_SIGNAL( activated(const TQString&) ),
+	   TQ_SLOT(changed() ) );
+  connect( m_pFonts[0]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT( slotStandardFont(const TQString&) ) );
+  connect( m_pFonts[0], TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT(changed() ) );
 
   label = new TQLabel( i18n( "&Fixed font:"), this );
   lay->addWidget( label, ++r, E );
@@ -97,14 +97,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   TQWhatsThis::add( label, wtstr );
   TQWhatsThis::add( m_pFonts[1], wtstr );
 
-  connect( m_pFonts[1], TQT_SIGNAL( activated(const TQString&) ),
-	   TQT_SLOT( slotFixedFont(const TQString&) ) );
-  connect( m_pFonts[1], TQT_SIGNAL( activated(const TQString&) ),
-	   TQT_SLOT(changed() ) );
-  connect( m_pFonts[1]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT( slotFixedFont(const TQString&) ) );
-  connect( m_pFonts[1], TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT(changed() ) );
+  connect( m_pFonts[1], TQ_SIGNAL( activated(const TQString&) ),
+	   TQ_SLOT( slotFixedFont(const TQString&) ) );
+  connect( m_pFonts[1], TQ_SIGNAL( activated(const TQString&) ),
+	   TQ_SLOT(changed() ) );
+  connect( m_pFonts[1]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT( slotFixedFont(const TQString&) ) );
+  connect( m_pFonts[1], TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT(changed() ) );
 
   label = new TQLabel( i18n( "S&erif font:" ), this );
   lay->addWidget( label, ++r, E );
@@ -118,14 +118,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   TQWhatsThis::add( label, wtstr );
   TQWhatsThis::add( m_pFonts[2], wtstr );
 
-  connect( m_pFonts[2], TQT_SIGNAL( activated( const TQString& ) ),
-	   TQT_SLOT( slotSerifFont( const TQString& ) ) );
-  connect( m_pFonts[2], TQT_SIGNAL( activated( const TQString& ) ),
-	   TQT_SLOT( changed() ) );
-  connect( m_pFonts[2]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT( slotSerifFont(const TQString&) ) );
-  connect( m_pFonts[2], TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT(changed() ) );
+  connect( m_pFonts[2], TQ_SIGNAL( activated( const TQString& ) ),
+	   TQ_SLOT( slotSerifFont( const TQString& ) ) );
+  connect( m_pFonts[2], TQ_SIGNAL( activated( const TQString& ) ),
+	   TQ_SLOT( changed() ) );
+  connect( m_pFonts[2]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT( slotSerifFont(const TQString&) ) );
+  connect( m_pFonts[2], TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT(changed() ) );
 
   label = new TQLabel( i18n( "Sa&ns serif font:" ), this );
   lay->addWidget( label, ++r, E );
@@ -139,14 +139,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   TQWhatsThis::add( label, wtstr );
   TQWhatsThis::add( m_pFonts[3], wtstr );
 
-  connect( m_pFonts[3], TQT_SIGNAL( activated( const TQString& ) ),
-	   TQT_SLOT( slotSansSerifFont( const TQString& ) ) );
-  connect( m_pFonts[3], TQT_SIGNAL( activated( const TQString& ) ),
-	   TQT_SLOT( changed() ) );
-  connect( m_pFonts[3]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT( slotSansSerifFont(const TQString&) ) );
-  connect( m_pFonts[3], TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT(changed() ) );
+  connect( m_pFonts[3], TQ_SIGNAL( activated( const TQString& ) ),
+	   TQ_SLOT( slotSansSerifFont( const TQString& ) ) );
+  connect( m_pFonts[3], TQ_SIGNAL( activated( const TQString& ) ),
+	   TQ_SLOT( changed() ) );
+  connect( m_pFonts[3]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT( slotSansSerifFont(const TQString&) ) );
+  connect( m_pFonts[3], TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT(changed() ) );
 
 
   label = new TQLabel( i18n( "C&ursive font:" ), this );
@@ -161,14 +161,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   TQWhatsThis::add( label, wtstr );
   TQWhatsThis::add( m_pFonts[4], wtstr );
 
-  connect( m_pFonts[4], TQT_SIGNAL( activated( const TQString& ) ),
-	   TQT_SLOT( slotCursiveFont( const TQString& ) ) );
-  connect( m_pFonts[4], TQT_SIGNAL( activated( const TQString& ) ),
-	   TQT_SLOT( changed() ) );
-  connect( m_pFonts[4]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT( slotCursiveFont(const TQString&) ) );
-  connect( m_pFonts[4], TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT(changed() ) );
+  connect( m_pFonts[4], TQ_SIGNAL( activated( const TQString& ) ),
+	   TQ_SLOT( slotCursiveFont( const TQString& ) ) );
+  connect( m_pFonts[4], TQ_SIGNAL( activated( const TQString& ) ),
+	   TQ_SLOT( changed() ) );
+  connect( m_pFonts[4]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT( slotCursiveFont(const TQString&) ) );
+  connect( m_pFonts[4], TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT(changed() ) );
 
 
   label = new TQLabel( i18n( "Fantas&y font:" ), this );
@@ -183,14 +183,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   TQWhatsThis::add( label, wtstr );
   TQWhatsThis::add( m_pFonts[5], wtstr );
 
-  connect( m_pFonts[5], TQT_SIGNAL( activated( const TQString& ) ),
-	   TQT_SLOT( slotFantasyFont( const TQString& ) ) );
-  connect( m_pFonts[5], TQT_SIGNAL( activated( const TQString& ) ),
-	   TQT_SLOT( changed() ) );
-  connect( m_pFonts[5]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT( slotFantasyFont(const TQString&) ) );
-  connect( m_pFonts[5], TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT(changed() ) );
+  connect( m_pFonts[5], TQ_SIGNAL( activated( const TQString& ) ),
+	   TQ_SLOT( slotFantasyFont( const TQString& ) ) );
+  connect( m_pFonts[5], TQ_SIGNAL( activated( const TQString& ) ),
+	   TQ_SLOT( changed() ) );
+  connect( m_pFonts[5]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT( slotFantasyFont(const TQString&) ) );
+  connect( m_pFonts[5], TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT(changed() ) );
 
 
   label = new TQLabel( i18n( "Font &size adjustment for this encoding:" ), this );
@@ -200,10 +200,10 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   label->setBuddy( m_pFontSizeAdjust );
   lay->addMultiCellWidget( m_pFontSizeAdjust, r, r, M+1, W );
 
-  connect( m_pFontSizeAdjust, TQT_SIGNAL( valueChanged( int ) ),
-	   TQT_SLOT( slotFontSizeAdjust( int ) ) );
-  connect( m_pFontSizeAdjust, TQT_SIGNAL( valueChanged( int ) ),
-	   TQT_SLOT( changed() ) );
+  connect( m_pFontSizeAdjust, TQ_SIGNAL( valueChanged( int ) ),
+	   TQ_SLOT( slotFontSizeAdjust( int ) ) );
+  connect( m_pFontSizeAdjust, TQ_SIGNAL( valueChanged( int ) ),
+	   TQ_SLOT( changed() ) );
 
   label = new TQLabel( i18n( "Default encoding:"), this );
   //++r;
@@ -222,10 +222,10 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   TQWhatsThis::add( label, wtstr );
   TQWhatsThis::add( m_pEncoding, wtstr );
 
-  connect( m_pEncoding, TQT_SIGNAL( activated(const TQString& ) ),
-	   TQT_SLOT( slotEncoding(const TQString&) ) );
-  connect( m_pEncoding, TQT_SIGNAL( activated(const TQString& ) ),
-	   TQT_SLOT( changed() ) );
+  connect( m_pEncoding, TQ_SIGNAL( activated(const TQString& ) ),
+	   TQ_SLOT( slotEncoding(const TQString&) ) );
+  connect( m_pEncoding, TQ_SIGNAL( activated(const TQString& ) ),
+	   TQ_SLOT( changed() ) );
 
   ++r; lay->setRowStretch(r, 8);
 
diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp
index e6521b3b8..53433264f 100644
--- a/kcontrol/konqhtml/domainlistview.cpp
+++ b/kcontrol/konqhtml/domainlistview.cpp
@@ -46,33 +46,33 @@ DomainListView::DomainListView(TDEConfig *config,const TQString &title,
   domainSpecificLV = new TDEListView(this);
   domainSpecificLV->addColumn(i18n("Host/Domain"));
   domainSpecificLV->addColumn(i18n("Policy"), 100);
-  connect(domainSpecificLV,TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(changePressed()));
-  connect(domainSpecificLV,TQT_SIGNAL(returnPressed(TQListViewItem *)), TQT_SLOT(changePressed()));
-  connect(domainSpecificLV, TQT_SIGNAL( executed( TQListViewItem *)), TQT_SLOT( updateButton()));
-  connect(domainSpecificLV, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateButton()));
+  connect(domainSpecificLV,TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(changePressed()));
+  connect(domainSpecificLV,TQ_SIGNAL(returnPressed(TQListViewItem *)), TQ_SLOT(changePressed()));
+  connect(domainSpecificLV, TQ_SIGNAL( executed( TQListViewItem *)), TQ_SLOT( updateButton()));
+  connect(domainSpecificLV, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateButton()));
   thisLayout->addMultiCellWidget(domainSpecificLV, 0, 5, 0, 0);
 
   addDomainPB = new TQPushButton(i18n("&New..."), this);
   thisLayout->addWidget(addDomainPB, 0, 1);
-  connect(addDomainPB, TQT_SIGNAL(clicked()), TQT_SLOT(addPressed()));
+  connect(addDomainPB, TQ_SIGNAL(clicked()), TQ_SLOT(addPressed()));
 
   changeDomainPB = new TQPushButton( i18n("Chan&ge..."), this);
   thisLayout->addWidget(changeDomainPB, 1, 1);
-  connect(changeDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(changePressed()));
+  connect(changeDomainPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(changePressed()));
 
   deleteDomainPB = new TQPushButton(i18n("De&lete"), this);
   thisLayout->addWidget(deleteDomainPB, 2, 1);
-  connect(deleteDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(deletePressed()));
+  connect(deleteDomainPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(deletePressed()));
 
   importDomainPB = new TQPushButton(i18n("&Import..."), this);
   thisLayout->addWidget(importDomainPB, 3, 1);
-  connect(importDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(importPressed()));
+  connect(importDomainPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(importPressed()));
   importDomainPB->setEnabled(false);
   importDomainPB->hide();
 
   exportDomainPB = new TQPushButton(i18n("&Export..."), this);
   thisLayout->addWidget(exportDomainPB, 4, 1);
-  connect(exportDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(exportPressed()));
+  connect(exportDomainPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(exportPressed()));
   exportDomainPB->setEnabled(false);
   exportDomainPB->hide();
 
diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp
index 6603c06ca..9b7f520ec 100644
--- a/kcontrol/konqhtml/filteropts.cpp
+++ b/kcontrol/konqhtml/filteropts.cpp
@@ -67,20 +67,20 @@ KCMFilter::KCMFilter(TDEConfig *config, TQString group,
     buttonBox->setSpacing( KDialog::spacingHint() );
 
     mInsertButton = new TQPushButton( i18n("Insert"), buttonBox );
-    connect( mInsertButton, TQT_SIGNAL( clicked() ), TQT_SLOT( insertFilter() ) );
+    connect( mInsertButton, TQ_SIGNAL( clicked() ), TQ_SLOT( insertFilter() ) );
     mUpdateButton = new TQPushButton( i18n("Update"), buttonBox );
-    connect( mUpdateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateFilter() ) );
+    connect( mUpdateButton, TQ_SIGNAL( clicked() ), TQ_SLOT( updateFilter() ) );
     mRemoveButton = new TQPushButton( i18n("Remove"), buttonBox );
-    connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeFilter() ) );
+    connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeFilter() ) );
 
     mImportButton = new TQPushButton(i18n("Import..."),buttonBox);
-    connect( mImportButton, TQT_SIGNAL( clicked() ), TQT_SLOT( importFilters() ) );
+    connect( mImportButton, TQ_SIGNAL( clicked() ), TQ_SLOT( importFilters() ) );
     mExportButton = new TQPushButton(i18n("Export..."),buttonBox);
-    connect( mExportButton, TQT_SIGNAL( clicked() ), TQT_SLOT( exportFilters() ) );
+    connect( mExportButton, TQ_SIGNAL( clicked() ), TQ_SLOT( exportFilters() ) );
 
-    connect( mEnableCheck, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotEnableChecked()));
-    connect( mKillCheck, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotKillChecked()));
-    connect( mListBox, TQT_SIGNAL( selectionChanged ()),this, TQT_SLOT( slotItemSelected()));
+    connect( mEnableCheck, TQ_SIGNAL( clicked()), this, TQ_SLOT( slotEnableChecked()));
+    connect( mKillCheck, TQ_SIGNAL( clicked()), this, TQ_SLOT( slotKillChecked()));
+    connect( mListBox, TQ_SIGNAL( selectionChanged ()),this, TQ_SLOT( slotItemSelected()));
 
 /*
  * Whats this items
diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp
index ed87ea349..14cf39a36 100644
--- a/kcontrol/konqhtml/htmlopts.cpp
+++ b/kcontrol/konqhtml/htmlopts.cpp
@@ -51,12 +51,12 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *
     m_pAdvancedAddBookmarkCheckBox = new TQCheckBox(i18n( "Ask for name and folder when adding bookmarks" ), bgBookmarks);
     TQWhatsThis::add( m_pAdvancedAddBookmarkCheckBox, i18n( "If this box is checked, Konqueror will allow you to"
                                                         " change the title of the bookmark and choose a folder in which to store it when you add a new bookmark." ) );
-    connect(m_pAdvancedAddBookmarkCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pAdvancedAddBookmarkCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
 
     m_pOnlyMarkedBookmarksCheckBox = new TQCheckBox(i18n( "Show only marked bookmarks in bookmark toolbar" ), bgBookmarks);
     TQWhatsThis::add( m_pOnlyMarkedBookmarksCheckBox, i18n( "If this box is checked, Konqueror will show only those"
                                                          " bookmarks in the bookmark toolbar which you have marked to do so in the bookmark editor." ) );
-    connect(m_pOnlyMarkedBookmarksCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pOnlyMarkedBookmarksCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
 
     lay->addMultiCellWidget( bgBookmarks, row, row, 0, 1 );
     row++;
@@ -67,14 +67,14 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *
     m_pFormCompletionCheckBox = new TQCheckBox(i18n( "Enable com&pletion of forms" ), bgForm);
     TQWhatsThis::add( m_pFormCompletionCheckBox, i18n( "If this box is checked, Konqueror will remember"
                                                         " the data you enter in web forms and suggest it in similar fields for all forms." ) );
-    connect(m_pFormCompletionCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pFormCompletionCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
 
     m_pMaxFormCompletionItems = new KIntNumInput( bgForm );
     m_pMaxFormCompletionItems->setLabel( i18n( "&Maximum completions:" ) );
     m_pMaxFormCompletionItems->setRange( 0, 100 );
     TQWhatsThis::add( m_pMaxFormCompletionItems,
         i18n( "Here you can select how many values Konqueror will remember for a form field." ) );
-    connect(m_pMaxFormCompletionItems, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged()));
+    connect(m_pMaxFormCompletionItems, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged()));
 
     lay->addMultiCellWidget( bgForm, row, row, 0, 1 );
     row++;
@@ -86,19 +86,19 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *
     m_cbCursor = new TQCheckBox(i18n("Chan&ge cursor over links"), bgMouse );
     TQWhatsThis::add( m_cbCursor, i18n("If this option is set, the shape of the cursor will change "
        "(usually to a hand) if it is moved over a hyperlink.") );
-    connect(m_cbCursor, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_cbCursor, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
 
     m_pOpenMiddleClick = new TQCheckBox( i18n ("M&iddle click opens URL in selection" ), bgMouse );
     TQWhatsThis::add( m_pOpenMiddleClick, i18n (
       "If this box is checked, you can open the URL in the selection by middle clicking on a "
       "Konqueror view." ) );
-    connect(m_pOpenMiddleClick, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pOpenMiddleClick, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
 
     m_pBackRightClick = new TQCheckBox( i18n( "Right click goes &back in history" ), bgMouse );
     TQWhatsThis::add( m_pBackRightClick, i18n(
       "If this box is checked, you can go back in history by right clicking on a Konqueror view. "
       "To access the context menu, press the right mouse button and move." ) );
-    connect(m_pBackRightClick, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pBackRightClick, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
 
     lay->addMultiCellWidget( bgMouse, row, row, 0, 1 );
     row++;
@@ -107,26 +107,26 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *
 
     m_pAutoLoadImagesCheckBox = new TQCheckBox( i18n( "A&utomatically load images"), this );
     TQWhatsThis::add( m_pAutoLoadImagesCheckBox, i18n( "If this box is checked, Konqueror will automatically load any images that are embedded in a web page. Otherwise, it will display placeholders for the images, and you can then manually load the images by clicking on the image button.<br>Unless you have a very slow network connection, you will probably want to check this box to enhance your browsing experience." ) );
-    connect(m_pAutoLoadImagesCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pAutoLoadImagesCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
     lay->addMultiCellWidget( m_pAutoLoadImagesCheckBox, row, row, 0, 1 );
     row++;
 
     m_pEnableFavIconCheckBox = new TQCheckBox( i18n( "Enable &favicons"), this );
     TQWhatsThis::add( m_pEnableFavIconCheckBox, i18n( "If this box is checked, Konqueror will automatically load and display favicon images that are associated with a web page. These images appear in the Location bar. Otherwise a generic image will appear." ) );
-    connect(m_pEnableFavIconCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pEnableFavIconCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
     lay->addMultiCellWidget( m_pEnableFavIconCheckBox, row, row, 0, 1 );
     row++;
 
     m_pUnfinishedImageFrameCheckBox = new TQCheckBox( i18n( "Dra&w frame around not completely loaded images"), this );
     TQWhatsThis::add( m_pUnfinishedImageFrameCheckBox, i18n( "If this box is checked, Konqueror will draw a frame as placeholder around not yet fully loaded images that are embedded in a web page.<br>Especially if you have a slow network connection, you will probably want to check this box to enhance your browsing experience." ) );
-    connect(m_pUnfinishedImageFrameCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pUnfinishedImageFrameCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
     lay->addMultiCellWidget( m_pUnfinishedImageFrameCheckBox, row, row, 0, 1 );
     row++;
 
     m_pAutoRedirectCheckBox = new TQCheckBox( i18n( "Allow automatic delayed &reloading/redirecting"), this );
     TQWhatsThis::add( m_pAutoRedirectCheckBox,
     i18n( "Some web pages request an automatic reload or redirection after a certain period of time. By unchecking this box Konqueror will ignore these requests." ) );
-    connect(m_pAutoRedirectCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pAutoRedirectCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
     lay->addMultiCellWidget( m_pAutoRedirectCheckBox, row, row, 0, 1 );
     row++;
 
@@ -153,7 +153,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *
 	    "</ul><br><i>Note: The site's CSS definitions can override this value</i>");
     TQWhatsThis::add( label, whatsThis);
     TQWhatsThis::add( m_pUnderlineCombo, whatsThis);
-    connect(m_pUnderlineCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged()));
+    connect(m_pUnderlineCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged()));
 
 
 
@@ -172,7 +172,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *
 	    "<li><b>Show only once</b>: Show all animations completely but do not repeat them.</li></ul>");
     TQWhatsThis::add( label, whatsThis);
     TQWhatsThis::add( m_pAnimationsCombo, whatsThis);
-    connect(m_pAnimationsCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged()));
+    connect(m_pAnimationsCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged()));
 
     label = new TQLabel( i18n("Sm&ooth scrolling"), this);
     m_pSmoothScrollingCombo = new TQComboBox( false, this );
@@ -190,7 +190,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *
 	    "</ul>");
     TQWhatsThis::add( label, whatsThis);
     TQWhatsThis::add( m_pSmoothScrollingCombo, whatsThis);
-    connect(m_pSmoothScrollingCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged()));
+    connect(m_pSmoothScrollingCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged()));
 
 
     lay->setRowStretch(row, 1);
diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp
index 6a702559e..2a0c15069 100644
--- a/kcontrol/konqhtml/javaopts.cpp
+++ b/kcontrol/konqhtml/javaopts.cpp
@@ -62,15 +62,15 @@ KJavaOptions::KJavaOptions( TDEConfig* config, TQString group,
     TQVGroupBox* globalGB = new TQVGroupBox( i18n( "Global Settings" ), this );
     toplevel->addWidget( globalGB );
     enableJavaGloballyCB = new TQCheckBox( i18n( "Enable Ja&va globally" ), globalGB );
-    connect( enableJavaGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) );
-    connect( enableJavaGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( toggleJavaControls() ) );
+    connect( enableJavaGloballyCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) );
+    connect( enableJavaGloballyCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( toggleJavaControls() ) );
 
 
     /***************************************************************************
      ***************** Domain Specific Settings ********************************
      **************************************************************************/
     domainSpecific = new JavaDomainListView(m_pConfig,m_groupname,this,this);
-    connect(domainSpecific,TQT_SIGNAL(changed(bool)),TQT_SLOT(slotChanged()));
+    connect(domainSpecific,TQ_SIGNAL(changed(bool)),TQ_SLOT(slotChanged()));
     toplevel->addWidget( domainSpecific, 2 );
 
     /***************************************************************************
@@ -84,37 +84,37 @@ KJavaOptions::KJavaOptions( TDEConfig* config, TQString group,
 
     javaSecurityManagerCB = new TQCheckBox( i18n("&Use security manager" ), checkboxes );
     grid->addWidget( javaSecurityManagerCB, 0, 0 );
-    connect( javaSecurityManagerCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) );
+    connect( javaSecurityManagerCB, TQ_SIGNAL(toggled( bool )), this, TQ_SLOT(slotChanged()) );
 
     useKioCB = new TQCheckBox( i18n("Use &TDEIO"), checkboxes );
     grid->addWidget( useKioCB, 0, 1 );
-    connect( useKioCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) );
+    connect( useKioCB, TQ_SIGNAL(toggled( bool )), this, TQ_SLOT(slotChanged()) );
 
     enableShutdownCB = new TQCheckBox( i18n("Shu&tdown applet server when inactive"), checkboxes );
     grid->addWidget( enableShutdownCB, 1, 0 );
-    connect( enableShutdownCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) );
-    connect( enableShutdownCB, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleJavaControls()) );
+    connect( enableShutdownCB, TQ_SIGNAL(toggled( bool )), this, TQ_SLOT(slotChanged()) );
+    connect( enableShutdownCB, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleJavaControls()) );
 
     TQHBox* secondsHB = new TQHBox( javartGB );
     serverTimeoutSB = new KIntNumInput( secondsHB );
     serverTimeoutSB->setRange( 0, 1000, 5 );
     serverTimeoutSB->setLabel( i18n("App&let server timeout:"), AlignLeft );
     serverTimeoutSB->setSuffix(i18n(" sec"));
-    connect(serverTimeoutSB, TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotChanged()));
+    connect(serverTimeoutSB, TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(slotChanged()));
 
     TQHBox* pathHB = new TQHBox( javartGB );
     pathHB->setSpacing( 10 );
     TQLabel* pathLA = new TQLabel( i18n( "&Path to Java executable, or 'java':" ),
                                  pathHB );
     pathED = new  KURLRequester( pathHB );
-    connect( pathED, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotChanged()) );
+    connect( pathED, TQ_SIGNAL(textChanged( const TQString& )), this, TQ_SLOT(slotChanged()) );
     pathLA->setBuddy( pathED );
 
     TQHBox* addArgHB = new TQHBox( javartGB );
     addArgHB->setSpacing( 10 );
     TQLabel* addArgLA = new TQLabel( i18n( "Additional Java a&rguments:" ), addArgHB  );
     addArgED = new TQLineEdit( addArgHB );
-    connect( addArgED, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotChanged()) );
+    connect( addArgED, TQ_SIGNAL(textChanged( const TQString& )), this, TQ_SLOT(slotChanged()) );
     addArgLA->setBuddy( addArgED );
 
     /***************************************************************************
diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp
index ebbf7c4aa..33fc33a7a 100644
--- a/kcontrol/konqhtml/jsopts.cpp
+++ b/kcontrol/konqhtml/jsopts.cpp
@@ -52,21 +52,21 @@ KJavaScriptOptions::KJavaScriptOptions( TDEConfig* config, TQString group, TQWid
   TQWhatsThis::add( enableJavaScriptGloballyCB, i18n("Enables the execution of scripts written in ECMA-Script "
         "(also known as JavaScript) that can be contained in HTML pages. "
         "Note that, as with any browser, enabling scripting languages can be a security problem.") );
-  connect( enableJavaScriptGloballyCB, TQT_SIGNAL( clicked() ), TQT_SLOT( changed() ) );
-  connect( enableJavaScriptGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChangeJSEnabled() ) );
+  connect( enableJavaScriptGloballyCB, TQ_SIGNAL( clicked() ), TQ_SLOT( changed() ) );
+  connect( enableJavaScriptGloballyCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChangeJSEnabled() ) );
 
   reportErrorsCB = new TQCheckBox( i18n( "Report &errors" ), globalGB );
   TQWhatsThis::add( reportErrorsCB, i18n("Enables the reporting of errors that occur when JavaScript "
 	"code is executed.") );
-  connect( reportErrorsCB, TQT_SIGNAL( clicked() ), TQT_SLOT( changed() ) );
+  connect( reportErrorsCB, TQ_SIGNAL( clicked() ), TQ_SLOT( changed() ) );
 
   jsDebugWindow = new TQCheckBox( i18n( "Enable debu&gger" ), globalGB );
   TQWhatsThis::add( jsDebugWindow, i18n( "Enables builtin JavaScript debugger." ) );
-  connect( jsDebugWindow, TQT_SIGNAL( clicked() ), TQT_SLOT( changed() ) );
+  connect( jsDebugWindow, TQ_SIGNAL( clicked() ), TQ_SLOT( changed() ) );
 
   // the domain-specific listview
   domainSpecific = new JSDomainListView(m_pConfig,m_groupname,this,this);
-  connect(domainSpecific,TQT_SIGNAL(changed(bool)),TQT_SLOT(changed()));
+  connect(domainSpecific,TQ_SIGNAL(changed(bool)),TQ_SLOT(changed()));
   toplevel->addWidget( domainSpecific, 2 );
 
   TQWhatsThis::add( domainSpecific, i18n("Here you can set specific JavaScript policies for any particular "
@@ -97,7 +97,7 @@ KJavaScriptOptions::KJavaScriptOptions( TDEConfig* config, TQString group, TQWid
   js_policies_frame = new JSPoliciesFrame(&js_global_policies,
   		i18n("Global JavaScript Policies"),this);
   toplevel->addWidget(js_policies_frame);
-  connect(js_policies_frame, TQT_SIGNAL(changed()), TQT_SLOT(changed()));
+  connect(js_policies_frame, TQ_SIGNAL(changed()), TQ_SLOT(changed()));
 
   // Finally do the loading
   load();
diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp
index 07a0cbea6..c24cd356e 100644
--- a/kcontrol/konqhtml/jspolicies.cpp
+++ b/kcontrol/konqhtml/jspolicies.cpp
@@ -197,7 +197,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
                "window.open()</i> for proper operation. Use "
                "this feature carefully.");
   TQWhatsThis::add(label, wtstr);
-  connect(js_popup, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowOpenPolicy(int)));
+  connect(js_popup, TQ_SIGNAL(clicked(int)), TQ_SLOT(setWindowOpenPolicy(int)));
 
   // === window.resizeBy/resizeTo ================================
   colIdx = 0;
@@ -235,7 +235,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
 		"This option specifies the treatment of such "
 		"attempts.");
   TQWhatsThis::add(label, wtstr);
-  connect(js_resize, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowResizePolicy(int)));
+  connect(js_resize, TQ_SIGNAL(clicked(int)), TQ_SLOT(setWindowResizePolicy(int)));
 
   // === window.moveBy/moveTo ================================
   colIdx = 0;
@@ -273,7 +273,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
 		"This option specifies the treatment of such "
 		"attempts.");
   TQWhatsThis::add(label, wtstr);
-  connect(js_move, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowMovePolicy(int)));
+  connect(js_move, TQ_SIGNAL(clicked(int)), TQ_SLOT(setWindowMovePolicy(int)));
 
   // === window.focus ================================
   colIdx = 0;
@@ -314,7 +314,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
 		"This option specifies the treatment of such "
 		"attempts.");
   TQWhatsThis::add(label, wtstr);
-  connect(js_focus, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowFocusPolicy(int)));
+  connect(js_focus, TQ_SIGNAL(clicked(int)), TQ_SLOT(setWindowFocusPolicy(int)));
 
   // === window.status ================================
   colIdx = 0;
@@ -354,7 +354,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
 		"This option specifies the treatment of such "
 		"attempts.");
   TQWhatsThis::add(label, wtstr);
-  connect(js_statusbar, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowStatusPolicy(int)));
+  connect(js_statusbar, TQ_SIGNAL(clicked(int)), TQ_SLOT(setWindowStatusPolicy(int)));
 }
 
 JSPoliciesFrame::~JSPoliciesFrame() {
diff --git a/kcontrol/konqhtml/khttpoptdlg.cpp b/kcontrol/konqhtml/khttpoptdlg.cpp
index 7272e6e93..68bbcab92 100644
--- a/kcontrol/konqhtml/khttpoptdlg.cpp
+++ b/kcontrol/konqhtml/khttpoptdlg.cpp
@@ -17,16 +17,16 @@ KHTTPOptions::KHTTPOptions(TDEConfig *config, TQString group, TQWidget *parent,
 
   le_languages = new TQLineEdit(this);
   lay->addWidget( le_languages );
-  connect(le_languages, TQT_SIGNAL(textChanged(const TQString&)),
-	  this, TQT_SLOT(slotChanged()));
+  connect(le_languages, TQ_SIGNAL(textChanged(const TQString&)),
+	  this, TQ_SLOT(slotChanged()));
 
   lay->addSpacing(10);
   lay->addWidget( new TQLabel(i18n("Accept character sets:"), this) );
 
   le_charsets = new TQLineEdit(this);
   lay->addWidget( le_charsets );
-  connect(le_charsets, TQT_SIGNAL(textChanged(const TQString&)),
-	  this, TQT_SLOT(slotChanged()));
+  connect(le_charsets, TQ_SIGNAL(textChanged(const TQString&)),
+	  this, TQ_SLOT(slotChanged()));
 
   lay->addStretch(10);
 
diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp
index a752a3a88..0794b390b 100644
--- a/kcontrol/konqhtml/main.cpp
+++ b/kcontrol/konqhtml/main.cpp
@@ -111,11 +111,11 @@ KJSParts::KJSParts(TDEConfig *config, TQWidget *parent, const char *name)
   // ### the groupname is duplicated in KJSParts::save
   java = new KJavaOptions( config, "Java/JavaScript Settings", this, name );
   tab->addTab( java, i18n( "&Java" ) );
-  connect( java, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );
+  connect( java, TQ_SIGNAL( changed( bool ) ), TQ_SIGNAL( changed( bool ) ) );
 
   javascript = new KJavaScriptOptions( config, "Java/JavaScript Settings", this, name );
   tab->addTab( javascript, i18n( "Java&Script" ) );
-  connect( javascript, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );
+  connect( javascript, TQ_SIGNAL( changed( bool ) ), TQ_SIGNAL( changed( bool ) ) );
 }
 
 KJSParts::~KJSParts()
diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp
index 547182f2d..b36f7f1a7 100644
--- a/kcontrol/konqhtml/pluginopts.cpp
+++ b/kcontrol/konqhtml/pluginopts.cpp
@@ -63,12 +63,12 @@ KPluginOptions::KPluginOptions( TDEConfig* config, TQString group, TQWidget *par
     enableUserDemand = new TQCheckBox( i18n( "&Load plugins on demand only" ), globalGB );
     priorityLabel = new TQLabel(i18n("CPU priority for plugins: %1").arg(TQString()), globalGB);
     priority = new TQSlider(5, 100, 5, 100, TQt::Horizontal, globalGB);
-    connect( enablePluginsGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) );
-    connect( enablePluginsGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTogglePluginsEnabled() ) );
-    connect( enableHTTPOnly, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) );
-    connect( enableUserDemand, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) );
-    connect( priority, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotChanged() ) );
-    connect( priority, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( updatePLabel(int) ) );
+    connect( enablePluginsGloballyCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) );
+    connect( enablePluginsGloballyCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotTogglePluginsEnabled() ) );
+    connect( enableHTTPOnly, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) );
+    connect( enableUserDemand, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) );
+    connect( priority, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotChanged() ) );
+    connect( priority, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( updatePLabel(int) ) );
 
     TQFrame *hrule = new TQFrame(globalGB);
     hrule->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
@@ -80,7 +80,7 @@ KPluginOptions::KPluginOptions( TDEConfig* config, TQString group, TQWidget *par
     TQPushButton *domainSpecPB = new TQPushButton(i18n("Domain-Specific Settin&gs"),
     						globalGB);
     domainSpecPB->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
-    connect(domainSpecPB,TQT_SIGNAL(clicked()),TQT_SLOT(slotShowDomainDlg()));
+    connect(domainSpecPB,TQ_SIGNAL(clicked()),TQ_SLOT(slotShowDomainDlg()));
 
     domainSpecificDlg = new KDialogBase(KDialogBase::Swallow,
     			i18n("Domain-Specific Policies"),KDialogBase::Close,
@@ -88,7 +88,7 @@ KPluginOptions::KPluginOptions( TDEConfig* config, TQString group, TQWidget *par
 
     domainSpecific = new PluginDomainListView(config,group,this,domainSpecificDlg);
     domainSpecific->setMinimumSize(320,200);
-    connect(domainSpecific,TQT_SIGNAL(changed(bool)),TQT_SLOT(slotChanged()));
+    connect(domainSpecific,TQ_SIGNAL(changed(bool)),TQ_SLOT(slotChanged()));
 
     domainSpecificDlg->setMainWidget(domainSpecific);
 
@@ -134,8 +134,8 @@ KPluginOptions::KPluginOptions( TDEConfig* config, TQString group, TQWidget *par
 	m_widget->dirEdit->setMode(KFile::ExistingOnly | KFile::LocalOnly | KFile::Directory);
 
     // setup widgets
-    connect( m_widget->scanAtStartup, TQT_SIGNAL(clicked()), TQT_SLOT(change()) );
-    connect( m_widget->scanButton, TQT_SIGNAL(clicked()), TQT_SLOT(scan()) );
+    connect( m_widget->scanAtStartup, TQ_SIGNAL(clicked()), TQ_SLOT(change()) );
+    connect( m_widget->scanButton, TQ_SIGNAL(clicked()), TQ_SLOT(scan()) );
 
     m_changed = false;
 
@@ -312,11 +312,11 @@ void KPluginOptions::scan()
     // start nspluginscan
     *m_nspluginscan << scanExe << "--verbose";
     kdDebug() << "Running nspluginscan" << endl;
-    connect(m_nspluginscan, TQT_SIGNAL(readReady(KProcIO*)),
-            this, TQT_SLOT(progress(KProcIO*)));
-    connect(m_nspluginscan, TQT_SIGNAL(processExited(TDEProcess *)),
-            this, TQT_SLOT(scanDone()));
-    connect(m_progress, TQT_SIGNAL(cancelled()), this, TQT_SLOT(scanDone()));
+    connect(m_nspluginscan, TQ_SIGNAL(readReady(KProcIO*)),
+            this, TQ_SLOT(progress(KProcIO*)));
+    connect(m_nspluginscan, TQ_SIGNAL(processExited(TDEProcess *)),
+            this, TQ_SLOT(scanDone()));
+    connect(m_progress, TQ_SIGNAL(cancelled()), this, TQ_SLOT(scanDone()));
 
     m_nspluginscan->start();
 }
@@ -345,22 +345,22 @@ void KPluginOptions::scanDone()
 void KPluginOptions::dirInit()
 {
     m_widget->dirEdit->setCaption(i18n("Select Plugin Scan Folder"));
-    connect( m_widget->dirNew, TQT_SIGNAL(clicked()), TQT_SLOT(dirNew()));
-    connect( m_widget->dirRemove, TQT_SIGNAL(clicked()), TQT_SLOT(dirRemove()));
-    connect( m_widget->dirUp, TQT_SIGNAL(clicked()), TQT_SLOT(dirUp()));
-    connect( m_widget->dirDown, TQT_SIGNAL(clicked()), TQT_SLOT(dirDown()) );
-    connect( m_widget->useArtsdsp, TQT_SIGNAL(clicked()),TQT_SLOT(change()));
+    connect( m_widget->dirNew, TQ_SIGNAL(clicked()), TQ_SLOT(dirNew()));
+    connect( m_widget->dirRemove, TQ_SIGNAL(clicked()), TQ_SLOT(dirRemove()));
+    connect( m_widget->dirUp, TQ_SIGNAL(clicked()), TQ_SLOT(dirUp()));
+    connect( m_widget->dirDown, TQ_SIGNAL(clicked()), TQ_SLOT(dirDown()) );
+    connect( m_widget->useArtsdsp, TQ_SIGNAL(clicked()),TQ_SLOT(change()));
     connect( m_widget->dirEdit,
-             TQT_SIGNAL(textChanged(const TQString&)),
-             TQT_SLOT(dirEdited(const TQString &)) );
+             TQ_SIGNAL(textChanged(const TQString&)),
+             TQ_SLOT(dirEdited(const TQString &)) );
 
     connect( m_widget->dirList,
-             TQT_SIGNAL(executed(TQListBoxItem*)),
-             TQT_SLOT(dirSelect(TQListBoxItem*)) );
+             TQ_SIGNAL(executed(TQListBoxItem*)),
+             TQ_SLOT(dirSelect(TQListBoxItem*)) );
 
     connect( m_widget->dirList,
-             TQT_SIGNAL(selectionChanged(TQListBoxItem*)),
-             TQT_SLOT(dirSelect(TQListBoxItem*)) );
+             TQ_SIGNAL(selectionChanged(TQListBoxItem*)),
+             TQ_SLOT(dirSelect(TQListBoxItem*)) );
 }
 
 
@@ -605,7 +605,7 @@ PluginDomainDialog::PluginDomainDialog(TQWidget *parent) :
   hl->addStretch(10);
 
   TQPushButton *closePB = new KPushButton(KStdGuiItem::close(),this);
-  connect(closePB,TQT_SIGNAL(clicked()),TQT_SLOT(slotClose()));
+  connect(closePB,TQ_SIGNAL(clicked()),TQ_SLOT(slotClose()));
   hl->addWidget(closePB);
   thisLayout->addLayout(hl);
 }
diff --git a/kcontrol/konqhtml/policydlg.cpp b/kcontrol/konqhtml/policydlg.cpp
index 9409023c1..03720f140 100644
--- a/kcontrol/konqhtml/policydlg.cpp
+++ b/kcontrol/konqhtml/policydlg.cpp
@@ -34,8 +34,8 @@ PolicyDialog::PolicyDialog( Policies *policies, TQWidget *parent, const char *na
   le_domain = new TQLineEdit(main);
   l->setBuddy( le_domain );
   grid->addWidget(le_domain, 0, 1);
-  connect( le_domain,TQT_SIGNAL(textChanged( const TQString & )),
-      TQT_SLOT(slotTextChanged( const TQString &)));
+  connect( le_domain,TQ_SIGNAL(textChanged( const TQString & )),
+      TQ_SLOT(slotTextChanged( const TQString &)));
 
   TQWhatsThis::add(le_domain, i18n("Enter the name of a host (like www.trinitydesktop.org) "
                                   "or a domain, starting with a dot (like .trinitydesktop.org or .org)") );
diff --git a/kcontrol/konqhtml/userInterConfig.cpp b/kcontrol/konqhtml/userInterConfig.cpp
index 4e18c6d38..d63512590 100644
--- a/kcontrol/konqhtml/userInterConfig.cpp
+++ b/kcontrol/konqhtml/userInterConfig.cpp
@@ -36,11 +36,11 @@ userInterConfig::userInterConfig(TDEConfig *config, TQString groupName,
     layout->addWidget(m_widget);
     layout->addStretch();
 
-    connect(m_widget, TQT_SIGNAL(changed()),
-            this, TQT_SLOT(changed()));
+    connect(m_widget, TQ_SIGNAL(changed()),
+            this, TQ_SLOT(changed()));
 
     load();
-    TQTimer::singleShot(0, this, TQT_SLOT(notChanged()));
+    TQTimer::singleShot(0, this, TQ_SLOT(notChanged()));
 }
 
 void userInterConfig::notChanged()
@@ -68,5 +68,5 @@ void userInterConfig::defaults()
     // TDEConfigDialogManager may queue an changed(false) signal,
     // so we make sure, that the module is labeled as changed,
     // while we manage some of the widgets ourselves
-    TQTimer::singleShot(0, this, TQT_SLOT(changed()));
+    TQTimer::singleShot(0, this, TQ_SLOT(changed()));
 }
diff --git a/kcontrol/konqhtml/userInterOpts_impl.cpp b/kcontrol/konqhtml/userInterOpts_impl.cpp
index efe3c7343..26eac0f60 100644
--- a/kcontrol/konqhtml/userInterOpts_impl.cpp
+++ b/kcontrol/konqhtml/userInterOpts_impl.cpp
@@ -39,17 +39,17 @@ userInterOpts::userInterOpts(TDEConfig *config, TQString groupName,
     : userInterOptsBase(parent, name), m_pConfig(config), m_groupName(groupName)
 {
     // connections
-    connect(m_pShowMMBInTabs, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pDynamicTabbarHide, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pDynamicTabbarCycle, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pNewTabsInBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pOpenAfterCurrentPage, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pTabConfirm, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pPermanentCloseButton, TQT_SIGNAL(toggled(bool)),  TQT_SLOT(slotChanged()));
-    connect(m_pHoverCloseButton, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pKonquerorTabforExternalURL, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pPopupsWithinTabs, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pTabCloseActivatePrevious, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
+    connect(m_pShowMMBInTabs, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pDynamicTabbarHide, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pDynamicTabbarCycle, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pNewTabsInBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pOpenAfterCurrentPage, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pTabConfirm, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pPermanentCloseButton, TQ_SIGNAL(toggled(bool)),  TQ_SLOT(slotChanged()));
+    connect(m_pHoverCloseButton, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pKonquerorTabforExternalURL, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pPopupsWithinTabs, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pTabCloseActivatePrevious, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
 }
 
 void userInterOpts::load()