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_viewmgr.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_viewmgr.cc')
| -rw-r--r-- | konqueror/konq_viewmgr.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc index b2ff4b475..f570322dc 100644 --- a/konqueror/konq_viewmgr.cc +++ b/konqueror/konq_viewmgr.cc @@ -65,7 +65,7 @@ KonqView* KonqViewManager::Initialize( const TQString &serviceType, const TQStri { //kdDebug(1202) << "KonqViewManager::Initialize()" << endl; KService::Ptr service; - KTrader::OfferList partServiceOffers, appServiceOffers; + TDETrader::OfferList partServiceOffers, appServiceOffers; KonqViewFactory newViewFactory = createView( serviceType, serviceName, service, partServiceOffers, appServiceOffers, true /*forceAutoEmbed*/ ); if ( newViewFactory.isNull() ) { @@ -106,7 +106,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation, KonqFrame* splitFrame = m_pMainWindow->currentView()->frame(); KService::Ptr service; - KTrader::OfferList partServiceOffers, appServiceOffers; + TDETrader::OfferList partServiceOffers, appServiceOffers; KonqViewFactory newViewFactory = createView( serviceType, serviceName, service, partServiceOffers, appServiceOffers, forceAutoEmbed ); @@ -217,7 +217,7 @@ KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation, TQString locationBarURL = m_pMainWindow->currentView()->locationBarURL(); KService::Ptr service; - KTrader::OfferList partServiceOffers, appServiceOffers; + TDETrader::OfferList partServiceOffers, appServiceOffers; KonqViewFactory newViewFactory = createView( serviceType, serviceName, service, partServiceOffers, appServiceOffers ); @@ -328,7 +328,7 @@ KonqView* KonqViewManager::addTab(const TQString &serviceType, const TQString &s } KService::Ptr service; - KTrader::OfferList partServiceOffers, appServiceOffers; + TDETrader::OfferList partServiceOffers, appServiceOffers; KonqViewFactory newViewFactory = createView( serviceType, serviceName, service, partServiceOffers, appServiceOffers, true /*forceAutoEmbed*/ ); @@ -984,8 +984,8 @@ KonqView *KonqViewManager::chooseNextView( KonqView *view ) KonqViewFactory KonqViewManager::createView( const TQString &serviceType, const TQString &serviceName, KService::Ptr &service, - KTrader::OfferList &partServiceOffers, - KTrader::OfferList &appServiceOffers, + TDETrader::OfferList &partServiceOffers, + TDETrader::OfferList &appServiceOffers, bool forceAutoEmbed ) { kdDebug(1202) << "KonqViewManager::createView" << endl; @@ -1018,8 +1018,8 @@ KonqViewFactory KonqViewManager::createView( const TQString &serviceType, KonqView *KonqViewManager::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 ) @@ -1471,7 +1471,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent, //kdDebug(1202) << "KonqViewManager::loadItem: ServiceType " << serviceType << " " << serviceName << endl; KService::Ptr service; - KTrader::OfferList partServiceOffers, appServiceOffers; + TDETrader::OfferList partServiceOffers, appServiceOffers; KonqViewFactory viewFactory = KonqFactory::createView( serviceType, serviceName, &service, &partServiceOffers, &appServiceOffers, true /*forceAutoEmbed*/ ); if ( viewFactory.isNull() ) |