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

(limited to 'lib/kofficeui/KoToolBox.h')

diff --git a/lib/kofficeui/KoToolBox.h b/lib/kofficeui/KoToolBox.h
index 4b83f03c..25c9f1c4 100644
--- a/lib/kofficeui/KoToolBox.h
+++ b/lib/kofficeui/KoToolBox.h
@@ -49,7 +49,7 @@ class KOFFICEUI_EXPORT KoToolBox : public KToolBar {
 
 public:
 
-    KoToolBox( KMainWindow *mainWin, const char* name, KInstance* instance, int numberOfTooltypes);
+    KoToolBox( KMainWindow *mainWin, const char* name, TDEInstance* instance, int numberOfTooltypes);
     virtual ~KoToolBox();
 
     // Called by the toolcontroller for each tool. For every category,
@@ -88,7 +88,7 @@ private:
 
     TQPtrList<ToolList> m_tools;
     TQPtrList<KAction> m_idToActionMap; // Map the buttongroup id's to actions for easy activating.
-    KInstance* m_instance;
+    TDEInstance* m_instance;
 };
 
 
-- 
cgit v1.2.1