diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:15 -0600 |
| commit | 5fc6f26e12b596addd235f87320c31761bd5a84d (patch) | |
| tree | 0a1ff964c23fce07fc088017df4ad537d57e62e5 /kontact/plugins/kpilot | |
| parent | 12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff) | |
| download | tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kontact/plugins/kpilot')
| -rw-r--r-- | kontact/plugins/kpilot/kpilot_plugin.cpp | 6 | ||||
| -rw-r--r-- | kontact/plugins/kpilot/kpilot_plugin.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/kontact/plugins/kpilot/kpilot_plugin.cpp b/kontact/plugins/kpilot/kpilot_plugin.cpp index 7993b0a2..fa3bc182 100644 --- a/kontact/plugins/kpilot/kpilot_plugin.cpp +++ b/kontact/plugins/kpilot/kpilot_plugin.cpp @@ -48,13 +48,13 @@ Kontact::Summary *KPilotPlugin::createSummaryWidget( TQWidget *parentWidget ) return new SummaryWidget( parentWidget ); } -const KAboutData *KPilotPlugin::aboutData() +const TDEAboutData *KPilotPlugin::aboutData() { if ( !mAboutData ) { - mAboutData = new KAboutData("kpilotplugin", I18N_NOOP("KPilot Information"), + mAboutData = new TDEAboutData("kpilotplugin", I18N_NOOP("KPilot Information"), KPILOT_VERSION, I18N_NOOP("KPilot - HotSync software for TDE\n\n"), - KAboutData::License_GPL, "(c) 2004 Reinhold Kainhofer"); + TDEAboutData::License_GPL, "(c) 2004 Reinhold Kainhofer"); mAboutData->addAuthor("Reinhold Kainhofer", I18N_NOOP("Plugin Developer"), "reinhold@kainhofer.com", "http://reinhold.kainhofer.com/Linux/"); mAboutData->addAuthor("Dan Pilone", diff --git a/kontact/plugins/kpilot/kpilot_plugin.h b/kontact/plugins/kpilot/kpilot_plugin.h index 5695d260..66a4d042 100644 --- a/kontact/plugins/kpilot/kpilot_plugin.h +++ b/kontact/plugins/kpilot/kpilot_plugin.h @@ -38,12 +38,12 @@ class KPilotPlugin : public Kontact::Plugin virtual bool showInSideBar() const { return false; } // virtual TQStringList configModules() const; - const KAboutData *aboutData(); + const TDEAboutData *aboutData(); protected: virtual KParts::ReadOnlyPart *createPart() { return 0; } private: - KAboutData *mAboutData; + TDEAboutData *mAboutData; }; #endif |