Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

14 files changed, 136 insertions, 136 deletions

diff --git a/twin-styles/cde/cdeclient.cpp b/twin-styles/cde/cdeclient.cpp
index 5aa8215e..1c89f218 100644
--- a/twin-styles/cde/cdeclient.cpp
+++ b/twin-styles/cde/cdeclient.cpp
@@ -329,8 +329,8 @@ void CdeClient::addClientButtons( const TQString& s )
                     if ( ! button[BtnMenu] )
                     {
                         button[BtnMenu] = new CdeButton( this, "menu", BtnMenu, i18n("Menu"), TQt::LeftButton|TQt::RightButton );
-                        connect( button[BtnMenu], TQT_SIGNAL(pressed()), TQT_SLOT(menuButtonPressed()) );
-                        connect( button[BtnMenu], TQT_SIGNAL(released()), TQT_SLOT(menuButtonReleased()) );
+                        connect( button[BtnMenu], TQ_SIGNAL(pressed()), TQ_SLOT(menuButtonPressed()) );
+                        connect( button[BtnMenu], TQ_SIGNAL(released()), TQ_SLOT(menuButtonReleased()) );
                         titleLayout->addWidget( button[BtnMenu] );
                     }
                     break;
@@ -341,7 +341,7 @@ void CdeClient::addClientButtons( const TQString& s )
                     {
                         button[BtnHelp] = new CdeButton( this, "help", BtnHelp, i18n("Help") );
                         connect(button[BtnHelp],
-				TQT_SIGNAL(clicked()), TQT_SLOT(showContextHelp()));
+				TQ_SIGNAL(clicked()), TQ_SLOT(showContextHelp()));
                         titleLayout->addWidget( button[BtnHelp] );
                     }
                     break;
@@ -352,7 +352,7 @@ void CdeClient::addClientButtons( const TQString& s )
                     {
                         button[BtnIconify] = new CdeButton( this, "iconify", BtnIconify, i18n("Minimize") );
                         connect(button[BtnIconify],
-				TQT_SIGNAL(clicked()), TQT_SLOT(minimize()));
+				TQ_SIGNAL(clicked()), TQ_SLOT(minimize()));
                         titleLayout->addWidget( button[BtnIconify] );
                     }
                     break;
@@ -362,8 +362,8 @@ void CdeClient::addClientButtons( const TQString& s )
                     if ( (! button[BtnMax] ) && isMaximizable() )
                     {
                         button[BtnMax] = new CdeButton(this, "maximize", BtnMax, i18n("Maximize"), TQt::LeftButton|TQt::MidButton|TQt::RightButton);
-                        connect(button[BtnMax], TQT_SIGNAL(clicked()),
-				TQT_SLOT(maximizeButtonClicked()));
+                        connect(button[BtnMax], TQ_SIGNAL(clicked()),
+				TQ_SLOT(maximizeButtonClicked()));
                         titleLayout->addWidget( button[BtnMax] );
                     }
                     break;
@@ -373,7 +373,7 @@ void CdeClient::addClientButtons( const TQString& s )
                     if ( !button[BtnClose] && isCloseable())
                     {
                         button[BtnClose] = new CdeButton(this, "close", BtnClose, i18n("Close"));
-                        connect( button[BtnClose], TQT_SIGNAL( clicked()), TQT_SLOT(closeWindow()) );
+                        connect( button[BtnClose], TQ_SIGNAL( clicked()), TQ_SLOT(closeWindow()) );
                         titleLayout->addWidget( button[BtnClose] );
                     }
 		// Add onAlldesktops button and spacers
diff --git a/twin-styles/cde/config/config.cpp b/twin-styles/cde/config/config.cpp
index 48b5c791..e14c82b0 100644
--- a/twin-styles/cde/config/config.cpp
+++ b/twin-styles/cde/config/config.cpp
@@ -54,9 +54,9 @@ CdeConfig::CdeConfig( TDEConfig* conf, TQWidget* parent )
 	load( conf );
 
 	// Ensure we track user changes properly
-	connect( cbColorBorder, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) );
-//	connect( cbTitlebarButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) );
-	connect( bgAlign, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotSelectionChanged(int)) );
+	connect( cbColorBorder, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectionChanged()) );
+//	connect( cbTitlebarButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectionChanged()) );
+	connect( bgAlign, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotSelectionChanged(int)) );
 
 	// Make the widgets visible in twindecoration
 	groupBox->show();
diff --git a/twin-styles/glow/config/glowconfigdialog.cpp b/twin-styles/glow/config/glowconfigdialog.cpp
index af13655e..98234175 100644
--- a/twin-styles/glow/config/glowconfigdialog.cpp
+++ b/twin-styles/glow/config/glowconfigdialog.cpp
@@ -73,8 +73,8 @@ GlowConfigDialog::GlowConfigDialog( TDEConfig * conf, TQWidget * parent )
         _theme_list_view->setResizeMode(TQListView::AllColumns);
 
 	main_group_boxLayout->addWidget (_theme_list_view);
