Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

9 files changed, 50 insertions, 50 deletions

diff --git a/src/aboutwidget.cpp b/src/aboutwidget.cpp
index 053f84b..71ce98a 100644
--- a/src/aboutwidget.cpp
+++ b/src/aboutwidget.cpp
@@ -120,8 +120,8 @@ TDERadioAboutWidget::TDERadioAboutWidget(const TDEAboutData &aboutData, int layo
 
     vbox = new TQVBoxLayout( mImageFrame, 1 );
     mImageLabel = new TDERadioImageTrackLabel( mImageFrame );
-    connect( mImageLabel, TQT_SIGNAL(mouseTrack( int, const TQMouseEvent * )),
-         TQT_SLOT( slotMouseTrack( int, const TQMouseEvent * )) );
+    connect( mImageLabel, TQ_SIGNAL(mouseTrack( int, const TQMouseEvent * )),
+         TQ_SLOT( slotMouseTrack( int, const TQMouseEvent * )) );
     vbox->addStretch(10);
     vbox->addWidget( mImageLabel );
     vbox->addStretch(10);
@@ -147,8 +147,8 @@ TDERadioAboutWidget::TDERadioAboutWidget(const TDEAboutData &aboutData, int layo
     gbox->setColStretch( 2, 10 );
 
     mImageLabel = new TDERadioImageTrackLabel( mImageFrame );
-    connect( mImageLabel, TQT_SIGNAL(mouseTrack( int, const TQMouseEvent * )),
-         TQT_SLOT( slotMouseTrack( int, const TQMouseEvent * )) );
+    connect( mImageLabel, TQ_SIGNAL(mouseTrack( int, const TQMouseEvent * )),
+         TQ_SLOT( slotMouseTrack( int, const TQMouseEvent * )) );
     gbox->addWidget( mImageLabel, 1, 1 );
     gbox->activate();
   }
@@ -171,8 +171,8 @@ TDERadioAboutWidget::TDERadioAboutWidget(const TDEAboutData &aboutData, int layo
 
     vbox = new TQVBoxLayout( mImageFrame, 1 );
     mImageLabel = new TDERadioImageTrackLabel( mImageFrame );
-    connect( mImageLabel, TQT_SIGNAL(mouseTrack( int, const TQMouseEvent * )),
-         TQT_SLOT( slotMouseTrack( int, const TQMouseEvent * )) );
+    connect( mImageLabel, TQ_SIGNAL(mouseTrack( int, const TQMouseEvent * )),
+         TQ_SLOT( slotMouseTrack( int, const TQMouseEvent * )) );
     vbox->addStretch(10);
     vbox->addWidget( mImageLabel );
     vbox->addStretch(10);
@@ -235,10 +235,10 @@ TQFrame *TDERadioAboutWidget::addTextPage( const TQString &title,
     browser->setMinimumHeight( fontMetrics().lineSpacing()*numLines );
 
     vbox->addWidget(browser);
-    connect(browser, TQT_SIGNAL(urlClick(const TQString &)),
-        TQT_SLOT(slotUrlClick(const TQString &)));
-    connect(browser, TQT_SIGNAL(mailClick(const TQString &,const TQString &)),
-        TQT_SLOT(slotMailClick(const TQString &,const TQString &)));
+    connect(browser, TQ_SIGNAL(urlClick(const TQString &)),
+        TQ_SLOT(slotUrlClick(const TQString &)));
+    connect(browser, TQ_SIGNAL(mailClick(const TQString &,const TQString &)),
+        TQ_SLOT(slotMailClick(const TQString &,const TQString &)));
   }
   else
   {
@@ -293,10 +293,10 @@ TDEAboutContainer *TDERadioAboutWidget::addContainerPage( const TQString &title,
     mContainerList[ mContainerList.size()-1 ]=container;
   }
 
-  connect(container, TQT_SIGNAL(urlClick(const TQString &)),
-      TQT_SLOT(slotUrlClick(const TQString &)));
-  connect(container, TQT_SIGNAL(mailClick(const TQString &,const TQString &)),
-      TQT_SLOT(slotMailClick(const TQString &,const TQString &)));
+  connect(container, TQ_SIGNAL(urlClick(const TQString &)),
+      TQ_SLOT(slotUrlClick(const TQString &)));
+  connect(container, TQ_SIGNAL(mailClick(const TQString &,const TQString &)),
+      TQ_SLOT(slotMailClick(const TQString &,const TQString &)));
 
   return container;
 }
@@ -325,10 +325,10 @@ TDEAboutContainer *TDERadioAboutWidget::addScrolledContainerPage(
   scrollView->addChild( container );
 
 
-  connect(container, TQT_SIGNAL(urlClick(const TQString &)),
-      TQT_SLOT(slotUrlClick(const TQString &)));
-  connect(container, TQT_SIGNAL(mailClick(const TQString &,const TQString &)),
-      TQT_SLOT(slotMailClick(const TQString &,const TQString &)));
+  connect(container, TQ_SIGNAL(urlClick(const TQString &)),
+      TQ_SLOT(slotUrlClick(const TQString &)));
+  connect(container, TQ_SIGNAL(mailClick(const TQString &,const TQString &)),
+      TQ_SLOT(slotMailClick(const TQString &,const TQString &)));
 
   return container;
 }
@@ -362,10 +362,10 @@ TDEAboutContainer *TDERadioAboutWidget::addContainer( int childAlignment,
     mContainerList[ mContainerList.size()-1 ]=container;
   }
 
-  connect(container, TQT_SIGNAL(urlClick(const TQString &)),
-      TQT_SLOT(slotUrlClick(const TQString &)));
-  connect(container, TQT_SIGNAL(mailClick(const TQString &,const TQString &)),
-      TQT_SLOT(slotMailClick(const TQString &,const TQString &)));
+  connect(container, TQ_SIGNAL(urlClick(const TQString &)),
+      TQ_SLOT(slotUrlClick(const TQString &)));
+  connect(container, TQ_SIGNAL(mailClick(const TQString &,const TQString &)),
+      TQ_SLOT(slotMailClick(const TQString &,const TQString &)));
 
   return container;
 }
@@ -516,8 +516,8 @@ void TDERadioAboutWidget::setAboutData(const TDEAboutData &_aboutData)
         url->setURL(aboutData->homepage());
         appPage->addWidget( url );
         // FIXME
-        connect( url, TQT_SIGNAL(leftClickedURL(const TQString &)),
-                 this, TQT_SLOT(slotUrlClick(const TQString &)));
+        connect( url, TQ_SIGNAL(leftClickedURL(const TQString &)),
+                 this, TQ_SLOT(slotUrlClick(const TQString &)));
     }
 
     int authorCount = aboutData->authors().count();
