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.h | |
| 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.h')
| -rw-r--r-- | konqueror/konq_viewmgr.h | 8 |
1 files changed, 4 insertions, 4 deletions
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); |