[CLAZY] Fixed all level 1 and level 2 warnings with small exceptions

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index f44d3236fc7fccc0b577090b6f42ce04e951ea22..d4f2b06e75075b69ade4a40b59721d6ea818ffea 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -21,7 +21,7 @@
 
 #include "dolphinmainwindow.h"
 
 
 #include "dolphinmainwindow.h"
 

-#include "dolphinapplication.h"
+#include "global.h"

 #include "dolphindockwidget.h"
 #include "dolphincontextmenu.h"
 #include "dolphinnewfilemenu.h"
 #include "dolphindockwidget.h"
 #include "dolphincontextmenu.h"
 #include "dolphinnewfilemenu.h"


@@ -49,13 +49,10 @@
 #include <KActionCollection>
 #include <KActionMenu>
 #include <KConfig>
 #include <KActionCollection>
 #include <KActionMenu>
 #include <KConfig>

-#include <kdeversion.h>

 #include <kdualaction.h>
 #include <kdualaction.h>

-#include <KDialog>

 #include <KJobWidgets>
 #include <KJobWidgets>

-#include <KLineEdit>
+#include <QLineEdit>

 #include <KToolBar>
 #include <KToolBar>

-#include <KIO/NetAccess>

 #include <KIO/JobUiDelegate>
 #include <KLocalizedString>
 #include <KProtocolManager>
 #include <KIO/JobUiDelegate>
 #include <KLocalizedString>
 #include <KProtocolManager>


@@ -64,13 +61,13 @@
 #include <KFileItemListProperties>
 #include <KRun>
 #include <KShell>
 #include <KFileItemListProperties>
 #include <KRun>
 #include <KShell>

-#include <kstatusbar.h>

 #include <KStandardAction>
 #include <KToggleAction>
 #include <KUrlNavigator>
 #include <KToolInvocation>
 #include <KUrlComboBox>
 
 #include <KStandardAction>
 #include <KToggleAction>
 #include <KUrlNavigator>
 #include <KToolInvocation>
 #include <KUrlComboBox>
 

+#include <QApplication>

 #include <QMenuBar>
 #include <QClipboard>
 #include <QToolButton>
 #include <QMenuBar>
 #include <QClipboard>
 #include <QToolButton>


@@ -79,6 +76,7 @@
 #include <QPushButton>
 #include <QCloseEvent>
 #include <QShowEvent>
 #include <QPushButton>
 #include <QCloseEvent>
 #include <QShowEvent>

