summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:39:13 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:39:13 -0600
commit5f2980e30e8c46f5bc9ac8b2694e3465d02424ff (patch)
tree5f517133f43a8b1e1f3470bc823fd6e3475aff43 /src
parentfbabec38df7425dea82c500ade2d50ab3ec9c042 (diff)
downloaddolphin-5f2980e30e8c46f5bc9ac8b2694e3465d02424ff.tar.gz
dolphin-5f2980e30e8c46f5bc9ac8b2694e3465d02424ff.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'src')
-rw-r--r--src/dolphincontextmenu.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 468499a..a814a2a 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -306,14 +306,14 @@ int DolphinContextMenu::insertOpenWithItems(KPopupMenu* popup,
if (insertOpenWithItems) {
// fill the 'Open with' sub menu with application types
const KMimeType::Ptr mimePtr = KMimeType::findByURL(m_fileInfo->url());
- KTrader::OfferList offers = KTrader::self()->query(mimePtr->name(),
+ TDETrader::OfferList offers = TDETrader::self()->query(mimePtr->name(),
"Type == 'Application'");
int index = openWithIDStart;
if (offers.count() > 0) {
- KTrader::OfferList::Iterator it;
+ TDETrader::OfferList::Iterator it;
KPopupMenu* openWithMenu = new KPopupMenu();
for(it = offers.begin(); it != offers.end(); ++it) {
- // The offer list from the KTrader returns duplicate
+ // The offer list from the TDETrader returns duplicate
// application entries. Although this seems to be a configuration
// problem outside the scope of Dolphin, duplicated entries just
// will be skipped here.