diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
| commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
| tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /tdecore/kglobal.h | |
| parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
| download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kglobal.h')
| -rw-r--r-- | tdecore/kglobal.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tdecore/kglobal.h b/tdecore/kglobal.h index 931ee6a98..5a775ae8c 100644 --- a/tdecore/kglobal.h +++ b/tdecore/kglobal.h @@ -19,7 +19,7 @@ #define _KGLOBAL_H #include "tdelibs_export.h" -#include <kinstance.h> // KDE4: class KInstance is enough here +#include <kinstance.h> // KDE4: class TDEInstance is enough here class KCharsets; class KConfig; @@ -53,7 +53,7 @@ public: * cases the application itself). * @return the global instance */ - static KInstance *instance(); + static TDEInstance *instance(); /** * Returns the application standard dirs object. @@ -167,7 +167,7 @@ public: //private: static KStringDict *_stringDict; - static KInstance *_instance; + static TDEInstance *_instance; static KLocale *_locale; static KCharsets *_charsets; static KStaticDeleterList *_staticDeleters; @@ -178,10 +178,10 @@ public: * Don't use this - it's mainly for KAboutDialog and KBugReport. * @internal */ - static void setActiveInstance(KInstance *d); - static KInstance *activeInstance() { return _activeInstance; } + static void setActiveInstance(TDEInstance *d); + static TDEInstance *activeInstance() { return _activeInstance; } - static KInstance *_activeInstance; + static TDEInstance *_activeInstance; }; /** |