Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit cb5e787fde24bc986f17de4c78b5840f8ed85856)

11 files changed, 39 insertions, 39 deletions

diff --git a/kweather/dockwidget.cpp b/kweather/dockwidget.cpp
index 11d45ea..d8a5f85 100644
--- a/kweather/dockwidget.cpp
+++ b/kweather/dockwidget.cpp
@@ -37,7 +37,7 @@ dockwidget::dockwidget(const TQString &location, TQWidget *parent,
     m_font = TDEGlobalSettings::generalFont();
     setBackgroundOrigin( AncestorOrigin );
     initDock();
-    connect(m_button, TQT_SIGNAL( clicked() ), TQT_SIGNAL( buttonClicked() ));
+    connect(m_button, TQ_SIGNAL( clicked() ), TQ_SIGNAL( buttonClicked() ));
 
     m_weatherService = new WeatherService_stub( "KWeatherService", "WeatherService" );
     updateIcon();
@@ -195,7 +195,7 @@ void dockwidget::initDock()
 
     updateFont();
 
-    TQTimer::singleShot( 0, this, TQT_SLOT( showWeather() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( showWeather() ) );
 }
 
 /** resize the view **/
diff --git a/kweather/kcmweatherapplet.cpp b/kweather/kcmweatherapplet.cpp
index 87decad..20b4cb4 100644
--- a/kweather/kcmweatherapplet.cpp
+++ b/kweather/kcmweatherapplet.cpp
@@ -63,12 +63,12 @@ KCMWeatherApplet::KCMWeatherApplet( TQWidget *parent, const char *name )
 
   fillStationList();
   load();
-  connect( mWidget->m_viewMode, TQT_SIGNAL( released( int ) ),
-                                TQT_SLOT( changeViewMode( int ) ) );
-  connect( mWidget->m_reportLocation, TQT_SIGNAL( activated( const TQString& ) ),
-                                      TQT_SLOT( reportLocationChanged() ) );
-  connect( mWidget->m_textColor, TQT_SIGNAL( changed(const TQColor &) ),
-                                 TQT_SLOT( textColorChanged(const TQColor &) ) );
+  connect( mWidget->m_viewMode, TQ_SIGNAL( released( int ) ),
+                                TQ_SLOT( changeViewMode( int ) ) );
+  connect( mWidget->m_reportLocation, TQ_SIGNAL( activated( const TQString& ) ),
+                                      TQ_SLOT( reportLocationChanged() ) );
+  connect( mWidget->m_textColor, TQ_SIGNAL( changed(const TQColor &) ),
+                                 TQ_SLOT( textColorChanged(const TQColor &) ) );
 
   TDEAboutData *about = new TDEAboutData(
       I18N_NOOP( "kcmweatherapplet" ),
diff --git a/kweather/kcmweatherservice.cpp b/kweather/kcmweatherservice.cpp
index af48790..f014ff7 100644
--- a/kweather/kcmweatherservice.cpp
+++ b/kweather/kcmweatherservice.cpp
@@ -63,10 +63,10 @@ KCMWeatherService::KCMWeatherService( TQWidget *parent, const char *name )
 	layout->addStretch();
 
 	load();
-	connect( mWidget->m_enableLog, TQT_SIGNAL( toggled( bool ) ),
-					 TQT_SLOT( enableLogWidgets( bool ) ) );
-	connect( mWidget->m_iconTheme, TQT_SIGNAL( released( int ) ),
-					 TQT_SLOT( changed() ) );
+	connect( mWidget->m_enableLog, TQ_SIGNAL( toggled( bool ) ),
+					 TQ_SLOT( enableLogWidgets( bool ) ) );
+	connect( mWidget->m_iconTheme, TQ_SIGNAL( released( int ) ),
+					 TQ_SLOT( changed() ) );
 
 	TDEAboutData *about = new TDEAboutData(
 		I18N_NOOP( "kcmweatherservice" ),
diff --git a/kweather/kcmweatherstations.cpp b/kweather/kcmweatherstations.cpp
index 3d60f5a..73e257d 100644
--- a/kweather/kcmweatherstations.cpp
+++ b/kweather/kcmweatherstations.cpp
@@ -45,7 +45,7 @@ KCMWeatherStations::KCMWeatherStations( TQWidget *parent, const char *name )
   mWidget = new StationsConfigWidget( this );
 
   // not needed, as a change immediately changes the service
-  //connect(mWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
+  //connect(mWidget, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool)));
 
   layout->addWidget( mWidget );
   TDEAboutData *about = new TDEAboutData( "kcmweatherstations",
diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp
index 1a215f4..9b8969a 100644
--- a/kweather/kweather.cpp
+++ b/kweather/kweather.cpp
@@ -65,12 +65,12 @@ kweather::kweather(const TQString& configFile, Type t, int actions,
     initDCOP();
 
     dockWidget = new dockwidget(reportLocation, this, "dockwidget");
-    connect(dockWidget, TQT_SIGNAL(buttonClicked()), TQT_SLOT(doReport()));
+    connect(dockWidget, TQ_SIGNAL(buttonClicked()), TQ_SLOT(doReport()));
     dockWidget->setViewMode(mViewMode);
     setLabelColor();
 
     timeOut = new TQTimer(this, "timeOut" );
-    connect(timeOut, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()));
+    connect(timeOut, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()));
     timeOut->start(10*60*1000);
 
     if(mFirstRun)
@@ -89,13 +89,13 @@ void kweather::initContextMenu()
     mContextMenu = new TDEPopupMenu(this);
     mContextMenu->insertTitle(i18n("KWeather - %1").arg( reportLocation ), -1, 0);
     mContextMenu->insertItem(SmallIcon("viewmag"), i18n("Show &Report"),
-        this, TQT_SLOT(doReport()), 0, -1, 1);
+        this, TQ_SLOT(doReport()), 0, -1, 1);
     mContextMenu->insertItem(SmallIcon("reload"), i18n("&Update Now"),
-        this, TQT_SLOT(slotUpdateNow()), 0, -1, 2);
+        this, TQ_SLOT(slotUpdateNow()), 0, -1, 2);
     mContextMenu->insertSeparator();
-    mContextMenu->insertItem(SmallIcon("kweather"), i18n("&About KWeather"), this, TQT_SLOT(about()));
+    mContextMenu->insertItem(SmallIcon("kweather"), i18n("&About KWeather"), this, TQ_SLOT(about()));
     mContextMenu->insertItem(SmallIcon("configure"),
-        i18n("&Configure KWeather..."), this, TQT_SLOT(preferences()));
+        i18n("&Configure KWeather..."), this, TQ_SLOT(preferences()));
     setCustomMenu(mContextMenu);
 }
 