-	TQObject::connect (_theme_list_view, TQT_SIGNAL(selectionChanged()),
-			this, TQT_SLOT(slotThemeListViewSelectionChanged()));
+	TQObject::connect (_theme_list_view, TQ_SIGNAL(selectionChanged()),
+			this, TQ_SLOT(slotThemeListViewSelectionChanged()));
 	slotLoadThemeList();
 
 	_button_glow_color_group_box = new TQGroupBox(
@@ -121,14 +121,14 @@ GlowConfigDialog::GlowConfigDialog( TDEConfig * conf, TQWidget * parent )
 	_titleButtonMapper = new TQSignalMapper(this);
 	for( uint i=0; i<_titleButtonList.size(); i++ ) {
 		_titleButtonMapper->setMapping(_titleButtonList[i], i);
-		connect(_titleButtonList[i], TQT_SIGNAL(clicked()),_titleButtonMapper, TQT_SLOT(map()));
+		connect(_titleButtonList[i], TQ_SIGNAL(clicked()),_titleButtonMapper, TQ_SLOT(map()));
 	}
-	connect(_titleButtonMapper, TQT_SIGNAL(mapped(int)),this, TQT_SLOT(slotTitleButtonClicked(int)));
+	connect(_titleButtonMapper, TQ_SIGNAL(mapped(int)),this, TQ_SLOT(slotTitleButtonClicked(int)));
 
 	_colorButton = new KColorButton(_button_glow_color_group_box);
 	_colorButton->setEnabled(false);
-	connect(_colorButton, TQT_SIGNAL(changed(const TQColor&)),
-		this, TQT_SLOT(slotColorButtonChanged(const TQColor&)));
+	connect(_colorButton, TQ_SIGNAL(changed(const TQColor&)),
+		this, TQ_SLOT(slotColorButtonChanged(const TQColor&)));
 
 	colorHBoxLayout->addItem(new TQSpacerItem(
 		200, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
@@ -156,8 +156,8 @@ GlowConfigDialog::GlowConfigDialog( TDEConfig * conf, TQWidget * parent )
 		_titlebarGradientTypeComboBox->insertItem(gradPixmap, i);
 	}
 
-	connect(_titlebarGradientTypeComboBox, TQT_SIGNAL(activated(int)),
-		this, TQT_SLOT(slotTitlebarGradientTypeChanged(int)));
+	connect(_titlebarGradientTypeComboBox, TQ_SIGNAL(activated(int)),
+		this, TQ_SLOT(slotTitlebarGradientTypeChanged(int)));
 	titlebarGradientTypeLayout->addWidget(
 		new TQLabel(i18n("Titlebar gradient:"), _main_group_box));
 	titlebarGradientTypeLayout->addWidget(_titlebarGradientTypeComboBox, 0, TQt::AlignLeft);
@@ -167,8 +167,8 @@ GlowConfigDialog::GlowConfigDialog( TDEConfig * conf, TQWidget * parent )
 
 	_showResizeHandleCheckBox = new TQCheckBox(
 			i18n("Show resize handle"),	_main_group_box);
-	connect(_showResizeHandleCheckBox, TQT_SIGNAL(clicked()),
-		this, TQT_SLOT(slotResizeHandleCheckBoxChanged()));
+	connect(_showResizeHandleCheckBox, TQ_SIGNAL(clicked()),
+		this, TQ_SLOT(slotResizeHandleCheckBoxChanged()));
 	main_group_boxLayout->addWidget(_showResizeHandleCheckBox);
 
 	// load config and update user interface
diff --git a/twin-styles/glow/glowbutton.cpp b/twin-styles/glow/glowbutton.cpp
index 9baa98a3..a3f70741 100644
--- a/twin-styles/glow/glowbutton.cpp
+++ b/twin-styles/glow/glowbutton.cpp
@@ -90,7 +90,7 @@ GlowButton::GlowButton(TQWidget *parent, const char *name,
 	m_pixmapName = TQString();
 
 	m_timer = new TQTimer(this);
-	connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()));
+	connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout()));
 	m_pos = 0;
 	m_timerStatus = Stop;
 
diff --git a/twin-styles/glow/glowclient.cpp b/twin-styles/glow/glowclient.cpp
index d4650246..7c905e99 100644
--- a/twin-styles/glow/glowclient.cpp
+++ b/twin-styles/glow/glowclient.cpp
@@ -654,31 +654,31 @@ void GlowClient::createButtons()
 	m_stickyButton = factory->createGlowButton(widget(),
 					"StickyButton", isOnAllDesktops()?i18n("Not on all desktops"):i18n("On all desktops"), TQt::LeftButton|TQt::RightButton);
 	m_stickyButton->setFixedSize(size);
-	connect(m_stickyButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleOnAllDesktops()));
+	connect(m_stickyButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleOnAllDesktops()));
 	m_buttonList.insert(m_buttonList.end(), m_stickyButton);
 
 	m_helpButton = factory->createGlowButton(widget(),
 					"HelpButton", i18n("Help"));
 	m_helpButton->setFixedSize(size);
-	connect(m_helpButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(showContextHelp()));
+	connect(m_helpButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(showContextHelp()));
 	m_buttonList.insert(m_buttonList.end(), m_helpButton);
 
 	m_minimizeButton = factory->createGlowButton(widget(),
 					"IconifyButton", i18n("Minimize"));
 	m_minimizeButton->setFixedSize(size);
-	connect(m_minimizeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(minimize()));
+	connect(m_minimizeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(minimize()));
 	m_buttonList.insert(m_buttonList.end(), m_minimizeButton);
 
 	m_maximizeButton=factory->createGlowButton(widget(),
 					"MaximizeButton", i18n("Maximize"), TQt::LeftButton|TQt::MidButton|TQt::RightButton);
 	m_maximizeButton->setFixedSize(size);
-	connect(m_maximizeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMaximize()));
+	connect(m_maximizeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMaximize()));
 	m_buttonList.insert(m_buttonList.end(), m_maximizeButton);
 
 	m_closeButton = factory->createGlowButton(widget(),
 					"CloseButton", i18n("Close"));
 	m_closeButton->setFixedSize(size);
-	connect(m_closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeWindow()));
+	connect(m_closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(closeWindow()));
 	m_buttonList.insert(m_buttonList.end(), m_closeButton);
 }
 
diff --git a/twin-styles/icewm/config/config.cpp b/twin-styles/icewm/config/config.cpp
index 88905c80..3b6b77a6 100644
--- a/twin-styles/icewm/config/config.cpp
+++ b/twin-styles/icewm/config/config.cpp
@@ -112,20 +112,20 @@ IceWMConfig::IceWMConfig( TDEConfig* conf, TQWidget* parent )
 	load( conf );
 
 	// Ensure we track user changes properly
-	connect( themeListBox, TQT_SIGNAL(selectionChanged()),
-			 this, TQT_SLOT(slotSelectionChanged()) );
+	connect( themeListBox, TQ_SIGNAL(selectionChanged()),
+			 this, TQ_SLOT(slotSelectionChanged()) );
 
-	connect( urlLabel, TQT_SIGNAL(leftClickedURL(const TQString&)),
-			 this, TQT_SLOT(callURL(const TQString&)));
+	connect( urlLabel, TQ_SIGNAL(leftClickedURL(const TQString&)),
+			 this, TQ_SLOT(callURL(const TQString&)));
 
