summaryrefslogtreecommitdiffstats
path: root/libkonq/konq_popupmenu.cc
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:49:49 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:49:49 -0600
commitdc5f267664506a312203c26bfe9001a448b0bb0f (patch)
treea78c7f15e87303d22b89619db42fc56ad8f4a046 /libkonq/konq_popupmenu.cc
parent98f4a055baf6eb7ea5c3d69d6a3f2162b491e253 (diff)
downloadtdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.tar.gz
tdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'libkonq/konq_popupmenu.cc')
-rw-r--r--libkonq/konq_popupmenu.cc14
1 files changed, 7 insertions, 7 deletions
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