diff --git a/src/frequencyseekhelper.cpp b/src/frequencyseekhelper.cpp
index 1c24329..32b6e30 100644
--- a/src/frequencyseekhelper.cpp
+++ b/src/frequencyseekhelper.cpp
@@ -22,7 +22,7 @@ FrequencySeekHelper::FrequencySeekHelper(ISeekRadio &parent)
   : SeekHelper(parent)
 {
     m_timer = new TQTimer(this);
-    TQObject::connect (m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(step()));
+    TQObject::connect (m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(step()));
 }
 
 
diff --git a/src/pluginmanager-configuration.cpp b/src/pluginmanager-configuration.cpp
index 964b004..1e36005 100644
--- a/src/pluginmanager-configuration.cpp
+++ b/src/pluginmanager-configuration.cpp
@@ -37,11 +37,11 @@ PluginManagerConfiguration::PluginManagerConfiguration(TQWidget *parent, TDERadi
     noticePluginLibrariesChanged();
     noticePluginsChanged();
 
-    TQObject::connect(btnAddLibrary,           TQT_SIGNAL(clicked()),     this, TQT_SLOT(slotAddLibrary()));
-    TQObject::connect(btnRemoveLibrary,        TQT_SIGNAL(clicked()),     this, TQT_SLOT(slotRemoveLibrary()));
-    TQObject::connect(btnNewPluginInstance,    TQT_SIGNAL(clicked()),     this, TQT_SLOT(slotNewPluginInstance()));
-    TQObject::connect(btnRemovePluginInstance, TQT_SIGNAL(clicked()),     this, TQT_SLOT(slotRemovePluginInstance()));
-    TQObject::connect(cbShowProgressBar,       TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetDirty()));
+    TQObject::connect(btnAddLibrary,           TQ_SIGNAL(clicked()),     this, TQ_SLOT(slotAddLibrary()));
+    TQObject::connect(btnRemoveLibrary,        TQ_SIGNAL(clicked()),     this, TQ_SLOT(slotRemoveLibrary()));
+    TQObject::connect(btnNewPluginInstance,    TQ_SIGNAL(clicked()),     this, TQ_SLOT(slotNewPluginInstance()));
+    TQObject::connect(btnRemovePluginInstance, TQ_SIGNAL(clicked()),     this, TQ_SLOT(slotRemovePluginInstance()));
+    TQObject::connect(cbShowProgressBar,       TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetDirty()));
 
     slotCancel();
 }
