From 1d061b286a8b183b39be60fe531f2b1c2915f03a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:15:55 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- konqueror/konq_viewmgr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'konqueror/konq_viewmgr.h') diff --git a/konqueror/konq_viewmgr.h b/konqueror/konq_viewmgr.h index 0e1a7f3dc..9b5c4e5b3 100644 --- a/konqueror/konq_viewmgr.h +++ b/konqueror/konq_viewmgr.h @@ -313,7 +313,7 @@ protected: const TQString &name, const KURL & defaultURL, bool openURL, bool openAfterCurrentPage = false ); // Disabled - we do it ourselves - virtual void setActiveInstance( KInstance * ) {} + virtual void setActiveInstance( TDEInstance * ) {} private: -- cgit v1.2.3