+#include <QDialog>

 
 namespace {
     // Used for GeneralSettings::version() to determine whether
 
 namespace {
     // Used for GeneralSettings::version() to determine whether


@@ -98,7 +96,7 @@ DolphinMainWindow::DolphinMainWindow() :
     m_updateToolBarTimer(0),
     m_lastHandleUrlStatJob(0)
 {
     m_updateToolBarTimer(0),
     m_lastHandleUrlStatJob(0)
 {

-    setObjectName("Dolphin#");
+    setObjectName(QStringLiteral("Dolphin#"));

 
     connect(&DolphinNewFileMenuObserver::instance(), &DolphinNewFileMenuObserver::errorMessage,
             this, &DolphinMainWindow::showErrorMessage);
 
     connect(&DolphinNewFileMenuObserver::instance(), &DolphinNewFileMenuObserver::errorMessage,
             this, &DolphinMainWindow::showErrorMessage);


@@ -124,12 +122,12 @@ DolphinMainWindow::DolphinMainWindow() :
     setAcceptDrops(true);
 
     m_tabWidget = new DolphinTabWidget(this);
     setAcceptDrops(true);
 
     m_tabWidget = new DolphinTabWidget(this);

-    connect(m_tabWidget, SIGNAL(activeViewChanged(DolphinViewContainer*)),
-            this, SLOT(activeViewChanged(DolphinViewContainer*)));
-    connect(m_tabWidget, SIGNAL(tabCountChanged(int)),
-            this, SLOT(tabCountChanged(int)));
-    connect(m_tabWidget, SIGNAL(currentUrlChanged(QUrl)),
-            this, SLOT(setUrlAsCaption(QUrl)));
+    connect(m_tabWidget, &DolphinTabWidget::activeViewChanged,
+            this, &DolphinMainWindow::activeViewChanged);
+    connect(m_tabWidget, &DolphinTabWidget::tabCountChanged,
+            this, &DolphinMainWindow::tabCountChanged);
+    connect(m_tabWidget, &DolphinTabWidget::currentUrlChanged,
+            this, &DolphinMainWindow::setUrlAsCaption);

     setCentralWidget(m_tabWidget);
 
     setupActions();
     setCentralWidget(m_tabWidget);
 
     setupActions();


@@ -145,13 +143,13 @@ DolphinMainWindow::DolphinMainWindow() :
     setupDockWidgets();
 
     setupGUI(Keys | Save | Create | ToolBar);
     setupDockWidgets();
 
     setupGUI(Keys | Save | Create | ToolBar);

-    stateChanged("new_file");
+    stateChanged(QStringLiteral("new_file"));

 
     QClipboard* clipboard = QApplication::clipboard();
     connect(clipboard, &QClipboard::dataChanged,
             this, &DolphinMainWindow::updatePasteAction);
 
 
     QClipboard* clipboard = QApplication::clipboard();
     connect(clipboard, &QClipboard::dataChanged,
             this, &DolphinMainWindow::updatePasteAction);
 

-    QAction* showFilterBarAction = actionCollection()->action("show_filter_bar");
+    QAction* showFilterBarAction = actionCollection()->action(QStringLiteral("show_filter_bar"));

     showFilterBarAction->setChecked(generalSettings->filterBar());
 
     if (firstRun) {
     showFilterBarAction->setChecked(generalSettings->filterBar());
 
     if (firstRun) {


@@ -172,14 +170,14 @@ DolphinMainWindow::~DolphinMainWindow()
 {
 }
 
 {
 }
 

-void DolphinMainWindow::openDirectories(const QList<QUrl>& dirs)
+void DolphinMainWindow::openDirectories(const QList<QUrl>& dirs, bool splitView)

 {
 {

-    m_tabWidget->openDirectories(dirs);
+    m_tabWidget->openDirectories(dirs, splitView);

 }
 
 }
 

-void DolphinMainWindow::openFiles(const QList<QUrl>& files)
+void DolphinMainWindow::openFiles(const QList<QUrl>& files, bool splitView)

 {
 {

-    m_tabWidget->openFiles(files);
+    m_tabWidget->openFiles(files, splitView);

 }
 
 void DolphinMainWindow::showCommand(CommandType command)
 }
 
 void DolphinMainWindow::showCommand(CommandType command)


@@ -244,7 +242,7 @@ void DolphinMainWindow::slotTerminalDirectoryChanged(const QUrl& url)
 void DolphinMainWindow::slotEditableStateChanged(bool editable)
 {
     KToggleAction* editableLocationAction =
 void DolphinMainWindow::slotEditableStateChanged(bool editable)
 {
     KToggleAction* editableLocationAction =

-        static_cast<KToggleAction*>(actionCollection()->action("editable_location"));
+        static_cast<KToggleAction*>(actionCollection()->action(QStringLiteral("editable_location")));

     editableLocationAction->setChecked(editable);
 }
 
     editableLocationAction->setChecked(editable);
 }
 


@@ -254,7 +252,7 @@ void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection)
 
     const int selectedUrlsCount = m_tabWidget->currentTabPage()->selectedItemsCount();
 
 
     const int selectedUrlsCount = m_tabWidget->currentTabPage()->selectedItemsCount();
 

-    QAction* compareFilesAction = actionCollection()->action("compare_files");
+    QAction* compareFilesAction = actionCollection()->action(QStringLiteral("compare_files"));

     if (selectedUrlsCount == 2) {
         compareFilesAction->setEnabled(isKompareInstalled());
     } else {
     if (selectedUrlsCount == 2) {
         compareFilesAction->setEnabled(isKompareInstalled());
     } else {


@@ -264,23 +262,18 @@ void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection)
     emit selectionChanged(selection);
 }
 
     emit selectionChanged(selection);
 }
 

-void DolphinMainWindow::slotRequestItemInfo(const KFileItem& item)
-{
-    emit requestItemInfo(item);
-}
-

 void DolphinMainWindow::updateHistory()
 {
     const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
     const int index = urlNavigator->historyIndex();
 
 void DolphinMainWindow::updateHistory()
 {
     const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
     const int index = urlNavigator->historyIndex();
 

-    QAction* backAction = actionCollection()->action("go_back");
+    QAction* backAction = actionCollection()->action(QStringLiteral("go_back"));

     if (backAction) {
         backAction->setToolTip(i18nc("@info", "Go back"));
         backAction->setEnabled(index < urlNavigator->historySize() - 1);
     }
 
     if (backAction) {
         backAction->setToolTip(i18nc("@info", "Go back"));
         backAction->setEnabled(index < urlNavigator->historySize() - 1);
     }
 

-    QAction* forwardAction = actionCollection()->action("go_forward");
+    QAction* forwardAction = actionCollection()->action(QStringLiteral("go_forward"));

     if (forwardAction) {
         forwardAction->setToolTip(i18nc("@info", "Go forward"));
         forwardAction->setEnabled(index > 0);
     if (forwardAction) {
         forwardAction->setToolTip(i18nc("@info", "Go forward"));
         forwardAction->setEnabled(index > 0);


@@ -289,13 +282,13 @@ void DolphinMainWindow::updateHistory()
 
 void DolphinMainWindow::updateFilterBarAction(bool show)
 {
 
 void DolphinMainWindow::updateFilterBarAction(bool show)
 {

-    QAction* showFilterBarAction = actionCollection()->action("show_filter_bar");
+    QAction* showFilterBarAction = actionCollection()->action(QStringLiteral("show_filter_bar"));

     showFilterBarAction->setChecked(show);
 }
 
 void DolphinMainWindow::openNewMainWindow()
 {
     showFilterBarAction->setChecked(show);
 }
 
 void DolphinMainWindow::openNewMainWindow()
 {

-    KRun::run("dolphin %u", QList<QUrl>(), this);
+    KRun::run(QStringLiteral("dolphin %u"), QList<QUrl>(), this);

 }
 
 void DolphinMainWindow::openNewActivatedTab()
 }
 
 void DolphinMainWindow::openNewActivatedTab()


@@ -308,11 +301,6 @@ void DolphinMainWindow::openNewTab(const QUrl& url)
     m_tabWidget->openNewTab(url);
 }
 
     m_tabWidget->openNewTab(url);
 }
 

-void DolphinMainWindow::openNewActivatedTab(const QUrl& url)
-{
-    m_tabWidget->openNewActivatedTab(url);
-}
-

 void DolphinMainWindow::openInNewTab()
 {
     const KFileItemList& list = m_activeViewContainer->view()->selectedItems();
 void DolphinMainWindow::openInNewTab()
 {
     const KFileItemList& list = m_activeViewContainer->view()->selectedItems();


@@ -341,7 +329,7 @@ void DolphinMainWindow::openInNewWindow()
     }
 
     if (!newWindowUrl.isEmpty()) {
     }
 
     if (!newWindowUrl.isEmpty()) {

-        KRun::run("dolphin %u", QList<QUrl>() << newWindowUrl, this);
+        KRun::run(QStringLiteral("dolphin %u"), {newWindowUrl}, this);

     }
 }
 
     }
 }
 


@@ -359,23 +347,22 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
     // Find out if Dolphin is closed directly by the user or
     // by the session manager because the session is closed
     bool closedByUser = true;
     // Find out if Dolphin is closed directly by the user or
     // by the session manager because the session is closed
     bool closedByUser = true;

-    DolphinApplication *application = qobject_cast<DolphinApplication*>(qApp);
-    if (application && application->sessionSaving()) {
+    if (qApp->isSavingSession()) {

         closedByUser = false;
     }
 
     if (m_tabWidget->count() > 1 && GeneralSettings::confirmClosingMultipleTabs() && closedByUser) {
         // Ask the user if he really wants to quit and close all tabs.
         // Open a confirmation dialog with 3 buttons:
         closedByUser = false;
     }
 
     if (m_tabWidget->count() > 1 && GeneralSettings::confirmClosingMultipleTabs() && closedByUser) {
         // Ask the user if he really wants to quit and close all tabs.
         // Open a confirmation dialog with 3 buttons:

-        // KDialog::Yes    -> Quit
-        // KDialog::No     -> Close only the current tab
-        // KDialog::Cancel -> do nothing
+        // QDialogButtonBox::Yes    -> Quit
+        // QDialogButtonBox::No     -> Close only the current tab
+        // QDialogButtonBox::Cancel -> do nothing

         QDialog *dialog = new QDialog(this, Qt::Dialog);
         dialog->setWindowTitle(i18nc("@title:window", "Confirmation"));
         dialog->setModal(true);
         QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Yes | QDialogButtonBox::No | QDialogButtonBox::Cancel);
         KGuiItem::assign(buttons->button(QDialogButtonBox::Yes), KStandardGuiItem::quit());
         QDialog *dialog = new QDialog(this, Qt::Dialog);
         dialog->setWindowTitle(i18nc("@title:window", "Confirmation"));
         dialog->setModal(true);
         QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Yes | QDialogButtonBox::No | QDialogButtonBox::Cancel);
         KGuiItem::assign(buttons->button(QDialogButtonBox::Yes), KStandardGuiItem::quit());

-        KGuiItem::assign(buttons->button(QDialogButtonBox::No), KGuiItem(i18n("C&lose Current Tab"), QIcon::fromTheme("tab-close")));
+        KGuiItem::assign(buttons->button(QDialogButtonBox::No), KGuiItem(i18n("C&lose Current Tab"), QIcon::fromTheme(QStringLiteral("tab-close"))));

         KGuiItem::assign(buttons->button(QDialogButtonBox::Cancel), KStandardGuiItem::cancel());
         buttons->button(QDialogButtonBox::Yes)->setDefault(true);
 
         KGuiItem::assign(buttons->button(QDialogButtonBox::Cancel), KStandardGuiItem::cancel());
         buttons->button(QDialogButtonBox::Yes)->setDefault(true);
 


@@ -498,6 +485,11 @@ void DolphinMainWindow::updatePasteAction()
     pasteAction->setText(pasteInfo.second);
 }
 
     pasteAction->setText(pasteInfo.second);
 }
 

+void DolphinMainWindow::slotDirectoryLoadingCompleted()
+{
+    updatePasteAction();
+}
+

 void DolphinMainWindow::selectAll()
 {
     clearStatusBar();
 void DolphinMainWindow::selectAll()
 {
     clearStatusBar();


@@ -543,12 +535,12 @@ void DolphinMainWindow::stopLoading()
 
 void DolphinMainWindow::enableStopAction()
 {
 
 void DolphinMainWindow::enableStopAction()
 {

-    actionCollection()->action("stop")->setEnabled(true);
+    actionCollection()->action(QStringLiteral("stop"))->setEnabled(true);

 }
 
 void DolphinMainWindow::disableStopAction()
 {
 }
 
 void DolphinMainWindow::disableStopAction()
 {

-    actionCollection()->action("stop")->setEnabled(false);
+    actionCollection()->action(QStringLiteral("stop"))->setEnabled(false);

 }
 
 void DolphinMainWindow::showFilterBar()
 }
 
 void DolphinMainWindow::showFilterBar()


@@ -560,7 +552,7 @@ void DolphinMainWindow::toggleEditLocation()
 {
     clearStatusBar();
 
 {
     clearStatusBar();
 

-    QAction* action = actionCollection()->action("editable_location");
+    QAction* action = actionCollection()->action(QStringLiteral("editable_location"));

     KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
     urlNavigator->setUrlEditable(action->isChecked());
 }
     KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
     urlNavigator->setUrlEditable(action->isChecked());
 }


@@ -619,7 +611,7 @@ void DolphinMainWindow::goHome()
 void DolphinMainWindow::goBack(Qt::MouseButtons buttons)
 {
     // The default case (left button pressed) is handled in goBack().
 void DolphinMainWindow::goBack(Qt::MouseButtons buttons)
 {
     // The default case (left button pressed) is handled in goBack().

-    if (buttons == Qt::MidButton) {
+    if (buttons == Qt::MiddleButton) {

         KUrlNavigator* urlNavigator = activeViewContainer()->urlNavigator();
         const int index = urlNavigator->historyIndex() + 1;
         openNewTab(urlNavigator->locationUrl(index));
         KUrlNavigator* urlNavigator = activeViewContainer()->urlNavigator();
         const int index = urlNavigator->historyIndex() + 1;
         openNewTab(urlNavigator->locationUrl(index));


@@ -629,7 +621,7 @@ void DolphinMainWindow::goBack(Qt::MouseButtons buttons)
 void DolphinMainWindow::goForward(Qt::MouseButtons buttons)
 {
     // The default case (left button pressed) is handled in goForward().
 void DolphinMainWindow::goForward(Qt::MouseButtons buttons)
 {
     // The default case (left button pressed) is handled in goForward().

-    if (buttons == Qt::MidButton) {
+    if (buttons == Qt::MiddleButton) {

         KUrlNavigator* urlNavigator = activeViewContainer()->urlNavigator();
         const int index = urlNavigator->historyIndex() - 1;
         openNewTab(urlNavigator->locationUrl(index));
         KUrlNavigator* urlNavigator = activeViewContainer()->urlNavigator();
         const int index = urlNavigator->historyIndex() - 1;
         openNewTab(urlNavigator->locationUrl(index));


@@ -639,7 +631,7 @@ void DolphinMainWindow::goForward(Qt::MouseButtons buttons)
 void DolphinMainWindow::goUp(Qt::MouseButtons buttons)
 {
     // The default case (left button pressed) is handled in goUp().
 void DolphinMainWindow::goUp(Qt::MouseButtons buttons)
 {
     // The default case (left button pressed) is handled in goUp().

-    if (buttons == Qt::MidButton) {
+    if (buttons == Qt::MiddleButton) {

         openNewTab(KIO::upUrl(activeViewContainer()->url()));
     }
 }
         openNewTab(KIO::upUrl(activeViewContainer()->url()));
     }
 }


@@ -647,8 +639,8 @@ void DolphinMainWindow::goUp(Qt::MouseButtons buttons)
 void DolphinMainWindow::goHome(Qt::MouseButtons buttons)
 {
     // The default case (left button pressed) is handled in goHome().
 void DolphinMainWindow::goHome(Qt::MouseButtons buttons)
 {
     // The default case (left button pressed) is handled in goHome().

-    if (buttons == Qt::MidButton) {
-        openNewTab(GeneralSettings::self()->homeUrl());
+    if (buttons == Qt::MiddleButton) {
+        openNewTab(Dolphin::homeUrl());

     }
 }
 
     }
 }
 


@@ -664,12 +656,12 @@ void DolphinMainWindow::compareFiles()
     QUrl urlA = items.at(0).url();
     QUrl urlB = items.at(1).url();
 
     QUrl urlA = items.at(0).url();
     QUrl urlB = items.at(1).url();
 

-    QString command("kompare -c \"");
+    QString command(QStringLiteral("kompare -c \""));

     command.append(urlA.toDisplayString(QUrl::PreferLocalFile));
     command.append("\" \"");
     command.append(urlB.toDisplayString(QUrl::PreferLocalFile));
     command.append('\"');
     command.append(urlA.toDisplayString(QUrl::PreferLocalFile));
     command.append("\" \"");
     command.append(urlB.toDisplayString(QUrl::PreferLocalFile));
     command.append('\"');

-    KRun::runCommand(command, "Kompare", "kompare", this);
+    KRun::runCommand(command, QStringLiteral("Kompare"), QStringLiteral("kompare"), this);

 }
 
 void DolphinMainWindow::toggleShowMenuBar()
 }
 
 void DolphinMainWindow::toggleShowMenuBar()


@@ -689,7 +681,10 @@ void DolphinMainWindow::openTerminal()
 
     // If the given directory is not local, it can still be the URL of an
     // ioslave using UDS_LOCAL_PATH which to be converted first.
 
     // If the given directory is not local, it can still be the URL of an
     // ioslave using UDS_LOCAL_PATH which to be converted first.

-    QUrl url = KIO::NetAccess::mostLocalUrl(m_activeViewContainer->url(), this);
+    KIO::StatJob* statJob = KIO::mostLocalUrl(m_activeViewContainer->url());
+    KJobWidgets::setWindow(statJob, this);
+    statJob->exec();
+    QUrl url = statJob->mostLocalUrl();

 
     //If the URL is local after the above conversion, set the directory.
     if (url.isLocalFile()) {
 
     //If the URL is local after the above conversion, set the directory.
     if (url.isLocalFile()) {


@@ -759,7 +754,7 @@ void DolphinMainWindow::openContextMenu(const QPoint& pos,
                                         const QUrl& url,
                                         const QList<QAction*>& customActions)
 {
                                         const QUrl& url,
                                         const QList<QAction*>& customActions)
 {

-    QWeakPointer<DolphinContextMenu> contextMenu = new DolphinContextMenu(this, pos, item, url);
+    QPointer<DolphinContextMenu> contextMenu = new DolphinContextMenu(this, pos, item, url);

     contextMenu.data()->setCustomActions(customActions);
     const DolphinContextMenu::Command command = contextMenu.data()->open();
 
     contextMenu.data()->setCustomActions(customActions);
     const DolphinContextMenu::Command command = contextMenu.data()->open();
 


@@ -770,7 +765,7 @@ void DolphinMainWindow::openContextMenu(const QPoint& pos,
 
     case DolphinContextMenu::OpenParentFolderInNewWindow: {
 
 
     case DolphinContextMenu::OpenParentFolderInNewWindow: {
 

-        KRun::run("dolphin %u", QList<QUrl>() << KIO::upUrl(item.url()), this);
+        KRun::run(QStringLiteral("dolphin %u"), {KIO::upUrl(item.url())}, this);

         break;
     }
 
         break;
     }
 


@@ -783,7 +778,10 @@ void DolphinMainWindow::openContextMenu(const QPoint& pos,
         break;
     }
 
         break;
     }
 

-    delete contextMenu.data();
+    // Delete the menu, unless it has been deleted in its own nested event loop already.
+    if (contextMenu) {
+        contextMenu->deleteLater();
+    }

 }
 
 void DolphinMainWindow::updateControlMenu()
 }
 
 void DolphinMainWindow::updateControlMenu()


@@ -791,8 +789,8 @@ void DolphinMainWindow::updateControlMenu()
     QMenu* menu = qobject_cast<QMenu*>(sender());
     Q_ASSERT(menu);
 
     QMenu* menu = qobject_cast<QMenu*>(sender());
     Q_ASSERT(menu);
 

-    // All actions get cleared by QMenu::clear(). The sub-menus are deleted
-    // by connecting to the aboutToHide() signal from the parent-menu.
+    // All actions get cleared by QMenu::clear(). This includes the sub-menus
+    // because 'menu' is their parent.

     menu->clear();
 
     KActionCollection* ac = actionCollection();
     menu->clear();
 
     KActionCollection* ac = actionCollection();


@@ -800,8 +798,8 @@ void DolphinMainWindow::updateControlMenu()
     // Add "Edit" actions
     bool added = addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Undo)), menu) |
                  addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Find)), menu) |
     // Add "Edit" actions
     bool added = addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Undo)), menu) |
                  addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Find)), menu) |

