Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

6 files changed, 78 insertions, 78 deletions

diff --git a/plugins/gui-standard-display/displaycfg.cpp b/plugins/gui-standard-display/displaycfg.cpp
index f51a4db..4cb9b18 100644
--- a/plugins/gui-standard-display/displaycfg.cpp
+++ b/plugins/gui-standard-display/displaycfg.cpp
@@ -40,9 +40,9 @@ DisplayConfiguration::DisplayConfiguration(TQWidget *parent)
     m_btnInactive = new KColorButton(queryDisplayInactiveColor(), bg);
     m_btnBkgnd    = new KColorButton(queryDisplayBkgndColor(), bg);
 
-    connect(m_btnActive,   TQT_SIGNAL(changed(const TQColor &)), this, TQT_SLOT(slotSetDirty()));
-    connect(m_btnInactive, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SLOT(slotSetDirty()));
-    connect(m_btnBkgnd,    TQT_SIGNAL(changed(const TQColor &)), this, TQT_SLOT(slotSetDirty()));
+    connect(m_btnActive,   TQ_SIGNAL(changed(const TQColor &)), this, TQ_SLOT(slotSetDirty()));
+    connect(m_btnInactive, TQ_SIGNAL(changed(const TQColor &)), this, TQ_SLOT(slotSetDirty()));
+    connect(m_btnBkgnd,    TQ_SIGNAL(changed(const TQColor &)), this, TQ_SLOT(slotSetDirty()));
 
     TQLabel *l1  = new TQLabel(i18n("Active Text"), bg);
     TQLabel *l2  = new TQLabel(i18n("Inactive Text"), bg);
@@ -78,10 +78,10 @@ DisplayConfiguration::DisplayConfiguration(TQWidget *parent)
     l->addWidget(bg);
     l->addWidget(m_fontChooser);
 
-    connect(m_btnActive,   TQT_SIGNAL(changed(const TQColor &)),     this, TQT_SLOT(slotSetDirty()));
-    connect(m_btnInactive, TQT_SIGNAL(changed(const TQColor &)),     this, TQT_SLOT(slotSetDirty()));
-    connect(m_btnBkgnd,    TQT_SIGNAL(changed(const TQColor &)),     this, TQT_SLOT(slotSetDirty()));
-    connect(m_fontChooser, TQT_SIGNAL(fontSelected(const TQFont &)), this, TQT_SLOT(slotSetDirty()));
+    connect(m_btnActive,   TQ_SIGNAL(changed(const TQColor &)),     this, TQ_SLOT(slotSetDirty()));
+    connect(m_btnInactive, TQ_SIGNAL(changed(const TQColor &)),     this, TQ_SLOT(slotSetDirty()));
+    connect(m_btnBkgnd,    TQ_SIGNAL(changed(const TQColor &)),     this, TQ_SLOT(slotSetDirty()));
+    connect(m_fontChooser, TQ_SIGNAL(fontSelected(const TQFont &)), this, TQ_SLOT(slotSetDirty()));
 
 }
 
