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/interfaces | |
| parent | 12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff) | |
| download | tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kontact/interfaces')
| -rw-r--r-- | kontact/interfaces/plugin.cpp | 4 | ||||
| -rw-r--r-- | kontact/interfaces/plugin.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp index 14248250..bedd52c3 100644 --- a/kontact/interfaces/plugin.cpp +++ b/kontact/interfaces/plugin.cpp @@ -126,11 +126,11 @@ KParts::ReadOnlyPart *Plugin::loadPart() return core()->createPart( d->partLibraryName ); } -const KAboutData *Plugin::aboutData() +const TDEAboutData *Plugin::aboutData() { kdDebug(5601) << "Plugin::aboutData(): libname: " << d->partLibraryName << endl; - const KInstance *instance = + const TDEInstance *instance = KParts::Factory::partInstanceFromLibrary( d->partLibraryName ); if ( instance ) { diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h index 09bc25c7..6e0abdfb 100644 --- a/kontact/interfaces/plugin.h +++ b/kontact/interfaces/plugin.h @@ -32,7 +32,7 @@ class TQStringList; class DCOPClient; class DCOPObject; -class KAboutData; +class TDEAboutData; class KAction; class KConfig; class TQWidget; @@ -142,7 +142,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient Reimplement this method if you want to add your credits to the Kontact about dialog. */ - virtual const KAboutData *aboutData(); + virtual const TDEAboutData *aboutData(); /** You can use this method if you need to access the current part. You can be |