diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:49:49 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:49:49 -0600 |
| commit | dc5f267664506a312203c26bfe9001a448b0bb0f (patch) | |
| tree | a78c7f15e87303d22b89619db42fc56ad8f4a046 /libkonq | |
| parent | 98f4a055baf6eb7ea5c3d69d6a3f2162b491e253 (diff) | |
| download | tdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.tar.gz tdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'libkonq')
| -rw-r--r-- | libkonq/konq_iconviewwidget.cc | 4 | ||||
| -rw-r--r-- | libkonq/konq_popupmenu.cc | 14 | ||||
| -rw-r--r-- | libkonq/konq_propsview.cc | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc index 34f5791a6..cd349da99 100644 --- a/libkonq/konq_iconviewwidget.cc +++ b/libkonq/konq_iconviewwidget.cc @@ -1912,8 +1912,8 @@ void KonqIconViewWidget::updatePreviewMimeTypes() d->pPreviewMimeTypes->clear(); // Load the list of plugins to determine which mimetypes are supported - KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator"); - KTrader::OfferList::ConstIterator it; + TDETrader::OfferList plugins = TDETrader::self()->query("ThumbCreator"); + TDETrader::OfferList::ConstIterator it; for ( it = plugins.begin(); it != plugins.end(); ++it ) { if ( d->previewSettings.contains((*it)->desktopEntryName()) ) { diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc index e11ef9046..9d25cf794 100644 --- a/libkonq/konq_popupmenu.cc +++ b/libkonq/konq_popupmenu.cc @@ -847,7 +847,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) } } - KTrader::OfferList offers; + TDETrader::OfferList offers; if (kapp->authorizeKAction("openwith")) { @@ -864,7 +864,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) ++it; } - offers = KTrader::self()->query( first, constraint ); + offers = TDETrader::self()->query( first, constraint ); } //// Ok, we have everything, now insert @@ -895,7 +895,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) text.appendChild( m_doc.createTextNode( i18n("&Open With") ) ); } - KTrader::OfferList::ConstIterator it = offers.begin(); + TDETrader::OfferList::ConstIterator it = offers.begin(); for( ; it != offers.end(); it++ ) { KService::Ptr service = (*it); @@ -1179,14 +1179,14 @@ void KonqPopupMenu::addPlugins() { // search for Konq_PopupMenuPlugins inspired by simons kpropsdlg //search for a plugin with the right protocol - KTrader::OfferList plugin_offers; + TDETrader::OfferList plugin_offers; unsigned int pluginCount = 0; - plugin_offers = KTrader::self()->query( m_sMimeType.isNull() ? TQString::fromLatin1( "all/all" ) : m_sMimeType, "'KonqPopupMenu/Plugin' in ServiceTypes"); + plugin_offers = TDETrader::self()->query( m_sMimeType.isNull() ? TQString::fromLatin1( "all/all" ) : m_sMimeType, "'KonqPopupMenu/Plugin' in ServiceTypes"); if ( plugin_offers.isEmpty() ) return; // no plugins installed do not bother about it - KTrader::OfferList::ConstIterator iterator = plugin_offers.begin(); - KTrader::OfferList::ConstIterator end = plugin_offers.end(); + TDETrader::OfferList::ConstIterator iterator = plugin_offers.begin(); + TDETrader::OfferList::ConstIterator end = plugin_offers.end(); addGroup( "plugins" ); // travers the offerlist diff --git a/libkonq/konq_propsview.cc b/libkonq/konq_propsview.cc index 8a179672e..bc8aa4e9d 100644 --- a/libkonq/konq_propsview.cc +++ b/libkonq/konq_propsview.cc @@ -563,8 +563,8 @@ const TQStringList& KonqPropsView::previewSettings() d->previewsToShow = new TQStringList; if (d->previewsEnabled) { - KTrader::OfferList plugins = KTrader::self()->query( "ThumbCreator" ); - for ( KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it ) + TDETrader::OfferList plugins = TDETrader::self()->query( "ThumbCreator" ); + for ( TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it ) { TQString name = (*it)->desktopEntryName(); if ( ! m_dontPreview.contains(name) ) |