diff --git a/src/pluginmanager.cpp b/src/pluginmanager.cpp
index 89c750a..ef376ce 100644
--- a/src/pluginmanager.cpp
+++ b/src/pluginmanager.cpp
@@ -107,7 +107,7 @@ void PluginManager::addWidgetPluginMenuItems(TQMenuData *menu, TQMap<WidgetPlugi
         WidgetPluginBase *b = dynamic_cast<WidgetPluginBase*>(it.current());
         if (!b) continue;
 
-        int id = menu->insertItem("dummy", b->getWidget(), TQT_SLOT(toggleShown()));
+        int id = menu->insertItem("dummy", b->getWidget(), TQ_SLOT(toggleShown()));
         map.insert(b, id);
         updateWidgetPluginMenuItem(b, menu, map, b->isReallyVisible());
     }
@@ -305,8 +305,8 @@ TQFrame *PluginManager::addConfigurationPage (const ConfigPageInfo &info)
     l->addWidget( info.page, 0, 0 );
 
     // make sure, that config page receives ok, apply and cancel signals
-    TQObject::connect(this,           TQT_SIGNAL(sigConfigOK()),   info.page, TQT_SLOT(slotOK()));
-    TQObject::connect(m_configDialog, TQT_SIGNAL(cancelClicked()), info.page, TQT_SLOT(slotCancel()));
+    TQObject::connect(this,           TQ_SIGNAL(sigConfigOK()),   info.page, TQ_SLOT(slotOK()));
+    TQObject::connect(m_configDialog, TQ_SIGNAL(cancelClicked()), info.page, TQ_SLOT(slotCancel()));
 
     return f;
 }
@@ -329,8 +329,8 @@ void PluginManager::createConfigDialog(const TQString &title)
 
     m_configDialog = cfg;
 
-    TQObject::connect(m_configDialog, TQT_SIGNAL(okClicked()),     this, TQT_SLOT(slotConfigOK()));
-    TQObject::connect(m_configDialog, TQT_SIGNAL(applyClicked()),  this, TQT_SLOT(slotConfigOK()));
+    TQObject::connect(m_configDialog, TQ_SIGNAL(okClicked()),     this, TQ_SLOT(slotConfigOK()));
+    TQObject::connect(m_configDialog, TQ_SIGNAL(applyClicked()),  this, TQ_SLOT(slotConfigOK()));
 
     insertPlugin(cfg);
 
diff --git a/src/radiostation-config.cpp b/src/radiostation-config.cpp
index 52a692e..7287cda 100644
--- a/src/radiostation-config.cpp
+++ b/src/radiostation-config.cpp
@@ -70,7 +70,7 @@ FrequencyRadioStationConfig::FrequencyRadioStationConfig (TQWidget *parent)
     vl->addWidget (m_editFrequency);
     hl->addItem(new TQSpacerItem (10, 1, TQSizePolicy::Expanding, TQSizePolicy::Fixed));
 
-    connect (m_editFrequency, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged(int)));
+    connect (m_editFrequency, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotValueChanged(int)));
 }
 
 FrequencyRadioStationConfig::~FrequencyRadioStationConfig()
diff --git a/src/radiostation-listview.cpp b/src/radiostation-listview.cpp
index 4c7fe64..cac9ce5 100644
--- a/src/radiostation-listview.cpp
+++ b/src/radiostation-listview.cpp
@@ -37,14 +37,14 @@ RadioStationListView::RadioStationListView(TQWidget *parent, const char *name)
     setAllColumnsShowFocus(true);
     setSorting(-1);
 
