summaryrefslogtreecommitdiffstats
path: root/kontact/plugins/weather
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:22:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:22:15 -0600
commit5fc6f26e12b596addd235f87320c31761bd5a84d (patch)
tree0a1ff964c23fce07fc088017df4ad537d57e62e5 /kontact/plugins/weather
parent12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff)
downloadtdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz
tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kontact/plugins/weather')
-rw-r--r--kontact/plugins/weather/weather_plugin.cpp6
-rw-r--r--kontact/plugins/weather/weather_plugin.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/kontact/plugins/weather/weather_plugin.cpp b/kontact/plugins/weather/weather_plugin.cpp
index 564465bed..af4f9f5c7 100644
--- a/kontact/plugins/weather/weather_plugin.cpp
+++ b/kontact/plugins/weather/weather_plugin.cpp
@@ -42,13 +42,13 @@ Kontact::Summary *WeatherPlugin::createSummaryWidget( TQWidget *parentWidget )
return new SummaryWidget( parentWidget );
}
-const KAboutData *WeatherPlugin::aboutData()
+const TDEAboutData *WeatherPlugin::aboutData()
{
if ( !mAboutData ) {
- mAboutData = new KAboutData( "weatherplugin", I18N_NOOP( "Weather Information" ),
+ mAboutData = new TDEAboutData( "weatherplugin", I18N_NOOP( "Weather Information" ),
"0.1",
I18N_NOOP( "Weather Information" ),
- KAboutData::License_GPL_V2,
+ TDEAboutData::License_GPL_V2,
"(c) 2003 The Kontact developers" );
mAboutData->addAuthor( "Ian Reinhart Geiser", "", "geiseri@kde.org" );
mAboutData->addAuthor( "Tobias Koenig", "", "tokoe@kde.org" );
diff --git a/kontact/plugins/weather/weather_plugin.h b/kontact/plugins/weather/weather_plugin.h
index 4ab019645..ecf2a6fee 100644
--- a/kontact/plugins/weather/weather_plugin.h
+++ b/kontact/plugins/weather/weather_plugin.h
@@ -33,12 +33,12 @@ class WeatherPlugin : public Kontact::Plugin
virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget );
- const KAboutData *aboutData();
+ const TDEAboutData *aboutData();
protected:
virtual KParts::ReadOnlyPart *createPart() { return 0; }
private:
- KAboutData *mAboutData;
+ TDEAboutData *mAboutData;
};
#endif