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

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

diff --git a/lib/kofficeui/tktoolbarbutton.h b/lib/kofficeui/tktoolbarbutton.h
index 17fc37584..bfa3a1480 100644
--- a/lib/kofficeui/tktoolbarbutton.h
+++ b/lib/kofficeui/tktoolbarbutton.h
@@ -27,7 +27,7 @@
 #include <kglobal.h>
 
 class KToolBar;
-class KInstance;
+class TDEInstance;
 class TQPopupMenu;
 class TQPainter;
 
@@ -37,7 +37,7 @@ class TKToolBarButton : public TQToolButton
 public:
   TKToolBarButton(const TQString& icon, const TQString& txt,
                      TQWidget* parent = 0, const char *name=0L,
-                     KInstance *_instance = KGlobal::instance());
+                     TDEInstance *_instance = KGlobal::instance());
 
   TKToolBarButton(const TQPixmap&, const TQString&, TQWidget* parent=0, const char* name=0);
   ~TKToolBarButton();
-- 
cgit v1.2.3