X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/546384562ae872614cd0c8fa568bd65ae41885da..2c689ca4f7c8dfe62c75dc3c93ac9df2f31c0a8c:/src/dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index f40b47878..8f75cbce1 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -23,101 +23,125 @@
 #include "dolphinmainwindow.h"
 #include "dolphinsettings.h"
 #include "dolphinview.h"
-#include "editbookmarkdialog.h"
-
-#include <assert.h>
+#include "dolphinviewcontainer.h"
 
 #include <kactioncollection.h>
-#include <kbookmarkmanager.h>
-#include <kbookmark.h>
+#include <kfileplacesmodel.h>
 #include <kdesktopfile.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kio/netaccess.h>
 #include <kmenu.h>
+#include <kmessagebox.h>
 #include <kmimetypetrader.h>
 #include <knewmenu.h>
+#include <konqmimedata.h>
+#include <konq_operations.h>
 #include <klocale.h>
 #include <kpropertiesdialog.h>
 #include <krun.h>
 #include <kstandardaction.h>
 #include <kstandarddirs.h>
 
-#include <QDir>
+#include <QtGui/QApplication>
+#include <QtGui/QClipboard>
+#include <QtCore/QDir>
+
+DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
+                                       const KFileItem& fileInfo,
+                                       const KUrl& baseUrl) :
+    m_mainWindow(parent),
+    m_fileInfo(fileInfo),
+    m_baseUrl(baseUrl),
+    m_context(NoContext)
+{
+    // The context menu either accesses the URLs of the selected items
+    // or the items itself. To increase the performance both lists are cached.
+    DolphinView* view = m_mainWindow->activeViewContainer()->view();
+    m_selectedUrls = view->selectedUrls();
+    m_selectedItems = view->selectedItems();
+}
 
-DolphinContextMenu::DolphinContextMenu(DolphinView* parent,
-                                       KFileItem* fileInfo) :
-   m_dolphinView(parent),
-   m_fileInfo(fileInfo)
+DolphinContextMenu::~DolphinContextMenu()
 {
 }
 
 void DolphinContextMenu::open()
 {
-    if (m_fileInfo == 0) {
-        openViewportContextMenu();
+    // get the context information
+    if (m_baseUrl.protocol() == "trash") {
+        m_context |= TrashContext;
+    }
+
+    if (!m_fileInfo.isNull()) {
+        m_context |= ItemContext;
+        // TODO: handle other use cases like devices + desktop files
     }
-    else {
+
+    // open the corresponding popup for the context
+    if (m_context & TrashContext) {
+        if (m_context & ItemContext) {
+            openTrashItemContextMenu();
+        } else {
+            openTrashContextMenu();
+        }
+    } else if (m_context & ItemContext) {
         openItemContextMenu();
+    } else {
+        Q_ASSERT(m_context == NoContext);
+        openViewportContextMenu();
     }
 }
 
-DolphinContextMenu::~DolphinContextMenu()
-{
-}
 
-void DolphinContextMenu::openViewportContextMenu()
+void DolphinContextMenu::openTrashContextMenu()
 {
-    assert(m_fileInfo == 0);
-    DolphinMainWindow* dolphin = m_dolphinView->mainWindow();
-    KMenu* popup = new KMenu(m_dolphinView);
+    Q_ASSERT(m_context & TrashContext);
 
-    // setup 'Create New' menu
-    KNewMenu* newMenu = dolphin->newMenu();
-    newMenu->slotCheckUpToDate();
-    newMenu->setPopupFiles(m_dolphinView->url());
-    popup->addMenu(newMenu->menu());
-    popup->addSeparator();
+    KMenu* popup = new KMenu(m_mainWindow);
 
-    QAction* pasteAction = dolphin->actionCollection()->action(KStandardAction::stdName(KStandardAction::Paste));
-    popup->addAction(pasteAction);
+    QAction* emptyTrashAction = new QAction(KIcon("emptytrash"), i18nc("@action:inmenu", "Empty Trash"), popup);
+    KConfig trashConfig("trashrc", KConfig::OnlyLocal);
+    emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true));
+    popup->addAction(emptyTrashAction);
 
-    // setup 'View Mode' menu
-    KMenu* viewModeMenu = new KMenu(i18n("View Mode"));
+    QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
+    popup->addAction(propertiesAction);
 
-    QAction* iconsMode = dolphin->actionCollection()->action("icons");
-    viewModeMenu->addAction(iconsMode);
+    if (popup->exec(QCursor::pos()) == emptyTrashAction) {
+        const QString text(i18nc("@info", "Do you really want to empty the Trash? All items will get deleted."));
+        const bool del = KMessageBox::warningContinueCancel(m_mainWindow,
+                                                            text,
+                                                            QString(),
+                                                            KGuiItem(i18nc("@action:button", "Empty Trash"),
+                                                                     KIcon("user-trash"))
+                                                           ) == KMessageBox::Continue;
+        if (del) {
+            KonqOperations::emptyTrash(m_mainWindow);
+        }
+    }
 
-    QAction* detailsMode = dolphin->actionCollection()->action("details");
-    viewModeMenu->addAction(detailsMode);
+    popup->deleteLater();
+}
 
