diff options
Diffstat (limited to 'kweather')
| -rw-r--r-- | kweather/kweather.cpp | 2 | ||||
| -rw-r--r-- | kweather/sidebarwidget.cpp | 4 | ||||
| -rw-r--r-- | kweather/stationsconfigwidget.cpp | 2 | ||||
| -rw-r--r-- | kweather/weatherbar.cpp | 2 | ||||
| -rw-r--r-- | kweather/weatherbutton.cpp | 8 | ||||
| -rw-r--r-- | kweather/weatherservice.cpp | 10 |
6 files changed, 14 insertions, 14 deletions
diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp index 61e5eb4..9843914 100644 --- a/kweather/kweather.cpp +++ b/kweather/kweather.cpp @@ -173,7 +173,7 @@ void kweather::preferences() /** The help handler */ void kweather::help() { - kapp->invokeHelp(TQString(), TQString::fromLatin1("kweather")); + tdeApp->invokeHelp(TQString(), TQString::fromLatin1("kweather")); } /** Display the current weather report. */ diff --git a/kweather/sidebarwidget.cpp b/kweather/sidebarwidget.cpp index dc481ec..6a785d1 100644 --- a/kweather/sidebarwidget.cpp +++ b/kweather/sidebarwidget.cpp @@ -63,9 +63,9 @@ sidebarwidget::sidebarwidget(TQWidget* parent, const char* name) mainLayout->addWidget(toolbar); mainLayout->addWidget(reportGrid); - if(!kapp->dcopClient()->isAttached()) + if(!tdeApp->dcopClient()->isAttached()) { - kapp->dcopClient()->attach(); + tdeApp->dcopClient()->attach(); } dcopCall = new DCOPRef( "KWeatherService", "WeatherService" ); diff --git a/kweather/stationsconfigwidget.cpp b/kweather/stationsconfigwidget.cpp index 5ba7aee..365650b 100644 --- a/kweather/stationsconfigwidget.cpp +++ b/kweather/stationsconfigwidget.cpp @@ -204,7 +204,7 @@ bool StationsConfigWidget::dcopActive() TQString error; TQCString appID; bool isGood = true; - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if ( !client->isApplicationRegistered( "KWeatherService" ) ) { if ( TDEApplication::startServiceByDesktopName( "kweatherservice", TQStringList(), &error, &appID ) ) isGood = false; diff --git a/kweather/weatherbar.cpp b/kweather/weatherbar.cpp index 98cad49..e9f5309 100644 --- a/kweather/weatherbar.cpp +++ b/kweather/weatherbar.cpp @@ -187,7 +187,7 @@ bool KonqSidebarWeather::startWeatherService() TQDataStream arg(data, IO_WriteOnly); arg << TQString("KWeatherService") << TQStringList(); - if ( !kapp->dcopClient()->call( + if ( !tdeApp->dcopClient()->call( "tdelauncher", "tdelauncher", "start_service_by_name(TQString,TQStringList)", data, replyType, replyData) ) { diff --git a/kweather/weatherbutton.cpp b/kweather/weatherbutton.cpp index 986eebf..9f1dc21 100644 --- a/kweather/weatherbutton.cpp +++ b/kweather/weatherbutton.cpp @@ -34,13 +34,13 @@ WeatherButton::WeatherButton( TQWidget *parent, const char *name ) { setBackgroundOrigin( AncestorOrigin ); - connect( kapp, TQ_SIGNAL( settingsChanged( int ) ), + connect( tdeApp, TQ_SIGNAL( settingsChanged( int ) ), TQ_SLOT( slotSettingsChanged( int ) ) ); - connect( kapp, TQ_SIGNAL( iconChanged( int ) ), + connect( tdeApp, TQ_SIGNAL( iconChanged( int ) ), TQ_SLOT( slotIconChanged( int ) ) ); - kapp->addKipcEventMask( KIPC::SettingsChanged ); - kapp->addKipcEventMask( KIPC::IconChanged ); + tdeApp->addKipcEventMask( KIPC::SettingsChanged ); + tdeApp->addKipcEventMask( KIPC::IconChanged ); slotSettingsChanged( TDEApplication::SETTINGS_MOUSE ); } diff --git a/kweather/weatherservice.cpp b/kweather/weatherservice.cpp index 3ec47c9..1418cdd 100644 --- a/kweather/weatherservice.cpp +++ b/kweather/weatherservice.cpp @@ -47,7 +47,7 @@ WeatherService::WeatherService(TQObject *parent, const char *name) : TQObject (p connect(m_weatherLib, TQ_SIGNAL(stationRemoved(const TQString&)), TQ_SLOT(slotStationRemoved(const TQString&))); - TDEConfig *conf = kapp->config(); + TDEConfig *conf = tdeApp->config(); conf->setGroup("WEATHERSTATIONS"); TQStringList stations =conf->readListEntry("stations"); @@ -61,7 +61,7 @@ WeatherService::~WeatherService() kdDebug(12006) << "Going away... " << endl; // Don't need to call saveSettings() because WeatherService::exit // already does that. Plus it wouldn't work here anyway because - // we can't get the config after calling kapp->quit(); + // we can't get the config after calling tdeApp->quit(); delete stationDB; } @@ -141,7 +141,7 @@ TQString WeatherService::pressure(const TQString &stationID) TQPixmap WeatherService::icon(const TQString &stationID, uint iconSize) { - return kapp->iconLoader()->loadIcon( + return tdeApp->iconLoader()->loadIcon( iconPath(stationID, iconSize), TDEIcon::Panel, iconSize ); @@ -249,7 +249,7 @@ void WeatherService::addStation(const TQString &stationID) void WeatherService::exit() { saveSettings(); - kapp->quit(); + tdeApp->quit(); } TQStringList WeatherService::listStations() @@ -259,7 +259,7 @@ TQStringList WeatherService::listStations() void WeatherService::saveSettings() { - TDEConfig *conf = kapp->config(); + TDEConfig *conf = tdeApp->config(); conf->setGroup("WEATHERSTATIONS"); conf->writeEntry( "stations", m_weatherLib->stations()); conf->sync(); |