summaryrefslogtreecommitdiffstats
path: root/konqueror/konq_view.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:49:49 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:49:49 -0600
commitdc5f267664506a312203c26bfe9001a448b0bb0f (patch)
treea78c7f15e87303d22b89619db42fc56ad8f4a046 /konqueror/konq_view.h
parent98f4a055baf6eb7ea5c3d69d6a3f2162b491e253 (diff)
downloadtdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.tar.gz
tdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/konq_view.h')
-rw-r--r--konqueror/konq_view.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/konqueror/konq_view.h b/konqueror/konq_view.h
index 6a63bff9..55f0f106 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;