From 73ff676f11662d6178c8854a7832ebffe2ae409d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 19:55:40 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- lib/kofficeui/KoTooluButton.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/kofficeui/KoTooluButton.cpp') diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp index 10334c32c..cc606584a 100644 --- a/lib/kofficeui/KoTooluButton.cpp +++ b/lib/kofficeui/KoTooluButton.cpp @@ -646,7 +646,7 @@ void KoColorPopupProxy::slotMoreColors() KoToolButton::KoToolButton( const TQString& icon, int id, TQWidget* parent, - const char* name, const TQString& txt, KInstance* _instance ) : + const char* name, const TQString& txt, TDEInstance* _instance ) : KToolBarButton( icon, id, parent, name, txt, _instance ), m_arrowPressed( false ) { init(); -- cgit v1.2.3