-	connect( cbThemeTitleTextColors, TQT_SIGNAL(clicked()),
-			 this, TQT_SLOT(slotSelectionChanged()) );
+	connect( cbThemeTitleTextColors, TQ_SIGNAL(clicked()),
+			 this, TQ_SLOT(slotSelectionChanged()) );
 
-	connect( cbTitleBarOnTop, TQT_SIGNAL(clicked()),
-			 this, TQT_SLOT(slotSelectionChanged()) );
+	connect( cbTitleBarOnTop, TQ_SIGNAL(clicked()),
+			 this, TQ_SLOT(slotSelectionChanged()) );
 
-	connect( cbShowMenuButtonIcon, TQT_SIGNAL(clicked()),
-			 this, TQT_SLOT(slotSelectionChanged()) );
+	connect( cbShowMenuButtonIcon, TQ_SIGNAL(clicked()),
+			 this, TQ_SLOT(slotSelectionChanged()) );
 
 	// Create the theme directory (if not found) ... and obtain the path as we do so.
 	localThemeString = TDEGlobal::dirs()->saveLocation("data", "twin");
@@ -135,9 +135,9 @@ IceWMConfig::IceWMConfig( TDEConfig* conf, TQWidget* parent )
 
 	// Watch the icewm theme directory for theme additions/removals
 	KDirWatch::self()->addDir(localThemeString);
-	connect( KDirWatch::self(), TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(findIceWMThemes()) );
-	connect( KDirWatch::self(), TQT_SIGNAL(created(const TQString&)), this, TQT_SLOT(findIceWMThemes()) );
-	connect( KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)), this, TQT_SLOT(findIceWMThemes()) );
+	connect( KDirWatch::self(), TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(findIceWMThemes()) );
+	connect( KDirWatch::self(), TQ_SIGNAL(created(const TQString&)), this, TQ_SLOT(findIceWMThemes()) );
+	connect( KDirWatch::self(), TQ_SIGNAL(deleted(const TQString&)), this, TQ_SLOT(findIceWMThemes()) );
 
 	// Set the konqui link url
 	TQString urlThemeString = TQString("file://") + localThemeString;
diff --git a/twin-styles/icewm/icewm.cpp b/twin-styles/icewm/icewm.cpp
index 3e4b9c08..4ce0a2c8 100644
--- a/twin-styles/icewm/icewm.cpp
+++ b/twin-styles/icewm/icewm.cpp
@@ -982,10 +982,10 @@ void IceWMClient::addClientButtons( const TQString& s )
 							button[BtnSysMenu] = new IceWMButton(this, "menu",
 								&menuButtonPix, false, i18n("Menu"));
 
-						connect( button[BtnSysMenu], TQT_SIGNAL(pressed()),
-								 this, TQT_SLOT(menuButtonPressed()));
-						connect( button[BtnSysMenu], TQT_SIGNAL(released()),
-								 this, TQT_SLOT(menuButtonReleased()));
+						connect( button[BtnSysMenu], TQ_SIGNAL(pressed()),
+								 this, TQ_SLOT(menuButtonPressed()));
+						connect( button[BtnSysMenu], TQ_SIGNAL(released()),
+								 this, TQ_SLOT(menuButtonReleased()));
 						hb->addWidget( button[BtnSysMenu] );
 					}
 					break;
@@ -996,8 +996,8 @@ void IceWMClient::addClientButtons( const TQString& s )
 						button[BtnClose] = new IceWMButton(this, "close",
 								&closePix, false, i18n("Close"));
 						hb->addWidget( button[BtnClose] );
-						connect( button[BtnClose], TQT_SIGNAL(clicked()),
-								 this, TQT_SLOT(closeWindow()));
+						connect( button[BtnClose], TQ_SIGNAL(clicked()),
+								 this, TQ_SLOT(closeWindow()));
 					}
 					break;
 
@@ -1007,8 +1007,8 @@ void IceWMClient::addClientButtons( const TQString& s )
 						button[BtnMaximize] = new IceWMButton(this, "maximize",
 								&maximizePix, false, i18n("Maximize"), TQt::LeftButton|TQt::MidButton|TQt::RightButton);
 						hb->addWidget( button[BtnMaximize] );
-						connect( button[BtnMaximize], TQT_SIGNAL(clicked()),
-								 this, TQT_SLOT(slotMaximize()));
+						connect( button[BtnMaximize], TQ_SIGNAL(clicked()),
+								 this, TQ_SLOT(slotMaximize()));
 					}
 					break;
 
@@ -1019,8 +1019,8 @@ void IceWMClient::addClientButtons( const TQString& s )
 						button[BtnMinimize] = new IceWMButton(this, "minimize",
 								&minimizePix, false, i18n("Minimize"));
 						hb->addWidget( button[BtnMinimize] );
-						connect( button[BtnMinimize], TQT_SIGNAL(clicked()),
-								 this, TQT_SLOT(minimize()));
+						connect( button[BtnMinimize], TQ_SIGNAL(clicked()),
+								 this, TQ_SLOT(minimize()));
 					}
 					break;
 
@@ -1038,8 +1038,8 @@ void IceWMClient::addClientButtons( const TQString& s )
 							isSetShade() ? &rolldownPix : &rollupPix,
 										    false, i18n("Rollup"));
 						hb->addWidget( button[BtnRollup] );
-						connect( button[BtnRollup], TQT_SIGNAL(clicked()),
-								 this, TQT_SLOT(toggleShade()));
+						connect( button[BtnRollup], TQ_SIGNAL(clicked()),
+								 this, TQ_SLOT(toggleShade()));
 					}
 					break;
 
@@ -1051,8 +1051,8 @@ void IceWMClient::addClientButtons( const TQString& s )
 								&depthPix, true, isOnAllDesktops()?i18n("Not on all desktops"):i18n("On all desktops"));
 						button[BtnDepth]->turnOn( isOnAllDesktops() );
 						hb->addWidget( button[BtnDepth] );
