summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 10:40:04 -0600
committerTimothy Pearson <[email protected]>2013-02-01 10:40:04 -0600
commitd2382c4f8ef9e81b06fe241181caa4d80b8e14c8 (patch)
tree46e56dd34b2df55f5ef166af04f42c402a9aa0f1
parentb4b33b94d0a02a0ada190753b8e342f4ecce8f95 (diff)
downloadkatapult-d2382c4f8ef9e81b06fe241181caa4d80b8e14c8.tar.gz
katapult-d2382c4f8ef9e81b06fe241181caa4d80b8e14c8.zip
Rename KLock and KTrader to avoid conflicts with KDE4
-rw-r--r--katapult/katapult/katapultsettings.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/katapult/katapult/katapultsettings.cpp b/katapult/katapult/katapultsettings.cpp
index 7188c48..a0c11da 100644
--- a/katapult/katapult/katapultsettings.cpp
+++ b/katapult/katapult/katapultsettings.cpp
@@ -299,8 +299,8 @@ void KatapultSettings::loadCatalogPlugins()
_catalogIds.clear();
ActionRegistry::self()->clear();
- KTrader::OfferList offers = KTrader::self()->query("Katapult/Catalog");
- KTrader::OfferList::ConstIterator it;
+ TDETrader::OfferList offers = TDETrader::self()->query("Katapult/Catalog");
+ TDETrader::OfferList::ConstIterator it;
for(it = offers.begin(); it != offers.end(); ++it)
{
TQString id;
@@ -343,8 +343,8 @@ void KatapultSettings::loadDisplayPlugins()
_displayNames.clear();
_displayIds.clear();
- KTrader::OfferList offers = KTrader::self()->query("Katapult/Display");
- KTrader::OfferList::ConstIterator it;
+ TDETrader::OfferList offers = TDETrader::self()->query("Katapult/Display");
+ TDETrader::OfferList::ConstIterator it;
for(it = offers.begin(); it != offers.end(); ++it)
{
KService::Ptr service = *it;