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/kuniqueapplication.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tdecore/kuniqueapplication.cpp')

diff --git a/tdecore/kuniqueapplication.cpp b/tdecore/kuniqueapplication.cpp
index 97a8eec1b..708a9efb0 100644
--- a/tdecore/kuniqueapplication.cpp
+++ b/tdecore/kuniqueapplication.cpp
@@ -351,9 +351,9 @@ KUniqueApplication::~KUniqueApplication()
 }
 
 // this gets called before even entering TQApplication::TQApplication()
-KInstance* KUniqueApplication::initHack( bool configUnique )
+TDEInstance* KUniqueApplication::initHack( bool configUnique )
 {
-  KInstance* inst = new KInstance( TDECmdLineArgs::about );
+  TDEInstance* inst = new TDEInstance( TDECmdLineArgs::about );
   if (configUnique)
   {
     KConfigGroupSaver saver( inst->config(), "KDE" );
-- 
cgit v1.2.3