-						connect( button[BtnDepth], TQT_SIGNAL(clicked()),
-								 this, TQT_SLOT(toggleOnAllDesktops()));
+						connect( button[BtnDepth], TQ_SIGNAL(clicked()),
+								 this, TQ_SLOT(toggleOnAllDesktops()));
 					}
 					break;
 			}
diff --git a/twin-styles/kde1/kde1client.cpp b/twin-styles/kde1/kde1client.cpp
index c06af33d..1dbc4535 100644
--- a/twin-styles/kde1/kde1client.cpp
+++ b/twin-styles/kde1/kde1client.cpp
@@ -312,7 +312,7 @@ void StdClient::addButtons(TQBoxLayout *hb, const TQString& s)
                           button[ButtonMenu]->setIconSet(isActive() ? *menu_pix : *dis_menu_pix);
                       else
                           button[ButtonMenu]->setIconSet( icon().pixmap( TQIconSet::Small, TQIconSet::Normal ));
-                      connect( button[0], TQT_SIGNAL( pressed() ), this, TQT_SLOT( menuButtonPressed() ) );
+                      connect( button[0], TQ_SIGNAL( pressed() ), this, TQ_SLOT( menuButtonPressed() ) );
                       hb->addWidget(button[ButtonMenu]);
                   }
                   break;
@@ -325,7 +325,7 @@ void StdClient::addButtons(TQBoxLayout *hb, const TQString& s)
                      button[ButtonSticky]->setCursor(ArrowCursor);
                      button[ButtonSticky]->setIconSet(isOnAllDesktops() ? isActive() ? *pindown_pix : *dis_pindown_pix :
                                                       isActive() ? *pinup_pix : *dis_pinup_pix );
-                     connect( button[ButtonSticky], TQT_SIGNAL( clicked() ), this, ( TQT_SLOT( toggleOnAllDesktops() ) ) );
+                     connect( button[ButtonSticky], TQ_SIGNAL( clicked() ), this, ( TQ_SLOT( toggleOnAllDesktops() ) ) );
                      hb->addWidget(button[ButtonSticky]);
                   }
                   break;
@@ -335,7 +335,7 @@ void StdClient::addButtons(TQBoxLayout *hb, const TQString& s)
                       button[ButtonHelp] = new TQToolButton( widget(), 0 );
                       TQToolTip::add( button[ButtonHelp], i18n("Help") );
                       button[ButtonHelp]->setIconSet( isActive() ? *question_mark_pix : *dis_question_mark_pix);
-                      connect( button[ButtonHelp], TQT_SIGNAL( clicked() ), this, ( TQT_SLOT( showContextHelp() ) ) );
+                      connect( button[ButtonHelp], TQ_SIGNAL( clicked() ), this, ( TQ_SLOT( showContextHelp() ) ) );
                       button[ButtonHelp]->setCursor(ArrowCursor);
                       hb->addWidget(button[ButtonHelp]);
                   }
@@ -347,7 +347,7 @@ void StdClient::addButtons(TQBoxLayout *hb, const TQString& s)
                       TQToolTip::add( button[ButtonMinimize], i18n("Minimize") );
                       button[ButtonMinimize]->setCursor(ArrowCursor);
                       button[ButtonMinimize]->setIconSet(isActive() ? *minimize_pix : *dis_minimize_pix);
-                      connect( button[ButtonMinimize], TQT_SIGNAL( clicked() ), this, ( TQT_SLOT( minimize() ) ) );
+                      connect( button[ButtonMinimize], TQ_SIGNAL( clicked() ), this, ( TQ_SLOT( minimize() ) ) );
                       hb->addWidget(button[ButtonMinimize]);
                   }
                   break;
@@ -359,8 +359,8 @@ void StdClient::addButtons(TQBoxLayout *hb, const TQString& s)
                       TQToolTip::add( button[ButtonMaximize], max?i18n("Restore"):i18n("Maximize") );
                       button[ButtonMaximize]->setCursor(ArrowCursor);
                       button[ButtonMaximize]->setIconSet( max?(isActive() ? *normalize_pix : *dis_normalize_pix):(isActive() ? *maximize_pix : *dis_maximize_pix) );
-                      connect( button[ButtonMaximize], TQT_SIGNAL( clicked(ButtonState) ),
-                               this, ( TQT_SLOT( maxButtonClicked(ButtonState) ) ) );
+                      connect( button[ButtonMaximize], TQ_SIGNAL( clicked(ButtonState) ),
+                               this, ( TQ_SLOT( maxButtonClicked(ButtonState) ) ) );
                       hb->addWidget(button[ButtonMaximize]);
                   }
                   break;
@@ -371,7 +371,7 @@ void StdClient::addButtons(TQBoxLayout *hb, const TQString& s)
                       TQToolTip::add( button[ButtonClose], i18n("Close") );
                       button[ButtonClose]->setCursor(ArrowCursor);
                       button[ButtonClose]->setIconSet(isActive() ? *close_pix : *dis_close_pix);
-                      connect( button[ButtonClose], TQT_SIGNAL( clicked() ), this, ( TQT_SLOT( closeWindow() ) ) );
+                      connect( button[ButtonClose], TQ_SIGNAL( clicked() ), this, ( TQ_SLOT( closeWindow() ) ) );
                       hb->addWidget(button[ButtonClose]);
                   }
                   break;
@@ -615,7 +615,7 @@ void StdToolClient::init()
 
     closeBtn = new TQToolButton( widget(), 0 );
     TQToolTip::add( closeBtn, i18n("Close") );
-    connect( closeBtn, TQT_SIGNAL( clicked() ), this, ( TQT_SLOT( closeWindow() ) ) );
+    connect( closeBtn, TQ_SIGNAL( clicked() ), this, ( TQ_SLOT( closeWindow() ) ) );
     closeBtn->setFixedSize( 13, 13);
     reset( -1U );
 
diff --git a/twin-styles/kde1/kde1client.h b/twin-styles/kde1/kde1client.h
index 407c3993..be0a8bfa 100644
--- a/twin-styles/kde1/kde1client.h
+++ b/twin-styles/kde1/kde1client.h
@@ -110,7 +110,7 @@ public:
   ThreeButtonButton ( TQWidget *parent = 0, const char* name = 0 )
       : TQToolButton( parent, name )
     {
-	connect( this, TQT_SIGNAL( clicked() ), this, TQT_SLOT( handleClicked() ) );
+	connect( this, TQ_SIGNAL( clicked() ), this, TQ_SLOT( handleClicked() ) );
         setCursor( arrowCursor );
     }
     ~ThreeButtonButton () {}