@@ -159,7 +159,7 @@ void kweather::preferences()
     if ( settingsDialog == 0 )
     {
       settingsDialog = new KCMultiDialog( this );
-      connect( settingsDialog, TQT_SIGNAL( configCommitted() ), TQT_SLOT( slotPrefsAccepted() ) );
+      connect( settingsDialog, TQ_SIGNAL( configCommitted() ), TQ_SLOT( slotPrefsAccepted() ) );
 
       settingsDialog->addModule( "kcmweatherapplet.desktop" );
       settingsDialog->addModule( "kcmweatherservice.desktop" );
@@ -191,7 +191,7 @@ void kweather::doReport()
     {
         mReport = new reportView(reportLocation);
 
-        connect( mReport, TQT_SIGNAL( finished() ), TQT_SLOT( slotReportFinished() ) );
+        connect( mReport, TQ_SIGNAL( finished() ), TQ_SLOT( slotReportFinished() ) );
     }
 
     mReport->show();
diff --git a/kweather/sidebarwidget.cpp b/kweather/sidebarwidget.cpp
index 1afe45a..dc481ec 100644
--- a/kweather/sidebarwidget.cpp
+++ b/kweather/sidebarwidget.cpp
@@ -45,9 +45,9 @@ sidebarwidget::sidebarwidget(TQWidget* parent, const char* name)
     toolbar->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Minimum);
 
     TDEAction *refresh = new TDEAction( i18n("Refresh"), SmallIcon("view-refresh"),
-        0, this, TQT_SLOT(slotRefresh()), this, "refresh" );
+        0, this, TQ_SLOT(slotRefresh()), this, "refresh" );
     TDEAction *prefs   = new TDEAction( i18n("Settings"), SmallIcon("configure"),
-        0, this, TQT_SLOT(slotConfigure()), this, "preferences" );
+        0, this, TQ_SLOT(slotConfigure()), this, "preferences" );
     refresh->plug(toolbar);
     prefs->plug(toolbar);
 
@@ -90,7 +90,7 @@ void sidebarwidget::slotConfigure()
     if ( settingsDialog == 0 )
     {
       settingsDialog = new KCMultiDialog(0);
-      connect( settingsDialog, TQT_SIGNAL( configCommitted() ), this, TQT_SLOT( slotRefresh() ) );
+      connect( settingsDialog, TQ_SIGNAL( configCommitted() ), this, TQ_SLOT( slotRefresh() ) );
 
       settingsDialog->addModule( "kcmweatherstations.desktop" );
       settingsDialog->addModule( "kcmweatherservice.desktop" );
diff --git a/kweather/stationsconfigwidget.cpp b/kweather/stationsconfigwidget.cpp
index 66d7c22..5ba7aee 100644
--- a/kweather/stationsconfigwidget.cpp
+++ b/kweather/stationsconfigwidget.cpp
@@ -60,8 +60,8 @@ StationsConfigWidget::StationsConfigWidget( TQWidget *parent, const char *name )
   : stationsConfig( parent, name ), mService(0)
 {
   mService = new WeatherService_stub( "KWeatherService", "WeatherService" );
-  connect( mAllStations, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), TQT_SLOT( addStation() ) );
-  connect( mSelectedStations, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), TQT_SLOT( removeStation() ) );
+  connect( mAllStations, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), TQ_SLOT( addStation() ) );
+  connect( mSelectedStations, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), TQ_SLOT( removeStation() ) );
 
   initGUI();
   loadLocations();
