Merge branch 'Applications/16.04'

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 0830d4b8b73c8b9feca13306de3f1a4fb93721cc..dfec76144dafd9210aa8b6f45458ded98e27ab53 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -139,14 +139,14 @@ void DolphinContextMenu::openTrashContextMenu()
 {
     Q_ASSERT(m_context & TrashContext);
 
 {
     Q_ASSERT(m_context & TrashContext);
 

-    QAction* emptyTrashAction = new QAction(QIcon::fromTheme("trash-empty"), i18nc("@action:inmenu", "Empty Trash"), this);
-    KConfig trashConfig("trashrc", KConfig::SimpleConfig);
+    QAction* emptyTrashAction = new QAction(QIcon::fromTheme(QStringLiteral("trash-empty")), i18nc("@action:inmenu", "Empty Trash"), this);
+    KConfig trashConfig(QStringLiteral("trashrc"), KConfig::SimpleConfig);

     emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true));
     addAction(emptyTrashAction);
 
     addCustomActions();
 
     emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true));
     addAction(emptyTrashAction);
 
     addCustomActions();
 

-    QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
+    QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));

     addAction(propertiesAction);
 
     addShowMenuBarAction();
     addAction(propertiesAction);
 
     addShowMenuBarAction();


@@ -170,14 +170,15 @@ void DolphinContextMenu::openTrashItemContextMenu()
     QAction* restoreAction = new QAction(i18nc("@action:inmenu", "Restore"), m_mainWindow);
     addAction(restoreAction);
 
     QAction* restoreAction = new QAction(i18nc("@action:inmenu", "Restore"), m_mainWindow);
     addAction(restoreAction);
 

-    QAction* deleteAction = m_mainWindow->actionCollection()->action("delete");
+    QAction* deleteAction = m_mainWindow->actionCollection()->action(QStringLiteral("delete"));

     addAction(deleteAction);
 
     addAction(deleteAction);
 

-    QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
+    QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));

     addAction(propertiesAction);
 
     if (exec(m_pos) == restoreAction) {
         QList<QUrl> selectedUrls;
     addAction(propertiesAction);
 
     if (exec(m_pos) == restoreAction) {
         QList<QUrl> selectedUrls;

+        selectedUrls.reserve(m_selectedItems.count());

         foreach (const KFileItem &item, m_selectedItems) {
             selectedUrls.append(item.url());
         }
         foreach (const KFileItem &item, m_selectedItems) {
             selectedUrls.append(item.url());
         }


@@ -212,36 +213,36 @@ void DolphinContextMenu::openItemContextMenu()
 
             QMenu* menu = newFileMenu->menu();
             menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
 
             QMenu* menu = newFileMenu->menu();
             menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));

-            menu->setIcon(QIcon::fromTheme("document-new"));
+            menu->setIcon(QIcon::fromTheme(QStringLiteral("document-new")));

             addMenu(menu);
             addSeparator();
 
             // insert 'Open in new window' and 'Open in new tab' entries
             addMenu(menu);
             addSeparator();
 
             // insert 'Open in new window' and 'Open in new tab' entries

-            addAction(m_mainWindow->actionCollection()->action("open_in_new_window"));
-            addAction(m_mainWindow->actionCollection()->action("open_in_new_tab"));
+            addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_window")));
+            addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_tab")));

 
             // insert 'Add to Places' entry
             if (!placeExists(m_fileInfo.url())) {
 
             // insert 'Add to Places' entry
             if (!placeExists(m_fileInfo.url())) {

-                addToPlacesAction = addAction(QIcon::fromTheme("bookmark-new"),
+                addToPlacesAction = addAction(QIcon::fromTheme(QStringLiteral("bookmark-new")),

                                                        i18nc("@action:inmenu Add selected folder to places",
                                                              "Add to Places"));
             }
 
             addSeparator();
                                                        i18nc("@action:inmenu Add selected folder to places",
                                                              "Add to Places"));
             }
 
             addSeparator();

