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_view.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'konqueror/konq_view.cc') diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc index c19438668..023b1e19f 100644 --- a/konqueror/konq_view.cc +++ b/konqueror/konq_view.cc @@ -59,8 +59,8 @@ KonqView::KonqView( KonqViewFactory &viewFactory, KonqFrame* viewFrame, KonqMainWindow *mainWindow, 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 ) @@ -325,7 +325,7 @@ bool KonqView::changeViewMode( const TQString &serviceType, } kdDebug(1202) << "Switching view modes..." << endl; - KTrader::OfferList partServiceOffers, appServiceOffers; + TDETrader::OfferList partServiceOffers, appServiceOffers; KService::Ptr service = 0L; KonqViewFactory viewFactory = KonqFactory::createView( serviceType, serviceName, &service, &partServiceOffers, &appServiceOffers, forceAutoEmbed ); -- cgit v1.2.1