Rename KLock and KTrader to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent aa3c2a7bc3
commit 5b7c66df15

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

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

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

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

Loading…
Cancel
Save