Rename KLock and KTrader to avoid conflicts with KDE4

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;