diff --git a/kweather/weatherbar.cpp b/kweather/weatherbar.cpp
index f191358..3570c1b 100644
--- a/kweather/weatherbar.cpp
+++ b/kweather/weatherbar.cpp
@@ -63,7 +63,7 @@ KonqSidebarWeather::KonqSidebarWeather(TDEInstance* inst, TQObject* parent,
 		kdDebug() << "attached dcop signals..." << endl;
 
 	timeOut = new TQTimer(this, "timeOut" );
-	connect(timeOut, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateWidgets()));
+	connect(timeOut, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateWidgets()));
 
 	updateWidgets();
 }
diff --git a/kweather/weatherbutton.cpp b/kweather/weatherbutton.cpp
index 9137e54..986eebf 100644
--- a/kweather/weatherbutton.cpp
+++ b/kweather/weatherbutton.cpp
@@ -34,10 +34,10 @@ WeatherButton::WeatherButton( TQWidget *parent, const char *name )
 {
     setBackgroundOrigin( AncestorOrigin );
 
-    connect( kapp, TQT_SIGNAL( settingsChanged( int ) ),
-       TQT_SLOT( slotSettingsChanged( int ) ) );
-    connect( kapp, TQT_SIGNAL( iconChanged( int ) ),
-       TQT_SLOT( slotIconChanged( int ) ) );
+    connect( kapp, TQ_SIGNAL( settingsChanged( int ) ),
+       TQ_SLOT( slotSettingsChanged( int ) ) );
+    connect( kapp, TQ_SIGNAL( iconChanged( int ) ),
+       TQ_SLOT( slotIconChanged( int ) ) );
 
     kapp->addKipcEventMask( KIPC::SettingsChanged );
     kapp->addKipcEventMask( KIPC::IconChanged );
diff --git a/kweather/weatherlib.cpp b/kweather/weatherlib.cpp
index ca95a31..31e6c5a 100644
--- a/kweather/weatherlib.cpp
+++ b/kweather/weatherlib.cpp
@@ -221,8 +221,8 @@ void WeatherLib::getData(Data *d, bool force /* try even if host was down last t
 
 		d->job = TDEIO::file_copy( url, local, -1, true, false, false);
 		d->job->addMetaData("cache", "reload"); // Make sure to get fresh info
-		connect( d->job, TQT_SIGNAL( result( TDEIO::Job *)),
-			TQT_SLOT(slotCopyDone(TDEIO::Job *)));
+		connect( d->job, TQ_SIGNAL( result( TDEIO::Job *)),
+			TQ_SLOT(slotCopyDone(TDEIO::Job *)));
 		kdDebug( 12006 ) << "Copying " << url.prettyURL() << " to "
 			<< local.prettyURL() << endl;
 		emit fileUpdating(d->wi.reportLocation);
diff --git a/kweather/weatherservice.cpp b/kweather/weatherservice.cpp
index e61138b..3ec47c9 100644
--- a/kweather/weatherservice.cpp
+++ b/kweather/weatherservice.cpp
@@ -40,12 +40,12 @@ WeatherService::WeatherService(TQObject *parent, const char *name) : TQObject (p
 	stationDB = new StationDatabase();
 
 	m_weatherLib = new WeatherLib(stationDB, this, "WeatherLib");
-	connect(m_weatherLib, TQT_SIGNAL(fileUpdating( const TQString&)),
-			TQT_SLOT(updating( const TQString&)));
-	connect(m_weatherLib, TQT_SIGNAL(fileUpdate( const TQString&)),
-			TQT_SLOT(updated( const TQString&)));
-	connect(m_weatherLib, TQT_SIGNAL(stationRemoved(const TQString&)),
-			TQT_SLOT(slotStationRemoved(const TQString&)));
+	connect(m_weatherLib, TQ_SIGNAL(fileUpdating( const TQString&)),
+			TQ_SLOT(updating( const TQString&)));
+	connect(m_weatherLib, TQ_SIGNAL(fileUpdate( const TQString&)),
+			TQ_SLOT(updated( const TQString&)));
+	connect(m_weatherLib, TQ_SIGNAL(stationRemoved(const TQString&)),
+			TQ_SLOT(slotStationRemoved(const TQString&)));
 
 	TDEConfig *conf = kapp->config();