From fcd5041fd6bf0cea48980d8a035468b2cdb5fff2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:20:31 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kaboodle/kaboodle_factory.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kaboodle/kaboodle_factory.h') diff --git a/kaboodle/kaboodle_factory.h b/kaboodle/kaboodle_factory.h index 5ee0a1dc..7a85afb8 100644 --- a/kaboodle/kaboodle_factory.h +++ b/kaboodle/kaboodle_factory.h @@ -43,12 +43,12 @@ public: virtual KParts::Part *createPartObject(TQWidget *widgetParent, const char *widgetName, TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); - static const KAboutData *aboutData(); - static KInstance *instance(); + static const TDEAboutData *aboutData(); + static TDEInstance *instance(); private: - static KInstance *s_instance; - static KAboutData *s_aboutData; + static TDEInstance *s_instance; + static TDEAboutData *s_aboutData; }; } -- cgit v1.2.1