From dc5f267664506a312203c26bfe9001a448b0bb0f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 10:49:49 -0600 Subject: Rename KLock and KTrader to avoid conflicts with KDE4 --- konqueror/konq_viewmgr.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'konqueror/konq_viewmgr.h') diff --git a/konqueror/konq_viewmgr.h b/konqueror/konq_viewmgr.h index 766cfb799..a7dbf939c 100644 --- a/konqueror/konq_viewmgr.h +++ b/konqueror/konq_viewmgr.h @@ -325,8 +325,8 @@ private: KonqViewFactory createView( const TQString &serviceType, const TQString &serviceName, KService::Ptr &service, - KTrader::OfferList &partServiceOffers, - KTrader::OfferList &appServiceOffers, + TDETrader::OfferList &partServiceOffers, + TDETrader::OfferList &appServiceOffers, bool forceAutoEmbed = false ); /** @@ -336,8 +336,8 @@ private: KonqView *setupView( KonqFrameContainerBase *parentContainer, KonqViewFactory &viewFactory, const KService::Ptr &service, - const KTrader::OfferList &partServiceOffers, - const KTrader::OfferList &appServiceOffers, + const TDETrader::OfferList &partServiceOffers, + const TDETrader::OfferList &appServiceOffers, const TQString &serviceType, bool passiveMode, bool openAfterCurrentPage = false); -- cgit v1.2.1