-                 addActionToMenu(ac->action("select_all"), menu) |
-                 addActionToMenu(ac->action("invert_selection"), menu);
+                 addActionToMenu(ac->action(QStringLiteral("select_all")), menu) |
+                 addActionToMenu(ac->action(QStringLiteral("invert_selection")), menu);

 
     if (added) {
         menu->addSeparator();
 
     if (added) {
         menu->addSeparator();


@@ -814,49 +812,47 @@ void DolphinMainWindow::updateControlMenu()
         menu->addSeparator();
     }
 
         menu->addSeparator();
     }
 

-    added = addActionToMenu(ac->action("view_mode"), menu) |
-            addActionToMenu(ac->action("sort"), menu) |
-            addActionToMenu(ac->action("additional_info"), menu) |
-            addActionToMenu(ac->action("show_preview"), menu) |
-            addActionToMenu(ac->action("show_in_groups"), menu) |
-            addActionToMenu(ac->action("show_hidden_files"), menu);
+    added = addActionToMenu(ac->action(QStringLiteral("view_mode")), menu) |
+            addActionToMenu(ac->action(QStringLiteral("sort")), menu) |
+            addActionToMenu(ac->action(QStringLiteral("additional_info")), menu) |
+            addActionToMenu(ac->action(QStringLiteral("show_preview")), menu) |
+            addActionToMenu(ac->action(QStringLiteral("show_in_groups")), menu) |
+            addActionToMenu(ac->action(QStringLiteral("show_hidden_files")), menu);

 
     if (added) {
         menu->addSeparator();
     }
 
 
     if (added) {
         menu->addSeparator();
     }
 

-    added = addActionToMenu(ac->action("split_view"), menu) |
-            addActionToMenu(ac->action("reload"), menu) |
-            addActionToMenu(ac->action("view_properties"), menu);
+    added = addActionToMenu(ac->action(QStringLiteral("split_view")), menu) |
+            addActionToMenu(ac->action(QStringLiteral("reload")), menu) |
+            addActionToMenu(ac->action(QStringLiteral("view_properties")), menu);

     if (added) {
         menu->addSeparator();
     }
 
     if (added) {
         menu->addSeparator();
     }
 

-    addActionToMenu(ac->action("panels"), menu);
+    addActionToMenu(ac->action(QStringLiteral("panels")), menu);

     QMenu* locationBarMenu = new QMenu(i18nc("@action:inmenu", "Location Bar"), menu);
     QMenu* locationBarMenu = new QMenu(i18nc("@action:inmenu", "Location Bar"), menu);

-    locationBarMenu->addAction(ac->action("editable_location"));
-    locationBarMenu->addAction(ac->action("replace_location"));
+    locationBarMenu->addAction(ac->action(QStringLiteral("editable_location")));
+    locationBarMenu->addAction(ac->action(QStringLiteral("replace_location")));

     menu->addMenu(locationBarMenu);
 
     menu->addSeparator();
 
     // Add "Go" menu
     QMenu* goMenu = new QMenu(i18nc("@action:inmenu", "Go"), menu);
     menu->addMenu(locationBarMenu);
 
     menu->addSeparator();
 
     // Add "Go" menu
     QMenu* goMenu = new QMenu(i18nc("@action:inmenu", "Go"), menu);

-    connect(menu, &QMenu::aboutToHide, goMenu, &QMenu::deleteLater);

     goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Back)));
     goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Forward)));
     goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Up)));
     goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Home)));
     goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Back)));
     goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Forward)));
     goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Up)));
     goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Home)));

