Rename KLock and KTrader to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent b4b33b94d0
commit d2382c4f8e

@ -299,8 +299,8 @@ void KatapultSettings::loadCatalogPlugins()
_catalogIds.clear(); _catalogIds.clear();
ActionRegistry::self()->clear(); ActionRegistry::self()->clear();
KTrader::OfferList offers = KTrader::self()->query("Katapult/Catalog"); TDETrader::OfferList offers = TDETrader::self()->query("Katapult/Catalog");
KTrader::OfferList::ConstIterator it; TDETrader::OfferList::ConstIterator it;
for(it = offers.begin(); it != offers.end(); ++it) for(it = offers.begin(); it != offers.end(); ++it)
{ {
TQString id; TQString id;
@ -343,8 +343,8 @@ void KatapultSettings::loadDisplayPlugins()
_displayNames.clear(); _displayNames.clear();
_displayIds.clear(); _displayIds.clear();
KTrader::OfferList offers = KTrader::self()->query("Katapult/Display"); TDETrader::OfferList offers = TDETrader::self()->query("Katapult/Display");
KTrader::OfferList::ConstIterator it; TDETrader::OfferList::ConstIterator it;
for(it = offers.begin(); it != offers.end(); ++it) for(it = offers.begin(); it != offers.end(); ++it)
{ {
KService::Ptr service = *it; KService::Ptr service = *it;

Loading…
Cancel
Save