diff --git a/twin-styles/kstep/nextclient.cpp b/twin-styles/kstep/nextclient.cpp
index fefcf019..8cb138bc 100644
--- a/twin-styles/kstep/nextclient.cpp
+++ b/twin-styles/kstep/nextclient.cpp
@@ -481,8 +481,8 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec)
                     new NextButton(this, "maximize", maximize_bits, 10, 10,
                                    i18n("Maximize"), TQt::LeftButton|TQt::MidButton|TQt::RightButton);
                 titleLayout->addWidget( button[MAXIMIZE_IDX] );
-                connect( button[MAXIMIZE_IDX], TQT_SIGNAL(clicked()),
-                         this, TQT_SLOT(maximizeButtonClicked()) );
+                connect( button[MAXIMIZE_IDX], TQ_SIGNAL(clicked()),
+                         this, TQ_SLOT(maximizeButtonClicked()) );
             }
             break;
 
@@ -491,8 +491,8 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec)
 		button[HELP_IDX] = new NextButton(this,
 			"help", question_bits, 10, 10, i18n("Help"));
 		titleLayout->addWidget( button[HELP_IDX] );
-		connect( button[HELP_IDX], TQT_SIGNAL(clicked()),
-			 this, TQT_SLOT(showContextHelp()) );
+		connect( button[HELP_IDX], TQ_SIGNAL(clicked()),
+			 this, TQ_SLOT(showContextHelp()) );
 	    }
             break;
 
@@ -502,8 +502,8 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec)
                     new NextButton(this, "iconify", iconify_bits, 10, 10,
                                    i18n("Minimize"));
                 titleLayout->addWidget( button[ICONIFY_IDX] );
-                connect( button[ICONIFY_IDX], TQT_SIGNAL(clicked()),
-                         this, TQT_SLOT(minimize()) );
+                connect( button[ICONIFY_IDX], TQ_SIGNAL(clicked()),
+                         this, TQ_SLOT(minimize()) );
             }
             break;
 
@@ -512,16 +512,16 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec)
                 new NextButton(this, "menu", NULL, 10, 10, i18n("Menu"), TQt::LeftButton|TQt::RightButton);
             titleLayout->addWidget( button[MENU_IDX] );
             // NOTE DIFFERENCE: capture pressed(), not clicked()
-            connect( button[MENU_IDX], TQT_SIGNAL(pressed()),
-                     this, TQT_SLOT(menuButtonPressed()) );
+            connect( button[MENU_IDX], TQ_SIGNAL(pressed()),
+                     this, TQ_SLOT(menuButtonPressed()) );
             break;
 
         case 'L':
             button[SHADE_IDX] =
                 new NextButton(this, "shade", NULL, 0, 0, i18n("Shade"));
             titleLayout->addWidget( button[SHADE_IDX] );
-            connect( button[SHADE_IDX], TQT_SIGNAL(clicked()),
-                     this, TQT_SLOT(shadeClicked()) );
+            connect( button[SHADE_IDX], TQ_SIGNAL(clicked()),
+                     this, TQ_SLOT(shadeClicked()) );
             // NOTE DIFFERENCE: set the pixmap separately (2 states)
 	    shadeChange();
             break;
@@ -530,8 +530,8 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec)
             button[STICKY_IDX] =
                 new NextButton(this, "sticky", NULL, 0, 0, i18n("On all desktops"));
             titleLayout->addWidget( button[STICKY_IDX] );
-            connect( button[STICKY_IDX], TQT_SIGNAL(clicked()),
-                     this, TQT_SLOT(toggleOnAllDesktops()) );
+            connect( button[STICKY_IDX], TQ_SIGNAL(clicked()),
+                     this, TQ_SLOT(toggleOnAllDesktops()) );
             // NOTE DIFFERENCE: set the pixmap separately (2 states)
 	    desktopChange();
             break;
@@ -539,20 +539,20 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec)
 	case 'F':
             button[ABOVE_IDX] = new NextButton(this, "above", NULL, 0, 0, "");
             titleLayout->addWidget( button[ABOVE_IDX] );
-            connect( button[ABOVE_IDX], TQT_SIGNAL(clicked()),
-                     this, TQT_SLOT(aboveClicked()) );
-	    connect(this, TQT_SIGNAL(keepAboveChanged(bool)), 
-		    TQT_SLOT(keepAboveChange(bool)));
+            connect( button[ABOVE_IDX], TQ_SIGNAL(clicked()),
+                     this, TQ_SLOT(aboveClicked()) );
+	    connect(this, TQ_SIGNAL(keepAboveChanged(bool)), 
+		    TQ_SLOT(keepAboveChange(bool)));
 	    keepAboveChange(keepAbove());
 	    break;
 	    
 	case 'B':
             button[BELOW_IDX] = new NextButton(this, "below", NULL, 0, 0, "");
             titleLayout->addWidget( button[BELOW_IDX] );
-            connect( button[BELOW_IDX], TQT_SIGNAL(clicked()),
-                     this, TQT_SLOT(belowClicked()) );
-	    connect(this, TQT_SIGNAL(keepBelowChanged(bool)), 
-		    TQT_SLOT(keepBelowChange(bool)));
+            connect( button[BELOW_IDX], TQ_SIGNAL(clicked()),
+                     this, TQ_SLOT(belowClicked()) );
+	    connect(this, TQ_SIGNAL(keepBelowChanged(bool)), 
+		    TQ_SLOT(keepBelowChange(bool)));
 	    keepBelowChange(keepBelow());
 	    break;
         
@@ -562,8 +562,8 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec)
 		    new NextButton(this, "close", close_bits, 10, 10,
 				   i18n("Close"));
 		titleLayout->addWidget(button[CLOSE_IDX]);
