Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

2 files changed, 27 insertions, 27 deletions

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;
 			}