From 3a044decb0a5d7be822c888b2d5374573d7df96e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:23:50 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- languages/cpp/app_templates/kofficepart/kopart_factory.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'languages/cpp/app_templates/kofficepart/kopart_factory.h') diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.h b/languages/cpp/app_templates/kofficepart/kopart_factory.h index 2bb18133..2d5a56e2 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_factory.h +++ b/languages/cpp/app_templates/kofficepart/kopart_factory.h @@ -8,8 +8,8 @@ #include -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class %{APPNAME}Factory : public KoFactory { @@ -21,14 +21,14 @@ public: virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); - static KInstance* global(); + static TDEInstance* global(); - // _Creates_ a KAboutData but doesn't keep ownership - static KAboutData* aboutData(); + // _Creates_ a TDEAboutData but doesn't keep ownership + static TDEAboutData* aboutData(); private: - static KInstance* s_global; - static KAboutData* s_aboutData; + static TDEInstance* s_global; + static TDEAboutData* s_aboutData; }; #endif -- cgit v1.2.1