-		connect(button[CLOSE_IDX], TQT_SIGNAL(clicked()),
-			 this, TQT_SLOT(closeWindow()));
+		connect(button[CLOSE_IDX], TQ_SIGNAL(clicked()),
+			 this, TQ_SLOT(closeWindow()));
             }
             break;
 
@@ -574,8 +574,8 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec)
 				   i18n("Resize"));
 		titleLayout->addWidget(button[RESIZE_IDX]);
 		// NOTE DIFFERENCE: capture pressed(), not clicked()
-		connect(button[RESIZE_IDX], TQT_SIGNAL(pressed()),
-			 this, TQT_SLOT(resizePressed()));
+		connect(button[RESIZE_IDX], TQ_SIGNAL(pressed()),
+			 this, TQ_SLOT(resizePressed()));
             }
 	    break;
         case '_':
diff --git a/twin-styles/riscos/Manager.cpp b/twin-styles/riscos/Manager.cpp
index 9eb26720..dafac2ff 100644
--- a/twin-styles/riscos/Manager.cpp
+++ b/twin-styles/riscos/Manager.cpp
@@ -593,9 +593,9 @@ void Manager::createTitle()
       {
          case 'S': // Sticky
             tb = new StickyButton(widget());
-            connect(this, TQT_SIGNAL(stickyChanged(bool)),
-                    tb, TQT_SLOT(setOn(bool)));
-            connect(tb, TQT_SIGNAL(toggleSticky()), this, TQT_SLOT(slotToggleSticky()));
+            connect(this, TQ_SIGNAL(stickyChanged(bool)),
+                    tb, TQ_SLOT(setOn(bool)));
+            connect(tb, TQ_SIGNAL(toggleSticky()), this, TQ_SLOT(slotToggleSticky()));
             emit(stickyChanged(isOnAllDesktops()));
             break;
 
@@ -603,7 +603,7 @@ void Manager::createTitle()
             if (providesContextHelp())
             {
                tb = new HelpButton(widget());
-               connect(tb, TQT_SIGNAL(help()), this, TQT_SLOT(showContextHelp()));
+               connect(tb, TQ_SIGNAL(help()), this, TQ_SLOT(showContextHelp()));
             }
             break;
 
@@ -611,7 +611,7 @@ void Manager::createTitle()
             if (isMinimizable())
             {
                tb = new IconifyButton(widget());
-               connect(tb, TQT_SIGNAL(iconify()), this, TQT_SLOT(minimize()));
+               connect(tb, TQ_SIGNAL(iconify()), this, TQ_SLOT(minimize()));
             }
             break;
 
@@ -619,29 +619,29 @@ void Manager::createTitle()
             if (isMaximizable())
             {
                tb = new MaximiseButton(widget());
-               connect(tb, TQT_SIGNAL(maximizeClicked(ButtonState)),
-                       this, TQT_SLOT(slotMaximizeClicked(ButtonState)));
-               connect(this, TQT_SIGNAL(maximizeChanged(bool)),
-                       tb, TQT_SLOT(setOn(bool)));
+               connect(tb, TQ_SIGNAL(maximizeClicked(ButtonState)),
+                       this, TQ_SLOT(slotMaximizeClicked(ButtonState)));
+               connect(this, TQ_SIGNAL(maximizeChanged(bool)),
+                       tb, TQ_SLOT(setOn(bool)));
                emit(maximizeChanged(maximizeMode() == MaximizeFull));
             }
             break;
 
          case 'F': // Above
             tb = new AboveButton(widget());
-            connect(tb, TQT_SIGNAL(above()), this, TQT_SLOT(slotAbove()));
+            connect(tb, TQ_SIGNAL(above()), this, TQ_SLOT(slotAbove()));
             break;
 
          case 'B': // Lower
             tb = new LowerButton(widget());
-            connect(tb, TQT_SIGNAL(lower()), this, TQT_SLOT(slotLower()));
+            connect(tb, TQ_SIGNAL(lower()), this, TQ_SLOT(slotLower()));
             break;
 
          case 'X': // Close
             if (isCloseable())
             {
                tb = new CloseButton(widget());
-               connect(tb, TQT_SIGNAL(closeWindow()), this, TQT_SLOT(closeWindow()));
+               connect(tb, TQ_SIGNAL(closeWindow()), this, TQ_SLOT(closeWindow()));
             }
             break;
 
@@ -652,7 +652,7 @@ void Manager::createTitle()
 
       if (tb != NULL)
       {
-         connect(this, TQT_SIGNAL(activeChanged(bool)), tb, TQT_SLOT(setActive(bool)));
+         connect(this, TQ_SIGNAL(activeChanged(bool)), tb, TQ_SLOT(setActive(bool)));
          buttonList->append(tb);
       }
    }
diff --git a/twin-styles/smooth-blend/client/config/smoothblendconfig.cpp b/twin-styles/smooth-blend/client/config/smoothblendconfig.cpp
index f3c5c545..7f6a2d0d 100644
--- a/twin-styles/smooth-blend/client/config/smoothblendconfig.cpp
+++ b/twin-styles/smooth-blend/client/config/smoothblendconfig.cpp
@@ -41,20 +41,20 @@ smoothblendConfig::smoothblendConfig(TDEConfig* config, TQWidget* parent)
     load(config_);
 
     // setup the connections for title align
-    connect(dialog_->titlealign, TQT_SIGNAL(clicked(int)),this, TQT_SLOT(selectionChanged(int)));
+    connect(dialog_->titlealign, TQ_SIGNAL(clicked(int)),this, TQ_SLOT(selectionChanged(int)));
     // setup the connections for corner rounding
-    connect(dialog_->roundCorners, TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(selectionChanged(int)));
+    connect(dialog_->roundCorners, TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(selectionChanged(int)));
     // setup title shadow
-    connect(dialog_->titleshadow, TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(selectionChanged(int)));
+    connect(dialog_->titleshadow, TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(selectionChanged(int)));
     // setup button actions
-    connect(dialog_->animatebuttons, TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(selectionChanged(int)));
-    connect(dialog_->btnComboBox, TQT_SIGNAL(activated(int)),this,TQT_SLOT(selectionChanged(int)));
+    connect(dialog_->animatebuttons, TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(selectionChanged(int)));
+    connect(dialog_->btnComboBox, TQ_SIGNAL(activated(int)),this,TQ_SLOT(selectionChanged(int)));
     // setup the connections for spin boxes
