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

---
 korganizer/koglobals.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'korganizer/koglobals.cpp')

diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp
index e4caf058f..3077e0cdf 100644
--- a/korganizer/koglobals.cpp
+++ b/korganizer/koglobals.cpp
@@ -67,9 +67,9 @@ KOGlobals *KOGlobals::self()
 KOGlobals::KOGlobals()
   : mHolidays(0)
 {
-  // Needed to distinguish from global KInstance
+  // Needed to distinguish from global TDEInstance
   // in case we are a KPart
-  mOwnInstance = new KInstance( "korganizer" );
+  mOwnInstance = new TDEInstance( "korganizer" );
   mOwnInstance->config()->setGroup( "General" );
   mOwnInstance->iconLoader()->addAppDir( "tdepim" );
   KGlobal::iconLoader()->addAppDir( "tdepim" );
-- 
cgit v1.2.1