From dc5f267664506a312203c26bfe9001a448b0bb0f Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 10:49:49 -0600
Subject: Rename KLock and KTrader to avoid conflicts with KDE4

---
 kcontrol/tdeio/fakeuaprovider.cpp | 6 +++---
 kcontrol/tdeio/fakeuaprovider.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kcontrol/tdeio')

diff --git a/kcontrol/tdeio/fakeuaprovider.cpp b/kcontrol/tdeio/fakeuaprovider.cpp
index e00c63862..e13c680b8 100644
--- a/kcontrol/tdeio/fakeuaprovider.cpp
+++ b/kcontrol/tdeio/fakeuaprovider.cpp
@@ -71,15 +71,15 @@ FakeUASProvider::StatusCode FakeUASProvider::createNewUAProvider( const TQString
 void FakeUASProvider::loadFromDesktopFiles()
 {
   m_providers.clear();
-  m_providers = KTrader::self()->query("UserAgentStrings");
+  m_providers = TDETrader::self()->query("UserAgentStrings");
 }
 
 void FakeUASProvider::parseDescription()
 {
   TQString tmp;
 
-  KTrader::OfferList::ConstIterator it = m_providers.begin();
-  KTrader::OfferList::ConstIterator lastItem = m_providers.end();
+  TDETrader::OfferList::ConstIterator it = m_providers.begin();
+  TDETrader::OfferList::ConstIterator lastItem = m_providers.end();
 
   for ( ; it != lastItem; ++it )
   {
diff --git a/kcontrol/tdeio/fakeuaprovider.h b/kcontrol/tdeio/fakeuaprovider.h
index 8aedb639d..01593c2d2 100644
--- a/kcontrol/tdeio/fakeuaprovider.h
+++ b/kcontrol/tdeio/fakeuaprovider.h
@@ -49,7 +49,7 @@ protected:
   void parseDescription();
 
 private:
-  KTrader::OfferList m_providers;
+  TDETrader::OfferList m_providers;
   TQStringList m_lstIdentity;
   TQStringList m_lstAlias;
   bool m_bIsDirty;
-- 
cgit v1.2.1