-    TQObject::connect(this, TQT_SIGNAL(spacePressed(TQListViewItem*)),
-                     this, TQT_SLOT(slotStationActivation(TQListViewItem* )));
-    TQObject::connect(this, TQT_SIGNAL(returnPressed(TQListViewItem*)),
-                     this, TQT_SLOT(slotStationActivation(TQListViewItem* )));
-    TQObject::connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*)),
-                     this, TQT_SLOT(slotStationActivation(TQListViewItem *)));
-    TQObject::connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)),
-                     this, TQT_SLOT(slotCurrentStationChanged(TQListViewItem *)));
+    TQObject::connect(this, TQ_SIGNAL(spacePressed(TQListViewItem*)),
+                     this, TQ_SLOT(slotStationActivation(TQListViewItem* )));
+    TQObject::connect(this, TQ_SIGNAL(returnPressed(TQListViewItem*)),
+                     this, TQ_SLOT(slotStationActivation(TQListViewItem* )));
+    TQObject::connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+                     this, TQ_SLOT(slotStationActivation(TQListViewItem *)));
+    TQObject::connect(this, TQ_SIGNAL(currentChanged(TQListViewItem*)),
+                     this, TQ_SLOT(slotCurrentStationChanged(TQListViewItem *)));
 
     setAcceptDrops(true);
 }
diff --git a/src/standardscandialog.cpp b/src/standardscandialog.cpp
index 32f1138..d352665 100644
--- a/src/standardscandialog.cpp
+++ b/src/standardscandialog.cpp
@@ -34,7 +34,7 @@ StandardScanDialog::StandardScanDialog(TQWidget *parent)
       m_oldStation(NULL),
       m_ignorePower(false)
 {
-    TQObject::connect(buttonCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCancelDone()));
+    TQObject::connect(buttonCancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCancelDone()));
 }
 
 
diff --git a/src/stationselector.cpp b/src/stationselector.cpp
index d604ea8..c231229 100644
--- a/src/stationselector.cpp
+++ b/src/stationselector.cpp
@@ -30,10 +30,10 @@ StationSelector::StationSelector (TQWidget *parent)
     : StationSelectorUI(parent),
       m_dirty(true)
 {
-    TQObject::connect(buttonToLeft,  TQT_SIGNAL(clicked()), this, TQT_SLOT(slotButtonToLeft()));
-    TQObject::connect(buttonToRight, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotButtonToRight()));
-    TQObject::connect(listAvailable, TQT_SIGNAL(sigStationsReceived(const TQStringList&)), this, TQT_SLOT(slotMoveToLeft(const TQStringList&)));
-    TQObject::connect(listSelected,  TQT_SIGNAL(sigStationsReceived(const TQStringList&)), this, TQT_SLOT(slotMoveToRight(const TQStringList&)));
+    TQObject::connect(buttonToLeft,  TQ_SIGNAL(clicked()), this, TQ_SLOT(slotButtonToLeft()));
+    TQObject::connect(buttonToRight, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotButtonToRight()));
+    TQObject::connect(listAvailable, TQ_SIGNAL(sigStationsReceived(const TQStringList&)), this, TQ_SLOT(slotMoveToLeft(const TQStringList&)));
+    TQObject::connect(listSelected,  TQ_SIGNAL(sigStationsReceived(const TQStringList&)), this, TQ_SLOT(slotMoveToRight(const TQStringList&)));
 
     listSelected->setSelectionMode(TQListView::Extended);
     listAvailable->setSelectionMode(TQListView::Extended);
diff --git a/src/tderadioapp.cpp b/src/tderadioapp.cpp
index 83b481f..c30c78e 100644
--- a/src/tderadioapp.cpp
+++ b/src/tderadioapp.cpp
@@ -129,7 +129,7 @@ TDERadioApp::TDERadioApp()
     m_quitting(false)
 {
     m_Instances.setAutoDelete(true);
-    connect(this, TQT_SIGNAL(aboutToQuit()), this, TQT_SLOT(slotAboutToQuit()));
+    connect(this, TQ_SIGNAL(aboutToQuit()), this, TQ_SLOT(slotAboutToQuit()));
 }