-    goMenu->addAction(ac->action("closed_tabs"));
+    goMenu->addAction(ac->action(QStringLiteral("closed_tabs")));

     menu->addMenu(goMenu);
 
     // Add "Tool" menu
     QMenu* toolsMenu = new QMenu(i18nc("@action:inmenu", "Tools"), menu);
     menu->addMenu(goMenu);
 
     // Add "Tool" menu
     QMenu* toolsMenu = new QMenu(i18nc("@action:inmenu", "Tools"), menu);

-    connect(menu, &QMenu::aboutToHide, toolsMenu, &QMenu::deleteLater);
-    toolsMenu->addAction(ac->action("show_filter_bar"));
-    toolsMenu->addAction(ac->action("compare_files"));
-    toolsMenu->addAction(ac->action("open_terminal"));
-    toolsMenu->addAction(ac->action("change_remote_encoding"));
+    toolsMenu->addAction(ac->action(QStringLiteral("show_filter_bar")));
+    toolsMenu->addAction(ac->action(QStringLiteral("compare_files")));
+    toolsMenu->addAction(ac->action(QStringLiteral("open_terminal")));
+    toolsMenu->addAction(ac->action(QStringLiteral("change_remote_encoding")));

     menu->addMenu(toolsMenu);
 
     // Add "Settings" menu entries
     menu->addMenu(toolsMenu);
 
     // Add "Settings" menu entries


@@ -866,7 +862,6 @@ void DolphinMainWindow::updateControlMenu()
 
     // Add "Help" menu
     QMenu* helpMenu = new QMenu(i18nc("@action:inmenu", "Help"), menu);
 
     // Add "Help" menu
     QMenu* helpMenu = new QMenu(i18nc("@action:inmenu", "Help"), menu);

-    connect(menu, &QMenu::aboutToHide, helpMenu, &QMenu::deleteLater);

     helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::HelpContents)));
     helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::WhatsThis)));
     helpMenu->addSeparator();
     helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::HelpContents)));
     helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::WhatsThis)));
     helpMenu->addSeparator();


@@ -895,11 +890,6 @@ void DolphinMainWindow::slotControlButtonDeleted()
     m_updateToolBarTimer->start();
 }
 
     m_updateToolBarTimer->start();
 }
 

-void DolphinMainWindow::slotPanelErrorMessage(const QString& error)
-{
-    activeViewContainer()->showMessage(error, DolphinViewContainer::Error);
-}
-

 void DolphinMainWindow::slotPlaceActivated(const QUrl& url)
 {
     DolphinViewContainer* view = activeViewContainer();
 void DolphinMainWindow::slotPlaceActivated(const QUrl& url)
 {
     DolphinViewContainer* view = activeViewContainer();


@@ -915,7 +905,7 @@ void DolphinMainWindow::slotPlaceActivated(const QUrl& url)
 
 void DolphinMainWindow::closedTabsCountChanged(unsigned int count)
 {
 
 void DolphinMainWindow::closedTabsCountChanged(unsigned int count)
 {

-    actionCollection()->action("undo_close_tab")->setEnabled(count > 0);
+    actionCollection()->action(QStringLiteral("undo_close_tab"))->setEnabled(count > 0);

 }
 
 void DolphinMainWindow::activeViewChanged(DolphinViewContainer* viewContainer)
 }
 
 void DolphinMainWindow::activeViewChanged(DolphinViewContainer* viewContainer)


@@ -950,9 +940,9 @@ void DolphinMainWindow::activeViewChanged(DolphinViewContainer* viewContainer)
 void DolphinMainWindow::tabCountChanged(int count)
 {
     const bool enableTabActions = (count > 1);
 void DolphinMainWindow::tabCountChanged(int count)
 {
     const bool enableTabActions = (count > 1);

-    actionCollection()->action("close_tab")->setEnabled(enableTabActions);
-    actionCollection()->action("activate_next_tab")->setEnabled(enableTabActions);
-    actionCollection()->action("activate_prev_tab")->setEnabled(enableTabActions);
+    actionCollection()->action(QStringLiteral("close_tab"))->setEnabled(enableTabActions);
+    actionCollection()->action(QStringLiteral("activate_next_tab"))->setEnabled(enableTabActions);
+    actionCollection()->action(QStringLiteral("activate_prev_tab"))->setEnabled(enableTabActions);

 }
 
 void DolphinMainWindow::setUrlAsCaption(const QUrl& url)
 }
 
 void DolphinMainWindow::setUrlAsCaption(const QUrl& url)


@@ -965,10 +955,14 @@ void DolphinMainWindow::setUrlAsCaption(const QUrl& url)
         }
     }
 
         }
     }
 

-    const QString fileName = url.fileName().isEmpty() ? "/" : url.fileName();
+    QString fileName = url.adjusted(QUrl::StripTrailingSlash).fileName();
+    if (fileName.isEmpty()) {
+        fileName = '/';
+    }
+

     caption.append(fileName);
 
     caption.append(fileName);
 

-    setCaption(caption);
+    setWindowTitle(caption);

 }
 
 void DolphinMainWindow::setupActions()
 }
 
 void DolphinMainWindow::setupActions()


@@ -977,25 +971,25 @@ void DolphinMainWindow::setupActions()
     m_newFileMenu = new DolphinNewFileMenu(actionCollection(), this);
     QMenu* menu = m_newFileMenu->menu();
     menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
     m_newFileMenu = new DolphinNewFileMenu(actionCollection(), this);
     QMenu* menu = m_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")));

     m_newFileMenu->setDelayed(false);
     connect(menu, &QMenu::aboutToShow,
             this, &DolphinMainWindow::updateNewMenu);
 
     m_newFileMenu->setDelayed(false);
     connect(menu, &QMenu::aboutToShow,
             this, &DolphinMainWindow::updateNewMenu);
 

-    QAction* newWindow = actionCollection()->addAction("new_window");
-    newWindow->setIcon(QIcon::fromTheme("window-new"));
+    QAction* newWindow = actionCollection()->addAction(QStringLiteral("new_window"));
+    newWindow->setIcon(QIcon::fromTheme(QStringLiteral("window-new")));

     newWindow->setText(i18nc("@action:inmenu File", "New &Window"));
     actionCollection()->setDefaultShortcut(newWindow, Qt::CTRL | Qt::Key_N);
     connect(newWindow, &QAction::triggered, this, &DolphinMainWindow::openNewMainWindow);
 
     newWindow->setText(i18nc("@action:inmenu File", "New &Window"));
     actionCollection()->setDefaultShortcut(newWindow, Qt::CTRL | Qt::Key_N);
     connect(newWindow, &QAction::triggered, this, &DolphinMainWindow::openNewMainWindow);
 

-    QAction* newTab = actionCollection()->addAction("new_tab");
-    newTab->setIcon(QIcon::fromTheme("tab-new"));
+    QAction* newTab = actionCollection()->addAction(QStringLiteral("new_tab"));
+    newTab->setIcon(QIcon::fromTheme(QStringLiteral("tab-new")));

     newTab->setText(i18nc("@action:inmenu File", "New Tab"));
     newTab->setText(i18nc("@action:inmenu File", "New Tab"));

-    actionCollection()->setDefaultShortcuts(newTab, QList<QKeySequence>() << QKeySequence(Qt::CTRL | Qt::Key_T) << QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_N));
+    actionCollection()->setDefaultShortcuts(newTab, {Qt::CTRL | Qt::Key_T, Qt::CTRL | Qt::SHIFT | Qt::Key_N});

     connect(newTab, &QAction::triggered, this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::openNewActivatedTab));
 
     connect(newTab, &QAction::triggered, this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::openNewActivatedTab));
 

-    QAction* closeTab = actionCollection()->addAction("close_tab");
-    closeTab->setIcon(QIcon::fromTheme("tab-close"));
+    QAction* closeTab = actionCollection()->addAction(QStringLiteral("close_tab"));
+    closeTab->setIcon(QIcon::fromTheme(QStringLiteral("tab-close")));

     closeTab->setText(i18nc("@action:inmenu File", "Close Tab"));
     actionCollection()->setDefaultShortcut(closeTab, Qt::CTRL | Qt::Key_W);
     closeTab->setEnabled(false);
     closeTab->setText(i18nc("@action:inmenu File", "Close Tab"));
     actionCollection()->setDefaultShortcut(closeTab, Qt::CTRL | Qt::Key_W);
     closeTab->setEnabled(false);


@@ -1023,12 +1017,12 @@ void DolphinMainWindow::setupActions()
 
     KStandardAction::find(this, SLOT(find()), actionCollection());
 
 
     KStandardAction::find(this, SLOT(find()), actionCollection());
 

