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

---
 libkmid/deviceman.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libkmid')

diff --git a/libkmid/deviceman.cc b/libkmid/deviceman.cc
index c8030f44e..f989f2beb 100644
--- a/libkmid/deviceman.cc
+++ b/libkmid/deviceman.cc
@@ -108,8 +108,8 @@ DeviceManager::DeviceManager(int def)
 #if 1
   if (def==-1)
   {
-    KInstance *tmp_instance=0L;
-    if (!KGlobal::_instance) tmp_instance=new KInstance("nonKDEapp");
+    TDEInstance *tmp_instance=0L;
+    if (!KGlobal::_instance) tmp_instance=new TDEInstance("nonKDEapp");
     KConfig *config = new KConfig("kcmmidirc", true);
 
     config->setGroup("Configuration");
-- 
cgit v1.2.1