From 387a27b62f25387e42a850739ced151d64a2e760 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:03:49 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- sip/tdecore/kglobal.sip | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sip/tdecore/kglobal.sip') diff --git a/sip/tdecore/kglobal.sip b/sip/tdecore/kglobal.sip index 849bb07..7a03345 100644 --- a/sip/tdecore/kglobal.sip +++ b/sip/tdecore/kglobal.sip @@ -32,7 +32,7 @@ class KGlobal public: - static KInstance* instance (); + static TDEInstance* instance (); static KStandardDirs* dirs (); static KConfig* config (); @@ -49,13 +49,13 @@ public: static void unregisterStaticDeleter (KStaticDeleterBase*); static void deleteStaticDeleters (); //ig KStringDict* _stringDict; -//ig KInstance* _instance; +//ig TDEInstance* _instance; //ig KLocale* _locale; //ig KCharsets* _charsets; //ig KStaticDeleterList* _staticDeleters; - static void setActiveInstance (KInstance*); - static KInstance* activeInstance (); -//ig KInstance* _activeInstance; + static void setActiveInstance (TDEInstance*); + static TDEInstance* activeInstance (); +//ig TDEInstance* _activeInstance; }; // class KGlobal -- cgit v1.2.1