diff --git a/plugins/gui-standard-display/radioview-configuration.cpp b/plugins/gui-standard-display/radioview-configuration.cpp
index 64af3ed..b007f3f 100644
--- a/plugins/gui-standard-display/radioview-configuration.cpp
+++ b/plugins/gui-standard-display/radioview-configuration.cpp
@@ -31,62 +31,62 @@ RadioViewConfiguration::~RadioViewConfiguration()
 void RadioViewConfiguration::addTab    (TQWidget *child, const TQString &label)
 {
 	TQTabWidget::addTab(child, label);
-	TQObject::connect(this,  TQT_SIGNAL(sigOK()),     child, TQT_SLOT(slotOK()));
-	TQObject::connect(this,  TQT_SIGNAL(sigCancel()), child, TQT_SLOT(slotCancel()));
-    TQObject::connect(child, TQT_SIGNAL(sigDirty()),  this,  TQT_SLOT(slotSetDirty()));
+	TQObject::connect(this,  TQ_SIGNAL(sigOK()),     child, TQ_SLOT(slotOK()));
+	TQObject::connect(this,  TQ_SIGNAL(sigCancel()), child, TQ_SLOT(slotCancel()));
+    TQObject::connect(child, TQ_SIGNAL(sigDirty()),  this,  TQ_SLOT(slotSetDirty()));
 }
 
 
 void RadioViewConfiguration::addTab    (TQWidget *child, const TQIconSet &iconset, const TQString &label)
 {
 	TQTabWidget::addTab(child, iconset, label);
-	TQObject::connect(this,  TQT_SIGNAL(sigOK()),     child, TQT_SLOT(slotOK()));
-	TQObject::connect(this,  TQT_SIGNAL(sigCancel()), child, TQT_SLOT(slotCancel()));
-    TQObject::connect(child, TQT_SIGNAL(sigDirty()),  this,  TQT_SLOT(slotSetDirty()));
+	TQObject::connect(this,  TQ_SIGNAL(sigOK()),     child, TQ_SLOT(slotOK()));
+	TQObject::connect(this,  TQ_SIGNAL(sigCancel()), child, TQ_SLOT(slotCancel()));
+    TQObject::connect(child, TQ_SIGNAL(sigDirty()),  this,  TQ_SLOT(slotSetDirty()));
 }
 
 
 void RadioViewConfiguration::addTab    (TQWidget *child, TQTab *tab)
 {
 	TQTabWidget::addTab(child, tab);
-	TQObject::connect(this,  TQT_SIGNAL(sigOK()),     child, TQT_SLOT(slotOK()));
-	TQObject::connect(this,  TQT_SIGNAL(sigCancel()), child, TQT_SLOT(slotCancel()));
-    TQObject::connect(child, TQT_SIGNAL(sigDirty()),  this,  TQT_SLOT(slotSetDirty()));
+	TQObject::connect(this,  TQ_SIGNAL(sigOK()),     child, TQ_SLOT(slotOK()));
+	TQObject::connect(this,  TQ_SIGNAL(sigCancel()), child, TQ_SLOT(slotCancel()));
+    TQObject::connect(child, TQ_SIGNAL(sigDirty()),  this,  TQ_SLOT(slotSetDirty()));
 }
 
 
 void RadioViewConfiguration::insertTab (TQWidget *child, const TQString &label, int index)
 {
 	TQTabWidget::insertTab(child, label, index);
-	TQObject::connect(this,  TQT_SIGNAL(sigOK()),     child, TQT_SLOT(slotOK()));
-	TQObject::connect(this,  TQT_SIGNAL(sigCancel()), child, TQT_SLOT(slotCancel()));
-    TQObject::connect(child, TQT_SIGNAL(sigDirty()),  this,  TQT_SLOT(slotSetDirty()));
+	TQObject::connect(this,  TQ_SIGNAL(sigOK()),     child, TQ_SLOT(slotOK()));
+	TQObject::connect(this,  TQ_SIGNAL(sigCancel()), child, TQ_SLOT(slotCancel()));
+    TQObject::connect(child, TQ_SIGNAL(sigDirty()),  this,  TQ_SLOT(slotSetDirty()));
 }
 
 
 void RadioViewConfiguration::insertTab (TQWidget *child, const TQIconSet &iconset, const TQString &label, int index)
 {
 	TQTabWidget::insertTab(child, iconset, label, index);
-	TQObject::connect(this,  TQT_SIGNAL(sigOK()),     child, TQT_SLOT(slotOK()));
-	TQObject::connect(this,  TQT_SIGNAL(sigCancel()), child, TQT_SLOT(slotCancel()));
-    TQObject::connect(child, TQT_SIGNAL(sigDirty()),  this,  TQT_SLOT(slotSetDirty()));
+	TQObject::connect(this,  TQ_SIGNAL(sigOK()),     child, TQ_SLOT(slotOK()));
+	TQObject::connect(this,  TQ_SIGNAL(sigCancel()), child, TQ_SLOT(slotCancel()));
+    TQObject::connect(child, TQ_SIGNAL(sigDirty()),  this,  TQ_SLOT(slotSetDirty()));
 }
 
 
 void RadioViewConfiguration::insertTab (TQWidget *child, TQTab *tab, int index)
 {
 	TQTabWidget::insertTab(child, tab, index);
-	TQObject::connect(this,  TQT_SIGNAL(sigOK()),     child, TQT_SLOT(slotOK()));
-	TQObject::connect(this,  TQT_SIGNAL(sigCancel()), child, TQT_SLOT(slotCancel()));
-    TQObject::connect(child, TQT_SIGNAL(sigDirty()),  this,  TQT_SLOT(slotSetDirty()));
+	TQObject::connect(this,  TQ_SIGNAL(sigOK()),     child, TQ_SLOT(slotOK()));
+	TQObject::connect(this,  TQ_SIGNAL(sigCancel()), child, TQ_SLOT(slotCancel()));
+    TQObject::connect(child, TQ_SIGNAL(sigDirty()),  this,  TQ_SLOT(slotSetDirty()));
 }
 
 
 void RadioViewConfiguration::removePage(TQWidget *w)
 {
-	TQObject::disconnect(this,  TQT_SIGNAL(sigOK()),     w,    TQT_SLOT(slotOK()));
-	TQObject::disconnect(this,  TQT_SIGNAL(sigCancel()), w,    TQT_SLOT(slotCancel()));
-    TQObject::disconnect(w,     TQT_SIGNAL(sigDirty()),  this, TQT_SLOT(slotSetDirty()));
+	TQObject::disconnect(this,  TQ_SIGNAL(sigOK()),     w,    TQ_SLOT(slotOK()));
+	TQObject::disconnect(this,  TQ_SIGNAL(sigCancel()), w,    TQ_SLOT(slotCancel()));
+    TQObject::disconnect(w,     TQ_SIGNAL(sigDirty()),  this, TQ_SLOT(slotSetDirty()));
 	TQTabWidget::removePage(w);
 }
 
