Rename KLock and KTrader to avoid conflicts with KDE4

kaffeine/src/input/disc/paranoia.cpp

@@ -237,9 +237,9 @@ bool Paranoia::encode( const TQStringList &list, TQWidget *parent )
 	myParent = parent;
 
 	// check for encoders
-	KTrader::OfferList offers = KTrader::self()->query("KaffeineAudioEncoder");
-	KTrader::OfferList::Iterator end(offers.end());
-	for(KTrader::OfferList::Iterator it = offers.begin(); it != end; ++it) {
+	TDETrader::OfferList offers = TDETrader::self()->query("KaffeineAudioEncoder");
+	TDETrader::OfferList::Iterator end(offers.end());
+	for(TDETrader::OfferList::Iterator it = offers.begin(); it != end; ++it) {
 		KService::Ptr ptr = (*it);
 		desktop.append( ptr->desktopEntryName() );
 		encoderName.append( ptr->name() );

kaffeine/src/input/dvb/dvbevents.cpp

@@ -43,9 +43,9 @@ DVBevents::DVBevents( TQString devType, int anum, int tnum, const TQString &char
 	TQString plugName;
 	int error;
 
-	KTrader::OfferList offers = KTrader::self()->query("KaffeineEpgPlugin");
-	KTrader::OfferList::Iterator end( offers.end() );
-	for ( KTrader::OfferList::Iterator it=offers.begin(); it!=end; ++it ) {
+	TDETrader::OfferList offers = TDETrader::self()->query("KaffeineEpgPlugin");
+	TDETrader::OfferList::Iterator end( offers.end() );
+	for ( TDETrader::OfferList::Iterator it=offers.begin(); it!=end; ++it ) {
 		error = 0;
 		KService::Ptr ptr = (*it);
 		if ( !ptr->name().contains(devType) )

kaffeine/src/input/dvb/dvbpanel.cpp

@@ -1035,8 +1035,8 @@ void DvbPanel::setConfig()
 	item = new DIconViewItem(this, iconView, i18n("TV"), TDEGlobal::iconLoader()->loadIcon(dvbConfig->tvIcon, KIcon::NoGroup, KIcon::SizeSmallMedium));
 	item->setDropEnabled( false );
 
-	KTrader::OfferList offers = KTrader::self()->query("KaffeineDvbPlugin");
-	KTrader::OfferList::Iterator it = offers.begin();
+	TDETrader::OfferList offers = TDETrader::self()->query("KaffeineDvbPlugin");
+	TDETrader::OfferList::Iterator it = offers.begin();
 	if ( it!=offers.end() ) {
 		KService::Ptr ptr = (*it);
 		plugName = ptr->desktopEntryName();

kaffeine/src/kaffeine.cpp

@@ -694,9 +694,9 @@ void Kaffeine::setupActions()
 	TQStringList mediaParts;
 
 	// check for kaffeine parts
-	KTrader::OfferList offers = KTrader::self()->query("audio/x-mp3", "'KaffeinePart' in ServiceTypes");
-	KTrader::OfferList::Iterator end(offers.end());
-	for(KTrader::OfferList::Iterator it = offers.begin(); it != end; ++it)
+	TDETrader::OfferList offers = TDETrader::self()->query("audio/x-mp3", "'KaffeinePart' in ServiceTypes");
+	TDETrader::OfferList::Iterator end(offers.end());
+	for(TDETrader::OfferList::Iterator it = offers.begin(); it != end; ++it)
 	{
 		KService::Ptr ptr = (*it);