-    QAction* selectAll = actionCollection()->addAction("select_all");
+    QAction* selectAll = actionCollection()->addAction(QStringLiteral("select_all"));

     selectAll->setText(i18nc("@action:inmenu Edit", "Select All"));
     actionCollection()->setDefaultShortcut(selectAll, Qt::CTRL | Qt::Key_A);
     connect(selectAll, &QAction::triggered, this, &DolphinMainWindow::selectAll);
 
     selectAll->setText(i18nc("@action:inmenu Edit", "Select All"));
     actionCollection()->setDefaultShortcut(selectAll, Qt::CTRL | Qt::Key_A);
     connect(selectAll, &QAction::triggered, this, &DolphinMainWindow::selectAll);
 

-    QAction* invertSelection = actionCollection()->addAction("invert_selection");
+    QAction* invertSelection = actionCollection()->addAction(QStringLiteral("invert_selection"));

     invertSelection->setText(i18nc("@action:inmenu Edit", "Invert Selection"));
     actionCollection()->setDefaultShortcut(invertSelection, Qt::CTRL | Qt::SHIFT | Qt::Key_A);
     connect(invertSelection, &QAction::triggered, this, &DolphinMainWindow::invertSelection);
     invertSelection->setText(i18nc("@action:inmenu Edit", "Invert Selection"));
     actionCollection()->setDefaultShortcut(invertSelection, Qt::CTRL | Qt::SHIFT | Qt::Key_A);
     connect(invertSelection, &QAction::triggered, this, &DolphinMainWindow::invertSelection);


@@ -1036,28 +1030,28 @@ void DolphinMainWindow::setupActions()
     // setup 'View' menu
     // (note that most of it is set up in DolphinViewActionHandler)
 
     // setup 'View' menu
     // (note that most of it is set up in DolphinViewActionHandler)
 

-    QAction* split = actionCollection()->addAction("split_view");
+    QAction* split = actionCollection()->addAction(QStringLiteral("split_view"));

     actionCollection()->setDefaultShortcut(split, Qt::Key_F3);
     connect(split, &QAction::triggered, this, &DolphinMainWindow::toggleSplitView);
 
     actionCollection()->setDefaultShortcut(split, Qt::Key_F3);
     connect(split, &QAction::triggered, this, &DolphinMainWindow::toggleSplitView);
 

-    QAction* reload = actionCollection()->addAction("reload");
+    QAction* reload = actionCollection()->addAction(QStringLiteral("reload"));

     reload->setText(i18nc("@action:inmenu View", "Reload"));
     actionCollection()->setDefaultShortcut(reload, Qt::Key_F5);
     reload->setText(i18nc("@action:inmenu View", "Reload"));
     actionCollection()->setDefaultShortcut(reload, Qt::Key_F5);

-    reload->setIcon(QIcon::fromTheme("view-refresh"));
+    reload->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh")));

     connect(reload, &QAction::triggered, this, &DolphinMainWindow::reloadView);
 
     connect(reload, &QAction::triggered, this, &DolphinMainWindow::reloadView);
 

-    QAction* stop = actionCollection()->addAction("stop");
+    QAction* stop = actionCollection()->addAction(QStringLiteral("stop"));

     stop->setText(i18nc("@action:inmenu View", "Stop"));
     stop->setToolTip(i18nc("@info", "Stop loading"));
     stop->setText(i18nc("@action:inmenu View", "Stop"));
     stop->setToolTip(i18nc("@info", "Stop loading"));

-    stop->setIcon(QIcon::fromTheme("process-stop"));
+    stop->setIcon(QIcon::fromTheme(QStringLiteral("process-stop")));

     connect(stop, &QAction::triggered, this, &DolphinMainWindow::stopLoading);
 
     connect(stop, &QAction::triggered, this, &DolphinMainWindow::stopLoading);
 

-    KToggleAction* editableLocation = actionCollection()->add<KToggleAction>("editable_location");
+    KToggleAction* editableLocation = actionCollection()->add<KToggleAction>(QStringLiteral("editable_location"));

     editableLocation->setText(i18nc("@action:inmenu Navigation Bar", "Editable Location"));
     actionCollection()->setDefaultShortcut(editableLocation, Qt::Key_F6);
     connect(editableLocation, &KToggleAction::triggered, this, &DolphinMainWindow::toggleEditLocation);
 
     editableLocation->setText(i18nc("@action:inmenu Navigation Bar", "Editable Location"));
     actionCollection()->setDefaultShortcut(editableLocation, Qt::Key_F6);
     connect(editableLocation, &KToggleAction::triggered, this, &DolphinMainWindow::toggleEditLocation);
 

-    QAction* replaceLocation = actionCollection()->addAction("replace_location");
+    QAction* replaceLocation = actionCollection()->addAction(QStringLiteral("replace_location"));

     replaceLocation->setText(i18nc("@action:inmenu Navigation Bar", "Replace Location"));
     actionCollection()->setDefaultShortcut(replaceLocation, Qt::CTRL | Qt::Key_L);
     connect(replaceLocation, &QAction::triggered, this, &DolphinMainWindow::replaceLocation);
     replaceLocation->setText(i18nc("@action:inmenu Navigation Bar", "Replace Location"));
     actionCollection()->setDefaultShortcut(replaceLocation, Qt::CTRL | Qt::Key_L);
     connect(replaceLocation, &QAction::triggered, this, &DolphinMainWindow::replaceLocation);


@@ -1069,41 +1063,44 @@ void DolphinMainWindow::setupActions()
     actionCollection()->setDefaultShortcuts(backAction, backShortcuts);
 
     DolphinRecentTabsMenu* recentTabsMenu = new DolphinRecentTabsMenu(this);
     actionCollection()->setDefaultShortcuts(backAction, backShortcuts);
 
     DolphinRecentTabsMenu* recentTabsMenu = new DolphinRecentTabsMenu(this);

-    actionCollection()->addAction("closed_tabs", recentTabsMenu);
-    connect(m_tabWidget, SIGNAL(rememberClosedTab(QUrl,QByteArray)),
-            recentTabsMenu, SLOT(rememberClosedTab(QUrl,QByteArray)));
-    connect(recentTabsMenu, SIGNAL(restoreClosedTab(QByteArray)),
-            m_tabWidget, SLOT(restoreClosedTab(QByteArray)));
-    connect(recentTabsMenu, SIGNAL(closedTabsCountChanged(uint)),
-            this, SLOT(closedTabsCountChanged(uint)));
-
-    QAction* undoCloseTab = actionCollection()->addAction("undo_close_tab");
+    actionCollection()->addAction(QStringLiteral("closed_tabs"), recentTabsMenu);
+    connect(m_tabWidget, &DolphinTabWidget::rememberClosedTab,
+            recentTabsMenu, &DolphinRecentTabsMenu::rememberClosedTab);
+    connect(recentTabsMenu, &DolphinRecentTabsMenu::restoreClosedTab,
+            m_tabWidget, &DolphinTabWidget::restoreClosedTab);
+    connect(recentTabsMenu, &DolphinRecentTabsMenu::closedTabsCountChanged,
+            this, &DolphinMainWindow::closedTabsCountChanged);
+
+    QAction* undoCloseTab = actionCollection()->addAction(QStringLiteral("undo_close_tab"));

     undoCloseTab->setText(i18nc("@action:inmenu File", "Undo close tab"));
     actionCollection()->setDefaultShortcut(undoCloseTab, Qt::CTRL | Qt::SHIFT | Qt::Key_T);
     undoCloseTab->setText(i18nc("@action:inmenu File", "Undo close tab"));
     actionCollection()->setDefaultShortcut(undoCloseTab, Qt::CTRL | Qt::SHIFT | Qt::Key_T);

-    undoCloseTab->setIcon(QIcon::fromTheme("edit-undo"));
+    undoCloseTab->setIcon(QIcon::fromTheme(QStringLiteral("edit-undo")));

     undoCloseTab->setEnabled(false);
     undoCloseTab->setEnabled(false);

-    connect(undoCloseTab, SIGNAL(triggered()), recentTabsMenu, SLOT(undoCloseTab()));
+    connect(undoCloseTab, &QAction::triggered, recentTabsMenu, &DolphinRecentTabsMenu::undoCloseTab);
+
+    auto undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo));
+    undoAction->setEnabled(false); // undo should be disabled by default

 
     KStandardAction::forward(this, SLOT(goForward()), actionCollection());
     KStandardAction::up(this, SLOT(goUp()), actionCollection());
     KStandardAction::home(this, SLOT(goHome()), actionCollection());
 
     // setup 'Tools' menu
 
     KStandardAction::forward(this, SLOT(goForward()), actionCollection());
     KStandardAction::up(this, SLOT(goUp()), actionCollection());
     KStandardAction::home(this, SLOT(goHome()), actionCollection());
 
     // setup 'Tools' menu

-    QAction* showFilterBar = actionCollection()->addAction("show_filter_bar");
+    QAction* showFilterBar = actionCollection()->addAction(QStringLiteral("show_filter_bar"));

     showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar"));
     showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar"));

-    showFilterBar->setIcon(QIcon::fromTheme("view-filter"));
+    showFilterBar->setIcon(QIcon::fromTheme(QStringLiteral("view-filter")));

     actionCollection()->setDefaultShortcut(showFilterBar, Qt::CTRL | Qt::Key_I);
     connect(showFilterBar, &QAction::triggered, this, &DolphinMainWindow::showFilterBar);
 
     actionCollection()->setDefaultShortcut(showFilterBar, Qt::CTRL | Qt::Key_I);
     connect(showFilterBar, &QAction::triggered, this, &DolphinMainWindow::showFilterBar);
 

