summaryrefslogtreecommitdiffstats
path: root/kcontrol/tdeio
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 10:49:49 -0600
committerTimothy Pearson <[email protected]>2013-02-01 10:49:49 -0600
commitdc5f267664506a312203c26bfe9001a448b0bb0f (patch)
treea78c7f15e87303d22b89619db42fc56ad8f4a046 /kcontrol/tdeio
parent98f4a055baf6eb7ea5c3d69d6a3f2162b491e253 (diff)
downloadtdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.tar.gz
tdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/tdeio')
-rw-r--r--kcontrol/tdeio/fakeuaprovider.cpp6
-rw-r--r--kcontrol/tdeio/fakeuaprovider.h2
2 files changed, 4 insertions, 4 deletions
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;