From b19ddece21e102b8e4b292037ca7578f60b128fe Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 20:20:05 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 tdecore/klocale.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tdecore/klocale.cpp')

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()));
 
-- 
cgit v1.2.1