-    QAction* compareFiles = actionCollection()->addAction("compare_files");
+    QAction* compareFiles = actionCollection()->addAction(QStringLiteral("compare_files"));

     compareFiles->setText(i18nc("@action:inmenu Tools", "Compare Files"));
     compareFiles->setText(i18nc("@action:inmenu Tools", "Compare Files"));

-    compareFiles->setIcon(QIcon::fromTheme("kompare"));
+    compareFiles->setIcon(QIcon::fromTheme(QStringLiteral("kompare")));

     compareFiles->setEnabled(false);
     connect(compareFiles, &QAction::triggered, this, &DolphinMainWindow::compareFiles);
 
     compareFiles->setEnabled(false);
     connect(compareFiles, &QAction::triggered, this, &DolphinMainWindow::compareFiles);
 

-    QAction* openTerminal = actionCollection()->addAction("open_terminal");
+    QAction* openTerminal = actionCollection()->addAction(QStringLiteral("open_terminal"));

     openTerminal->setText(i18nc("@action:inmenu Tools", "Open Terminal"));
     openTerminal->setText(i18nc("@action:inmenu Tools", "Open Terminal"));

-    openTerminal->setIcon(QIcon::fromTheme("utilities-terminal"));
+    openTerminal->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal")));

     actionCollection()->setDefaultShortcut(openTerminal, Qt::SHIFT | Qt::Key_F4);
     connect(openTerminal, &QAction::triggered, this, &DolphinMainWindow::openTerminal);
 
     actionCollection()->setDefaultShortcut(openTerminal, Qt::SHIFT | Qt::Key_F4);
     connect(openTerminal, &QAction::triggered, this, &DolphinMainWindow::openTerminal);
 


@@ -1114,22 +1111,20 @@ void DolphinMainWindow::setupActions()
     KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());
 
     // not in menu actions
     KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());
 
     // not in menu actions

-    QList<QKeySequence> nextTabKeys;
-    nextTabKeys.append(KStandardShortcut::tabNext().first()); //TODO: is this correct
+    QList<QKeySequence> nextTabKeys = KStandardShortcut::tabNext();

     nextTabKeys.append(QKeySequence(Qt::CTRL | Qt::Key_Tab));
 
     nextTabKeys.append(QKeySequence(Qt::CTRL | Qt::Key_Tab));
 

-    QList<QKeySequence> prevTabKeys;
-    prevTabKeys.append(KStandardShortcut::tabPrev().first()); //TODO: is this correct
+    QList<QKeySequence> prevTabKeys = KStandardShortcut::tabPrev();

     prevTabKeys.append(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_Tab));
 
     prevTabKeys.append(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_Tab));
 

-    QAction* activateNextTab = actionCollection()->addAction("activate_next_tab");
+    QAction* activateNextTab = actionCollection()->addAction(QStringLiteral("activate_next_tab"));

     activateNextTab->setIconText(i18nc("@action:inmenu", "Next Tab"));
     activateNextTab->setText(i18nc("@action:inmenu", "Activate Next Tab"));
     activateNextTab->setEnabled(false);
     connect(activateNextTab, &QAction::triggered, m_tabWidget, &DolphinTabWidget::activateNextTab);
     actionCollection()->setDefaultShortcuts(activateNextTab, QApplication::isRightToLeft() ? prevTabKeys : nextTabKeys);
 
     activateNextTab->setIconText(i18nc("@action:inmenu", "Next Tab"));
     activateNextTab->setText(i18nc("@action:inmenu", "Activate Next Tab"));
     activateNextTab->setEnabled(false);
     connect(activateNextTab, &QAction::triggered, m_tabWidget, &DolphinTabWidget::activateNextTab);
     actionCollection()->setDefaultShortcuts(activateNextTab, QApplication::isRightToLeft() ? prevTabKeys : nextTabKeys);
 

-    QAction* activatePrevTab = actionCollection()->addAction("activate_prev_tab");
+    QAction* activatePrevTab = actionCollection()->addAction(QStringLiteral("activate_prev_tab"));

     activatePrevTab->setIconText(i18nc("@action:inmenu", "Previous Tab"));
     activatePrevTab->setText(i18nc("@action:inmenu", "Activate Previous Tab"));
     activatePrevTab->setEnabled(false);
     activatePrevTab->setIconText(i18nc("@action:inmenu", "Previous Tab"));
     activatePrevTab->setText(i18nc("@action:inmenu", "Activate Previous Tab"));
     activatePrevTab->setEnabled(false);


@@ -1137,19 +1132,19 @@ void DolphinMainWindow::setupActions()
     actionCollection()->setDefaultShortcuts(activatePrevTab, QApplication::isRightToLeft() ? nextTabKeys : prevTabKeys);
 
     // for context menu
     actionCollection()->setDefaultShortcuts(activatePrevTab, QApplication::isRightToLeft() ? nextTabKeys : prevTabKeys);
 
     // for context menu

-    QAction* openInNewTab = actionCollection()->addAction("open_in_new_tab");
+    QAction* openInNewTab = actionCollection()->addAction(QStringLiteral("open_in_new_tab"));

     openInNewTab->setText(i18nc("@action:inmenu", "Open in New Tab"));
     openInNewTab->setText(i18nc("@action:inmenu", "Open in New Tab"));

-    openInNewTab->setIcon(QIcon::fromTheme("tab-new"));
+    openInNewTab->setIcon(QIcon::fromTheme(QStringLiteral("tab-new")));

     connect(openInNewTab, &QAction::triggered, this, &DolphinMainWindow::openInNewTab);
 
     connect(openInNewTab, &QAction::triggered, this, &DolphinMainWindow::openInNewTab);
 

-    QAction* openInNewTabs = actionCollection()->addAction("open_in_new_tabs");
+    QAction* openInNewTabs = actionCollection()->addAction(QStringLiteral("open_in_new_tabs"));

     openInNewTabs->setText(i18nc("@action:inmenu", "Open in New Tabs"));
     openInNewTabs->setText(i18nc("@action:inmenu", "Open in New Tabs"));

-    openInNewTabs->setIcon(QIcon::fromTheme("tab-new"));
+    openInNewTabs->setIcon(QIcon::fromTheme(QStringLiteral("tab-new")));

     connect(openInNewTabs, &QAction::triggered, this, &DolphinMainWindow::openInNewTab);
 
     connect(openInNewTabs, &QAction::triggered, this, &DolphinMainWindow::openInNewTab);
 

-    QAction* openInNewWindow = actionCollection()->addAction("open_in_new_window");
+    QAction* openInNewWindow = actionCollection()->addAction(QStringLiteral("open_in_new_window"));

     openInNewWindow->setText(i18nc("@action:inmenu", "Open in New Window"));
     openInNewWindow->setText(i18nc("@action:inmenu", "Open in New Window"));

-    openInNewWindow->setIcon(QIcon::fromTheme("window-new"));
+    openInNewWindow->setIcon(QIcon::fromTheme(QStringLiteral("window-new")));

     connect(openInNewWindow, &QAction::triggered, this, &DolphinMainWindow::openInNewWindow);
 }
 
     connect(openInNewWindow, &QAction::triggered, this, &DolphinMainWindow::openInNewWindow);
 }
 


