From d2382c4f8ef9e81b06fe241181caa4d80b8e14c8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 10:40:04 -0600 Subject: [PATCH] Rename KLock and KTrader to avoid conflicts with KDE4 --- katapult/katapult/katapultsettings.cpp | 8 ++++---- 1 file 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;