-        } else if (m_baseUrl.scheme().contains("search") || m_baseUrl.scheme().contains("timeline")) {
-            openParentAction = new QAction(QIcon::fromTheme("document-open-folder"),
+        } else if (m_baseUrl.scheme().contains(QStringLiteral("search")) || m_baseUrl.scheme().contains(QStringLiteral("timeline"))) {
+            openParentAction = new QAction(QIcon::fromTheme(QStringLiteral("document-open-folder")),

                                            i18nc("@action:inmenu",
                                                  "Open Path"),
                                            this);
             addAction(openParentAction);
 
                                            i18nc("@action:inmenu",
                                                  "Open Path"),
                                            this);
             addAction(openParentAction);
 

-            openParentInNewWindowAction = new QAction(QIcon::fromTheme("window-new"),
+            openParentInNewWindowAction = new QAction(QIcon::fromTheme(QStringLiteral("window-new")),

                                                     i18nc("@action:inmenu",
                                                           "Open Path in New Window"),
                                                     this);
             addAction(openParentInNewWindowAction);
 
                                                     i18nc("@action:inmenu",
                                                           "Open Path in New Window"),
                                                     this);
             addAction(openParentInNewWindowAction);
 

-            openParentInNewTabAction = new QAction(QIcon::fromTheme("tab-new"),
+            openParentInNewTabAction = new QAction(QIcon::fromTheme(QStringLiteral("tab-new")),

                                                    i18nc("@action:inmenu",
                                                          "Open Path in New Tab"),
                                                    this);
                                                    i18nc("@action:inmenu",
                                                          "Open Path in New Tab"),
                                                    this);


@@ -250,8 +251,8 @@ void DolphinContextMenu::openItemContextMenu()
             addSeparator();
         } else if (!DolphinView::openItemAsFolderUrl(m_fileInfo).isEmpty()) {
             // insert 'Open in new window' and 'Open in new tab' entries
             addSeparator();
         } else if (!DolphinView::openItemAsFolderUrl(m_fileInfo).isEmpty()) {
             // insert 'Open in new window' and 'Open in new tab' entries

-            addAction(m_mainWindow->actionCollection()->action("open_in_new_window"));
-            addAction(m_mainWindow->actionCollection()->action("open_in_new_tab"));
+            addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_window")));
+            addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_tab")));

 
             addSeparator();
         }
 
             addSeparator();
         }


@@ -267,7 +268,7 @@ void DolphinContextMenu::openItemContextMenu()
 
         if (selectionHasOnlyDirs) {
             // insert 'Open in new tab' entry
 
         if (selectionHasOnlyDirs) {
             // insert 'Open in new tab' entry

-            addAction(m_mainWindow->actionCollection()->action("open_in_new_tabs"));
+            addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_tabs")));

             addSeparator();
         }
     }
             addSeparator();
         }
     }


@@ -293,7 +294,7 @@ void DolphinContextMenu::openItemContextMenu()
     }
 
     // insert 'Properties...' entry
     }
 
     // insert 'Properties...' entry

-    QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
+    QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));

     addAction(propertiesAction);
 
     QAction* activatedAction = exec(m_pos);
     addAction(propertiesAction);
 
     QAction* activatedAction = exec(m_pos);


@@ -330,13 +331,13 @@ void DolphinContextMenu::openViewportContextMenu()
 
     // Insert 'New Window' and 'New Tab' entries. Don't use "open_in_new_window" and
     // "open_in_new_tab" here, as the current selection should get ignored.
 
     // Insert 'New Window' and 'New Tab' entries. Don't use "open_in_new_window" and
     // "open_in_new_tab" here, as the current selection should get ignored.

-    addAction(m_mainWindow->actionCollection()->action("new_window"));
-    addAction(m_mainWindow->actionCollection()->action("new_tab"));
+    addAction(m_mainWindow->actionCollection()->action(QStringLiteral("new_window")));
+    addAction(m_mainWindow->actionCollection()->action(QStringLiteral("new_tab")));

 
     // Insert 'Add to Places' entry if exactly one item is selected
     QAction* addToPlacesAction = 0;
     if (!placeExists(m_mainWindow->activeViewContainer()->url())) {
 
     // Insert 'Add to Places' entry if exactly one item is selected
     QAction* addToPlacesAction = 0;
     if (!placeExists(m_mainWindow->activeViewContainer()->url())) {

-        addToPlacesAction = addAction(QIcon::fromTheme("bookmark-new"),
+        addToPlacesAction = addAction(QIcon::fromTheme(QStringLiteral("bookmark-new")),

                                              i18nc("@action:inmenu Add current folder to places", "Add to Places"));
     }
 
                                              i18nc("@action:inmenu Add current folder to places", "Add to Places"));
     }
 


@@ -358,7 +359,7 @@ void DolphinContextMenu::openViewportContextMenu()
 
     addCustomActions();
 
 
     addCustomActions();
 

-    QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
+    QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));

     addAction(propertiesAction);
 
     addShowMenuBarAction();
     addAction(propertiesAction);
 
     addShowMenuBarAction();


