Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

2 files changed, 18 insertions, 18 deletions

diff --git a/tdescreensaver/kxsconfig/kxsconfig.cpp b/tdescreensaver/kxsconfig/kxsconfig.cpp
index f91b0321..2fde6f49 100644
--- a/tdescreensaver/kxsconfig/kxsconfig.cpp
+++ b/tdescreensaver/kxsconfig/kxsconfig.cpp
@@ -171,16 +171,16 @@ bool KXSConfigDialog::create()
 	item->read( config );
         TQWidget *i = dynamic_cast<TQWidget*>(item);
         if (i) {
-            connect( i, TQT_SIGNAL(changed()), TQT_SLOT(slotChanged()) );
+            connect( i, TQ_SIGNAL(changed()), TQ_SLOT(slotChanged()) );
         }
     }
 
     mPreviewProc = new TDEProcess;
-    connect(mPreviewProc, TQT_SIGNAL(processExited(TDEProcess *)),
-	    TQT_SLOT(slotPreviewExited(TDEProcess *)));
+    connect(mPreviewProc, TQ_SIGNAL(processExited(TDEProcess *)),
+	    TQ_SLOT(slotPreviewExited(TDEProcess *)));
 
     mPreviewTimer = new TQTimer(this);
-    connect(mPreviewTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotNewPreview()));
+    connect(mPreviewTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotNewPreview()));
 
     mPreview = new TQWidget(plainPage());
     mPreview->setFixedSize(250, 200);
diff --git a/tdescreensaver/kxsconfig/kxscontrol.cpp b/tdescreensaver/kxsconfig/kxscontrol.cpp
index 26e7ad6f..0e9d502b 100644
--- a/tdescreensaver/kxsconfig/kxscontrol.cpp
+++ b/tdescreensaver/kxsconfig/kxscontrol.cpp
@@ -40,7 +40,7 @@ KXSRangeControl::KXSRangeControl(TQWidget *parent, const TQString &name,
   TQLabel *label = new TQLabel(mLabel, this);
   l->add(label);
   mSlider = new TQSlider(mMinimum, mMaximum, 10, mValue, TQt::Horizontal, this);
-  connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)));
+  connect(mSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)));
   l->add(mSlider);
 }
 
@@ -56,7 +56,7 @@ KXSRangeControl::KXSRangeControl(TQWidget *parent, const TQString &name,
 	}
 	mSpinBox = new TQSpinBox(mMinimum, mMaximum, 1, this);
 	mSpinBox->setValue(mValue);
-	connect(mSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)));
+	connect(mSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)));
 	hb->add(mSpinBox);
     } else {
 	TQString lowLabel = attr.value("_low-label");
@@ -72,7 +72,7 @@ KXSRangeControl::KXSRangeControl(TQWidget *parent, const TQString &name,
 	    hb->addWidget(l);
 	}
 	mSlider = new TQSlider(mMinimum, mMaximum, 10, mValue, TQt::Horizontal, this);
-	connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)));
+	connect(mSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)));
 	hb->add(mSlider);
 	if (!highLabel.isEmpty()){
             TQLabel *l = new TQLabel(i18n(highLabel.utf8()), this);
@@ -108,7 +108,7 @@ KXSDoubleRangeControl::KXSDoubleRangeControl(TQWidget *parent,
   int value = int((mValue - mMinimum) * 100 / (mMaximum - mMinimum));
 
   mSlider = new TQSlider(0, 100, 10, value, TQt::Horizontal, this);
-  connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)));
+  connect(mSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)));
   l->add(mSlider);
 }
 
@@ -130,7 +130,7 @@ KXSDoubleRangeControl::KXSDoubleRangeControl(TQWidget *parent,
     }
     int value = int((mValue - mMinimum) * 100 / (mMaximum - mMinimum));
     mSlider = new TQSlider(0, 100, 10, value, TQt::Horizontal, this);
-    connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)));
+    connect(mSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)));
     hb->add(mSlider);
     if (!highLabel.isEmpty()){
         TQLabel *l = new TQLabel(i18n(highLabel.utf8()), this);
@@ -158,7 +158,7 @@ KXSCheckBoxControl::KXSCheckBoxControl(TQWidget *parent, const TQString &name,
 {
   setText(mLabel);
   setChecked(mValue);
-  connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool)));
+  connect(this, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggled(bool)));
 }
 
 KXSCheckBoxControl::KXSCheckBoxControl(TQWidget *parent, const TQString &name,
@@ -167,7 +167,7 @@ KXSCheckBoxControl::KXSCheckBoxControl(TQWidget *parent, const TQString &name,
 {
   setText(i18n(mLabel.utf8()));
   setChecked(mValue);
-  connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool)));
+  connect(this, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggled(bool)));
 }
 
 void KXSCheckBoxControl::slotToggled(bool state)
@@ -194,7 +194,7 @@ KXSDropListControl::KXSDropListControl(TQWidget *parent, const TQString &name,
   for(uint i=0; i < mOptions.count(); i++)
       mCombo->insertItem( i18n(mOptions[i].utf8()) );
   mCombo->setCurrentItem(mValue);
-  connect(mCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
+  connect(mCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
   l->add(mCombo);
 }
 
@@ -206,7 +206,7 @@ KXSDropListControl::KXSDropListControl(TQWidget *parent, const TQString &name,
   TQLabel *label = new TQLabel(i18n(mLabel.utf8()), this);
   l->add(label);
   mCombo = new TQComboBox(this);
-  connect(mCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
+  connect(mCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
   l->add(mCombo);
 }
 
@@ -239,7 +239,7 @@ KXSLineEditControl::KXSLineEditControl(TQWidget *parent, const TQString &name,
   TQLabel *label = new TQLabel(mLabel, this);
   l->add(label);
   mEdit = new TQLineEdit(this);
-  connect(mEdit, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChanged(const TQString &)));
+  connect(mEdit, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(textChanged(const TQString &)));
   l->add(mEdit);
 }
 
@@ -251,7 +251,7 @@ KXSLineEditControl::KXSLineEditControl(TQWidget *parent, const TQString &name,
   TQLabel *label = new TQLabel(i18n(mLabel.utf8()), this);
   l->add(label);
   mEdit = new TQLineEdit(this);
-  connect(mEdit, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChanged(const TQString &)));
+  connect(mEdit, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(textChanged(const TQString &)));
   l->add(mEdit);
 }
 
@@ -276,7 +276,7 @@ KXSFileControl::KXSFileControl(TQWidget *parent, const TQString &name,
   TQLabel *label = new TQLabel(mLabel, this);
   l->add(label);
   mEdit = new TQLineEdit(this);
-  connect(mEdit, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChanged(const TQString &)));
+  connect(mEdit, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(textChanged(const TQString &)));
   l->add(mEdit);
 }
 
@@ -289,10 +289,10 @@ KXSFileControl::KXSFileControl(TQWidget *parent, const TQString &name,
   l->add(label);
   TQHBoxLayout *hb = new TQHBoxLayout(l);
   mEdit = new TQLineEdit(this);
-  connect(mEdit, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChanged(const TQString &)));
+  connect(mEdit, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(textChanged(const TQString &)));
   hb->add(mEdit);
   TQPushButton *pb = new TQPushButton( "...", this );
-  connect( pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectFile()) );
+  connect( pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectFile()) );
   hb->addWidget(pb);
 }