Fixed issue in method naturalCompare: strings having numbers with the same amount...

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 74c216017fc1f994e36d559f2c8374f581b0049f..6c4dda80ab828467373125409d24e8b26e0c824c 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
 #include "dolphincontextmenu.h"
@@ -38,7 +38,7 @@
 #include <assert.h>
 #include <kio/netaccess.h>
 #include <kmenu.h>
-#include <kstdaction.h>
+#include <kstandardaction.h>
 
 #include "dolphinmainwindow.h"
 #include "dolphinview.h"
@@ -84,19 +84,16 @@ void DolphinContextMenu::openViewportContextMenu()
     // setup 'Create New' menu
     KMenu* createNewMenu = new KMenu();
 
-    KAction* createFolderAction = dolphin->actionCollection()->action("create_folder");
+    QAction* createFolderAction = dolphin->actionCollection()->action("create_folder");
     if (createFolderAction != 0) {
-        createFolderAction->plug(createNewMenu);
+        createNewMenu->addAction(createFolderAction);
     }
 
     createNewMenu->insertSeparator();
 
-    KAction* action = 0;
-
-    Q3PtrListIterator<KAction> fileGrouptIt(dolphin->fileGroupActions());
-    while ((action = fileGrouptIt.current()) != 0) {
-        action->plug(createNewMenu);
-        ++fileGrouptIt;
+    QLinkedListIterator<QAction*> fileGrouptIt(dolphin->fileGroupActions());
+    while (fileGrouptIt.hasNext()) {
+        createNewMenu->addAction(fileGrouptIt.next());
     }
 
     // TODO: not used yet. See documentation of Dolphin::linkGroupActions()
@@ -122,20 +119,20 @@ void DolphinContextMenu::openViewportContextMenu()
     popup->insertItem(SmallIcon("filenew"), i18n("Create New"), createNewMenu);
     popup->insertSeparator();
 
-    KAction* pasteAction = dolphin->actionCollection()->action(KStdAction::stdName(KStdAction::Paste));
-    pasteAction->plug(popup);
+    QAction* pasteAction = dolphin->actionCollection()->action(KStandardAction::stdName(KStandardAction::Paste));
+    popup->addAction(pasteAction);
 
     // setup 'View Mode' menu
     KMenu* viewModeMenu = new KMenu();
 
-    KAction* iconsMode = dolphin->actionCollection()->action("icons");
-    iconsMode->plug(viewModeMenu);
+    QAction* iconsMode = dolphin->actionCollection()->action("icons");
+    viewModeMenu->addAction(iconsMode);
 
-    KAction* detailsMode = dolphin->actionCollection()->action("details");
-    detailsMode->plug(viewModeMenu);
+    QAction* detailsMode = dolphin->actionCollection()->action("details");
+    viewModeMenu->addAction(detailsMode);
 
-    KAction* previewsMode = dolphin->actionCollection()->action("previews");
-    previewsMode->plug(viewModeMenu);
+    QAction* previewsMode = dolphin->actionCollection()->action("previews");
+    viewModeMenu->addAction(previewsMode);
 
     popup->insertItem(i18n("View Mode"), viewModeMenu);
     popup->insertSeparator();
@@ -180,35 +177,35 @@ void DolphinContextMenu::openItemContextMenu()
     const KUrl::List urls = m_dolphinView->selectedUrls();
 
     // insert 'Cut', 'Copy' and 'Paste'
-    const KStdAction::StdAction actionNames[] = { KStdAction::Cut, KStdAction::Copy, KStdAction::Paste };
-    const int count = sizeof(actionNames) / sizeof(KStdAction::StdAction);
+    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) {
-        KAction* action = dolphin->actionCollection()->action(KStdAction::stdName(actionNames[i]));
+        QAction* action = dolphin->actionCollection()->action(KStandardAction::stdName(actionNames[i]));
         if (action != 0) {
-            action->plug(popup);
+            popup->addAction(action);
         }
     }
     popup->insertSeparator();
 
     // insert 'Rename'
-    KAction* renameAction = dolphin->actionCollection()->action("rename");
-    renameAction->plug(popup);
+    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()) {
-        KAction* moveToTrashAction = dolphin->actionCollection()->action("move_to_trash");
-        moveToTrashAction->plug(popup);
+        QAction* moveToTrashAction = dolphin->actionCollection()->action("move_to_trash");
+        popup->addAction(moveToTrashAction);
     }
     else {
-        KAction* deleteAction = dolphin->actionCollection()->action("delete");
-        deleteAction->plug(popup);
+        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;
+    QAction* bookmarkAction = 0;
     if (m_fileInfo->isDir() && (urls.count() == 1)) {
         bookmarkAction = popup->addAction(i18n("Bookmark this folder"));
     }
@@ -225,8 +222,8 @@ void DolphinContextMenu::openItemContextMenu()
 
     // insert 'Properties...' entry
     popup->insertSeparator();
-    KAction* propertiesAction = dolphin->actionCollection()->action("properties");
-    propertiesAction->plug(popup);
+    QAction* propertiesAction = dolphin->actionCollection()->action("properties");
+    popup->addAction(propertiesAction);
 
     QAction *activatedAction = popup->exec(m_pos);
 
@@ -301,8 +298,8 @@ QList<QAction*> DolphinContextMenu::insertOpenWithItems(KMenu* popup,
                 // will be skipped here.
                 const QString appName((*it)->name());
                 if (!containsEntry(openWithMenu, appName)) {
-                    QAction *action = openWithMenu->addAction((*it)->pixmap(K3Icon::Small),
-                                                              appName);
+                    const KIcon icon((*it)->icon());
+                    QAction *action = openWithMenu->addAction(icon, appName);
                     openWithVector.append(*it);
                     openWithActions << action;
                 }