@@ -388,7 +389,7 @@ void DolphinContextMenu::insertDefaultItemActions(const KFileItemListProperties&
     addSeparator();
 
     // Insert 'Rename'
     addSeparator();
 
     // Insert 'Rename'

-    QAction* renameAction = collection->action("rename");
+    QAction* renameAction = collection->action(QStringLiteral("rename"));

     addAction(renameAction);
 
     // Insert 'Move to Trash' and/or 'Delete'
     addAction(renameAction);
 
     // Insert 'Move to Trash' and/or 'Delete'


@@ -401,10 +402,10 @@ void DolphinContextMenu::insertDefaultItemActions(const KFileItemListProperties&
         if (showDeleteAction && showMoveToTrashAction) {
             delete m_removeAction;
             m_removeAction = 0;
         if (showDeleteAction && showMoveToTrashAction) {
             delete m_removeAction;
             m_removeAction = 0;

-            addAction(m_mainWindow->actionCollection()->action("move_to_trash"));
-            addAction(m_mainWindow->actionCollection()->action("delete"));
+            addAction(m_mainWindow->actionCollection()->action(QStringLiteral("move_to_trash")));
+            addAction(m_mainWindow->actionCollection()->action(QStringLiteral("delete")));

         } else if (showDeleteAction && !showMoveToTrashAction) {
         } else if (showDeleteAction && !showMoveToTrashAction) {

-            addAction(m_mainWindow->actionCollection()->action("delete"));
+            addAction(m_mainWindow->actionCollection()->action(QStringLiteral("delete")));

         } else {
             if (!m_removeAction) {
                 m_removeAction = new DolphinRemoveAction(this, m_mainWindow->actionCollection());
         } else {
             if (!m_removeAction) {
                 m_removeAction = new DolphinRemoveAction(this, m_mainWindow->actionCollection());


@@ -443,7 +444,7 @@ QAction* DolphinContextMenu::createPasteAction()
         const QMimeData *mimeData = QApplication::clipboard()->mimeData();
         bool canPaste;
         const QString text = KIO::pasteActionText(mimeData, &canPaste, m_fileInfo);
         const QMimeData *mimeData = QApplication::clipboard()->mimeData();
         bool canPaste;
         const QString text = KIO::pasteActionText(mimeData, &canPaste, m_fileInfo);

-        action = new QAction(QIcon::fromTheme("edit-paste"), text, this);
+        action = new QAction(QIcon::fromTheme(QStringLiteral("edit-paste")), text, this);

         action->setEnabled(canPaste);
         connect(action, &QAction::triggered, m_mainWindow, &DolphinMainWindow::pasteIntoFolder);
     } else {
         action->setEnabled(canPaste);
         connect(action, &QAction::triggered, m_mainWindow, &DolphinMainWindow::pasteIntoFolder);
     } else {


@@ -474,7 +475,7 @@ void DolphinContextMenu::addServiceActions(KFileItemActions& fileItemActions)
     fileItemActions.setParentWidget(m_mainWindow);
 
     // insert 'Open With...' action or sub menu
     fileItemActions.setParentWidget(m_mainWindow);
 
     // insert 'Open With...' action or sub menu

-    fileItemActions.addOpenWithActionsTo(this, "DesktopEntryName != 'dolphin'");
+    fileItemActions.addOpenWithActionsTo(this, QStringLiteral("DesktopEntryName != 'dolphin'"));

 
     // insert 'Actions' sub menu
     fileItemActions.addServiceActionsTo(this);
 
     // insert 'Actions' sub menu
     fileItemActions.addServiceActionsTo(this);


@@ -491,15 +492,15 @@ void DolphinContextMenu::addFileItemPluginActions()
 
     QString commonMimeType = props.mimeType();
     if (commonMimeType.isEmpty()) {
 
     QString commonMimeType = props.mimeType();
     if (commonMimeType.isEmpty()) {

-        commonMimeType = QLatin1String("application/octet-stream");
+        commonMimeType = QStringLiteral("application/octet-stream");

     }
 
     }
 

-    const KService::List pluginServices = KMimeTypeTrader::self()->query(commonMimeType, "KFileItemAction/Plugin", "exist Library");
+    const KService::List pluginServices = KMimeTypeTrader::self()->query(commonMimeType, QStringLiteral("KFileItemAction/Plugin"), QStringLiteral("exist Library"));

     if (pluginServices.isEmpty()) {
         return;
     }
 
     if (pluginServices.isEmpty()) {
         return;
     }
 

-    const KConfig config("kservicemenurc", KConfig::NoGlobals);
+    const KConfig config(QStringLiteral("kservicemenurc"), KConfig::NoGlobals);

     const KConfigGroup showGroup = config.group("Show");
 
     foreach (const KService::Ptr& service, pluginServices) {
     const KConfigGroup showGroup = config.group("Show");
 
     foreach (const KService::Ptr& service, pluginServices) {