@@ -1157,26 +1152,26 @@ void DolphinMainWindow::setupDockWidgets()
 {
     const bool lock = GeneralSettings::lockPanels();
 
 {
     const bool lock = GeneralSettings::lockPanels();
 

-    KDualAction* lockLayoutAction = actionCollection()->add<KDualAction>("lock_panels");
+    KDualAction* lockLayoutAction = actionCollection()->add<KDualAction>(QStringLiteral("lock_panels"));

     lockLayoutAction->setActiveText(i18nc("@action:inmenu Panels", "Unlock Panels"));
     lockLayoutAction->setActiveText(i18nc("@action:inmenu Panels", "Unlock Panels"));

-    lockLayoutAction->setActiveIcon(QIcon::fromTheme("object-unlocked"));
+    lockLayoutAction->setActiveIcon(QIcon::fromTheme(QStringLiteral("object-unlocked")));

     lockLayoutAction->setInactiveText(i18nc("@action:inmenu Panels", "Lock Panels"));
     lockLayoutAction->setInactiveText(i18nc("@action:inmenu Panels", "Lock Panels"));

-    lockLayoutAction->setInactiveIcon(QIcon::fromTheme("object-locked"));
+    lockLayoutAction->setInactiveIcon(QIcon::fromTheme(QStringLiteral("object-locked")));

     lockLayoutAction->setActive(lock);
     connect(lockLayoutAction, &KDualAction::triggered, this, &DolphinMainWindow::togglePanelLockState);
 
     // Setup "Information"
     DolphinDockWidget* infoDock = new DolphinDockWidget(i18nc("@title:window", "Information"));
     infoDock->setLocked(lock);
     lockLayoutAction->setActive(lock);
     connect(lockLayoutAction, &KDualAction::triggered, this, &DolphinMainWindow::togglePanelLockState);
 
     // Setup "Information"
     DolphinDockWidget* infoDock = new DolphinDockWidget(i18nc("@title:window", "Information"));
     infoDock->setLocked(lock);

-    infoDock->setObjectName("infoDock");
+    infoDock->setObjectName(QStringLiteral("infoDock"));

     infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     InformationPanel* infoPanel = new InformationPanel(infoDock);
     infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     InformationPanel* infoPanel = new InformationPanel(infoDock);

-    infoPanel->setCustomContextMenuActions(QList<QAction*>() << lockLayoutAction);
+    infoPanel->setCustomContextMenuActions({lockLayoutAction});

     connect(infoPanel, &InformationPanel::urlActivated, this, &DolphinMainWindow::handleUrl);
     infoDock->setWidget(infoPanel);
 
     QAction* infoAction = infoDock->toggleViewAction();
     connect(infoPanel, &InformationPanel::urlActivated, this, &DolphinMainWindow::handleUrl);
     infoDock->setWidget(infoPanel);
 
     QAction* infoAction = infoDock->toggleViewAction();

-    createPanelAction(QIcon::fromTheme("dialog-information"), Qt::Key_F11, infoAction, "show_information_panel");
+    createPanelAction(QIcon::fromTheme(QStringLiteral("dialog-information")), Qt::Key_F11, infoAction, QStringLiteral("show_information_panel"));

 
     addDockWidget(Qt::RightDockWidgetArea, infoDock);
     connect(this, &DolphinMainWindow::urlChanged,
 
     addDockWidget(Qt::RightDockWidgetArea, infoDock);
     connect(this, &DolphinMainWindow::urlChanged,


@@ -1189,14 +1184,14 @@ void DolphinMainWindow::setupDockWidgets()
     // Setup "Folders"
     DolphinDockWidget* foldersDock = new DolphinDockWidget(i18nc("@title:window", "Folders"));
     foldersDock->setLocked(lock);
     // Setup "Folders"
     DolphinDockWidget* foldersDock = new DolphinDockWidget(i18nc("@title:window", "Folders"));
     foldersDock->setLocked(lock);

-    foldersDock->setObjectName("foldersDock");
+    foldersDock->setObjectName(QStringLiteral("foldersDock"));

     foldersDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     FoldersPanel* foldersPanel = new FoldersPanel(foldersDock);
     foldersDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     FoldersPanel* foldersPanel = new FoldersPanel(foldersDock);

-    foldersPanel->setCustomContextMenuActions(QList<QAction*>() << lockLayoutAction);
+    foldersPanel->setCustomContextMenuActions({lockLayoutAction});

     foldersDock->setWidget(foldersPanel);
 
     QAction* foldersAction = foldersDock->toggleViewAction();
     foldersDock->setWidget(foldersPanel);
 
     QAction* foldersAction = foldersDock->toggleViewAction();

-    createPanelAction(QIcon::fromTheme("folder"), Qt::Key_F7, foldersAction, "show_folders_panel");
+    createPanelAction(QIcon::fromTheme(QStringLiteral("folder")), Qt::Key_F7, foldersAction, QStringLiteral("show_folders_panel"));

 
     addDockWidget(Qt::LeftDockWidgetArea, foldersDock);
     connect(this, &DolphinMainWindow::urlChanged,
 
     addDockWidget(Qt::LeftDockWidgetArea, foldersDock);
     connect(this, &DolphinMainWindow::urlChanged,


@@ -1206,16 +1201,16 @@ void DolphinMainWindow::setupDockWidgets()
     connect(foldersPanel, &FoldersPanel::folderMiddleClicked,
             this, &DolphinMainWindow::openNewTab);
     connect(foldersPanel, &FoldersPanel::errorMessage,
     connect(foldersPanel, &FoldersPanel::folderMiddleClicked,
             this, &DolphinMainWindow::openNewTab);
     connect(foldersPanel, &FoldersPanel::errorMessage,

-            this, &DolphinMainWindow::slotPanelErrorMessage);
+            this, &DolphinMainWindow::showErrorMessage);

 
     // Setup "Terminal"
 #ifndef Q_OS_WIN
     DolphinDockWidget* terminalDock = new DolphinDockWidget(i18nc("@title:window Shell terminal", "Terminal"));
     terminalDock->setLocked(lock);
 
     // Setup "Terminal"
 #ifndef Q_OS_WIN
     DolphinDockWidget* terminalDock = new DolphinDockWidget(i18nc("@title:window Shell terminal", "Terminal"));
     terminalDock->setLocked(lock);

-    terminalDock->setObjectName("terminalDock");
+    terminalDock->setObjectName(QStringLiteral("terminalDock"));

     terminalDock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
     TerminalPanel* terminalPanel = new TerminalPanel(terminalDock);
     terminalDock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
     TerminalPanel* terminalPanel = new TerminalPanel(terminalDock);

-    terminalPanel->setCustomContextMenuActions(QList<QAction*>() << lockLayoutAction);
+    terminalPanel->setCustomContextMenuActions({lockLayoutAction});

     terminalDock->setWidget(terminalPanel);
 
     connect(terminalPanel, &TerminalPanel::hideTerminalPanel, terminalDock, &DolphinDockWidget::hide);
     terminalDock->setWidget(terminalPanel);
 
     connect(terminalPanel, &TerminalPanel::hideTerminalPanel, terminalDock, &DolphinDockWidget::hide);


@@ -1224,7 +1219,7 @@ void DolphinMainWindow::setupDockWidgets()
             terminalPanel, &TerminalPanel::dockVisibilityChanged);
 
     QAction* terminalAction = terminalDock->toggleViewAction();
             terminalPanel, &TerminalPanel::dockVisibilityChanged);
 
     QAction* terminalAction = terminalDock->toggleViewAction();

-    createPanelAction(QIcon::fromTheme("utilities-terminal"), Qt::Key_F4, terminalAction, "show_terminal_panel");
+    createPanelAction(QIcon::fromTheme(QStringLiteral("utilities-terminal")), Qt::Key_F4, terminalAction, QStringLiteral("show_terminal_panel"));

 
     addDockWidget(Qt::BottomDockWidgetArea, terminalDock);
     connect(this, &DolphinMainWindow::urlChanged,
 
     addDockWidget(Qt::BottomDockWidgetArea, terminalDock);
     connect(this, &DolphinMainWindow::urlChanged,


@@ -1242,23 +1237,23 @@ void DolphinMainWindow::setupDockWidgets()
     // Setup "Places"
     DolphinDockWidget* placesDock = new DolphinDockWidget(i18nc("@title:window", "Places"));
     placesDock->setLocked(lock);
     // Setup "Places"
     DolphinDockWidget* placesDock = new DolphinDockWidget(i18nc("@title:window", "Places"));
     placesDock->setLocked(lock);

-    placesDock->setObjectName("placesDock");
+    placesDock->setObjectName(QStringLiteral("placesDock"));

     placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
 
     PlacesPanel* placesPanel = new PlacesPanel(placesDock);
     placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
 
     PlacesPanel* placesPanel = new PlacesPanel(placesDock);

-    placesPanel->setCustomContextMenuActions(QList<QAction*>() << lockLayoutAction);
+    placesPanel->setCustomContextMenuActions({lockLayoutAction});

     placesDock->setWidget(placesPanel);
 
     QAction* placesAction = placesDock->toggleViewAction();
     placesDock->setWidget(placesPanel);
 
     QAction* placesAction = placesDock->toggleViewAction();

-    createPanelAction(QIcon::fromTheme("bookmarks"), Qt::Key_F9, placesAction, "show_places_panel");
+    createPanelAction(QIcon::fromTheme(QStringLiteral("bookmarks")), Qt::Key_F9, placesAction, QStringLiteral("show_places_panel"));

 
     addDockWidget(Qt::LeftDockWidgetArea, placesDock);
     connect(placesPanel, &PlacesPanel::placeActivated,
             this, &DolphinMainWindow::slotPlaceActivated);
 
     addDockWidget(Qt::LeftDockWidgetArea, placesDock);
     connect(placesPanel, &PlacesPanel::placeActivated,
             this, &DolphinMainWindow::slotPlaceActivated);

-    connect(placesPanel, SIGNAL(placeMiddleClicked(QUrl)),
-            this, SLOT(openNewTab(QUrl)));
+    connect(placesPanel, &PlacesPanel::placeMiddleClicked,
+            this, &DolphinMainWindow::openNewTab);

     connect(placesPanel, &PlacesPanel::errorMessage,
     connect(placesPanel, &PlacesPanel::errorMessage,

-            this, &DolphinMainWindow::slotPanelErrorMessage);
+            this, &DolphinMainWindow::showErrorMessage);

     connect(this, &DolphinMainWindow::urlChanged,
             placesPanel, &PlacesPanel::setUrl);
     connect(placesDock, &DolphinDockWidget::visibilityChanged,
     connect(this, &DolphinMainWindow::urlChanged,
             placesPanel, &PlacesPanel::setUrl);
     connect(placesDock, &DolphinDockWidget::visibilityChanged,


@@ -1270,14 +1265,14 @@ void DolphinMainWindow::setupDockWidgets()
 
     // Add actions into the "Panels" menu
     KActionMenu* panelsMenu = new KActionMenu(i18nc("@action:inmenu View", "Panels"), this);
 
     // Add actions into the "Panels" menu
     KActionMenu* panelsMenu = new KActionMenu(i18nc("@action:inmenu View", "Panels"), this);

-    actionCollection()->addAction("panels", panelsMenu);
+    actionCollection()->addAction(QStringLiteral("panels"), panelsMenu);

     panelsMenu->setDelayed(false);
     const KActionCollection* ac = actionCollection();
     panelsMenu->setDelayed(false);
     const KActionCollection* ac = actionCollection();

-    panelsMenu->addAction(ac->action("show_places_panel"));
-    panelsMenu->addAction(ac->action("show_information_panel"));
-    panelsMenu->addAction(ac->action("show_folders_panel"));
+    panelsMenu->addAction(ac->action(QStringLiteral("show_places_panel")));
+    panelsMenu->addAction(ac->action(QStringLiteral("show_information_panel")));
+    panelsMenu->addAction(ac->action(QStringLiteral("show_folders_panel")));

 #ifndef Q_OS_WIN
 #ifndef Q_OS_WIN

-    panelsMenu->addAction(ac->action("show_terminal_panel"));
+    panelsMenu->addAction(ac->action(QStringLiteral("show_terminal_panel")));

 #endif
     panelsMenu->addSeparator();
     panelsMenu->addAction(lockLayoutAction);
 #endif
     panelsMenu->addSeparator();
     panelsMenu->addAction(lockLayoutAction);


@@ -1287,16 +1282,16 @@ void DolphinMainWindow::updateEditActions()
 {
     const KFileItemList list = m_activeViewContainer->view()->selectedItems();
     if (list.isEmpty()) {
 {
     const KFileItemList list = m_activeViewContainer->view()->selectedItems();
     if (list.isEmpty()) {

-        stateChanged("has_no_selection");
+        stateChanged(QStringLiteral("has_no_selection"));

     } else {
     } else {

-        stateChanged("has_selection");
+        stateChanged(QStringLiteral("has_selection"));

 
         KActionCollection* col = actionCollection();
 
         KActionCollection* col = actionCollection();

-        QAction* renameAction      = col->action("rename");
-        QAction* moveToTrashAction = col->action("move_to_trash");
-        QAction* deleteAction      = col->action("delete");
+        QAction* renameAction      = col->action(QStringLiteral("rename"));
+        QAction* moveToTrashAction = col->action(QStringLiteral("move_to_trash"));
+        QAction* deleteAction      = col->action(QStringLiteral("delete"));

         QAction* cutAction         = col->action(KStandardAction::name(KStandardAction::Cut));
         QAction* cutAction         = col->action(KStandardAction::name(KStandardAction::Cut));

-        QAction* deleteWithTrashShortcut = col->action("delete_shortcut"); // see DolphinViewActionHandler
+        QAction* deleteWithTrashShortcut = col->action(QStringLiteral("delete_shortcut")); // see DolphinViewActionHandler

 
         KFileItemListProperties capabilities(list);
         const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving();
 
         KFileItemListProperties capabilities(list);
         const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving();


@@ -1313,12 +1308,12 @@ void DolphinMainWindow::updateViewActions()
 {
     m_actionHandler->updateViewActions();
 
 {
     m_actionHandler->updateViewActions();
 

-    QAction* showFilterBarAction = actionCollection()->action("show_filter_bar");
+    QAction* showFilterBarAction = actionCollection()->action(QStringLiteral("show_filter_bar"));

     showFilterBarAction->setChecked(m_activeViewContainer->isFilterBarVisible());
 
     updateSplitAction();
 
     showFilterBarAction->setChecked(m_activeViewContainer->isFilterBarVisible());
 
     updateSplitAction();
 

-    QAction* editableLocactionAction = actionCollection()->action("editable_location");
+    QAction* editableLocactionAction = actionCollection()->action(QStringLiteral("editable_location"));

     const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
     editableLocactionAction->setChecked(urlNavigator->isUrlEditable());
 }
     const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
     editableLocactionAction->setChecked(urlNavigator->isUrlEditable());
 }


@@ -1338,7 +1333,7 @@ void DolphinMainWindow::createControlButton()
     Q_ASSERT(!m_controlButton);
 
     m_controlButton = new QToolButton(this);
     Q_ASSERT(!m_controlButton);
 
     m_controlButton = new QToolButton(this);

-    m_controlButton->setIcon(QIcon::fromTheme("applications-system"));
+    m_controlButton->setIcon(QIcon::fromTheme(QStringLiteral("application-menu")));

     m_controlButton->setText(i18nc("@action", "Control"));
     m_controlButton->setPopupMode(QToolButton::InstantPopup);
     m_controlButton->setToolButtonStyle(toolBar()->toolButtonStyle());
     m_controlButton->setText(i18nc("@action", "Control"));
     m_controlButton->setPopupMode(QToolButton::InstantPopup);
     m_controlButton->setToolButtonStyle(toolBar()->toolButtonStyle());


@@ -1419,7 +1414,7 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container)
     connect(view, &DolphinView::selectionChanged,
             this, &DolphinMainWindow::slotSelectionChanged);
     connect(view, &DolphinView::requestItemInfo,
     connect(view, &DolphinView::selectionChanged,
             this, &DolphinMainWindow::slotSelectionChanged);
     connect(view, &DolphinView::requestItemInfo,

-            this, &DolphinMainWindow::slotRequestItemInfo);
+            this, &DolphinMainWindow::requestItemInfo);

     connect(view, &DolphinView::tabRequested,
             this, &DolphinMainWindow::openNewTab);
     connect(view, &DolphinView::requestContextMenu,
     connect(view, &DolphinView::tabRequested,
             this, &DolphinMainWindow::openNewTab);
     connect(view, &DolphinView::requestContextMenu,


@@ -1428,6 +1423,8 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container)
             this, &DolphinMainWindow::enableStopAction);
     connect(view, &DolphinView::directoryLoadingCompleted,
             this, &DolphinMainWindow::disableStopAction);
             this, &DolphinMainWindow::enableStopAction);
     connect(view, &DolphinView::directoryLoadingCompleted,
             this, &DolphinMainWindow::disableStopAction);

+    connect(view, &DolphinView::directoryLoadingCompleted,
+            this, &DolphinMainWindow::slotDirectoryLoadingCompleted);

     connect(view, &DolphinView::goBackRequested,
             this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::goBack));
     connect(view, &DolphinView::goForwardRequested,
     connect(view, &DolphinView::goBackRequested,
             this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::goBack));
     connect(view, &DolphinView::goForwardRequested,


@@ -1446,22 +1443,22 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container)
 
 void DolphinMainWindow::updateSplitAction()
 {
 
 void DolphinMainWindow::updateSplitAction()
 {

-    QAction* splitAction = actionCollection()->action("split_view");
+    QAction* splitAction = actionCollection()->action(QStringLiteral("split_view"));

     const DolphinTabPage* tabPage = m_tabWidget->currentTabPage();
     if (tabPage->splitViewEnabled()) {
         if (tabPage->primaryViewActive()) {
             splitAction->setText(i18nc("@action:intoolbar Close left view", "Close"));
             splitAction->setToolTip(i18nc("@info", "Close left view"));
     const DolphinTabPage* tabPage = m_tabWidget->currentTabPage();
     if (tabPage->splitViewEnabled()) {
         if (tabPage->primaryViewActive()) {
             splitAction->setText(i18nc("@action:intoolbar Close left view", "Close"));
             splitAction->setToolTip(i18nc("@info", "Close left view"));

-            splitAction->setIcon(QIcon::fromTheme("view-left-close"));
+            splitAction->setIcon(QIcon::fromTheme(QStringLiteral("view-left-close")));

         } else {
             splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
             splitAction->setToolTip(i18nc("@info", "Close right view"));
         } else {
             splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
             splitAction->setToolTip(i18nc("@info", "Close right view"));

-            splitAction->setIcon(QIcon::fromTheme("view-right-close"));
+            splitAction->setIcon(QIcon::fromTheme(QStringLiteral("view-right-close")));

         }
     } else {
         splitAction->setText(i18nc("@action:intoolbar Split view", "Split"));
         splitAction->setToolTip(i18nc("@info", "Split view"));
         }
     } else {
         splitAction->setText(i18nc("@action:intoolbar Split view", "Split"));
         splitAction->setToolTip(i18nc("@info", "Split view"));

-        splitAction->setIcon(QIcon::fromTheme("view-right-new"));
+        splitAction->setIcon(QIcon::fromTheme(QStringLiteral("view-right-new")));

     }
 }
 
     }
 }