-    connect(dialog_->titlesize, TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(selectionChanged(int)));
-    connect(dialog_->buttonsize, TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(selectionChanged(int)));
-    connect(dialog_->framesize, TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(selectionChanged(int)));
+    connect(dialog_->titlesize, TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(selectionChanged(int)));
+    connect(dialog_->buttonsize, TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(selectionChanged(int)));
+    connect(dialog_->framesize, TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(selectionChanged(int)));
     // double click the menu 
-    connect(dialog_->menuClose, TQT_SIGNAL(stateChanged(int)),this, TQT_SLOT(selectionChanged(int)));
+    connect(dialog_->menuClose, TQ_SIGNAL(stateChanged(int)),this, TQ_SLOT(selectionChanged(int)));
 }
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/twin-styles/smooth-blend/client/smoothblend.cpp b/twin-styles/smooth-blend/client/smoothblend.cpp
index ba9d5973..be1d5bb4 100644
--- a/twin-styles/smooth-blend/client/smoothblend.cpp
+++ b/twin-styles/smooth-blend/client/smoothblend.cpp
@@ -178,9 +178,9 @@ smoothblendButton::smoothblendButton(smoothblendClient *parent, const char *name
     setToggleButton(toggle);
     //button animation setup
     animTmr = new TQTimer(this);
-    connect(animTmr, TQT_SIGNAL(timeout() ), this, TQT_SLOT(animate() ) );
-    connect(this, TQT_SIGNAL(pressed() ), this, TQT_SLOT(buttonClicked() ) );
-    connect(this, TQT_SIGNAL(released() ), this, TQT_SLOT(buttonReleased() ) );
+    connect(animTmr, TQ_SIGNAL(timeout() ), this, TQ_SLOT(animate() ) );
+    connect(this, TQ_SIGNAL(pressed() ), this, TQ_SLOT(buttonClicked() ) );
+    connect(this, TQ_SIGNAL(released() ), this, TQ_SLOT(buttonReleased() ) );
     animProgress = 0;
     m_clicked=false;
 }
@@ -697,8 +697,8 @@ void smoothblendClient::_resetLayout()
     mainLayout_->addItem( bottomSpacer_ );
     
     // connections
-    connect(this, TQT_SIGNAL(keepAboveChanged(bool)), TQT_SLOT(keepAboveChange(bool)));
-    connect(this, TQT_SIGNAL(keepBelowChanged(bool)), TQT_SLOT(keepBelowChange(bool)));
+    connect(this, TQ_SIGNAL(keepAboveChanged(bool)), TQ_SLOT(keepAboveChange(bool)));
+    connect(this, TQ_SIGNAL(keepBelowChanged(bool)), TQ_SLOT(keepBelowChange(bool)));
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -715,8 +715,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b
                 if (!button[ButtonMenu]) {
                     button[ButtonMenu] =
                         new smoothblendButton(this, "splat.png", i18n("Menu"),ButtonMenu,button_size);
-                    connect(button[ButtonMenu], TQT_SIGNAL(pressed()), this, TQT_SLOT(menuButtonPressed()));
-                    connect(button[ButtonMenu], TQT_SIGNAL(released()), this, TQT_SLOT(menuButtonReleased()));
+                    connect(button[ButtonMenu], TQ_SIGNAL(pressed()), this, TQ_SLOT(menuButtonPressed()));
+                    connect(button[ButtonMenu], TQ_SIGNAL(released()), this, TQ_SLOT(menuButtonReleased()));
                     layout->addWidget(button[ButtonMenu]);
                     if (n < s.length()-1) layout->addSpacing(1);
                 }
@@ -731,8 +731,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b
                     }
                     button[ButtonSticky] =
                         new smoothblendButton(this, "circle.png", tip, ButtonSticky, button_size, true);
-                    connect(button[ButtonSticky], TQT_SIGNAL(clicked()),
-                            this, TQT_SLOT(toggleOnAllDesktops()));
+                    connect(button[ButtonSticky], TQ_SIGNAL(clicked()),
+                            this, TQ_SLOT(toggleOnAllDesktops()));
                     layout->addWidget(button[ButtonSticky]);
                     if (n < s.length()-1) layout->addSpacing(1);
                 }
@@ -742,8 +742,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b
                 if ((!button[ButtonHelp]) && providesContextHelp()) {
                     button[ButtonHelp] =
                         new smoothblendButton(this, "help.png", i18n("Help"), ButtonHelp, button_size);
-                    connect(button[ButtonHelp], TQT_SIGNAL(clicked()),
-                            this, TQT_SLOT(showContextHelp()));
+                    connect(button[ButtonHelp], TQ_SIGNAL(clicked()),
+                            this, TQ_SLOT(showContextHelp()));
                     layout->addWidget(button[ButtonHelp]);
                     if (n < s.length()-1) layout->addSpacing(1);
                 }
@@ -753,8 +753,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b
                 if ((!button[ButtonMin]) && isMinimizable())  {
                     button[ButtonMin] =
                         new smoothblendButton(this, "minimize.png", i18n("Minimize"), ButtonMin, button_size);
-                    connect(button[ButtonMin], TQT_SIGNAL(clicked()),
-                            this, TQT_SLOT(minimize()));
+                    connect(button[ButtonMin], TQ_SIGNAL(clicked()),
+                            this, TQ_SLOT(minimize()));
                     layout->addWidget(button[ButtonMin]);
                     if (n < s.length()-1) layout->addSpacing(1);
                 }
@@ -769,8 +769,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b
                     }
                     button[ButtonMax]  =
                         new smoothblendButton(this, "maximize.png", tip, ButtonMax, button_size, true);
-                    connect(button[ButtonMax], TQT_SIGNAL(clicked()),
-                            this, TQT_SLOT(maxButtonPressed()));
+                    connect(button[ButtonMax], TQ_SIGNAL(clicked()),
+                            this, TQ_SLOT(maxButtonPressed()));
                     layout->addWidget(button[ButtonMax]);
                     if (n < s.length()-1) layout->addSpacing(1);
                 }