diff --git a/plugins/gui-standard-display/radioview.cpp b/plugins/gui-standard-display/radioview.cpp
index 3ea0a9a..43f1a1b 100644
--- a/plugins/gui-standard-display/radioview.cpp
+++ b/plugins/gui-standard-display/radioview.cpp
@@ -125,24 +125,24 @@ RadioView::RadioView(const TQString &name)
     m_pauseMenu     = new TDEPopupMenu(btnPower);
     m_pauseMenu->insertItem(SmallIcon("tderadio_pause"),
                             i18n("Pause TDERadio"),
-                            this, TQT_SLOT(slotPause()));
+                            this, TQ_SLOT(slotPause()));
     btnPower->setPopupDelay(200);
 
     m_RecordingMenu = new TDEPopupMenu(btnRecording);
     m_RecordingMenu->insertItem(SmallIcon("tderadio_record"),
                                 i18n("Start Recording"),
                                 POPUP_ID_START_RECORDING_DEFAULT);
-    TQObject::connect(m_RecordingMenu, TQT_SIGNAL(activated(int)),
-                     this,            TQT_SLOT(slotRecordingMenu(int)));
+    TQObject::connect(m_RecordingMenu, TQ_SIGNAL(activated(int)),
+                     this,            TQ_SLOT(slotRecordingMenu(int)));
     btnRecording->setPopup(m_RecordingMenu);
 
 
     m_SnoozeMenu   = new TDEPopupMenu(btnSnooze);
