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

(limited to 'tdeui/ktoolbarbutton.cpp')

diff --git a/tdeui/ktoolbarbutton.cpp b/tdeui/ktoolbarbutton.cpp
index 1316081c6..66b9d6ee9 100644
--- a/tdeui/ktoolbarbutton.cpp
+++ b/tdeui/ktoolbarbutton.cpp
@@ -93,7 +93,7 @@ public:
 
   TQPoint m_mousePressPos;
 
-  KInstance  *m_instance;
+  TDEInstance  *m_instance;
 };
 
 // This will construct a separator
@@ -109,7 +109,7 @@ KToolBarButton::KToolBarButton( TQWidget *_parent, const char *_name )
 
 KToolBarButton::KToolBarButton( const TQString& _icon, int _id,
                                 TQWidget *_parent, const char *_name,
-                                const TQString &_txt, KInstance *_instance )
+                                const TQString &_txt, TDEInstance *_instance )
     : TQToolButton( _parent, _name ), d( 0 )
 {
   d = new KToolBarButtonPrivate;
-- 
cgit v1.2.1