@@ -780,8 +780,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b
                 if ((!button[ButtonClose]) && isCloseable()) {
                     button[ButtonClose] =
                         new smoothblendButton(this, "close.png", i18n("Close"), ButtonClose, button_size);
-                    connect(button[ButtonClose], TQT_SIGNAL(clicked()),
-                            this, TQT_SLOT(closeWindow()));
+                    connect(button[ButtonClose], TQ_SIGNAL(clicked()),
+                            this, TQ_SLOT(closeWindow()));
                     layout->addWidget(button[ButtonClose]);
                     if (n < s.length()-1) layout->addSpacing(1);
                 }
@@ -792,8 +792,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b
                     button[ButtonAbove] =
                         new smoothblendButton(this, "keep_above.png",
                                           i18n("Keep Above Others"), ButtonAbove, button_size, true);
-                    connect(button[ButtonAbove], TQT_SIGNAL(clicked()),
-                            this, TQT_SLOT(aboveButtonPressed()));
+                    connect(button[ButtonAbove], TQ_SIGNAL(clicked()),
+                            this, TQ_SLOT(aboveButtonPressed()));
                     layout->addWidget(button[ButtonAbove]);
                     if (n < s.length()-1) layout->addSpacing(1);
                 }
@@ -804,8 +804,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b
                     button[ButtonBelow] =
                         new smoothblendButton(this, "keep_below.png",
                                           i18n("Keep Below Others"), ButtonBelow, button_size, true);
-                    connect(button[ButtonBelow], TQT_SIGNAL(clicked()),
-                            this, TQT_SLOT(belowButtonPressed()));
+                    connect(button[ButtonBelow], TQ_SIGNAL(clicked()),
+                            this, TQ_SLOT(belowButtonPressed()));
                     layout->addWidget(button[ButtonBelow]);
                     if (n < s.length()-1) layout->addSpacing(1);
                 }
@@ -820,8 +820,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b
                     }
                     button[ButtonShade] =
                         new smoothblendButton(this, "shade.png", tip, ButtonShade, button_size, true);
-                    connect(button[ButtonShade], TQT_SIGNAL(clicked()),
-                            this, TQT_SLOT(shadeButtonPressed()));
+                    connect(button[ButtonShade], TQ_SIGNAL(clicked()),
+                            this, TQ_SLOT(shadeButtonPressed()));
                     layout->addWidget(button[ButtonShade]);
                     if (n < s.length()-1) layout->addSpacing(1);
                 }
diff --git a/twin-styles/system/systemclient.cpp b/twin-styles/system/systemclient.cpp
index f3577630..24ca3ba5 100644
--- a/twin-styles/system/systemclient.cpp
+++ b/twin-styles/system/systemclient.cpp
@@ -351,7 +351,7 @@ void SystemClient::addButtons(TQBoxLayout *hb, const TQString& s)
               case 'X': // Close button
                   if ((!button[ButtonClose]) && isCloseable()) {
                       button[ButtonClose] = new SystemButton(this, "close", NULL, i18n("Close"));
-                      connect( button[ButtonClose], TQT_SIGNAL( clicked() ), this, ( TQT_SLOT( closeWindow() ) ) );
+                      connect( button[ButtonClose], TQ_SIGNAL( clicked() ), this, ( TQ_SLOT( closeWindow() ) ) );
                       hb->addWidget(button[ButtonClose]);
                       hb->addSpacing(1);
                   }
@@ -364,7 +364,7 @@ void SystemClient::addButtons(TQBoxLayout *hb, const TQString& s)
                          button[ButtonSticky]->setBitmap(unsticky_bits);
                      else
                          button[ButtonSticky]->setBitmap(sticky_bits);
-                     connect( button[ButtonSticky], TQT_SIGNAL( clicked() ), this, ( TQT_SLOT( toggleOnAllDesktops() ) ) );
+                     connect( button[ButtonSticky], TQ_SIGNAL( clicked() ), this, ( TQ_SLOT( toggleOnAllDesktops() ) ) );
                      hb->addWidget(button[ButtonSticky]);
                      hb->addSpacing(1);
                   }
@@ -373,7 +373,7 @@ void SystemClient::addButtons(TQBoxLayout *hb, const TQString& s)
               case 'I': // Minimize button
                   if ((!button[ButtonMinimize]) && isMinimizable())  {
                       button[ButtonMinimize] = new SystemButton(this, "iconify", iconify_bits, i18n("Minimize"));
-                      connect( button[ButtonMinimize], TQT_SIGNAL( clicked() ), this, ( TQT_SLOT( minimize() ) ) );
+                      connect( button[ButtonMinimize], TQ_SIGNAL( clicked() ), this, ( TQ_SLOT( minimize() ) ) );
                       hb->addWidget(button[ButtonMinimize]);
                       hb->addSpacing(1);
                   }
@@ -390,7 +390,7 @@ void SystemClient::addButtons(TQBoxLayout *hb, const TQString& s)
                       }
                       else
                           button[ButtonMaximize] = new SystemButton(this, "maximize", maximize_bits, i18n("Maximize"));
-                      connect( button[ButtonMaximize], TQT_SIGNAL( clicked() ), this, ( TQT_SLOT( maxButtonClicked() ) ) );
+                      connect( button[ButtonMaximize], TQ_SIGNAL( clicked() ), this, ( TQ_SLOT( maxButtonClicked() ) ) );
                       hb->addWidget(button[ButtonMaximize]);
                       hb->addSpacing(1);
                   }
@@ -399,7 +399,7 @@ void SystemClient::addButtons(TQBoxLayout *hb, const TQString& s)
               case 'H': // Help button
                   if ((!button[ButtonHelp]) && providesContextHelp()) {
                       button[ButtonHelp] = new SystemButton(this, "help", question_bits, i18n("Help"));
-                      connect( button[ButtonHelp], TQT_SIGNAL( clicked() ), this, ( TQT_SLOT( showContextHelp() ) ) );
+                      connect( button[ButtonHelp], TQ_SIGNAL( clicked() ), this, ( TQ_SLOT( showContextHelp() ) ) );
                       hb->addWidget(button[ButtonHelp]);
                       hb->addSpacing(1);
                   }