-    m_SnoozeMenu->insertItem(i18n("5 min"),  this, TQT_SLOT(slotSnooze(int)), 0,  5);
-    m_SnoozeMenu->insertItem(i18n("10 min"), this, TQT_SLOT(slotSnooze(int)), 0, 10);
-    m_SnoozeMenu->insertItem(i18n("15 min"), this, TQT_SLOT(slotSnooze(int)), 0, 15);
-    m_SnoozeMenu->insertItem(i18n("30 min"), this, TQT_SLOT(slotSnooze(int)), 0, 30);
-    m_SnoozeMenu->insertItem(i18n("60 min"), this, TQT_SLOT(slotSnooze(int)), 0, 60);
+    m_SnoozeMenu->insertItem(i18n("5 min"),  this, TQ_SLOT(slotSnooze(int)), 0,  5);
+    m_SnoozeMenu->insertItem(i18n("10 min"), this, TQ_SLOT(slotSnooze(int)), 0, 10);
+    m_SnoozeMenu->insertItem(i18n("15 min"), this, TQ_SLOT(slotSnooze(int)), 0, 15);
+    m_SnoozeMenu->insertItem(i18n("30 min"), this, TQ_SLOT(slotSnooze(int)), 0, 30);
+    m_SnoozeMenu->insertItem(i18n("60 min"), this, TQ_SLOT(slotSnooze(int)), 0, 60);
     btnSnooze->setPopup(m_SnoozeMenu);
     btnSnooze->setPopupDelay(200);
 
@@ -169,20 +169,20 @@ RadioView::RadioView(const TQString &name)
     comboStations->setMinimumHeight(28);
 
 
-    TQObject::connect(btnPower,      TQT_SIGNAL(toggled(bool)),
-                     this,          TQT_SLOT(slotPower(bool)));
-    TQObject::connect(btnQuit,       TQT_SIGNAL(clicked()),
-                     kapp,          TQT_SLOT(quit()));
-    TQObject::connect(btnConfigure,  TQT_SIGNAL(toggled(bool)),
-                     this,          TQT_SLOT(slotConfigure(bool)));
-    TQObject::connect(btnRecording,  TQT_SIGNAL(clicked()),
-                     this,          TQT_SLOT(slotRecord()));
-    TQObject::connect(btnSnooze,     TQT_SIGNAL(toggled(bool)),
-                     this,          TQT_SLOT(slotSnooze(bool)));
-    TQObject::connect(comboStations, TQT_SIGNAL(activated(int)),
-                     this,          TQT_SLOT(slotComboStationSelected(int)));
-    TQObject::connect(btnPlugins,    TQT_SIGNAL(clicked()),
-                     this,          TQT_SLOT(slotBtnPluginsClicked()));
+    TQObject::connect(btnPower,      TQ_SIGNAL(toggled(bool)),
+                     this,          TQ_SLOT(slotPower(bool)));
+    TQObject::connect(btnQuit,       TQ_SIGNAL(clicked()),
+                     kapp,          TQ_SLOT(quit()));
+    TQObject::connect(btnConfigure,  TQ_SIGNAL(toggled(bool)),
+                     this,          TQ_SLOT(slotConfigure(bool)));
+    TQObject::connect(btnRecording,  TQ_SIGNAL(clicked()),
+                     this,          TQ_SLOT(slotRecord()));
+    TQObject::connect(btnSnooze,     TQ_SIGNAL(toggled(bool)),
+                     this,          TQ_SLOT(slotSnooze(bool)));
+    TQObject::connect(comboStations, TQ_SIGNAL(activated(int)),
+                     this,          TQ_SLOT(slotComboStationSelected(int)));
+    TQObject::connect(btnPlugins,    TQ_SIGNAL(clicked()),
+                     this,          TQ_SLOT(slotBtnPluginsClicked()));
 
     // tooltips
 
@@ -224,8 +224,8 @@ bool RadioView::addElement (RadioViewElement *e)
 
 
     e->reparent(this, TQPoint(0, 0), true);
-    TQObject::connect(e,    TQT_SIGNAL(destroyed(TQObject*)),
-                     this, TQT_SLOT(removeElement(TQObject*)));
+    TQObject::connect(e,    TQ_SIGNAL(destroyed(TQObject*)),
+                     this, TQ_SLOT(removeElement(TQObject*)));
     elements.append(e);
     widgetStacks[cls]->addWidget(e);
 
