Rename KLock and KTrader to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent fbabec38df
commit 5f2980e30e

@ -306,14 +306,14 @@ int DolphinContextMenu::insertOpenWithItems(KPopupMenu* popup,
if (insertOpenWithItems) { if (insertOpenWithItems) {
// fill the 'Open with' sub menu with application types // fill the 'Open with' sub menu with application types
const KMimeType::Ptr mimePtr = KMimeType::findByURL(m_fileInfo->url()); 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'"); "Type == 'Application'");
int index = openWithIDStart; int index = openWithIDStart;
if (offers.count() > 0) { if (offers.count() > 0) {
KTrader::OfferList::Iterator it; TDETrader::OfferList::Iterator it;
KPopupMenu* openWithMenu = new KPopupMenu(); KPopupMenu* openWithMenu = new KPopupMenu();
for(it = offers.begin(); it != offers.end(); ++it) { 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 // application entries. Although this seems to be a configuration
// problem outside the scope of Dolphin, duplicated entries just // problem outside the scope of Dolphin, duplicated entries just
// will be skipped here. // will be skipped here.

Loading…
Cancel
Save