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/klocale.cpp | |
| parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
| download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/klocale.cpp')
| -rw-r--r-- | tdecore/klocale.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tdecore/klocale.cpp b/tdecore/klocale.cpp index c4ae52b19..43c21ef2e 100644 --- a/tdecore/klocale.cpp +++ b/tdecore/klocale.cpp @@ -2006,7 +2006,7 @@ void KLocale::initInstance() if (KGlobal::_locale) return; - KInstance *app = KGlobal::instance(); + TDEInstance *app = KGlobal::instance(); if (app) { KGlobal::_locale = new KLocale(TQString::fromLatin1(app->instanceName())); |