@@ -266,8 +266,8 @@ bool RadioView::removeElement (TQObject *_e)
         e->disconnectI(currentDevice);
 
     RadioViewClass cls = e->getClass();
-    TQObject::disconnect(e,    TQT_SIGNAL(destroyed(TQObject*)),
-                        this, TQT_SLOT(removeElement(TQObject*)));
+    TQObject::disconnect(e,    TQ_SIGNAL(destroyed(TQObject*)),
+                        this, TQ_SLOT(removeElement(TQObject*)));
     widgetStacks[cls]->removeWidget(e);
     elements.remove(e);
 
@@ -545,8 +545,8 @@ ConfigPageInfo RadioView::createConfigurationPage()
     }
 
     configPages.append(c);
-    TQObject::connect(c,    TQT_SIGNAL(destroyed(TQObject *)),
-                     this, TQT_SLOT(slotConfigPageDeleted(TQObject *)));
+    TQObject::connect(c,    TQ_SIGNAL(destroyed(TQObject *)),
+                     this, TQ_SLOT(slotConfigPageDeleted(TQObject *)));
 
     return ConfigPageInfo(
         c,
@@ -573,8 +573,8 @@ void RadioView::addConfigurationTabFor(RadioViewElement *e, TQTabWidget *c)
         }
 
         elementConfigPages.push_back(ElementCfg(e, inf.page));
-        TQObject::connect(inf.page, TQT_SIGNAL(destroyed(TQObject *)),
-                         this, TQT_SLOT(slotElementConfigPageDeleted(TQObject *)));
+        TQObject::connect(inf.page, TQ_SIGNAL(destroyed(TQObject *)),
+                         this, TQ_SLOT(slotElementConfigPageDeleted(TQObject *)));
     }
 }
 
@@ -593,8 +593,8 @@ void RadioView::addCommonConfigurationTab(TQTabWidget *c)
     c->addTab(f, i18n("Common"));
 
     elementConfigPages.push_back(ElementCfg(f));
-    TQObject::connect(f,    TQT_SIGNAL(destroyed(TQObject *)),
-                     this, TQT_SLOT(slotElementConfigPageDeleted(TQObject *)));
+    TQObject::connect(f,    TQ_SIGNAL(destroyed(TQObject *)),
+                     this, TQ_SLOT(slotElementConfigPageDeleted(TQObject *)));
 }
 
 
