From b19ddece21e102b8e4b292037ca7578f60b128fe Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:20:05 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- tdeui/ktoolbar.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tdeui/ktoolbar.h') diff --git a/tdeui/ktoolbar.h b/tdeui/ktoolbar.h index 1f233f23d..aa3717324 100644 --- a/tdeui/ktoolbar.h +++ b/tdeui/ktoolbar.h @@ -49,7 +49,7 @@ class KToolBarButton; class KToolBoxManager; class KAnimWidget; class KPopupMenu; -class KInstance; +class TDEInstance; class KComboBox; class KXMLGUIClient; @@ -207,7 +207,7 @@ public: */ int insertButton(const TQString& icon, int id, bool enabled = true, const TQString& text = TQString::null, int index=-1, - KInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = KGlobal::instance()); /** * This is the same as above, but with specified signals and @@ -230,7 +230,7 @@ public: int insertButton(const TQString& icon, int id, const char *signal, const TQObject *receiver, const char *slot, bool enabled = true, const TQString& text = TQString::null, - int index=-1, KInstance *_instance = KGlobal::instance() ); + int index=-1, TDEInstance *_instance = KGlobal::instance() ); /** * Inserts a button (a KToolBarButton) with the specified -- cgit v1.2.1