Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit a4241b7911d2e0b36edfb02f616b8b282050c0ec)

7 files changed, 94 insertions, 94 deletions

diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp
index 1b477d0e3..55eb642fe 100644
--- a/kcontrol/konq/behaviour.cpp
+++ b/kcontrol/konq/behaviour.cpp
@@ -66,13 +66,13 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
     cbNewWin = new TQCheckBox(i18n("Open folders in separate &windows"), vbox);
     TQWhatsThis::add( cbNewWin, i18n("If this option is checked, Konqueror will open a new window when "
                                     "you open a folder, rather than showing that folder's contents in the current window."));
-    connect(cbNewWin, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
-    connect(cbNewWin, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateWinPixmap(bool)));
+    connect(cbNewWin, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
+    connect(cbNewWin, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateWinPixmap(bool)));
 
     // ----
 
     cbListProgress = new TQCheckBox( i18n( "&Show network operations in a single window" ), vbox );
-    connect(cbListProgress, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(cbListProgress, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
     TQWhatsThis::add( cbListProgress, i18n("Checking this option will group the"
                                           " progress information for all network file transfers into a single window"
@@ -83,7 +83,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
     // ----
 
     cbShowArchivesAsFolders = new TQCheckBox( i18n( "Show archived &files as folders" ), vbox );
-    connect(cbShowArchivesAsFolders, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(cbShowArchivesAsFolders, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
     TQWhatsThis::add( cbShowArchivesAsFolders, i18n("Checking this option will list archived"
                                           " files as folders when using tree view.") );
@@ -92,16 +92,16 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
     // --
 
     cbShowTips = new TQCheckBox( i18n( "Show file &tips" ), vbox );
-    connect(cbShowTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(cbShowTips, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
     TQWhatsThis::add( cbShowTips, i18n("Here you can control if, when moving the mouse over a file, you want to see a "
                                     "small popup window with additional information about that file."
                                     "This feature requires 'Enable tooltips' in KControl, Appearance & Themes, Style."));
 
-    connect(cbShowTips, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotShowTips(bool)));
+    connect(cbShowTips, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotShowTips(bool)));
 /*
-    //connect(cbShowTips, TQT_SIGNAL(toggled(bool)), sbToolTip, TQT_SLOT(setEnabled(bool)));
-    //connect(cbShowTips, TQT_SIGNAL(toggled(bool)), fileTips, TQT_SLOT(setEnabled(bool)));
+    //connect(cbShowTips, TQ_SIGNAL(toggled(bool)), sbToolTip, TQ_SLOT(setEnabled(bool)));
+    //connect(cbShowTips, TQ_SIGNAL(toggled(bool)), fileTips, TQ_SLOT(setEnabled(bool)));
     fileTips->setBuddy(sbToolTip);
     TQString tipstr = i18n("If you move the mouse over a file, you usually see a small popup window that shows some "
                           "additional information about that file. Here, you can set how many items of information "
@@ -116,7 +116,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
     spacer->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
 
     cbShowPreviewsInTips = new TQCheckBox( i18n( "Show &previews in file tips" ), hboxpreview );
-    connect(cbShowPreviewsInTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(cbShowPreviewsInTips, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
     TQWhatsThis::add( cbShowPreviewsInTips, i18n("Here you can control if you want the "
                           "popup window to contain a larger preview for the file, when moving the mouse over it."));
@@ -124,12 +124,12 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
     cbRenameDirectlyIcon = new TQCheckBox(i18n("Rename icons in&line"), vbox);
     TQWhatsThis::add(cbRenameDirectlyIcon, i18n("Checking this option will allow files to be "
                                                "renamed by clicking directly on the icon name. "));
-    connect(cbRenameDirectlyIcon, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(cbRenameDirectlyIcon, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
     cbDoubleClickMoveToParent = new TQCheckBox(i18n("Double click on empty area to move to parent folder"), vbox);
     TQWhatsThis::add(cbDoubleClickMoveToParent, i18n("When this option is enabled, double clicking an "
                                                 "empty area will navigate to the parent folder."));
-    connect(cbDoubleClickMoveToParent, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(cbDoubleClickMoveToParent, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
 	TQHBoxLayout *hlay = new TQHBoxLayout( lay );
 
@@ -140,7 +140,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
 	homeURL->setMode(KFile::Directory);
 	homeURL->setCaption(i18n("Select Home Folder"));
 	hlay->addWidget( homeURL );
-    connect(homeURL, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+    connect(homeURL, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
     label->setBuddy(homeURL);
 
     TQString homestr = i18n("This is the URL (e.g. a folder or a web page) where "
@@ -153,7 +153,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
 
     cbShowDeleteCommand = new TQCheckBox( i18n( "Show 'Delete' context me&nu entries which bypass the trashcan" ), this );
     lay->addWidget( cbShowDeleteCommand );
-    connect(cbShowDeleteCommand, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(cbShowDeleteCommand, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
     TQWhatsThis::add( cbShowDeleteCommand, i18n("Check this if you want 'Delete' menu commands to be displayed "
                                                 "on the desktop and in the file manager's context menus. "
@@ -169,7 +169,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
        " <li><em>Delete:</em> simply deletes the file.</li>"
        " </li></ul>") );
 
-    connect(bg, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( changed() ));
+    connect(bg, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( changed() ));
 
     cbMoveToTrash = new TQCheckBox( i18n("&Move to trash"), bg );
 
diff --git a/kcontrol/konq/browser.cpp b/kcontrol/konq/browser.cpp
index 49587f2dc..4a8496eac 100644
--- a/kcontrol/konq/browser.cpp
+++ b/kcontrol/konq/browser.cpp
@@ -57,14 +57,14 @@ KBrowserOptions::KBrowserOptions(TDEConfig *config, TQString group, TQWidget *pa
     tab->addTab(kuick, i18n("&Quick Copy && Move"));
   }
 
-  connect(appearance, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
-  connect(behavior, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
-  connect(previews, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
+  connect(appearance, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool)));
+  connect(behavior, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool)));
+  connect(previews, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool)));
   if (kuick)
-     connect(kuick, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
+     connect(kuick, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool)));
 
-  connect(tab, TQT_SIGNAL(currentChanged(TQWidget *)), 
-          this, TQT_SIGNAL(quickHelpChanged()));
+  connect(tab, TQ_SIGNAL(currentChanged(TQWidget *)), 
+          this, TQ_SIGNAL(quickHelpChanged()));
   m_tab = tab;
 }
 
diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp
index d7af32f8b..5125a03f1 100644
--- a/kcontrol/konq/desktop.cpp
+++ b/kcontrol/konq/desktop.cpp
@@ -70,8 +70,8 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/)
   TQLabel *label = new TQLabel(i18n("N&umber of desktops: "), number_group);
   _numInput = new KIntNumInput(4, number_group);
   _numInput->setRange(1, maxDesktops, 1, true);
-  connect(_numInput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)));
-  connect(_numInput, TQT_SIGNAL(valueChanged(int)),  TQT_SLOT( changed() ));
+  connect(_numInput, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)));
+  connect(_numInput, TQ_SIGNAL(valueChanged(int)),  TQ_SLOT( changed() ));
   label->setBuddy( _numInput );
   TQString wtstr = i18n( "Here you can set how many virtual desktops you want on your TDE desktop. Move the slider to change the value." );
   TQWhatsThis::add( label, wtstr );
@@ -99,10 +99,10 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/)
       TQWhatsThis::add( _nameLabel[i+(maxDesktops/2)], i18n( "Here you can enter the name for desktop %1" ).arg( i+(maxDesktops/2)+1 ) );
       TQWhatsThis::add( _nameInput[i+(maxDesktops/2)], i18n( "Here you can enter the name for desktop %1" ).arg( i+(maxDesktops/2)+1 ) );
 
-      connect(_nameInput[i], TQT_SIGNAL(textChanged(const TQString&)),
-           TQT_SLOT( changed() ));
-      connect(_nameInput[i+(maxDesktops/2)], TQT_SIGNAL(textChanged(const TQString&)),
-           TQT_SLOT( changed() ));
+      connect(_nameInput[i], TQ_SIGNAL(textChanged(const TQString&)),
+           TQ_SLOT( changed() ));
+      connect(_nameInput[i+(maxDesktops/2)], TQ_SIGNAL(textChanged(const TQString&)),
+           TQ_SLOT( changed() ));
     }
 
   for(int i = 1; i < maxDesktops; i++)
@@ -111,7 +111,7 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/)
   layout->addWidget(name_group);
 
   _wheelOption = new TQCheckBox(i18n("Mouse wheel over desktop background switches desktop"), this);
-  connect(_wheelOption,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
+  connect(_wheelOption,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
 
   layout->addWidget(_wheelOption);
   layout->addStretch(1);
diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp
index 5c5fe2b95..3d149ef39 100644
--- a/kcontrol/konq/desktopbehavior_impl.cpp
+++ b/kcontrol/konq/desktopbehavior_impl.cpp
@@ -53,7 +53,7 @@ DesktopBehaviorModule::DesktopBehaviorModule(TDEConfig *config, TQWidget *parent
     TQVBoxLayout* layout = new TQVBoxLayout(this);
     m_behavior = new DesktopBehavior(config, this);
     layout->addWidget(m_behavior);
-    connect(m_behavior, TQT_SIGNAL(changed()), this, TQT_SLOT(changed()));
+    connect(m_behavior, TQ_SIGNAL(changed()), this, TQ_SLOT(changed()));
 }
 
 void DesktopBehaviorModule::changed()
@@ -127,16 +127,16 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char
 
   m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media"));
 
-  connect(desktopMenuGroup, TQT_SIGNAL(clicked(int)), this, TQT_SIGNAL(changed()));
-  connect(iconsEnabledBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged()));
-  connect(showHiddenBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed()));
-  connect(vrootBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed()));
-  connect(lockInPlaceBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableGridChanged()));
-  connect(autoLineupIconsBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableGridChanged()));
-  connect(toolTipBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed()));
-  connect(mediaListView, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(mediaListViewChanged(TQListViewItem *)));
-  connect(spacingValue, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(spacingChanged(int)));
-  connect(spacingCtrlScroll, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed()));
+  connect(desktopMenuGroup, TQ_SIGNAL(clicked(int)), this, TQ_SIGNAL(changed()));
+  connect(iconsEnabledBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableChanged()));
+  connect(showHiddenBox, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(changed()));
+  connect(vrootBox, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(changed()));
+  connect(lockInPlaceBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableGridChanged()));
+  connect(autoLineupIconsBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableGridChanged()));
+  connect(toolTipBox, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(changed()));
+  connect(mediaListView, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(mediaListViewChanged(TQListViewItem *)));
+  connect(spacingValue, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(spacingChanged(int)));
+  connect(spacingCtrlScroll, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(changed()));
 
   strMouseButton1 = i18n("&Left button:");
   strButtonTxt1 = i18n( "You can choose what happens when"
@@ -155,9 +155,9 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char
   leftLabel->setText( strMouseButton1 );
   leftLabel->setBuddy( leftComboBox );
   fillMenuCombo( leftComboBox );
-  connect(leftEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed()));
-  connect(leftComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed()));
-  connect(leftComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged()));
+  connect(leftEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editButtonPressed()));
+  connect(leftComboBox, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(changed()));
+  connect(leftComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(comboBoxChanged()));
   TQString wtstr = strButtonTxt1 +
                   i18n(" <ul><li><em>No action:</em> as you might guess, nothing happens!</li>"
                        " <li><em>Window list menu:</em> a menu showing all windows on all"
@@ -177,9 +177,9 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char
 
   middleLabel->setBuddy( middleComboBox );
   fillMenuCombo( middleComboBox );
-  connect(middleEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed()));
-  connect(middleComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed()));
-  connect(middleComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged()));
+  connect(middleEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editButtonPressed()));
+  connect(middleComboBox, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(changed()));
+  connect(middleComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(comboBoxChanged()));
   wtstr = i18n("You can choose what happens when"
                " you click the middle button of your pointing device on the desktop:"
                " <ul><li><em>No action:</em> as you might guess, nothing happens!</li>"
@@ -201,9 +201,9 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char
   rightLabel->setText( strMouseButton3 );
   rightLabel->setBuddy( rightComboBox );
   fillMenuCombo( rightComboBox );
-  connect(rightEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed()));
-  connect(rightComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed()));
-  connect(rightComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged()));
+  connect(rightEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editButtonPressed()));
+  connect(rightComboBox, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(changed()));
+  connect(rightComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(comboBoxChanged()));
   wtstr = strButtonTxt3 +
           i18n(" <ul><li><em>No action:</em> as you might guess, nothing happens!</li>"
                " <li><em>Window list menu:</em> a menu showing all windows on all"
@@ -223,8 +223,8 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char
 
   if (m_bHasMedia)
   {
-     connect(enableMediaBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged()));
-     connect(enableMediaFreeSpaceOverlayBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged()));
+     connect(enableMediaBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableChanged()));
+     connect(enableMediaFreeSpaceOverlayBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableChanged()));
   }
   else
   {
diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp
index 94f866b1a..e8a99297d 100644
--- a/kcontrol/konq/fontopts.cpp
+++ b/kcontrol/konq/fontopts.cpp
@@ -66,22 +66,22 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
     TQWhatsThis::add( m_pStandard, wtstr );
 
     row++;
-    connect( m_pStandard, TQT_SIGNAL( activated(const TQString&) ),
-             TQT_SLOT( slotStandardFont(const TQString&) ) );
-    connect( m_pStandard, TQT_SIGNAL( activated(const TQString&) ),
-             TQT_SLOT(changed() ) );
-    connect( m_pStandard, TQT_SIGNAL( textChanged(const TQString&) ),
-             TQT_SLOT( slotStandardFont(const TQString&) ) );
-    connect( m_pStandard, TQT_SIGNAL( textChanged(const TQString&) ),
-             TQT_SLOT(changed() ) );
+    connect( m_pStandard, TQ_SIGNAL( activated(const TQString&) ),
+             TQ_SLOT( slotStandardFont(const TQString&) ) );
+    connect( m_pStandard, TQ_SIGNAL( activated(const TQString&) ),
+             TQ_SLOT(changed() ) );
+    connect( m_pStandard, TQ_SIGNAL( textChanged(const TQString&) ),
+             TQ_SLOT( slotStandardFont(const TQString&) ) );
+    connect( m_pStandard, TQ_SIGNAL( textChanged(const TQString&) ),
+             TQ_SLOT(changed() ) );
 
     m_pSize = new TQSpinBox( 4,18,1,this );
     label = new TQLabel( m_pSize, i18n("Font si&ze:"), this );
     lay->addWidget(label,row,0);
     lay->addMultiCellWidget(m_pSize,row,row,1,1);
 
-    connect( m_pSize, TQT_SIGNAL( valueChanged(int) ),
-             this, TQT_SLOT( slotFontSize(int) ) );
+    connect( m_pSize, TQ_SIGNAL( valueChanged(int) ),
+             this, TQ_SLOT( slotFontSize(int) ) );
     row+=2;
 
     wtstr = i18n("This is the font size used to display text in Konqueror windows.");
@@ -100,8 +100,8 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
     TQWhatsThis::add( label, wtstr );
     TQWhatsThis::add( m_pNormalText, wtstr );
 
-    connect( m_pNormalText, TQT_SIGNAL( changed( const TQColor & ) ),
-             TQT_SLOT( slotNormalTextColorChanged( const TQColor & ) ) );
+    connect( m_pNormalText, TQ_SIGNAL( changed( const TQColor & ) ),
+             TQ_SLOT( slotNormalTextColorChanged( const TQColor & ) ) );
 
     /*
     row++;
@@ -115,8 +115,8 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
     TQWhatsThis::add( label, wtstr );
     TQWhatsThis::add( m_pHighlightedText, wtstr );
 
-    connect( m_pHighlightedText, TQT_SIGNAL( changed( const TQColor & ) ),
-             TQT_SLOT( slotHighlightedTextColorChanged( const TQColor & ) ) );
+    connect( m_pHighlightedText, TQ_SIGNAL( changed( const TQColor & ) ),
+             TQ_SLOT( slotHighlightedTextColorChanged( const TQColor & ) ) );
     */
 
     row++;
@@ -125,8 +125,8 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
     {
         m_cbTextBackground = new TQCheckBox( i18n("&Text background color:"), this );
         lay->addWidget(m_cbTextBackground,row,0);
-        connect( m_cbTextBackground, TQT_SIGNAL( clicked() ),
-                 TQT_SLOT( slotTextBackgroundClicked() ) );
+        connect( m_cbTextBackground, TQ_SIGNAL( clicked() ),
+                 TQ_SLOT( slotTextBackgroundClicked() ) );
 
         m_pTextBackground = new KColorButton( textBackgroundColor, this );
         lay->addWidget(m_pTextBackground,row,COLOR_BUTTON_COL,(TQt::AlignmentFlags)hAlign);
@@ -135,8 +135,8 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
         TQWhatsThis::add( label, wtstr );
         TQWhatsThis::add( m_pTextBackground, wtstr );
 
-        connect( m_pTextBackground, TQT_SIGNAL( changed( const TQColor & ) ),
-                 TQT_SLOT( slotTextBackgroundColorChanged( const TQColor & ) ) );
+        connect( m_pTextBackground, TQ_SIGNAL( changed( const TQColor & ) ),
+                 TQ_SLOT( slotTextBackgroundColorChanged( const TQColor & ) ) );
 
         row++;
     }
@@ -146,10 +146,10 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
         TQLabel* label = new TQLabel( m_pNbLines, i18n("H&eight for icon text:"), this );
         lay->addWidget( label, row, 0 );
         lay->addWidget( m_pNbLines, row, 1 );
-        connect( m_pNbLines, TQT_SIGNAL( valueChanged(int) ),
-                 this, TQT_SLOT( changed() ) );
-        connect( m_pNbLines, TQT_SIGNAL( valueChanged(int) ),
-                 TQT_SLOT( slotPNbLinesChanged(int)) );
+        connect( m_pNbLines, TQ_SIGNAL( valueChanged(int) ),
+                 this, TQ_SLOT( changed() ) );
+        connect( m_pNbLines, TQ_SIGNAL( valueChanged(int) ),
+                 TQ_SLOT( slotPNbLinesChanged(int)) );
 
         TQString thwt = i18n("This is the maximum number of lines that can be"
                             " used to draw icon text. Long file names are"
@@ -165,10 +165,10 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
         label = new TQLabel( m_pNbWidth, i18n("&Width for icon text:"), this );
         lay->addWidget( label, row, 0 );
         lay->addWidget( m_pNbWidth, row, 1 );
-        connect( m_pNbWidth, TQT_SIGNAL( valueChanged(int) ),
-                 this, TQT_SLOT( changed() ) );
-        connect( m_pNbWidth, TQT_SIGNAL( valueChanged(int) ),
-                 TQT_SLOT( slotPNbWidthChanged(int)) );
+        connect( m_pNbWidth, TQ_SIGNAL( valueChanged(int) ),
+                 this, TQ_SLOT( changed() ) );
+        connect( m_pNbWidth, TQ_SIGNAL( valueChanged(int) ),
+                 TQ_SLOT( slotPNbWidthChanged(int)) );
 
         thwt = i18n( "This is the maximum width for the icon text when konqueror "
                      "is used in multi column view mode." );
@@ -180,7 +180,7 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
 
     cbUnderline = new TQCheckBox(i18n("&Underline filenames"), this);
     lay->addMultiCellWidget(cbUnderline,row,row,0,LASTCOLUMN,(TQt::AlignmentFlags)hAlign);
-    connect(cbUnderline, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(cbUnderline, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
     TQWhatsThis::add( cbUnderline, i18n("Checking this option will result in filenames"
                                        " being underlined, so that they look like links on a web page. Note:"
@@ -193,7 +193,7 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
 
         m_pSizeInBytes = new TQCheckBox(i18n("Display file sizes in b&ytes"), this);
         lay->addMultiCellWidget( m_pSizeInBytes,row,row,0,LASTCOLUMN,(TQt::AlignmentFlags)hAlign );
-        connect( m_pSizeInBytes, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()) );
+        connect( m_pSizeInBytes, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()) );
 
         TQWhatsThis::add( m_pSizeInBytes, i18n("Checking this option will result in file sizes"
                                               " being displayed in bytes. Otherwise file sizes are"
diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp
index 3b2349fc7..309651dbb 100644
--- a/kcontrol/konq/previews.cpp
+++ b/kcontrol/konq/previews.cpp
@@ -130,14 +130,14 @@ KPreviewOptions::KPreviewOptions( TQWidget *parent, const char */*name*/ )
     m_maxSize->setRange( 0.2, 100, 0.2, true );
     label->setBuddy( m_maxSize );
     lay->addWidget( m_maxSize );
-    connect( m_maxSize, TQT_SIGNAL( valueChanged(double) ), TQT_SLOT( changed() ) );
+    connect( m_maxSize, TQ_SIGNAL( valueChanged(double) ), TQ_SLOT( changed() ) );
 
     m_boostSize = new TQCheckBox(i18n("&Increase size of previews relative to icons"), this);
-    connect( m_boostSize, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( changed() ) );
+    connect( m_boostSize, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( changed() ) );
     lay->addWidget(m_boostSize);
 
     m_useFileThumbnails = new TQCheckBox(i18n("&Use thumbnails embedded in files"), this);
-    connect( m_useFileThumbnails, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( changed() ) );
+    connect( m_useFileThumbnails, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( changed() ) );
 
     lay->addWidget(m_useFileThumbnails);
 
diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp
index 5da14f2f5..be73dcb7a 100644
--- a/kcontrol/konq/rootopts.cpp
+++ b/kcontrol/konq/rootopts.cpp
@@ -78,7 +78,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urDesktop->setMode( KFile::Directory );
   tmpLabel->setBuddy( urDesktop );
   lay->addMultiCellWidget(urDesktop, row, row, 1, RO_LASTCOL);
-  connect(urDesktop, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urDesktop, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   TQString wtstr = i18n("This folder contains all the files"
                        " which you see on your desktop. You can change the location of this"
                        " folder if you want to, and the contents will move automatically"
@@ -93,7 +93,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urAutostart->setMode( KFile::Directory );
   tmpLabel->setBuddy( urAutostart );
   lay->addMultiCellWidget(urAutostart, row, row, 1, RO_LASTCOL);
-  connect(urAutostart, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urAutostart, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   wtstr = i18n("This folder contains applications or"
                " links to applications (shortcuts) that you want to have started"
                " automatically whenever TDE starts. You can change the location of this"
@@ -109,7 +109,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urDocument->setMode( KFile::Directory );
   tmpLabel->setBuddy( urDocument );
   lay->addMultiCellWidget(urDocument, row, row, 1, RO_LASTCOL);
-  connect(urDocument, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urDocument, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   wtstr = i18n("This folder will be used by default to load or save documents from or to.");
   TQWhatsThis::add( tmpLabel, wtstr );
   TQWhatsThis::add( urDocument, wtstr );
@@ -121,7 +121,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urDownload->setMode( KFile::Directory );
   tmpLabel->setBuddy( urDownload );
   lay->addMultiCellWidget(urDownload, row, row, 1, RO_LASTCOL);
-  connect(urDownload, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urDownload, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   wtstr = i18n("This folder will be used by default to load or save downloads from or to.");
   TQWhatsThis::add( tmpLabel, wtstr );
   TQWhatsThis::add( urDownload, wtstr );
@@ -133,7 +133,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urMusic->setMode( KFile::Directory );
   tmpLabel->setBuddy( urMusic );
   lay->addMultiCellWidget(urMusic, row, row, 1, RO_LASTCOL);
-  connect(urMusic, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urMusic, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   wtstr = i18n("This folder will be used by default to load or save music from or to.");
   TQWhatsThis::add( tmpLabel, wtstr );
   TQWhatsThis::add( urMusic, wtstr );
@@ -145,7 +145,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urPictures->setMode( KFile::Directory );
   tmpLabel->setBuddy( urPictures );
   lay->addMultiCellWidget(urPictures, row, row, 1, RO_LASTCOL);
-  connect(urPictures, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urPictures, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   wtstr = i18n("This folder will be used by default to load or save pictures from or to.");
   TQWhatsThis::add( tmpLabel, wtstr );
   TQWhatsThis::add( urPictures, wtstr );
@@ -157,7 +157,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urPublicShare->setMode( KFile::Directory );
   tmpLabel->setBuddy( urPublicShare );
   lay->addMultiCellWidget(urPublicShare, row, row, 1, RO_LASTCOL);
-  connect(urPublicShare, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urPublicShare, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   wtstr = i18n("This folder will be used by default to load or save public shared files from or to.");
   TQWhatsThis::add( tmpLabel, wtstr );
   TQWhatsThis::add( urPublicShare, wtstr );
@@ -169,7 +169,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urTemplates->setMode( KFile::Directory );
   tmpLabel->setBuddy( urTemplates );
   lay->addMultiCellWidget(urTemplates, row, row, 1, RO_LASTCOL);
-  connect(urTemplates, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urTemplates, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   wtstr = i18n("This folder will be used by default to load or save templates from or to.");
   TQWhatsThis::add( tmpLabel, wtstr );
   TQWhatsThis::add( urTemplates, wtstr );
@@ -181,7 +181,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urVideos->setMode( KFile::Directory );
   tmpLabel->setBuddy( urVideos );
   lay->addMultiCellWidget(urVideos, row, row, 1, RO_LASTCOL);
-  connect(urVideos, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urVideos, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   wtstr = i18n("This folder will be used by default to load or save videos from or to.");
   TQWhatsThis::add( tmpLabel, wtstr );
   TQWhatsThis::add( urVideos, wtstr );
@@ -190,7 +190,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   Q_ASSERT( row == RO_LASTROW-1 ); // if it fails here, check the row++ and RO_LASTROW above
 
   loadTmr = new TQTimer(this);
-  connect(loadTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(loadTimerDone()));
+  connect(loadTmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(loadTimerDone()));
 
   load();
 }
@@ -543,8 +543,8 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt
             m_copyToDest = dest;
             m_copyFromSrc = src;
             TDEIO::ListJob* job = TDEIO::listDir( src );
-            connect( job, TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ),
-                     this, TQT_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ) );
+            connect( job, TQ_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ),
+                     this, TQ_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ) );
             tqApp->enter_loop();
 
             if (m_ok)
@@ -555,7 +555,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt
         else
         {
             TDEIO::Job * job = TDEIO::move( src, dest );
-            connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+            connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) );
             // wait for job
             tqApp->enter_loop();
         }
@@ -583,7 +583,7 @@ void DesktopPathConfig::slotEntries( TDEIO::Job * job, const TDEIO::UDSEntryList
         }
 
         TDEIO::Job * moveJob = TDEIO::move( file.url(), m_copyToDest );
-        connect( moveJob, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+        connect( moveJob, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) );
         tqApp->enter_loop();
     }
     tqApp->exit_loop();