diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 10:49:49 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 10:49:49 -0600 |
| commit | dc5f267664506a312203c26bfe9001a448b0bb0f (patch) | |
| tree | a78c7f15e87303d22b89619db42fc56ad8f4a046 /konqueror/konq_view.cc | |
| parent | 98f4a055baf6eb7ea5c3d69d6a3f2162b491e253 (diff) | |
| download | tdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.tar.gz tdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/konq_view.cc')
| -rw-r--r-- | konqueror/konq_view.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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 ); |