use inline keyword as suggested at http://www.parashift.com/c%2B%2B-faq-lite/inline...

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 7aa93dfc7a5d412a3c0f1a5d8c837e48aad10214..8f75cbce14904b0c585a4b139f142379a4869f55 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -46,7 +46,6 @@
 #include <QtGui/QApplication>
 #include <QtGui/QClipboard>
 #include <QtCore/QDir>
-#include <Qt3Support/Q3ValueList>
 
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
                                        const KFileItem& fileInfo,
@@ -158,10 +157,10 @@ void DolphinContextMenu::openItemContextMenu()
     popup->addSeparator();
 
     // insert 'Bookmark This Folder' entry if exactly one item is selected
-    QAction* bookmarkAction = 0;
+    QAction* addToPlacesAction = 0;
     if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) {
-        bookmarkAction = popup->addAction(KIcon("bookmark-folder"),
-                                          i18nc("@action:inmenu", "Bookmark Folder..."));
+        addToPlacesAction = popup->addAction(KIcon("bookmark-folder"),
+                                             i18nc("@action:inmenu Add selected folder to places", "Add to Places"));
     }
 
     // Insert 'Open With...' sub menu
@@ -179,7 +178,7 @@ void DolphinContextMenu::openItemContextMenu()
 
     QAction* activatedAction = popup->exec(QCursor::pos());
 
-    if ((bookmarkAction != 0) && (activatedAction == bookmarkAction)) {
+    if ((addToPlacesAction != 0) && (activatedAction == addToPlacesAction)) {
         const KUrl selectedUrl(m_fileInfo.url());
         if (selectedUrl.isValid()) {
             DolphinSettings::instance().placesModel()->addPlace(selectedUrl.fileName(),
@@ -208,7 +207,7 @@ void DolphinContextMenu::openItemContextMenu()
 
 void DolphinContextMenu::openViewportContextMenu()
 {
-    Q_ASSERT(!m_fileInfo.isNull());
+    Q_ASSERT(m_fileInfo.isNull());
     KMenu* popup = new KMenu(m_mainWindow);
 
     // setup 'Create New' menu
@@ -240,8 +239,8 @@ void DolphinContextMenu::openViewportContextMenu()
 
     popup->addSeparator();
 
-    QAction* bookmarkAction = popup->addAction(KIcon("bookmark-folder"),
-                                               i18nc("@action:inmenu", "Bookmark This Folder..."));
+    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"));
@@ -251,7 +250,7 @@ void DolphinContextMenu::openViewportContextMenu()
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
         KPropertiesDialog dialog(url);
         dialog.exec();
-    } else if (action == bookmarkAction) {
+    } else if (action == addToPlacesAction) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
         if (url.isValid()) {
             DolphinSettings::instance().placesModel()->addPlace(url.fileName(), url);
@@ -435,10 +434,10 @@ QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
                             actionsMenu->addMenu(menu);
                         }
 
-                        Q3ValueList<KDesktopFileActions::Service> userServices =
+                        QList<KDesktopFileActions::Service> userServices =
                             KDesktopFileActions::userDefinedServices(*dirIt + *entryIt, true);
 
-                        Q3ValueList<KDesktopFileActions::Service>::Iterator serviceIt;
+                        QList<KDesktopFileActions::Service>::const_iterator serviceIt;
                         for (serviceIt = userServices.begin(); serviceIt != userServices.end(); ++serviceIt) {
                             KDesktopFileActions::Service service = (*serviceIt);
                             if (!service.m_strIcon.isEmpty()) {