diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:23:41 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:23:41 -0600 |
| commit | 59ea7131b34cafad6181711d490cceafe0d0e87b (patch) | |
| tree | 2c47a77c9e4bcb24cc8fed9fdcc3c52e7185a615 /kweather | |
| parent | 545d48dc2acbfb766a1c277b6f82ae54eea3754f (diff) | |
| download | tdetoys-59ea7131b34cafad6181711d490cceafe0d0e87b.tar.gz tdetoys-59ea7131b34cafad6181711d490cceafe0d0e87b.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kweather')
| -rw-r--r-- | kweather/kweather.cpp | 4 | ||||
| -rw-r--r-- | kweather/reportmain.cpp | 4 | ||||
| -rw-r--r-- | kweather/serviceconfigwidget.cpp | 2 | ||||
| -rw-r--r-- | kweather/weatherbutton.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp index 9dd5def..c864d44 100644 --- a/kweather/kweather.cpp +++ b/kweather/kweather.cpp @@ -101,7 +101,7 @@ void kweather::initContextMenu() void kweather::initDCOP() { if ( !mClient ) - mClient = KApplication::dcopClient(); + mClient = TDEApplication::dcopClient(); if(!mClient->isAttached()) mClient->attach(); @@ -388,7 +388,7 @@ bool kweather::attach() { kdDebug(12004) << "Could not find service so I am starting it..." << endl; - if (!KApplication::startServiceByDesktopName("kweatherservice", + if (!TDEApplication::startServiceByDesktopName("kweatherservice", TQStringList(), &error)) { kdDebug(12004) << "Starting KWeatherService failed with message: " diff --git a/kweather/reportmain.cpp b/kweather/reportmain.cpp index 15c2534..fbff590 100644 --- a/kweather/reportmain.cpp +++ b/kweather/reportmain.cpp @@ -37,14 +37,14 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) return -1; } - KApplication app; + TDEApplication app; DCOPClient *client = app.dcopClient(); client->attach(); TQString error; if (!client->isApplicationRegistered("KWeatherService")) { - if (KApplication::startServiceByDesktopName("kweatherservice", + if (TDEApplication::startServiceByDesktopName("kweatherservice", TQStringList(), &error)) { kdDebug() << "Starting kweatherservice failed: " << error << endl; diff --git a/kweather/serviceconfigwidget.cpp b/kweather/serviceconfigwidget.cpp index a71d4b6..e606031 100644 --- a/kweather/serviceconfigwidget.cpp +++ b/kweather/serviceconfigwidget.cpp @@ -208,7 +208,7 @@ bool ServiceConfigWidget::dcopActive() bool isGood = true; DCOPClient *client = kapp->dcopClient(); if ( !client->isApplicationRegistered( "KWeatherService" ) ) { - if ( KApplication::startServiceByDesktopName( "kweatherservice", TQStringList(), &error, &appID ) ) + if ( TDEApplication::startServiceByDesktopName( "kweatherservice", TQStringList(), &error, &appID ) ) isGood = false; } diff --git a/kweather/weatherbutton.cpp b/kweather/weatherbutton.cpp index ee88962..33e4563 100644 --- a/kweather/weatherbutton.cpp +++ b/kweather/weatherbutton.cpp @@ -42,7 +42,7 @@ WeatherButton::WeatherButton( TQWidget *parent, const char *name ) kapp->addKipcEventMask( KIPC::SettingsChanged ); kapp->addKipcEventMask( KIPC::IconChanged ); - slotSettingsChanged( KApplication::SETTINGS_MOUSE ); + slotSettingsChanged( TDEApplication::SETTINGS_MOUSE ); } void WeatherButton::drawButton( TQPainter *p ) @@ -108,7 +108,7 @@ void WeatherButton::generateIcons() void WeatherButton::slotSettingsChanged( int category ) { - if ( category != KApplication::SETTINGS_MOUSE ) return; + if ( category != TDEApplication::SETTINGS_MOUSE ) return; bool changeCursor = KGlobalSettings::changeCursorOverIcon(); |