diff options
Diffstat (limited to 'kontact/plugins/weather')
-rw-r--r-- | kontact/plugins/weather/summarywidget.cpp | 14 | ||||
-rw-r--r-- | kontact/plugins/weather/summarywidget.h | 2 | ||||
-rw-r--r-- | kontact/plugins/weather/weather_plugin.cpp | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp index 37fbe74d..fb28ab33 100644 --- a/kontact/plugins/weather/summarywidget.cpp +++ b/kontact/plugins/weather/summarywidget.cpp @@ -33,7 +33,7 @@ #include <tdeglobalsettings.h> #include <kiconloader.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kurllabel.h> #include "summarywidget.h" @@ -52,7 +52,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) TQString error; TQCString appID; bool serviceAvailable = true; - if ( !kapp->dcopClient()->isApplicationRegistered( "KWeatherService" ) ) { + if ( !tdeApp->dcopClient()->isApplicationRegistered( "KWeatherService" ) ) { if ( TDEApplication::startServiceByDesktopName( "kweatherservice", TQStringList(), &error, &appID ) ) { TQLabel *label = new TQLabel( i18n( "No weather dcop service available;\nyou need KWeather to use this plugin." ), this ); mLayout->addWidget( label, TQt::AlignHCenter | AlignVCenter ); @@ -69,7 +69,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) if ( reply.isValid() ) { mStations = reply; - connect( &mTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( timeout() ) ); + connect( &mTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( timeout() ) ); mTimer.start( 0 ); } else { kdDebug(5602) << "ERROR: dcop reply not valid..." << endl; @@ -117,8 +117,8 @@ void SummaryWidget::updateView() urlLabel->setAlignment( AlignTop ); layout->addMultiCellWidget( urlLabel, 0, 1, 0, 0 ); mLabels.append( urlLabel ); - connect ( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), - this, TQT_SLOT( showReport( const TQString& ) ) ); + connect ( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), + this, TQ_SLOT( showReport( const TQString& ) ) ); TQLabel* label = new TQLabel( this ); label->setText( TQString( "%1 (%2)" ).arg( (*it).name() ).arg( (*it).temperature() ) ); @@ -210,8 +210,8 @@ void SummaryWidget::updateSummary( bool ) void SummaryWidget::showReport( const TQString &stationID ) { mProc = new TDEProcess; - TQApplication::connect( mProc, TQT_SIGNAL( processExited( TDEProcess* ) ), - this, TQT_SLOT( reportFinished( TDEProcess* ) ) ); + TQApplication::connect( mProc, TQ_SIGNAL( processExited( TDEProcess* ) ), + this, TQ_SLOT( reportFinished( TDEProcess* ) ) ); *mProc << "kweatherreport"; *mProc << stationID; diff --git a/kontact/plugins/weather/summarywidget.h b/kontact/plugins/weather/summarywidget.h index 96361526..196269fd 100644 --- a/kontact/plugins/weather/summarywidget.h +++ b/kontact/plugins/weather/summarywidget.h @@ -86,7 +86,7 @@ class WeatherData class SummaryWidget : public Kontact::Summary, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP public: diff --git a/kontact/plugins/weather/weather_plugin.cpp b/kontact/plugins/weather/weather_plugin.cpp index 93a97bfc..506b16fd 100644 --- a/kontact/plugins/weather/weather_plugin.cpp +++ b/kontact/plugins/weather/weather_plugin.cpp @@ -32,7 +32,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_weatherplugin, WeatherPluginFactory( "kontact_weatherplugin" ) ) WeatherPlugin::WeatherPlugin( Kontact::Core *core, const char *name, const TQStringList& ) - : Kontact::Plugin( core, TQT_TQOBJECT(core), name ), mAboutData( 0 ) + : Kontact::Plugin( core, core, name ), mAboutData( 0 ) { setInstance( WeatherPluginFactory::instance() ); } |