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.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'konqueror/konq_view.h') diff --git a/konqueror/konq_view.h b/konqueror/konq_view.h index 6a63bff9f..55f0f1069 100644 --- a/konqueror/konq_view.h +++ b/konqueror/konq_view.h @@ -82,8 +82,8 @@ public: 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); @@ -281,8 +281,8 @@ public: TQString caption() const { return m_caption; } - KTrader::OfferList partServiceOffers() { return m_partServiceOffers; } - KTrader::OfferList appServiceOffers() { return m_appServiceOffers; } + TDETrader::OfferList partServiceOffers() { return m_partServiceOffers; } + TDETrader::OfferList appServiceOffers() { return m_appServiceOffers; } KonqMainWindow *mainWindow() const { return m_pMainWindow; } @@ -465,8 +465,8 @@ private: uint m_bBackRightClick:1; uint m_bHierarchicalView:1; uint m_bDisableScrolling:1; - KTrader::OfferList m_partServiceOffers; - KTrader::OfferList m_appServiceOffers; + TDETrader::OfferList m_partServiceOffers; + TDETrader::OfferList m_appServiceOffers; KService::Ptr m_service; TQString m_serviceType; TQString m_caption; -- cgit v1.2.3