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

---
 lib/kofficeui/tkaction.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/kofficeui/tkaction.cpp')

diff --git a/lib/kofficeui/tkaction.cpp b/lib/kofficeui/tkaction.cpp
index 65b4de02..402c8d2c 100644
--- a/lib/kofficeui/tkaction.cpp
+++ b/lib/kofficeui/tkaction.cpp
@@ -56,7 +56,7 @@ int TKAction::plug(TQWidget* widget, int index)
   if ( widget->inherits("KToolBar") ) {
     KToolBar* bar = static_cast<KToolBar*>(widget);
     int id_ = KAction::getToolButtonID();
-    KInstance *instance;
+    TDEInstance *instance;
 
     if ( parentCollection() )
       instance = parentCollection()->instance();
-- 
cgit v1.2.1