summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 10:44:29 -0600
committerTimothy Pearson <[email protected]>2013-02-01 10:44:29 -0600
commit2cf12b3b4be272da465791312b82cfcc77704b9d (patch)
treeba7ef5bef653dc61153b3cc52ffb8b1a26077bd1
parent95fa1b2e1f05fa546f5846267044032bcdb92493 (diff)
downloadktorrent-2cf12b3b4be272da465791312b82cfcc77704b9d.tar.gz
ktorrent-2cf12b3b4be272da465791312b82cfcc77704b9d.zip
Rename KLock and KTrader to avoid conflicts with KDE4
-rw-r--r--libktorrent/pluginmanager.cpp4
-rw-r--r--libktorrent/pluginmanager.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/libktorrent/pluginmanager.cpp b/libktorrent/pluginmanager.cpp
index 2d3fe55..cd5a1eb 100644
--- a/libktorrent/pluginmanager.cpp
+++ b/libktorrent/pluginmanager.cpp
@@ -52,9 +52,9 @@ namespace kt
void PluginManager::loadPluginList()
{
- KTrader::OfferList offers = KTrader::self()->query("KTorrent/Plugin");
+ TDETrader::OfferList offers = TDETrader::self()->query("KTorrent/Plugin");
- KTrader::OfferList::ConstIterator iter;
+ TDETrader::OfferList::ConstIterator iter;
for(iter = offers.begin(); iter != offers.end(); ++iter)
{
KService::Ptr service = *iter;
diff --git a/libktorrent/pluginmanager.h b/libktorrent/pluginmanager.h
index af5f46c..b86e521 100644
--- a/libktorrent/pluginmanager.h
+++ b/libktorrent/pluginmanager.h
@@ -52,7 +52,7 @@ namespace kt
/**
* Load the list of plugins.
- * This basically uses KTrader to get a list of available plugins, and
+ * This basically uses TDETrader to get a list of available plugins, and
* loads those, but does not initialize them. We will consider a plugin loaded
* when it's load method is called.
*/