-    QAction* previewsMode = dolphin->actionCollection()->action("previews");
-    viewModeMenu->addAction(previewsMode);
+void DolphinContextMenu::openTrashItemContextMenu()
+{
+    Q_ASSERT(m_context & TrashContext);
+    Q_ASSERT(m_context & ItemContext);
 
-    popup->addMenu(viewModeMenu);
-    popup->addSeparator();
+    KMenu* popup = new KMenu(m_mainWindow);
 
-    QAction* bookmarkAction = popup->addAction(i18n("Bookmark this folder"));
-    popup->addSeparator();
+    QAction* restoreAction = new QAction(i18nc("@action:inmenu", "Restore"), m_mainWindow);
+    popup->addAction(restoreAction);
 
-    QAction* propertiesAction = popup->addAction(i18n("Properties..."));
+    QAction* deleteAction = m_mainWindow->actionCollection()->action("delete");
+    popup->addAction(deleteAction);
 
-    QAction* activatedAction = popup->exec(QCursor::pos());
-    if (activatedAction == propertiesAction) {
-        new KPropertiesDialog(dolphin->activeView()->url());
-    }
-    else if (activatedAction == bookmarkAction) {
-        const KUrl& url = dolphin->activeView()->url();
-        KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add folder as bookmark"),
-                                                             url.fileName(),
-                                                             url,
-                                                             "bookmark");
-        if (!bookmark.isNull()) {
-            KBookmarkManager* manager = DolphinSettings::instance().bookmarkManager();
-            KBookmarkGroup root = manager->root();
-            root.addBookmark(manager, bookmark);
-            manager->emitChanged(root);
-        }
+    QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
+    popup->addAction(propertiesAction);
+
+    if (popup->exec(QCursor::pos()) == restoreAction) {
+        KonqOperations::restoreTrashedItems(m_selectedUrls, m_mainWindow);
     }
 
     popup->deleteLater();
@@ -125,49 +149,18 @@ void DolphinContextMenu::openViewportContextMenu()
 
 void DolphinContextMenu::openItemContextMenu()
 {
-    assert(m_fileInfo != 0);
+    Q_ASSERT(!m_fileInfo.isNull());
 
-    KMenu* popup = new KMenu(m_dolphinView);
-    DolphinMainWindow* dolphin = m_dolphinView->mainWindow();
-    const KUrl::List urls = m_dolphinView->selectedUrls();
+    KMenu* popup = new KMenu(m_mainWindow);
+    insertDefaultItemActions(popup);
 
-    // insert 'Cut', 'Copy' and 'Paste'
-    const KStandardAction::StandardAction actionNames[] = {
-        KStandardAction::Cut,
-        KStandardAction::Copy,
-        KStandardAction::Paste
-    };
-
-    const int count = sizeof(actionNames) / sizeof(KStandardAction::StandardAction);
-    for (int i = 0; i < count; ++i) {
-        QAction* action = dolphin->actionCollection()->action(KStandardAction::stdName(actionNames[i]));
-        if (action != 0) {
-            popup->addAction(action);
-        }
-    }
     popup->addSeparator();
 
-    // insert 'Rename'
-    QAction* renameAction = dolphin->actionCollection()->action("rename");
-    popup->addAction(renameAction);
-
-    // insert 'Move to Trash' for local Urls, otherwise insert 'Delete'
-    const KUrl& url = dolphin->activeView()->url();
-    if (url.isLocalFile()) {
-        QAction* moveToTrashAction = dolphin->actionCollection()->action("move_to_trash");
-        popup->addAction(moveToTrashAction);
-    }
-    else {
-        QAction* deleteAction = dolphin->actionCollection()->action("delete");
-        popup->addAction(deleteAction);
-    }
-
-    // insert 'Bookmark this folder...' entry
-    // urls is a list of selected items, so insert boolmark menu if
-    // urls contains only one item, i.e. no multiple selection made
-    QAction* bookmarkAction = 0;
-    if (m_fileInfo->isDir() && (urls.count() == 1)) {
-        bookmarkAction = popup->addAction(i18n("Bookmark this folder"));
+    // insert 'Bookmark This Folder' entry if exactly one item is selected
+    QAction* addToPlacesAction = 0;
+    if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) {
+        addToPlacesAction = popup->addAction(KIcon("bookmark-folder"),
+                                             i18nc("@action:inmenu Add selected folder to places", "Add to Places"));
     }
 
     // Insert 'Open With...' sub menu
@@ -175,44 +168,35 @@ void DolphinContextMenu::openItemContextMenu()
     const QList<QAction*> openWithActions = insertOpenWithItems(popup, openWithVector);
 
     // Insert 'Actions' sub menu
-    QVector<KDEDesktopMimeType::Service> actionsVector;
+    QVector<KDesktopFileActions::Service> actionsVector;
     const QList<QAction*> serviceActions = insertActionItems(popup, actionsVector);
     popup->addSeparator();
 
     // insert 'Properties...' entry
-    QAction* propertiesAction = dolphin->actionCollection()->action("properties");
+    QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
     popup->addAction(propertiesAction);
 
     QAction* activatedAction = popup->exec(QCursor::pos());
 
-    if ((bookmarkAction!= 0) && (activatedAction == bookmarkAction)) {
-        const KUrl selectedUrl(m_fileInfo->url());
-        KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add folder as bookmark"),
-                                                             selectedUrl.fileName(),
-                                                             selectedUrl,
-                                                             "bookmark");
-        if (!bookmark.isNull()) {
-            KBookmarkManager* manager = DolphinSettings::instance().bookmarkManager();
-            KBookmarkGroup root = manager->root();
-            root.addBookmark(manager, bookmark);
-            manager->emitChanged(root);
+    if ((addToPlacesAction != 0) && (activatedAction == addToPlacesAction)) {
+        const KUrl selectedUrl(m_fileInfo.url());
+        if (selectedUrl.isValid()) {
+            DolphinSettings::instance().placesModel()->addPlace(selectedUrl.fileName(),
+                                                                selectedUrl);
         }
-    }
-    else if (serviceActions.contains(activatedAction)) {
+    } else if (serviceActions.contains(activatedAction)) {
         // one of the 'Actions' items has been selected
         int id = serviceActions.indexOf(activatedAction);
-        KDEDesktopMimeType::executeService(urls, actionsVector[id]);
-    }
-    else if (openWithActions.contains(activatedAction)) {
+        KDesktopFileActions::executeService(m_selectedUrls, actionsVector[id]);
+    } else if (openWithActions.contains(activatedAction)) {
         // one of the 'Open With' items has been selected
         if (openWithActions.last() == activatedAction) {
             // the item 'Other...' has been selected
-            KRun::displayOpenWithDialog(urls, m_dolphinView);
-        }
-        else {
+            KRun::displayOpenWithDialog(m_selectedUrls, m_mainWindow);
+        } else {
             int id = openWithActions.indexOf(activatedAction);
             KService::Ptr servicePtr = openWithVector[id];
-            KRun::run(*servicePtr, urls, m_dolphinView);
+            KRun::run(*servicePtr, m_selectedUrls, m_mainWindow);
         }
     }
 
@@ -221,8 +205,100 @@ void DolphinContextMenu::openItemContextMenu()
     popup->deleteLater();
 }
 
+void DolphinContextMenu::openViewportContextMenu()
+{
+    Q_ASSERT(m_fileInfo.isNull());
+    KMenu* popup = new KMenu(m_mainWindow);
+
+    // setup 'Create New' menu
+    KNewMenu* newMenu = m_mainWindow->newMenu();
+    newMenu->slotCheckUpToDate();
+    newMenu->setPopupFiles(m_baseUrl);
+    popup->addMenu(newMenu->menu());
+    popup->addSeparator();
+
+    QAction* pasteAction = m_mainWindow->actionCollection()->action(KStandardAction::stdName(KStandardAction::Paste));
+    popup->addAction(pasteAction);
+
+    // setup 'View Mode' menu
+    KMenu* viewModeMenu = new KMenu(i18nc("@title:menu", "View Mode"));
+
+    QAction* iconsMode = m_mainWindow->actionCollection()->action("icons");
+    viewModeMenu->addAction(iconsMode);
+
+    QAction* detailsMode = m_mainWindow->actionCollection()->action("details");
+    viewModeMenu->addAction(detailsMode);
+
+    QAction* columnsMode = m_mainWindow->actionCollection()->action("columns");
+    viewModeMenu->addAction(columnsMode);
+
+    QAction* previewsMode = m_mainWindow->actionCollection()->action("previews");
+    viewModeMenu->addAction(previewsMode);
+
+    popup->addMenu(viewModeMenu);
+
+    popup->addSeparator();
+
+    QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-folder"),
+                                                  i18nc("@action:inmenu Add current folder to places", "Add to Places"));
+    popup->addSeparator();
+
+    QAction* propertiesAction = popup->addAction(i18nc("@action:inmenu", "Properties"));
+
+    QAction* action = popup->exec(QCursor::pos());
+    if (action == propertiesAction) {
+        const KUrl& url = m_mainWindow->activeViewContainer()->url();
+        KPropertiesDialog dialog(url);
+        dialog.exec();
+    } else if (action == addToPlacesAction) {
+        const KUrl& url = m_mainWindow->activeViewContainer()->url();
+        if (url.isValid()) {
+            DolphinSettings::instance().placesModel()->addPlace(url.fileName(), url);
+        }
+    }
+
+    popup->deleteLater();
+}
+
+void DolphinContextMenu::insertDefaultItemActions(KMenu* popup)
+{
+    Q_ASSERT(popup != 0);
+    const KActionCollection* collection = m_mainWindow->actionCollection();
+
+    // insert 'Cut', 'Copy' and 'Paste'
+    QAction* cutAction = collection->action(KStandardAction::stdName(KStandardAction::Cut));
+    QAction* copyAction  = collection->action(KStandardAction::stdName(KStandardAction::Copy));
+    QAction* pasteAction = collection->action(KStandardAction::stdName(KStandardAction::Paste));
+
+    popup->addAction(cutAction);
+    popup->addAction(copyAction);
+    popup->addAction(pasteAction);
+    popup->addSeparator();
+
+    // insert 'Rename'
+    QAction* renameAction = collection->action("rename");
+    popup->addAction(renameAction);
+
+    // insert 'Move to Trash' and (optionally) 'Delete'
+    const KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
+    const KConfigGroup kdeConfig(globalConfig, "KDE");
+    bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false);
+    const KUrl& url = m_mainWindow->activeViewContainer()->url();
+    if (url.isLocalFile()) {
+        QAction* moveToTrashAction = collection->action("move_to_trash");
+        popup->addAction(moveToTrashAction);
+    } else {
+        showDeleteCommand = true;
+    }
+
+    if (showDeleteCommand) {
+        QAction* deleteAction = collection->action("delete");
+        popup->addAction(deleteAction);
+    }
+}
+
 QList<QAction*> DolphinContextMenu::insertOpenWithItems(KMenu* popup,
-                                                        QVector<KService::Ptr>& openWithVector)
+        QVector<KService::Ptr>& openWithVector)
 {
     // Parts of the following code have been taken
     // from the class KonqOperations located in
@@ -233,28 +309,26 @@ QList<QAction*> DolphinContextMenu::insertOpenWithItems(KMenu* popup,
     // are listed which are registered to open the item. As last entry "Other..." will be
     // attached which allows to select a custom application. If no applications are registered
     // no sub menu is created at all, only "Open With..." will be offered.
-    const KFileItemList list = m_dolphinView->selectedItems();
-
     bool insertOpenWithItems = true;
-    const QString contextMimeType(m_fileInfo->mimetype());
+    const QString contextMimeType(m_fileInfo.mimetype());
 
-    QListIterator<KFileItem*> mimeIt(list);
+    QListIterator<KFileItem> mimeIt(m_selectedItems);
     while (insertOpenWithItems && mimeIt.hasNext()) {
-        KFileItem* item = mimeIt.next();
-        insertOpenWithItems = (contextMimeType == item->mimetype());
+        KFileItem item = mimeIt.next();
+        insertOpenWithItems = (contextMimeType == item.mimetype());
     }
 
     QList<QAction*> openWithActions;
     if (insertOpenWithItems) {
         // 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());
         KService::List offers = KMimeTypeTrader::self()->query(mimePtr->name(),
-                                                               "Application",
-                                                               "Type == 'Application'");
+                                "Application",
+                                "Type == 'Application'");
         if (offers.count() > 0) {
             KService::List::Iterator it;
-            KMenu* openWithMenu = new KMenu(i18n("Open With"));
-            for(it = offers.begin(); it != offers.end(); ++it) {
+            KMenu* openWithMenu = new KMenu(i18nc("@title:menu", "Open With"));
+            for (it = offers.begin(); it != offers.end(); ++it) {
                 // The offer list from the KTrader returns duplicate
                 // application entries. Although this seems to be a configuration
                 // problem outside the scope of Dolphin, duplicated entries just
@@ -262,32 +336,28 @@ QList<QAction*> DolphinContextMenu::insertOpenWithItems(KMenu* popup,
                 const QString appName((*it)->name());
                 if (!containsEntry(openWithMenu, appName)) {
                     const KIcon icon((*it)->icon());
-                    QAction *action = openWithMenu->addAction(icon, appName);
+                    QAction* action = openWithMenu->addAction(icon, appName);
                     openWithVector.append(*it);
                     openWithActions << action;
                 }
             }
 
             openWithMenu->addSeparator();
-            QAction* action = openWithMenu->addAction(i18n("&Other..."));
+            QAction* action = openWithMenu->addAction(i18nc("@action:inmenu Open With", "&Other..."));
 
             openWithActions << action;
-            popup->addSeparator();
             popup->addMenu(openWithMenu);
-        }
-        else {
+        } else {
             // No applications are registered, hence just offer
             // a "Open With..." item instead of a sub menu containing
             // only one entry.
-            QAction* action = popup->addAction(i18n("Open With..."));
+            QAction* action = popup->addAction(i18nc("@title:menu", "Open With..."));
             openWithActions << action;
         }
-    }
-    else {
+    } else {
         // At least one of the selected items has a different MIME type. In this case
         // just show a disabled "Open With..." entry.
-        popup->addSeparator();
-        QAction* action = popup->addAction(i18n("Open With..."));
+        QAction* action = popup->addAction(i18nc("@title:menu", "Open With..."));
         action->setEnabled(false);
     }
 
@@ -295,14 +365,14 @@ QList<QAction*> DolphinContextMenu::insertOpenWithItems(KMenu* popup,
 }
 
 QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
-                                                      QVector<KDEDesktopMimeType::Service>& actionsVector)
+                                                      QVector<KDesktopFileActions::Service>& actionsVector)
 {
     // Parts of the following code have been taken
     // from the class KonqOperations located in
     // libqonq/konq_operations.h of Konqueror.
     // (Copyright (C) 2000  David Faure <faure@kde.org>)
 
-    KMenu* actionsMenu = new KMenu(i18n("Actions"));
+    KMenu* actionsMenu = new KMenu(i18nc("@title:menu", "Actions"));
 
     QList<QAction*> serviceActions;
 
@@ -317,8 +387,7 @@ QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
         QStringList entries = dir.entryList(QDir::Files);
 
         for (QStringList::ConstIterator entryIt = entries.begin(); entryIt != entries.end(); ++entryIt) {
-            KSimpleConfig cfg(*dirIt + *entryIt, true);
-            cfg.setDesktopGroup();
+            KConfigGroup cfg(KSharedConfig::openConfig(*dirIt + *entryIt, KConfig::OnlyLocal), "Desktop Entry");
             if ((cfg.hasKey("Actions") || cfg.hasKey("X-KDE-GetActionMenu")) && cfg.hasKey("ServiceTypes")) {
                 //const QStringList types = cfg.readListEntry("ServiceTypes");
                 QStringList types;
@@ -331,13 +400,11 @@ QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
                     if ((*it) == "all/allfiles") {
                         // The service type is valid for all files, but not for directories.
                         // Check whether the selected items only consist of files...
-                        const KFileItemList list = m_dolphinView->selectedItems();
-
-                        QListIterator<KFileItem*> mimeIt(list);
+                        QListIterator<KFileItem> mimeIt(m_selectedItems);
                         insert = true;
                         while (insert && mimeIt.hasNext()) {
-                            KFileItem* item = mimeIt.next();
-                            insert = !item->isDir();
+                            KFileItem item = mimeIt.next();
+                            insert = !item.isDir();
                         }
                     }
 
@@ -345,13 +412,11 @@ QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
                         // Check whether the MIME types of all selected files match
                         // to the mimetype of the service action. As soon as one MIME
                         // type does not match, no service menu is shown at all.
-                        const KFileItemList list = m_dolphinView->selectedItems();
-
-                        QListIterator<KFileItem*> mimeIt(list);
+                        QListIterator<KFileItem> mimeIt(m_selectedItems);
                         insert = true;
                         while (insert && mimeIt.hasNext()) {
-                            KFileItem* item = mimeIt.next();
-                            const QString mimeType(item->mimetype());
+                            KFileItem item = mimeIt.next();
+                            const QString mimeType(item.mimetype());
                             const QString mimeGroup(mimeType.left(mimeType.indexOf('/')));
 
                             insert  = (*it == mimeType) ||
@@ -363,24 +428,23 @@ QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
                     if (insert) {
                         menu = actionsMenu;
 
-                        const QString submenuName = cfg.readEntry( "X-KDE-Submenu" );
+                        const QString submenuName = cfg.readEntry("X-KDE-Submenu");
                         if (!submenuName.isEmpty()) {
                             menu = new KMenu(submenuName);
                             actionsMenu->addMenu(menu);
                         }
 
-                        Q3ValueList<KDEDesktopMimeType::Service> userServices =
-                            KDEDesktopMimeType::userDefinedServices(*dirIt + *entryIt, true);
+                        QList<KDesktopFileActions::Service> userServices =
+                            KDesktopFileActions::userDefinedServices(*dirIt + *entryIt, true);
 
-                        Q3ValueList<KDEDesktopMimeType::Service>::Iterator serviceIt;
+                        QList<KDesktopFileActions::Service>::const_iterator serviceIt;
                         for (serviceIt = userServices.begin(); serviceIt != userServices.end(); ++serviceIt) {
-                            KDEDesktopMimeType::Service service = (*serviceIt);
+                            KDesktopFileActions::Service service = (*serviceIt);
                             if (!service.m_strIcon.isEmpty()) {
-                                QAction* action = menu->addAction(SmallIcon(service.m_strIcon),
+                                QAction* action = menu->addAction(KIcon(service.m_strIcon),
                                                                   service.m_strName);
                                 serviceActions << action;
-                            }
-                            else {
+                            } else {
                                 QAction *action = menu->addAction(service.m_strName);
                                 serviceActions << action;
                             }
@@ -405,7 +469,7 @@ QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
         if (menu == actionsMenu) {
             // The item is an action, hence show the action in the root menu.
             const QList<QAction*> actions = actionsMenu->actions();
-            assert(actions.count() == 1);
+            Q_ASSERT(actions.count() == 1);
 
             const QString text = actions[0]->text();
             const QIcon icon = actions[0]->icon();
@@ -413,21 +477,18 @@ QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
                 QAction* action = popup->addAction(text);
                 serviceActions.clear();
                 serviceActions << action;
-            }
-            else {
+            } else {
                 QAction* action = popup->addAction(icon, text);
                 serviceActions.clear();
                 serviceActions << action;
             }
-        }
-        else {
+        } else {
             // The item is a sub menu, hence show the sub menu in the root menu.
             popup->addMenu(menu);
         }
         actionsMenu->deleteLater();
         actionsMenu = 0;
-    }
-    else {
+    } else {
         popup->addMenu(actionsMenu);
     }
 
@@ -437,7 +498,7 @@ QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
 bool DolphinContextMenu::containsEntry(const KMenu* menu,
                                        const QString& entryName) const
 {
-    assert(menu != 0);
+    Q_ASSERT(menu != 0);
 
     const QList<QAction*> list = menu->actions();
     const uint count = list.count();
@@ -450,3 +511,5 @@ bool DolphinContextMenu::containsEntry(const KMenu* menu,
 
     return false;
 }
+
+#include "dolphincontextmenu.moc"