Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

2 files changed, 32 insertions, 32 deletions

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