diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:38:41 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:38:41 -0600 |
| commit | 9f77b51ba89af86aead2b6faa1eb6dadbe47e771 (patch) | |
| tree | 686f83f67c631f695597b4ded8f729654acf1705 /amarok/src/mediumpluginmanager.cpp | |
| parent | 113814579a1110e047674c1772937ad02b12c065 (diff) | |
| download | amarok-9f77b51ba89af86aead2b6faa1eb6dadbe47e771.tar.gz amarok-9f77b51ba89af86aead2b6faa1eb6dadbe47e771.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'amarok/src/mediumpluginmanager.cpp')
| -rw-r--r-- | amarok/src/mediumpluginmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/amarok/src/mediumpluginmanager.cpp b/amarok/src/mediumpluginmanager.cpp index 56960608..0557b9cf 100644 --- a/amarok/src/mediumpluginmanager.cpp +++ b/amarok/src/mediumpluginmanager.cpp @@ -270,7 +270,7 @@ ManualDeviceAdder::ManualDeviceAdder( MediumPluginManager* mpm ) new TQLabel( i18n( "Select the plugin to use with this device:"), vbox1 ); m_mdaCombo = new KComboBox( false, vbox1, "m_mdacombo" ); m_mdaCombo->insertItem( i18n( "Do not handle" ) ); - for( KTrader::OfferList::ConstIterator it = MediaBrowser::instance()->getPlugins().begin(); + for( TDETrader::OfferList::ConstIterator it = MediaBrowser::instance()->getPlugins().begin(); it != MediaBrowser::instance()->getPlugins().end(); ++it ) m_mdaCombo->insertItem( (*it)->name() ); @@ -427,7 +427,7 @@ MediaDeviceConfig::MediaDeviceConfig( Medium *medium, MediumPluginManager *mgr, m_pluginCombo = new KComboBox( false, this ); m_pluginCombo->insertItem( i18n( "Do not handle" ) ); - for( KTrader::OfferList::ConstIterator it = MediaBrowser::instance()->getPlugins().begin(); + for( TDETrader::OfferList::ConstIterator it = MediaBrowser::instance()->getPlugins().begin(); it != MediaBrowser::instance()->getPlugins().end(); ++it ){ m_pluginCombo->insertItem( (*it)->name() ); |