diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:03:49 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:03:49 -0600 |
| commit | 387a27b62f25387e42a850739ced151d64a2e760 (patch) | |
| tree | bbba39b506feb102175f10aa296b201a5a4557f5 /sip/tdecore/kglobal.sip | |
| parent | 3d1fa8562bf693237a1a76918b4487cca3e2e356 (diff) | |
| download | pytde-387a27b62f25387e42a850739ced151d64a2e760.tar.gz pytde-387a27b62f25387e42a850739ced151d64a2e760.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'sip/tdecore/kglobal.sip')
| -rw-r--r-- | sip/tdecore/kglobal.sip | 10 |
1 files changed, 5 insertions, 5 deletions
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 |