diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:21:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:21:16 -0600 |
| commit | ef71f46965855308db367f74956513eccc71bc46 (patch) | |
| tree | 71f1aca189b7beda22f9e95b19608dccfa4f3050 /kopete/libkopete/kopeteplugin.h | |
| parent | bdf47e8ffbf1c94f4852d9aa2eb535a9ec176658 (diff) | |
| download | tdenetwork-ef71f46965855308db367f74956513eccc71bc46.tar.gz tdenetwork-ef71f46965855308db367f74956513eccc71bc46.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kopete/libkopete/kopeteplugin.h')
| -rw-r--r-- | kopete/libkopete/kopeteplugin.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kopete/libkopete/kopeteplugin.h b/kopete/libkopete/kopeteplugin.h index 7744ca7e..1b56eb1c 100644 --- a/kopete/libkopete/kopeteplugin.h +++ b/kopete/libkopete/kopeteplugin.h @@ -68,7 +68,7 @@ Comment=Plugin that do some nice stuff * * \code typedef KGenericFactory<MyPlugin> MyPluginFactory; - static const KAboutData aboutdata("kopete_myplugin", I18N_NOOP("MyPlugin") , "1.0" ); + static const TDEAboutData aboutdata("kopete_myplugin", I18N_NOOP("MyPlugin") , "1.0" ); K_EXPORT_COMPONENT_FACTORY( kopete_myplugin, MyPluginFactory( &aboutdata ) ) MyPlugin::MyPlugin( TQObject *parent, const char *name, const TQStringList & args ) @@ -93,7 +93,7 @@ class KOPETE_EXPORT Plugin : public TQObject, public KXMLGUIClient public: - Plugin( KInstance *instance, TQObject *parent, const char *name ); + Plugin( TDEInstance *instance, TQObject *parent, const char *name ); virtual ~Plugin(); /** |