diff --git a/plugins/gui-standard-display/radioview_frequencyseeker.cpp b/plugins/gui-standard-display/radioview_frequencyseeker.cpp
index 611c6a2..d043dd8 100644
--- a/plugins/gui-standard-display/radioview_frequencyseeker.cpp
+++ b/plugins/gui-standard-display/radioview_frequencyseeker.cpp
@@ -60,16 +60,16 @@ RadioViewFrequencySeeker::RadioViewFrequencySeeker(TQWidget *parent, const TQStr
     l->addWidget (m_btnStepRight);
     l->addWidget (m_btnSearchRight);
 
-    TQObject::connect(m_sldFrequency,   TQT_SIGNAL(valueChanged(int)),
-                     this,               TQT_SLOT(slotSliderChanged(int)));
-    TQObject::connect(m_btnSearchLeft,  TQT_SIGNAL(toggled(bool)),
-                     this,               TQT_SLOT(slotSearchLeft(bool)));
-    TQObject::connect(m_btnSearchRight, TQT_SIGNAL(toggled(bool)),
-                     this,               TQT_SLOT(slotSearchRight(bool)));
-    TQObject::connect(m_btnStepLeft,    TQT_SIGNAL(clicked()),
-                     m_sldFrequency,     TQT_SLOT(subtractStep()));
-    TQObject::connect(m_btnStepRight,   TQT_SIGNAL(clicked()),
-                     m_sldFrequency,     TQT_SLOT(addStep()));
+    TQObject::connect(m_sldFrequency,   TQ_SIGNAL(valueChanged(int)),
+                     this,               TQ_SLOT(slotSliderChanged(int)));
+    TQObject::connect(m_btnSearchLeft,  TQ_SIGNAL(toggled(bool)),
+                     this,               TQ_SLOT(slotSearchLeft(bool)));
+    TQObject::connect(m_btnSearchRight, TQ_SIGNAL(toggled(bool)),
+                     this,               TQ_SLOT(slotSearchRight(bool)));
+    TQObject::connect(m_btnStepLeft,    TQ_SIGNAL(clicked()),
+                     m_sldFrequency,     TQ_SLOT(subtractStep()));
+    TQObject::connect(m_btnStepRight,   TQ_SIGNAL(clicked()),
+                     m_sldFrequency,     TQ_SLOT(addStep()));
 
     // Tooltips
 
@@ -84,8 +84,8 @@ RadioViewFrequencySeeker::RadioViewFrequencySeeker(TQWidget *parent, const TQStr
     TQAccel *Accel = new TQAccel (this);
     Accel->insertItem (Key_Left,  100);
     Accel->insertItem (Key_Right, 101);
-    Accel->connectItem (100, m_sldFrequency, TQT_SLOT(subtractStep()));
-    Accel->connectItem (101, m_sldFrequency, TQT_SLOT(addStep()));
+    Accel->connectItem (100, m_sldFrequency, TQ_SLOT(subtractStep()));
+    Accel->connectItem (101, m_sldFrequency, TQ_SLOT(addStep()));
 }
 
 
diff --git a/plugins/gui-standard-display/radioview_seekinterface.ui.h b/plugins/gui-standard-display/radioview_seekinterface.ui.h
index c13c945..03c74d7 100644
--- a/plugins/gui-standard-display/radioview_seekinterface.ui.h
+++ b/plugins/gui-standard-display/radioview_seekinterface.ui.h
@@ -12,8 +12,8 @@ void RadioView_SeekerUI::init()
 	Accel = new TQAccel (this);
 	Accel->insertItem (Key_Left,  100);
 	Accel->insertItem (Key_Right, 101);
-	Accel->connectItem (100, sldRange, TQT_SLOT(subtractStep()));
-	Accel->connectItem (101, sldRange, TQT_SLOT(addStep()));
+	Accel->connectItem (100, sldRange, TQ_SLOT(subtractStep()));
+	Accel->connectItem (101, sldRange, TQ_SLOT(addStep()));
 }
 
 void RadioView_SeekerUI::destroy()
diff --git a/plugins/gui-standard-display/radioview_volume.cpp b/plugins/gui-standard-display/radioview_volume.cpp
index 11e00dd..a04bfcf 100644
--- a/plugins/gui-standard-display/radioview_volume.cpp
+++ b/plugins/gui-standard-display/radioview_volume.cpp
@@ -45,8 +45,8 @@ RadioViewVolume::RadioViewVolume(TQWidget *parent, const TQString &name)
                            getSlider4Volume(v),
                            TQt::Vertical, this);
 
-    TQObject::connect(m_slider, TQT_SIGNAL(valueChanged(int)),
-                     this,     TQT_SLOT(slotVolumeChanged(int)));
+    TQObject::connect(m_slider, TQ_SIGNAL(valueChanged(int)),
+                     this,     TQ_SLOT(slotVolumeChanged(int)));
 
     TQBoxLayout *l = new TQBoxLayout(this, TQBoxLayout::LeftToRight);
     l->addWidget(m_slider);
@@ -59,8 +59,8 @@ RadioViewVolume::RadioViewVolume(TQWidget *parent, const TQString &name)
     TQAccel *Accel = new TQAccel (this);
     Accel->insertItem (Key_Up,  100);
     Accel->insertItem (Key_Down, 101);
-    Accel->connectItem (100, m_slider, TQT_SLOT(subtractStep()));
-    Accel->connectItem (101, m_slider, TQT_SLOT(addStep()));
+    Accel->connectItem (100, m_slider, TQ_SLOT(subtractStep()));
+    Accel->connectItem (101, m_slider, TQ_SLOT(addStep()));
 
 }