diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 10:39:58 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 10:39:58 -0600 |
| commit | 5b7c66df15ea3f5a090a190592209762281f3e61 (patch) | |
| tree | 1887da51b238c43db61ba930429a5391d3c74d9d | |
| parent | aa3c2a7bc37ccff854308d0fa80b1a59ae6cacf3 (diff) | |
| download | kaffeine-5b7c66df15ea3f5a090a190592209762281f3e61.tar.gz kaffeine-5b7c66df15ea3f5a090a190592209762281f3e61.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
| -rw-r--r-- | kaffeine/src/input/disc/paranoia.cpp | 6 | ||||
| -rw-r--r-- | kaffeine/src/input/dvb/dvbevents.cpp | 6 | ||||
| -rw-r--r-- | kaffeine/src/input/dvb/dvbpanel.cpp | 4 | ||||
| -rw-r--r-- | kaffeine/src/kaffeine.cpp | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/kaffeine/src/input/disc/paranoia.cpp b/kaffeine/src/input/disc/paranoia.cpp index 14827e2..546e7d6 100644 --- a/kaffeine/src/input/disc/paranoia.cpp +++ b/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() ); diff --git a/kaffeine/src/input/dvb/dvbevents.cpp b/kaffeine/src/input/dvb/dvbevents.cpp index 6c4753b..8db5006 100644 --- a/kaffeine/src/input/dvb/dvbevents.cpp +++ b/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) ) diff --git a/kaffeine/src/input/dvb/dvbpanel.cpp b/kaffeine/src/input/dvb/dvbpanel.cpp index c025619..d138acc 100644 --- a/kaffeine/src/input/dvb/dvbpanel.cpp +++ b/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(); diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp index 9b4093b..20c7d85 100644 --- a/kaffeine/src/kaffeine.cpp +++ b/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); |