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

---
 tdeui/kxmlguifactory_p.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tdeui/kxmlguifactory_p.cpp')

diff --git a/tdeui/kxmlguifactory_p.cpp b/tdeui/kxmlguifactory_p.cpp
index 279753277..26d120de7 100644
--- a/tdeui/kxmlguifactory_p.cpp
+++ b/tdeui/kxmlguifactory_p.cpp
@@ -805,7 +805,7 @@ TQWidget *BuildHelper::createContainer( TQWidget *parent, int index,
         }
     }
 
-    KInstance *oldInstance = m_state.builder->builderInstance();
+    TDEInstance *oldInstance = m_state.builder->builderInstance();
     KXMLGUIClient *oldClient = m_state.builder->builderClient();
 
     m_state.builder->setBuilderClient( m_state.guiClient );
-- 
cgit v1.2.1