From: Artur Puzio <cytadela88@gmail.com>
Date: Wed, 16 Mar 2016 21:17:37 +0000 (+0100)
Subject: [CLAZY] Fixed all level 1 and level 2 warnings with small exceptions
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/5593c252e8d9638c86dcc2bb9edd394ea14f8ba1

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

REVIEW: 126771
---

diff --git a/src/dbusinterface.cpp b/src/dbusinterface.cpp
index 366fa9950..f9f1a6b22 100644
--- a/src/dbusinterface.cpp
+++ b/src/dbusinterface.cpp
@@ -29,8 +29,8 @@
 DBusInterface::DBusInterface() :
     QObject()
 {
-    QDBusConnection::sessionBus().registerService("org.freedesktop.FileManager1");
-    QDBusConnection::sessionBus().registerObject("/org/freedesktop/FileManager1", this,
+    QDBusConnection::sessionBus().registerService(QStringLiteral("org.freedesktop.FileManager1"));
+    QDBusConnection::sessionBus().registerObject(QStringLiteral("/org/freedesktop/FileManager1"), this,
             QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors);
 }
 
@@ -41,7 +41,7 @@ void DBusInterface::ShowFolders(const QStringList& uriList, const QString& start
     if (urls.isEmpty()) {
         return;
     }
-    KRun::run("dolphin %u", urls, nullptr);
+    KRun::run(QStringLiteral("dolphin %u"), urls, nullptr);
 }
 
 void DBusInterface::ShowItems(const QStringList& uriList, const QString& startUpId)
@@ -51,7 +51,7 @@ void DBusInterface::ShowItems(const QStringList& uriList, const QString& startUp
     if (urls.isEmpty()) {
         return;
     }
-    KRun::run("dolphin --select %u", urls, nullptr);
+    KRun::run(QStringLiteral("dolphin --select %u"), urls, nullptr);
 }
 
 void DBusInterface::ShowItemProperties(const QStringList& uriList, const QString& startUpId)
diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 0830d4b8b..dfec76144 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -139,14 +139,14 @@ void DolphinContextMenu::openTrashContextMenu()
 {
     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();
 
-    QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
+    QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));
     addAction(propertiesAction);
 
     addShowMenuBarAction();
@@ -170,14 +170,15 @@ void DolphinContextMenu::openTrashItemContextMenu()
     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);
 
-    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;
+        selectedUrls.reserve(m_selectedItems.count());
         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"));
-            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
-            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())) {
-                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();
-        } 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);
 
-            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);
 
-            openParentInNewTabAction = new QAction(QIcon::fromTheme("tab-new"),
+            openParentInNewTabAction = new QAction(QIcon::fromTheme(QStringLiteral("tab-new")),
                                                    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
-            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();
         }
@@ -267,7 +268,7 @@ void DolphinContextMenu::openItemContextMenu()
 
         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();
         }
     }
@@ -293,7 +294,7 @@ void DolphinContextMenu::openItemContextMenu()
     }
 
     // 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);
@@ -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.
-    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())) {
-        addToPlacesAction = addAction(QIcon::fromTheme("bookmark-new"),
+        addToPlacesAction = addAction(QIcon::fromTheme(QStringLiteral("bookmark-new")),
                                              i18nc("@action:inmenu Add current folder to places", "Add to Places"));
     }
 
@@ -358,7 +359,7 @@ void DolphinContextMenu::openViewportContextMenu()
 
     addCustomActions();
 
-    QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
+    QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));
     addAction(propertiesAction);
 
     addShowMenuBarAction();
@@ -388,7 +389,7 @@ void DolphinContextMenu::insertDefaultItemActions(const KFileItemListProperties&
     addSeparator();
 
     // Insert 'Rename'
-    QAction* renameAction = collection->action("rename");
+    QAction* renameAction = collection->action(QStringLiteral("rename"));
     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;
-            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) {
-            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());
@@ -443,7 +444,7 @@ QAction* DolphinContextMenu::createPasteAction()
         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 {
@@ -474,7 +475,7 @@ void DolphinContextMenu::addServiceActions(KFileItemActions& fileItemActions)
     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);
@@ -491,15 +492,15 @@ void DolphinContextMenu::addFileItemPluginActions()
 
     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;
     }
 
-    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) {
diff --git a/src/dolphindockwidget.cpp b/src/dolphindockwidget.cpp
index 1e83ef841..82cf91186 100644
--- a/src/dolphindockwidget.cpp
+++ b/src/dolphindockwidget.cpp
@@ -32,6 +32,8 @@ namespace {
  // Empty titlebar for the dock widgets when "Lock Layout" has been activated.
 class DolphinDockTitleBar : public QWidget
 {
+    Q_OBJECT
+
 public:
     DolphinDockTitleBar(QWidget* parent = 0) : QWidget(parent) {}
     virtual ~DolphinDockTitleBar() {}
@@ -91,3 +93,4 @@ bool DolphinDockWidget::isLocked() const
     return m_locked;
 }
 
+#include "dolphindockwidget.moc"
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 272a78f82..d4f2b06e7 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -96,7 +96,7 @@ DolphinMainWindow::DolphinMainWindow() :
     m_updateToolBarTimer(0),
     m_lastHandleUrlStatJob(0)
 {
-    setObjectName("Dolphin#");
+    setObjectName(QStringLiteral("Dolphin#"));
 
     connect(&DolphinNewFileMenuObserver::instance(), &DolphinNewFileMenuObserver::errorMessage,
             this, &DolphinMainWindow::showErrorMessage);
@@ -122,12 +122,12 @@ DolphinMainWindow::DolphinMainWindow() :
     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();
@@ -143,13 +143,13 @@ DolphinMainWindow::DolphinMainWindow() :
     setupDockWidgets();
 
     setupGUI(Keys | Save | Create | ToolBar);
-    stateChanged("new_file");
+    stateChanged(QStringLiteral("new_file"));
 
     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) {
@@ -242,7 +242,7 @@ void DolphinMainWindow::slotTerminalDirectoryChanged(const QUrl& url)
 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);
 }
 
@@ -252,7 +252,7 @@ void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection)
 
     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 {
@@ -267,13 +267,13 @@ 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);
     }
 
-    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);
@@ -282,13 +282,13 @@ void DolphinMainWindow::updateHistory()
 
 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()
 {
-    KRun::run("dolphin %u", QList<QUrl>(), this);
+    KRun::run(QStringLiteral("dolphin %u"), QList<QUrl>(), this);
 }
 
 void DolphinMainWindow::openNewActivatedTab()
@@ -329,7 +329,7 @@ void DolphinMainWindow::openInNewWindow()
     }
 
     if (!newWindowUrl.isEmpty()) {
-        KRun::run("dolphin %u", {newWindowUrl}, this);
+        KRun::run(QStringLiteral("dolphin %u"), {newWindowUrl}, this);
     }
 }
 
@@ -362,7 +362,7 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
         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);
 
@@ -535,12 +535,12 @@ void DolphinMainWindow::stopLoading()
 
 void DolphinMainWindow::enableStopAction()
 {
-    actionCollection()->action("stop")->setEnabled(true);
+    actionCollection()->action(QStringLiteral("stop"))->setEnabled(true);
 }
 
 void DolphinMainWindow::disableStopAction()
 {
-    actionCollection()->action("stop")->setEnabled(false);
+    actionCollection()->action(QStringLiteral("stop"))->setEnabled(false);
 }
 
 void DolphinMainWindow::showFilterBar()
@@ -552,7 +552,7 @@ void DolphinMainWindow::toggleEditLocation()
 {
     clearStatusBar();
 
-    QAction* action = actionCollection()->action("editable_location");
+    QAction* action = actionCollection()->action(QStringLiteral("editable_location"));
     KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
     urlNavigator->setUrlEditable(action->isChecked());
 }
@@ -656,12 +656,12 @@ void DolphinMainWindow::compareFiles()
     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('\"');
-    KRun::runCommand(command, "Kompare", "kompare", this);
+    KRun::runCommand(command, QStringLiteral("Kompare"), QStringLiteral("kompare"), this);
 }
 
 void DolphinMainWindow::toggleShowMenuBar()
@@ -765,7 +765,7 @@ void DolphinMainWindow::openContextMenu(const QPoint& pos,
 
     case DolphinContextMenu::OpenParentFolderInNewWindow: {
 
-        KRun::run("dolphin %u", {KIO::upUrl(item.url())}, this);
+        KRun::run(QStringLiteral("dolphin %u"), {KIO::upUrl(item.url())}, this);
         break;
     }
 
@@ -798,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) |
-                 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();
@@ -812,28 +812,28 @@ void DolphinMainWindow::updateControlMenu()
         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();
     }
 
-    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();
     }
 
-    addActionToMenu(ac->action("panels"), menu);
+    addActionToMenu(ac->action(QStringLiteral("panels")), 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();
@@ -844,15 +844,15 @@ void DolphinMainWindow::updateControlMenu()
     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);
-    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
@@ -905,7 +905,7 @@ void DolphinMainWindow::slotPlaceActivated(const QUrl& url)
 
 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)
@@ -940,9 +940,9 @@ void DolphinMainWindow::activeViewChanged(DolphinViewContainer* viewContainer)
 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)
@@ -971,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"));
-    menu->setIcon(QIcon::fromTheme("document-new"));
+    menu->setIcon(QIcon::fromTheme(QStringLiteral("document-new")));
     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);
 
-    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"));
     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));
 
-    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);
@@ -1017,12 +1017,12 @@ void DolphinMainWindow::setupActions()
 
     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);
 
-    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);
@@ -1030,28 +1030,28 @@ void DolphinMainWindow::setupActions()
     // 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);
 
-    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->setIcon(QIcon::fromTheme("view-refresh"));
+    reload->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh")));
     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->setIcon(QIcon::fromTheme("process-stop"));
+    stop->setIcon(QIcon::fromTheme(QStringLiteral("process-stop")));
     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);
 
-    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);
@@ -1063,20 +1063,20 @@ void DolphinMainWindow::setupActions()
     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->setIcon(QIcon::fromTheme("edit-undo"));
+    undoCloseTab->setIcon(QIcon::fromTheme(QStringLiteral("edit-undo")));
     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
@@ -1086,21 +1086,21 @@ void DolphinMainWindow::setupActions()
     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->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);
 
-    QAction* compareFiles = actionCollection()->addAction("compare_files");
+    QAction* compareFiles = actionCollection()->addAction(QStringLiteral("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);
 
-    QAction* openTerminal = actionCollection()->addAction("open_terminal");
+    QAction* openTerminal = actionCollection()->addAction(QStringLiteral("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);
 
@@ -1117,14 +1117,14 @@ void DolphinMainWindow::setupActions()
     QList<QKeySequence> prevTabKeys = KStandardShortcut::tabPrev();
     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);
 
-    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);
@@ -1132,19 +1132,19 @@ void DolphinMainWindow::setupActions()
     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->setIcon(QIcon::fromTheme("tab-new"));
+    openInNewTab->setIcon(QIcon::fromTheme(QStringLiteral("tab-new")));
     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->setIcon(QIcon::fromTheme("tab-new"));
+    openInNewTabs->setIcon(QIcon::fromTheme(QStringLiteral("tab-new")));
     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->setIcon(QIcon::fromTheme("window-new"));
+    openInNewWindow->setIcon(QIcon::fromTheme(QStringLiteral("window-new")));
     connect(openInNewWindow, &QAction::triggered, this, &DolphinMainWindow::openInNewWindow);
 }
 
@@ -1152,18 +1152,18 @@ void DolphinMainWindow::setupDockWidgets()
 {
     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->setActiveIcon(QIcon::fromTheme("object-unlocked"));
+    lockLayoutAction->setActiveIcon(QIcon::fromTheme(QStringLiteral("object-unlocked")));
     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);
-    infoDock->setObjectName("infoDock");
+    infoDock->setObjectName(QStringLiteral("infoDock"));
     infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     InformationPanel* infoPanel = new InformationPanel(infoDock);
     infoPanel->setCustomContextMenuActions({lockLayoutAction});
@@ -1171,7 +1171,7 @@ void DolphinMainWindow::setupDockWidgets()
     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,
@@ -1184,14 +1184,14 @@ void DolphinMainWindow::setupDockWidgets()
     // 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);
     foldersPanel->setCustomContextMenuActions({lockLayoutAction});
     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,
@@ -1207,7 +1207,7 @@ void DolphinMainWindow::setupDockWidgets()
 #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);
     terminalPanel->setCustomContextMenuActions({lockLayoutAction});
@@ -1219,7 +1219,7 @@ void DolphinMainWindow::setupDockWidgets()
             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,
@@ -1237,7 +1237,7 @@ void DolphinMainWindow::setupDockWidgets()
     // 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);
@@ -1245,13 +1245,13 @@ void DolphinMainWindow::setupDockWidgets()
     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);
-    connect(placesPanel, SIGNAL(placeMiddleClicked(QUrl)),
-            this, SLOT(openNewTab(QUrl)));
+    connect(placesPanel, &PlacesPanel::placeMiddleClicked,
+            this, &DolphinMainWindow::openNewTab);
     connect(placesPanel, &PlacesPanel::errorMessage,
             this, &DolphinMainWindow::showErrorMessage);
     connect(this, &DolphinMainWindow::urlChanged,
@@ -1265,14 +1265,14 @@ void DolphinMainWindow::setupDockWidgets()
 
     // 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->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
-    panelsMenu->addAction(ac->action("show_terminal_panel"));
+    panelsMenu->addAction(ac->action(QStringLiteral("show_terminal_panel")));
 #endif
     panelsMenu->addSeparator();
     panelsMenu->addAction(lockLayoutAction);
@@ -1282,16 +1282,16 @@ void DolphinMainWindow::updateEditActions()
 {
     const KFileItemList list = m_activeViewContainer->view()->selectedItems();
     if (list.isEmpty()) {
-        stateChanged("has_no_selection");
+        stateChanged(QStringLiteral("has_no_selection"));
     } else {
-        stateChanged("has_selection");
+        stateChanged(QStringLiteral("has_selection"));
 
         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* 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();
@@ -1308,12 +1308,12 @@ void DolphinMainWindow::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();
 
-    QAction* editableLocactionAction = actionCollection()->action("editable_location");
+    QAction* editableLocactionAction = actionCollection()->action(QStringLiteral("editable_location"));
     const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
     editableLocactionAction->setChecked(urlNavigator->isUrlEditable());
 }
@@ -1333,7 +1333,7 @@ void DolphinMainWindow::createControlButton()
     Q_ASSERT(!m_controlButton);
 
     m_controlButton = new QToolButton(this);
-    m_controlButton->setIcon(QIcon::fromTheme("application-menu"));
+    m_controlButton->setIcon(QIcon::fromTheme(QStringLiteral("application-menu")));
     m_controlButton->setText(i18nc("@action", "Control"));
     m_controlButton->setPopupMode(QToolButton::InstantPopup);
     m_controlButton->setToolButtonStyle(toolBar()->toolButtonStyle());
@@ -1443,22 +1443,22 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container)
 
 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"));
-            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"));
-            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"));
-        splitAction->setIcon(QIcon::fromTheme("view-right-new"));
+        splitAction->setIcon(QIcon::fromTheme(QStringLiteral("view-right-new")));
     }
 }
 
diff --git a/src/dolphinnewfilemenu.cpp b/src/dolphinnewfilemenu.cpp
index 87f0932d8..e6ad72078 100644
--- a/src/dolphinnewfilemenu.cpp
+++ b/src/dolphinnewfilemenu.cpp
@@ -26,7 +26,7 @@
 #include <KIO/Job>
 
 DolphinNewFileMenu::DolphinNewFileMenu(KActionCollection* collection, QObject* parent) :
-    KNewFileMenu(collection, "new_menu", parent)
+    KNewFileMenu(collection, QStringLiteral("new_menu"), parent)
 {
     DolphinNewFileMenuObserver::instance().attach(this);
 }
diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 1c0d611b9..01fe207f3 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -68,7 +68,7 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
     m_extension = new DolphinPartBrowserExtension(this);
 
     // make sure that other apps using this part find Dolphin's view-file-columns icons
-    KIconLoader::global()->addAppDir("dolphin");
+    KIconLoader::global()->addAppDir(QStringLiteral("dolphin"));
 
     m_view = new DolphinView(QUrl(), parentWidget);
     m_view->setTabsForFilesEnabled(true);
@@ -81,7 +81,7 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
     connect(m_view, &DolphinView::directoryLoadingProgress, this, &DolphinPart::updateProgress);
     connect(m_view, &DolphinView::errorMessage, this, &DolphinPart::slotErrorMessage);
 
-    setXMLFile("dolphinpart.rc");
+    setXMLFile(QStringLiteral("dolphinpart.rc"));
 
     connect(m_view, &DolphinView::infoMessage,
             this, &DolphinPart::slotMessage);
@@ -167,26 +167,26 @@ void DolphinPart::createActions()
     connect(m_newFileMenu->menu(), &QMenu::aboutToShow,
             this, &DolphinPart::updateNewMenu);
 
-    QAction *editMimeTypeAction = actionCollection()->addAction( "editMimeType" );
+    QAction *editMimeTypeAction = actionCollection()->addAction( QStringLiteral("editMimeType") );
     editMimeTypeAction->setText( i18nc("@action:inmenu Edit", "&Edit File Type..." ) );
     connect(editMimeTypeAction, &QAction::triggered, this, &DolphinPart::slotEditMimeType);
 
-    QAction* selectItemsMatching = actionCollection()->addAction("select_items_matching");
+    QAction* selectItemsMatching = actionCollection()->addAction(QStringLiteral("select_items_matching"));
     selectItemsMatching->setText(i18nc("@action:inmenu Edit", "Select Items Matching..."));
     actionCollection()->setDefaultShortcut(selectItemsMatching, Qt::CTRL | Qt::Key_S);
     connect(selectItemsMatching, &QAction::triggered, this, &DolphinPart::slotSelectItemsMatchingPattern);
 
-    QAction* unselectItemsMatching = actionCollection()->addAction("unselect_items_matching");
+    QAction* unselectItemsMatching = actionCollection()->addAction(QStringLiteral("unselect_items_matching"));
     unselectItemsMatching->setText(i18nc("@action:inmenu Edit", "Unselect Items Matching..."));
     connect(unselectItemsMatching, &QAction::triggered, this, &DolphinPart::slotUnselectItemsMatchingPattern);
 
-    actionCollection()->addAction(KStandardAction::SelectAll, "select_all", m_view, SLOT(selectAll()));
+    actionCollection()->addAction(KStandardAction::SelectAll, QStringLiteral("select_all"), m_view, SLOT(selectAll()));
 
-    QAction* unselectAll = actionCollection()->addAction("unselect_all");
+    QAction* unselectAll = actionCollection()->addAction(QStringLiteral("unselect_all"));
     unselectAll->setText(i18nc("@action:inmenu Edit", "Unselect All"));
     connect(unselectAll, &QAction::triggered, m_view, &DolphinView::clearSelection);
 
-    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, m_view, &DolphinView::invertSelection);
@@ -216,15 +216,15 @@ void DolphinPart::createActions()
                    goActionGroup);
 
     // Tools menu
-    m_findFileAction = actionCollection()->addAction("find_file");
+    m_findFileAction = actionCollection()->addAction(QStringLiteral("find_file"));
     m_findFileAction->setText(i18nc("@action:inmenu Tools", "Find File..."));
     actionCollection()->setDefaultShortcut(m_findFileAction, Qt::CTRL | Qt::Key_F);
-    m_findFileAction->setIcon(QIcon::fromTheme("edit-find"));
+    m_findFileAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-find")));
     connect(m_findFileAction, &QAction::triggered, this, &DolphinPart::slotFindFile);
 
-    if (KAuthorized::authorizeKAction("shell_access")) {
-        m_openTerminalAction = actionCollection()->addAction("open_terminal");
-        m_openTerminalAction->setIcon(QIcon::fromTheme("utilities-terminal"));
+    if (KAuthorized::authorizeKAction(QStringLiteral("shell_access"))) {
+        m_openTerminalAction = actionCollection()->addAction(QStringLiteral("open_terminal"));
+        m_openTerminalAction->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal")));
         m_openTerminalAction->setText(i18nc("@action:inmenu Tools", "Open &Terminal"));
         connect(m_openTerminalAction, &QAction::triggered, this, &DolphinPart::slotOpenTerminal);
         actionCollection()->setDefaultShortcut(m_openTerminalAction, Qt::Key_F4);
@@ -252,22 +252,22 @@ void DolphinPart::slotSelectionChanged(const KFileItemList& selection)
 {
     const bool hasSelection = !selection.isEmpty();
 
-    QAction* renameAction  = actionCollection()->action("rename");
-    QAction* moveToTrashAction = actionCollection()->action("move_to_trash");
-    QAction* deleteAction = actionCollection()->action("delete");
-    QAction* editMimeTypeAction = actionCollection()->action("editMimeType");
-    QAction* propertiesAction = actionCollection()->action("properties");
-    QAction* deleteWithTrashShortcut = actionCollection()->action("delete_shortcut"); // see DolphinViewActionHandler
+    QAction* renameAction  = actionCollection()->action(QStringLiteral("rename"));
+    QAction* moveToTrashAction = actionCollection()->action(QStringLiteral("move_to_trash"));
+    QAction* deleteAction = actionCollection()->action(QStringLiteral("delete"));
+    QAction* editMimeTypeAction = actionCollection()->action(QStringLiteral("editMimeType"));
+    QAction* propertiesAction = actionCollection()->action(QStringLiteral("properties"));
+    QAction* deleteWithTrashShortcut = actionCollection()->action(QStringLiteral("delete_shortcut")); // see DolphinViewActionHandler
 
     if (!hasSelection) {
-        stateChanged("has_no_selection");
+        stateChanged(QStringLiteral("has_no_selection"));
 
         emit m_extension->enableAction("cut", false);
         emit m_extension->enableAction("copy", false);
         deleteWithTrashShortcut->setEnabled(false);
         editMimeTypeAction->setEnabled(false);
     } else {
-        stateChanged("has_selection");
+        stateChanged(QStringLiteral("has_selection"));
 
         // TODO share this code with DolphinMainWindow::updateEditActions (and the desktop code)
         // in libkonq
@@ -294,7 +294,7 @@ void DolphinPart::updatePasteAction()
 
 KAboutData* DolphinPart::createAboutData()
 {
-    return new KAboutData("dolphinpart", i18nc("@title", "Dolphin Part"), "0.1");
+    return new KAboutData(QStringLiteral("dolphinpart"), i18nc("@title", "Dolphin Part"), QStringLiteral("0.1"));
 }
 
 bool DolphinPart::openUrl(const QUrl &url)
@@ -351,7 +351,7 @@ void DolphinPart::slotRequestItemInfo(const KFileItem& item)
         updateStatusBar();
     } else {
         const QString escapedText = Qt::convertFromPlainText(item.getStatusBarInfo());
-        ReadOnlyPart::setStatusBarText(QString("<qt>%1</qt>").arg(escapedText));
+        ReadOnlyPart::setStatusBarText(QStringLiteral("<qt>%1</qt>").arg(escapedText));
     }
 }
 
@@ -432,10 +432,10 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos,
             if (showDeleteAction && showMoveToTrashAction) {
                 delete m_removeAction;
                 m_removeAction = 0;
-                editActions.append(actionCollection()->action("move_to_trash"));
-                editActions.append(actionCollection()->action("delete"));
+                editActions.append(actionCollection()->action(QStringLiteral("move_to_trash")));
+                editActions.append(actionCollection()->action(QStringLiteral("delete")));
             } else if (showDeleteAction && !showMoveToTrashAction) {
-                editActions.append(actionCollection()->action("delete"));
+                editActions.append(actionCollection()->action(QStringLiteral("delete")));
             } else {
                 if (!m_removeAction)
                     m_removeAction = new DolphinRemoveAction(this, actionCollection());
@@ -447,7 +447,7 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos,
         }
 
         if (supportsMoving) {
-            editActions.append(actionCollection()->action("rename"));
+            editActions.append(actionCollection()->action(QStringLiteral("rename")));
         }
 
         // Normally KonqPopupMenu only shows the "Create new" submenu in the current view
@@ -458,7 +458,7 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos,
 
     }
 
-    actionGroups.insert("editactions", editActions);
+    actionGroups.insert(QStringLiteral("editactions"), editActions);
 
     emit m_extension->popupMenu(pos,
                                 items,
@@ -504,7 +504,7 @@ void DolphinPart::slotUnselectItemsMatchingPattern()
 void DolphinPart::openSelectionDialog(const QString& title, const QString& text, bool selectItems)
 {
     bool okClicked;
-    const QString pattern = QInputDialog::getText(m_view, title, text, QLineEdit::Normal, "*", &okClicked);
+    const QString pattern = QInputDialog::getText(m_view, title, text, QLineEdit::Normal, QStringLiteral("*"), &okClicked);
 
     if (okClicked && !pattern.isEmpty()) {
         QRegExp patternRegExp(pattern, Qt::CaseSensitive, QRegExp::Wildcard);
@@ -555,7 +555,7 @@ void DolphinPart::slotOpenTerminal()
 
 void DolphinPart::slotFindFile()
 {
-    KRun::run("kfind", {url()}, widget());
+    KRun::run(QStringLiteral("kfind"), {url()}, widget());
 }
 
 void DolphinPart::updateNewMenu()
@@ -570,7 +570,7 @@ void DolphinPart::updateNewMenu()
 void DolphinPart::updateStatusBar()
 {
     const QString escapedText = Qt::convertFromPlainText(m_view->statusBarText());
-    emit ReadOnlyPart::setStatusBarText(QString("<qt>%1</qt>").arg(escapedText));
+    emit ReadOnlyPart::setStatusBarText(QStringLiteral("<qt>%1</qt>").arg(escapedText));
 }
 
 void DolphinPart::updateProgress(int percent)
diff --git a/src/dolphinpart.h b/src/dolphinpart.h
index 9f0ed5570..48aff5602 100644
--- a/src/dolphinpart.h
+++ b/src/dolphinpart.h
@@ -98,7 +98,7 @@ protected:
     /**
      * We reimplement openUrl so no need to implement openFile.
      */
-    virtual bool openFile() { return true; }
+    virtual bool openFile() override { return true; }
 
 Q_SIGNALS:
     /**
diff --git a/src/dolphinrecenttabsmenu.cpp b/src/dolphinrecenttabsmenu.cpp
index 1087a38e4..c155632c6 100644
--- a/src/dolphinrecenttabsmenu.cpp
+++ b/src/dolphinrecenttabsmenu.cpp
@@ -25,19 +25,19 @@
 #include <QMenu>
 
 DolphinRecentTabsMenu::DolphinRecentTabsMenu(QObject* parent) :
-    KActionMenu(QIcon::fromTheme("edit-undo"), i18n("Recently Closed Tabs"), parent)
+    KActionMenu(QIcon::fromTheme(QStringLiteral("edit-undo")), i18n("Recently Closed Tabs"), parent)
 {
     setDelayed(false);
     setEnabled(false);
 
     m_clearListAction = new QAction(i18n("Empty Recently Closed Tabs"), this);
-    m_clearListAction->setIcon(QIcon::fromTheme("edit-clear-list"));
+    m_clearListAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-clear-list")));
     addAction(m_clearListAction);
 
     addSeparator();
 
-    connect(menu(), SIGNAL(triggered(QAction*)),
-            this, SLOT(handleAction(QAction*)));
+    connect(menu(), &QMenu::triggered,
+            this, &DolphinRecentTabsMenu::handleAction);
 }
 
 void DolphinRecentTabsMenu::rememberClosedTab(const QUrl& url, const QByteArray& state)
@@ -83,7 +83,7 @@ void DolphinRecentTabsMenu::handleAction(QAction* action)
         }
         emit closedTabsCountChanged(0);
     } else {
-        const QByteArray state = action->data().value<QByteArray>();
+        const QByteArray state = action->data().toByteArray();
         removeAction(action);
         delete action;
         action = 0;
diff --git a/src/dolphinremoveaction.cpp b/src/dolphinremoveaction.cpp
index 7ea4e4f79..c91d74579 100644
--- a/src/dolphinremoveaction.cpp
+++ b/src/dolphinremoveaction.cpp
@@ -46,10 +46,10 @@ void DolphinRemoveAction::update()
     // This is only done until the original action has been shown at least once. To
     // bypass this issue, the text and &-shortcut is applied manually.
     if (qApp->keyboardModifiers() & Qt::ShiftModifier) {
-        m_action = m_collection ? m_collection->action("delete") : 0;
+        m_action = m_collection ? m_collection->action(QStringLiteral("delete")) : 0;
         setText(i18nc("@action:inmenu", "&Delete"));
     } else {
-        m_action = m_collection ? m_collection->action("move_to_trash") : 0;
+        m_action = m_collection ? m_collection->action(QStringLiteral("move_to_trash")) : 0;
         setText(i18nc("@action:inmenu", "&Move to Trash"));
     }
 
diff --git a/src/dolphintabbar.cpp b/src/dolphintabbar.cpp
index dbd324db5..e909c36ae 100644
--- a/src/dolphintabbar.cpp
+++ b/src/dolphintabbar.cpp
@@ -39,8 +39,8 @@ DolphinTabBar::DolphinTabBar(QWidget* parent) :
     m_autoActivationTimer = new QTimer(this);
     m_autoActivationTimer->setSingleShot(true);
     m_autoActivationTimer->setInterval(800);
-    connect(m_autoActivationTimer, SIGNAL(timeout()),
-            this, SLOT(slotAutoActivationTimeout()));
+    connect(m_autoActivationTimer, &QTimer::timeout,
+            this, &DolphinTabBar::slotAutoActivationTimeout);
 }
 
 void DolphinTabBar::dragEnterEvent(QDragEnterEvent* event)
@@ -125,10 +125,10 @@ void DolphinTabBar::contextMenuEvent(QContextMenuEvent* event)
         // Tab context menu
         QMenu menu(this);
 
-        QAction* newTabAction = menu.addAction(QIcon::fromTheme("tab-new"), i18nc("@action:inmenu", "New Tab"));
-        QAction* detachTabAction = menu.addAction(QIcon::fromTheme("tab-detach"), i18nc("@action:inmenu", "Detach Tab"));
-        QAction* closeOtherTabsAction = menu.addAction(QIcon::fromTheme("tab-close-other"), i18nc("@action:inmenu", "Close Other Tabs"));
-        QAction* closeTabAction = menu.addAction(QIcon::fromTheme("tab-close"), i18nc("@action:inmenu", "Close Tab"));
+        QAction* newTabAction = menu.addAction(QIcon::fromTheme(QStringLiteral("tab-new")), i18nc("@action:inmenu", "New Tab"));
+        QAction* detachTabAction = menu.addAction(QIcon::fromTheme(QStringLiteral("tab-detach")), i18nc("@action:inmenu", "Detach Tab"));
+        QAction* closeOtherTabsAction = menu.addAction(QIcon::fromTheme(QStringLiteral("tab-close-other")), i18nc("@action:inmenu", "Close Other Tabs"));
+        QAction* closeTabAction = menu.addAction(QIcon::fromTheme(QStringLiteral("tab-close")), i18nc("@action:inmenu", "Close Tab"));
 
         QAction* selectedAction = menu.exec(event->globalPos());
         if (selectedAction == newTabAction) {
diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp
index 6d55ebeb2..0382341c8 100644
--- a/src/dolphintabpage.cpp
+++ b/src/dolphintabpage.cpp
@@ -40,10 +40,10 @@ DolphinTabPage::DolphinTabPage(const QUrl &primaryUrl, const QUrl &secondaryUrl,
 
     // Create a new primary view
     m_primaryViewContainer = createViewContainer(primaryUrl);
-    connect(m_primaryViewContainer->view(), SIGNAL(urlChanged(QUrl)),
-            this, SIGNAL(activeViewUrlChanged(QUrl)));
-    connect(m_primaryViewContainer->view(), SIGNAL(redirection(QUrl,QUrl)),
-            this, SLOT(slotViewUrlRedirection(QUrl,QUrl)));
+    connect(m_primaryViewContainer->view(), &DolphinView::urlChanged,
+            this, &DolphinTabPage::activeViewUrlChanged);
+    connect(m_primaryViewContainer->view(), &DolphinView::redirection,
+            this, &DolphinTabPage::slotViewUrlRedirection);
 
     m_splitter->addWidget(m_primaryViewContainer);
     m_primaryViewContainer->show();
@@ -302,14 +302,14 @@ void DolphinTabPage::slotViewActivated()
     const DolphinView* newActiveView = activeViewContainer()->view();
 
     if (newActiveView != oldActiveView) {
-        disconnect(oldActiveView, SIGNAL(urlChanged(QUrl)),
-                   this, SIGNAL(activeViewUrlChanged(QUrl)));
-        disconnect(oldActiveView, SIGNAL(redirection(QUrl,QUrl)),
-                   this, SLOT(slotViewUrlRedirection(QUrl,QUrl)));
-        connect(newActiveView, SIGNAL(urlChanged(QUrl)),
-                this, SIGNAL(activeViewUrlChanged(QUrl)));
-        connect(newActiveView, SIGNAL(redirection(QUrl,QUrl)),
-                this, SLOT(slotViewUrlRedirection(QUrl,QUrl)));
+        disconnect(oldActiveView, &DolphinView::urlChanged,
+                   this, &DolphinTabPage::activeViewUrlChanged);
+        disconnect(oldActiveView, &DolphinView::redirection,
+                   this, &DolphinTabPage::slotViewUrlRedirection);
+        connect(newActiveView, &DolphinView::urlChanged,
+                this, &DolphinTabPage::activeViewUrlChanged);
+        connect(newActiveView, &DolphinView::redirection,
+                this, &DolphinTabPage::slotViewUrlRedirection);
     }
 
     emit activeViewUrlChanged(activeViewContainer()->url());
@@ -329,8 +329,8 @@ DolphinViewContainer* DolphinTabPage::createViewContainer(const QUrl& url) const
     container->setActive(false);
 
     const DolphinView* view = container->view();
-    connect(view, SIGNAL(activated()),
-            this, SLOT(slotViewActivated()));
+    connect(view, &DolphinView::activated,
+            this, &DolphinTabPage::slotViewActivated);
 
     return container;
 }
diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp
index 0b1f07e0e..22674d1bd 100644
--- a/src/dolphintabwidget.cpp
+++ b/src/dolphintabwidget.cpp
@@ -24,6 +24,7 @@
 #include "dolphinviewcontainer.h"
 
 #include <QApplication>
+#include <QDropEvent>
 #include <KConfigGroup>
 #include <KShell>
 #include <kio/global.h>
@@ -33,18 +34,18 @@ DolphinTabWidget::DolphinTabWidget(QWidget* parent) :
     QTabWidget(parent),
     m_placesSelectorVisible(true)
 {
-    connect(this, SIGNAL(tabCloseRequested(int)),
-            this, SLOT(closeTab(int)));
-    connect(this, SIGNAL(currentChanged(int)),
-            this, SLOT(currentTabChanged(int)));
+    connect(this, &DolphinTabWidget::tabCloseRequested,
+            this, static_cast<void (DolphinTabWidget::*)(int)>(&DolphinTabWidget::closeTab));
+    connect(this, &DolphinTabWidget::currentChanged,
+            this, &DolphinTabWidget::currentTabChanged);
 
     DolphinTabBar* tabBar = new DolphinTabBar(this);
-    connect(tabBar, SIGNAL(openNewActivatedTab(int)),
-            this, SLOT(openNewActivatedTab(int)));
-    connect(tabBar, SIGNAL(tabDropEvent(int,QDropEvent*)),
-            this, SLOT(tabDropEvent(int,QDropEvent*)));
-    connect(tabBar, SIGNAL(tabDetachRequested(int)),
-            this, SLOT(detachTab(int)));
+    connect(tabBar, &DolphinTabBar::openNewActivatedTab,
+            this,  static_cast<void (DolphinTabWidget::*)(int)>(&DolphinTabWidget::openNewActivatedTab));
+    connect(tabBar, &DolphinTabBar::tabDropEvent,
+            this, &DolphinTabWidget::tabDropEvent);
+    connect(tabBar, &DolphinTabBar::tabDetachRequested,
+            this, &DolphinTabWidget::detachTab);
     tabBar->hide();
 
     setTabBar(tabBar);
@@ -141,10 +142,10 @@ void DolphinTabWidget::openNewTab(const QUrl& primaryUrl, const QUrl& secondaryU
 
     DolphinTabPage* tabPage = new DolphinTabPage(primaryUrl, secondaryUrl, this);
     tabPage->setPlacesSelectorVisible(m_placesSelectorVisible);
-    connect(tabPage, SIGNAL(activeViewChanged(DolphinViewContainer*)),
-            this, SIGNAL(activeViewChanged(DolphinViewContainer*)));
-    connect(tabPage, SIGNAL(activeViewUrlChanged(QUrl)),
-            this, SLOT(tabUrlChanged(QUrl)));
+    connect(tabPage, &DolphinTabPage::activeViewChanged,
+            this, &DolphinTabWidget::activeViewChanged);
+    connect(tabPage, &DolphinTabPage::activeViewUrlChanged,
+            this, &DolphinTabWidget::tabUrlChanged);
     addTab(tabPage, QIcon::fromTheme(KIO::iconNameForUrl(primaryUrl)), tabName(primaryUrl));
 
     if (focusWidget) {
@@ -335,7 +336,7 @@ void DolphinTabWidget::tabRemoved(int index)
 QString DolphinTabWidget::tabName(const QUrl& url) const
 {
     QString name;
-    if (url == QUrl("file:///")) {
+    if (url == QUrl(QStringLiteral("file:///"))) {
         name = '/';
     } else {
         name = url.adjusted(QUrl::StripTrailingSlash).fileName();
@@ -344,7 +345,7 @@ QString DolphinTabWidget::tabName(const QUrl& url) const
         } else {
             // Make sure that a '&' inside the directory name is displayed correctly
             // and not misinterpreted as a keyboard shortcut in QTabBar::setTabText()
-            name.replace('&', "&&");
+            name.replace('&', QLatin1String("&&"));
         }
     }
     return name;
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 6ceb18d6f..73ffd5c2d 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -576,16 +576,16 @@ void DolphinViewContainer::slotUrlNavigatorLocationChanged(const QUrl& url)
             // When an URL has been entered, the view should get the focus.
             // The focus must be requested asynchronously, as changing the URL might create
             // a new view widget.
-            QTimer::singleShot(0, this, SLOT(requestFocus()));
+            QTimer::singleShot(0, this, &DolphinViewContainer::requestFocus);
         }
     } else if (KProtocolManager::isSourceProtocol(url)) {
-        QString app = "konqueror";
+        QString app = QStringLiteral("konqueror");
         if (url.scheme().startsWith(QLatin1String("http"))) {
             showMessage(i18nc("@info:status", // krazy:exclude=qmethods
                               "Dolphin does not support web pages, the web browser has been launched"),
                         Information);
 
-            const KConfigGroup config(KSharedConfig::openConfig("kdeglobals"), "General");
+            const KConfigGroup config(KSharedConfig::openConfig(QStringLiteral("kdeglobals")), "General");
             const QString browser = config.readEntry("BrowserApplication");
             if (!browser.isEmpty()) {
                 app = browser;
@@ -654,7 +654,7 @@ void DolphinViewContainer::startSearching()
 {
     const QUrl url = m_searchBox->urlForSearching();
     if (url.isValid() && !url.isEmpty()) {
-        m_view->setViewPropertiesContext("search");
+        m_view->setViewPropertiesContext(QStringLiteral("search"));
         m_urlNavigator->setLocationUrl(url);
     }
 }
@@ -682,7 +682,7 @@ void DolphinViewContainer::showErrorMessage(const QString& msg)
 
 bool DolphinViewContainer::isSearchUrl(const QUrl& url) const
 {
-    return url.scheme().contains("search");
+    return url.scheme().contains(QStringLiteral("search"));
 }
 
 void DolphinViewContainer::saveViewState()
diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp
index 82d5f549e..caa2c1c92 100644
--- a/src/filterbar/filterbar.cpp
+++ b/src/filterbar/filterbar.cpp
@@ -35,7 +35,7 @@ FilterBar::FilterBar(QWidget* parent) :
     // Create close button
     QToolButton *closeButton = new QToolButton(this);
     closeButton->setAutoRaise(true);
-    closeButton->setIcon(QIcon::fromTheme("dialog-close"));
+    closeButton->setIcon(QIcon::fromTheme(QStringLiteral("dialog-close")));
     closeButton->setToolTip(i18nc("@info:tooltip", "Hide Filter Bar"));
     connect(closeButton, &QToolButton::clicked, this, &FilterBar::closeRequest);
 
@@ -43,7 +43,7 @@ FilterBar::FilterBar(QWidget* parent) :
     m_lockButton = new QToolButton(this);
     m_lockButton->setAutoRaise(true);
     m_lockButton->setCheckable(true);
-    m_lockButton->setIcon(QIcon::fromTheme("object-unlocked"));
+    m_lockButton->setIcon(QIcon::fromTheme(QStringLiteral("object-unlocked")));
     m_lockButton->setToolTip(i18nc("@info:tooltip", "Keep Filter When Changing Folders"));
     connect(m_lockButton, &QToolButton::toggled, this, &FilterBar::slotToggleLockButton);
 
@@ -102,9 +102,9 @@ void FilterBar::slotUrlChanged()
 void FilterBar::slotToggleLockButton(bool checked)
 {
     if (checked) {
-        m_lockButton->setIcon(QIcon::fromTheme("object-locked"));
+        m_lockButton->setIcon(QIcon::fromTheme(QStringLiteral("object-locked")));
     } else {
-        m_lockButton->setIcon(QIcon::fromTheme("object-unlocked"));
+        m_lockButton->setIcon(QIcon::fromTheme(QStringLiteral("object-unlocked")));
         clear();
     }
 }
diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp
index a740a3a23..1b6071820 100644
--- a/src/kitemviews/kfileitemlistview.cpp
+++ b/src/kitemviews/kfileitemlistview.cpp
@@ -166,7 +166,7 @@ QPixmap KFileItemListView::createDragPixmap(const KItemSet& indexes) const
     int x = 0;
     int y = 0;
 
-    foreach (int index, indexes) {
+    for (int index : indexes) {
         QPixmap pixmap = model()->data(index).value("iconPixmap").value<QPixmap>();
         if (pixmap.isNull()) {
             QIcon icon = QIcon::fromTheme(model()->data(index).value("iconName").toString());
diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index 8626f947d..1f94972c2 100644
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -112,7 +112,7 @@ KFileItemModel::KFileItemModel(QObject* parent) :
 KFileItemModel::~KFileItemModel()
 {
     qDeleteAll(m_itemData);
-    qDeleteAll(m_filteredItems.values());
+    qDeleteAll(m_filteredItems);
     qDeleteAll(m_pendingItemsToInsert);
 }
 
@@ -249,7 +249,7 @@ QMimeData* KFileItemModel::createMimeData(const KItemSet& indexes) const
     bool canUseMostLocalUrls = true;
     const ItemData* lastAddedItem = 0;
 
-    foreach (int index, indexes) {
+    for (int index : indexes) {
         const ItemData* itemData = m_itemData.at(index);
         const ItemData* parent = itemData->parent;
 
@@ -1102,7 +1102,7 @@ void KFileItemModel::slotClear()
     qCDebug(DolphinDebug) << "Clearing all items";
 #endif
 
-    qDeleteAll(m_filteredItems.values());
+    qDeleteAll(m_filteredItems);
     m_filteredItems.clear();
     m_groups.clear();
 
@@ -1550,7 +1550,7 @@ QHash<QByteArray, QVariant> KFileItemModel::retrieveData(const KFileItem& item,
     if (m_requestRole[DestinationRole]) {
         QString destination = item.linkDest();
         if (destination.isEmpty()) {
-            destination = QLatin1String("-");
+            destination = QStringLiteral("-");
         }
         data.insert(sharedValue("destination"), destination);
     }
@@ -1675,6 +1675,16 @@ public:
         m_collator.setNumericMode(other.m_collator.numericMode());
     }
 
+    ~KFileItemModelLessThan() = default;
+    //We do not delete m_model as the pointer was passed from outside ant it will be deleted elsewhere.
+
+    KFileItemModelLessThan& operator=(const KFileItemModelLessThan& other)
+    {
+        m_model = other.m_model;
+        m_collator = other.m_collator;
+        return *this;
+    }
+
     bool operator()(const KFileItemModel::ItemData* a, const KFileItemModel::ItemData* b) const
     {
         return m_model->lessThan(a, b, m_collator);
@@ -1852,13 +1862,14 @@ QList<QPair<int, QVariant> > KFileItemModel::nameRoleGroups() const
             if (newFirstChar.isLetter()) {
                 // Try to find a matching group in the range 'A' to 'Z'.
                 static std::vector<QChar> lettersAtoZ;
+                lettersAtoZ.reserve('Z' - 'A' + 1);
                 if (lettersAtoZ.empty()) {
                     for (char c = 'A'; c <= 'Z'; ++c) {
                         lettersAtoZ.push_back(QLatin1Char(c));
                     }
                 }
 
-                auto localeAwareLessThan = [this](const QChar& c1, const QChar& c2) -> bool {
+                auto localeAwareLessThan = [this](QChar c1, QChar c2) -> bool {
                     return m_collator.compare(c1, c2) < 0;
                 };
 
diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index 9f89de8e7..e5353dc2a 100644
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -100,9 +100,9 @@ KFileItemModelRolesUpdater::KFileItemModelRolesUpdater(KFileItemModel* model, QO
 
     const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");
     m_enabledPlugins = globalConfig.readEntry("Plugins", QStringList()
-                                                         << "directorythumbnail"
-                                                         << "imagethumbnail"
-                                                         << "jpegthumbnail");
+                                                         << QStringLiteral("directorythumbnail")
+                                                         << QStringLiteral("imagethumbnail")
+                                                         << QStringLiteral("jpegthumbnail"));
 
     connect(m_model, &KFileItemModel::itemsInserted,
             this,    &KFileItemModelRolesUpdater::slotItemsInserted);
@@ -635,7 +635,7 @@ void KFileItemModelRolesUpdater::resolveNextSortRole()
 
     if (!m_pendingSortRoleItems.isEmpty()) {
         applySortProgressToModel();
-        QTimer::singleShot(0, this, SLOT(resolveNextSortRole()));
+        QTimer::singleShot(0, this, &KFileItemModelRolesUpdater::resolveNextSortRole);
     } else {
         m_state = Idle;
 
@@ -670,7 +670,7 @@ void KFileItemModelRolesUpdater::resolveNextPendingRoles()
     }
 
     if (!m_pendingIndexes.isEmpty()) {
-        QTimer::singleShot(0, this, SLOT(resolveNextPendingRoles()));
+        QTimer::singleShot(0, this, &KFileItemModelRolesUpdater::resolveNextPendingRoles);
     } else {
         m_state = Idle;
 
@@ -829,7 +829,7 @@ void KFileItemModelRolesUpdater::startUpdating()
         m_pendingIndexes = indexes;
         // Trigger the asynchronous resolving of all roles.
         m_state = ResolvingAllRoles;
-        QTimer::singleShot(0, this, SLOT(resolveNextPendingRoles()));
+        QTimer::singleShot(0, this, &KFileItemModelRolesUpdater::resolveNextPendingRoles);
     }
 }
 
@@ -864,7 +864,7 @@ void KFileItemModelRolesUpdater::startPreviewJob()
     m_state = PreviewJobRunning;
 
     if (m_pendingPreviewItems.isEmpty()) {
-        QTimer::singleShot(0, this, SLOT(slotPreviewJobFinished()));
+        QTimer::singleShot(0, this, &KFileItemModelRolesUpdater::slotPreviewJobFinished);
         return;
     }
 
@@ -941,7 +941,7 @@ void KFileItemModelRolesUpdater::updateChangedItems()
             // asynchronous determination of the sort role.
             killPreviewJob();
             m_state = ResolvingSortRole;
-            QTimer::singleShot(0, this, SLOT(resolveNextSortRole()));
+            QTimer::singleShot(0, this, &KFileItemModelRolesUpdater::resolveNextSortRole);
         }
 
         return;
@@ -985,7 +985,7 @@ void KFileItemModelRolesUpdater::updateChangedItems()
         if (!resolvingInProgress) {
             // Trigger the asynchronous resolving of the changed roles.
             m_state = ResolvingAllRoles;
-            QTimer::singleShot(0, this, SLOT(resolveNextPendingRoles()));
+            QTimer::singleShot(0, this, &KFileItemModelRolesUpdater::resolveNextPendingRoles);
         }
     }
 }
diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp
index 94b49dbde..69a0a5f27 100644
--- a/src/kitemviews/kitemlistcontainer.cpp
+++ b/src/kitemviews/kitemlistcontainer.cpp
@@ -43,6 +43,8 @@
  */
 class KItemListContainerViewport : public QGraphicsView
 {
+    Q_OBJECT
+
 public:
     KItemListContainerViewport(QGraphicsScene* scene, QWidget* parent);
 protected:
@@ -425,3 +427,4 @@ void KItemListContainer::updateScrollOffsetScrollBarPolicy()
     }
 }
 
+#include "kitemlistcontainer.moc"
diff --git a/src/kitemviews/kitemlistselectionmanager.cpp b/src/kitemviews/kitemlistselectionmanager.cpp
index 46b77f7e4..46ffe7c13 100644
--- a/src/kitemviews/kitemlistselectionmanager.cpp
+++ b/src/kitemviews/kitemlistselectionmanager.cpp
@@ -259,7 +259,7 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges)
         const KItemSet previous = m_selectedItems;
         m_selectedItems.clear();
 
-        foreach (int index, previous) {
+        for (int index: previous) {
             int inc = 0;
             foreach (const KItemRange& itemRange, itemRanges) {
                 if (index < itemRange.index) {
@@ -308,7 +308,7 @@ void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges)
         const KItemSet previous = m_selectedItems;
         m_selectedItems.clear();
 
-        foreach (int oldIndex, previous) {
+        for (int oldIndex : previous) {
             const int index = indexAfterRangesRemoving(oldIndex, itemRanges, DiscardRemovedIndex);
             if (index >= 0)  {
                 m_selectedItems.insert(index);
@@ -354,7 +354,7 @@ void KItemListSelectionManager::itemsMoved(const KItemRange& itemRange, const QL
         const KItemSet previous = m_selectedItems;
         m_selectedItems.clear();
 
-        foreach (int index, previous) {
+        for (int index : previous) {
             if (index >= itemRange.index && index < itemRange.index + itemRange.count) {
                 m_selectedItems.insert(movedToIndexes.at(index - itemRange.index));
             }
diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp
index 7b1605a0c..f8630218f 100644
--- a/src/kitemviews/kitemlistviewaccessible.cpp
+++ b/src/kitemviews/kitemlistviewaccessible.cpp
@@ -146,7 +146,9 @@ QString KItemListViewAccessible::rowDescription(int) const
 QList<QAccessibleInterface*> KItemListViewAccessible::selectedCells() const
 {
     QList<QAccessibleInterface*> cells;
-    Q_FOREACH (int index, view()->controller()->selectionManager()->selectedItems()) {
+    const auto items = view()->controller()->selectionManager()->selectedItems();
+    cells.reserve(items.count());
+    for (int index : items) {
         cells.append(cell(index));
     }
     return cells;
@@ -248,7 +250,7 @@ QRect KItemListViewAccessible::rect() const
 
     const QGraphicsScene* scene = view()->scene();
     if (scene) {
-        const QPoint origin = scene->views()[0]->mapToGlobal(QPoint(0, 0));
+        const QPoint origin = scene->views().at(0)->mapToGlobal(QPoint(0, 0));
         const QRect viewRect = view()->geometry().toRect();
         return viewRect.translated(origin);
     } else {
diff --git a/src/kitemviews/kitemlistwidget.h b/src/kitemviews/kitemlistwidget.h
index ae99a1f29..d1ea7c9da 100644
--- a/src/kitemviews/kitemlistwidget.h
+++ b/src/kitemviews/kitemlistwidget.h
@@ -142,7 +142,7 @@ public:
      *         or KItemListWidget::expansionToggleRect().
      * @reimp
      */
-    virtual bool contains(const QPointF& point) const;
+    virtual bool contains(const QPointF& point) const override;
 
     /**
      * @return Rectangle for the area that shows the icon.
diff --git a/src/kitemviews/kitemset.h b/src/kitemviews/kitemset.h
index 385010f7d..31fe1d249 100644
--- a/src/kitemviews/kitemset.h
+++ b/src/kitemviews/kitemset.h
@@ -45,6 +45,8 @@ class KItemSet
 public:
     KItemSet();
     KItemSet(const KItemSet& other);
+    ~KItemSet();
+    KItemSet& operator=(const KItemSet& other);
 
     /**
      * Returns the number of items in the set.
@@ -80,6 +82,8 @@ public:
             return *this;
         }
 
+        ~iterator() = default;
+
         int operator*() const
         {
             return m_rangeIt->index + m_offset;
@@ -170,6 +174,8 @@ public:
             return *this;
         }
 
+        ~const_iterator() = default;
+
         int operator*() const
         {
             return m_rangeIt->index + m_offset;
@@ -297,6 +303,14 @@ inline KItemSet::KItemSet(const KItemSet& other) :
 {
 }
 
+inline KItemSet::~KItemSet() = default;
+
+inline KItemSet& KItemSet::operator=(const KItemSet& other)
+{
+    m_itemRanges=other.m_itemRanges;
+    return *this;
+}
+
 inline int KItemSet::count() const
 {
     int result = 0;
diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index 1112460a9..66131d5fa 100644
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -684,7 +684,7 @@ void KStandardItemListWidget::dataChanged(const QHash<QByteArray, QVariant>& cur
     // The URL might have changed (i.e., if the sort order of the items has
     // been changed). Therefore, the "is cut" state must be updated.
     KFileItemClipboard* clipboard = KFileItemClipboard::instance();
-    const QUrl itemUrl = data().value("url").value<QUrl>();
+    const QUrl itemUrl = data().value("url").toUrl();
     m_isCut = clipboard->isCut(itemUrl);
 
     // The icon-state might depend from other roles and hence is
@@ -835,7 +835,7 @@ void KStandardItemListWidget::showEvent(QShowEvent* event)
     // Listen to changes of the clipboard to mark the item as cut/uncut
     KFileItemClipboard* clipboard = KFileItemClipboard::instance();
 
-    const QUrl itemUrl = data().value("url").value<QUrl>();
+    const QUrl itemUrl = data().value("url").toUrl();
     m_isCut = clipboard->isCut(itemUrl);
 
     connect(clipboard, &KFileItemClipboard::cutItemsChanged,
@@ -852,7 +852,7 @@ void KStandardItemListWidget::hideEvent(QHideEvent* event)
 
 void KStandardItemListWidget::slotCutItemsChanged()
 {
-    const QUrl itemUrl = data().value("url").value<QUrl>();
+    const QUrl itemUrl = data().value("url").toUrl();
     const bool isCut = KFileItemClipboard::instance()->isCut(itemUrl);
     if (m_isCut != isCut) {
         m_isCut = isCut;
@@ -951,7 +951,7 @@ void KStandardItemListWidget::updatePixmapCache()
             if (iconName.isEmpty()) {
                 // The icon-name has not been not resolved by KFileItemModelRolesUpdater,
                 // use a generic icon as fallback
-                iconName = QLatin1String("unknown");
+                iconName = QStringLiteral("unknown");
             }
             const QStringList overlays = values["iconOverlays"].toStringList();
             m_pixmap = pixmapForIcon(iconName, overlays, maxIconHeight);
@@ -1390,7 +1390,7 @@ void KStandardItemListWidget::drawSiblingsInformation(QPainter* painter)
             if (m_isExpandable) {
                 option.state |= QStyle::State_Children;
             }
-            if (data()["isExpanded"].toBool()) {
+            if (data().value("isExpanded").toBool()) {
                 option.state |= QStyle::State_Open;
             }
             isItemSibling = false;
@@ -1441,7 +1441,7 @@ void KStandardItemListWidget::closeRoleEditor()
 QPixmap KStandardItemListWidget::pixmapForIcon(const QString& name, const QStringList& overlays, int size)
 {
     size *= qApp->devicePixelRatio();
-    const QString key = "KStandardItemListWidget:" % name % ":" % overlays.join(":") % ":" % QString::number(size);
+    const QString key = "KStandardItemListWidget:" % name % ":" % overlays.join(QStringLiteral(":")) % ":" % QString::number(size);
     QPixmap pixmap;
 
     if (!QPixmapCache::find(key, pixmap)) {
diff --git a/src/kitemviews/kstandarditemlistwidget.h b/src/kitemviews/kstandarditemlistwidget.h
index b47644172..9ab5d4c8f 100644
--- a/src/kitemviews/kstandarditemlistwidget.h
+++ b/src/kitemviews/kstandarditemlistwidget.h
@@ -104,7 +104,7 @@ public:
     void setSupportsItemExpanding(bool supportsItemExpanding);
     bool supportsItemExpanding() const;
 
-    virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
+    virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override;
 
     virtual QRectF iconRect() const Q_DECL_OVERRIDE;
     virtual QRectF textRect() const Q_DECL_OVERRIDE;
diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp
index b49499483..e0b889e6c 100644
--- a/src/kitemviews/private/kbaloorolesprovider.cpp
+++ b/src/kitemviews/private/kbaloorolesprovider.cpp
@@ -158,7 +158,7 @@ KBalooRolesProvider::KBalooRolesProvider() :
 
 QString KBalooRolesProvider::tagsFromValues(const QStringList& values) const
 {
-    return values.join(", ");
+    return values.join(QStringLiteral(", "));
 }
 
 QString KBalooRolesProvider::orientationFromValue(int value) const
@@ -183,6 +183,6 @@ QString KBalooRolesProvider::durationFromValue(int value) const
 {
     QTime duration;
     duration = duration.addSecs(value);
-    return duration.toString("hh:mm:ss");
+    return duration.toString(QStringLiteral("hh:mm:ss"));
 }
 
diff --git a/src/kitemviews/private/kfileitemclipboard.cpp b/src/kitemviews/private/kfileitemclipboard.cpp
index e12767853..d27869dff 100644
--- a/src/kitemviews/private/kfileitemclipboard.cpp
+++ b/src/kitemviews/private/kfileitemclipboard.cpp
@@ -63,7 +63,7 @@ void KFileItemClipboard::updateCutItems()
         return;
     }
 
-    const QByteArray data = mimeData->data("application/x-kde-cutselection");
+    const QByteArray data = mimeData->data(QStringLiteral("application/x-kde-cutselection"));
     const bool isCutSelection = (!data.isEmpty() && data.at(0) == QLatin1Char('1'));
     if (isCutSelection) {
         m_cutItems = KUrlMimeData::urlsFromMimeData(mimeData).toSet();
diff --git a/src/kitemviews/private/kitemlistselectiontoggle.cpp b/src/kitemviews/private/kitemlistselectiontoggle.cpp
index d4081a690..1429cb9ef 100644
--- a/src/kitemviews/private/kitemlistselectiontoggle.cpp
+++ b/src/kitemviews/private/kitemlistselectiontoggle.cpp
@@ -89,7 +89,7 @@ void KItemListSelectionToggle::resizeEvent(QGraphicsSceneResizeEvent* event)
 
 void KItemListSelectionToggle::updatePixmap()
 {
-    const QString icon = m_checked ? "list-remove" : "list-add";
+    const QString icon = m_checked ? QStringLiteral("list-remove") : QStringLiteral("list-add");
     const KIconLoader::States state = m_hovered ? KIconLoader::ActiveState : KIconLoader::DisabledState;
     m_pixmap = KIconLoader::global()->loadIcon(icon, KIconLoader::Desktop, iconSize(), state);
 }
diff --git a/src/main.cpp b/src/main.cpp
index 9610753d8..0bbae97fc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -39,7 +39,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
 {
     QApplication app(argc, argv);
     app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
-    app.setWindowIcon(QIcon::fromTheme("system-file-manager"));
+    app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager")));
 
     KCrash::initialize();
 
@@ -50,44 +50,44 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
 
     KLocalizedString::setApplicationDomain("dolphin");
 
-    KAboutData aboutData("dolphin", i18n("Dolphin"), QStringLiteral(DOLPHIN_VERSION_STRING),
+    KAboutData aboutData(QStringLiteral("dolphin"), i18n("Dolphin"), QStringLiteral(DOLPHIN_VERSION_STRING),
                          i18nc("@title", "File Manager"),
                          KAboutLicense::GPL,
                          i18nc("@info:credit", "(C) 2006-2016 Peter Penz, Frank Reininghaus, and Emmanuel Pescosta"));
-    aboutData.setHomepage("http://dolphin.kde.org");
+    aboutData.setHomepage(QStringLiteral("http://dolphin.kde.org"));
     aboutData.addAuthor(i18nc("@info:credit", "Emmanuel Pescosta"),
                         i18nc("@info:credit", "Maintainer (since 2014) and developer"),
-                        "emmanuelpescosta099@gmail.com");
+                        QStringLiteral("emmanuelpescosta099@gmail.com"));
     aboutData.addAuthor(i18nc("@info:credit", "Frank Reininghaus"),
                         i18nc("@info:credit", "Maintainer (2012-2014) and developer"),
-                        "frank78ac@googlemail.com");
+                        QStringLiteral("frank78ac@googlemail.com"));
     aboutData.addAuthor(i18nc("@info:credit", "Peter Penz"),
                         i18nc("@info:credit", "Maintainer and developer (2006-2012)"),
-                        "peter.penz19@gmail.com");
+                        QStringLiteral("peter.penz19@gmail.com"));
     aboutData.addAuthor(i18nc("@info:credit", "Sebastian Trüg"),
                         i18nc("@info:credit", "Developer"),
-                        "trueg@kde.org");
+                        QStringLiteral("trueg@kde.org"));
     aboutData.addAuthor(i18nc("@info:credit", "David Faure"),
                         i18nc("@info:credit", "Developer"),
-                        "faure@kde.org");
+                        QStringLiteral("faure@kde.org"));
     aboutData.addAuthor(i18nc("@info:credit", "Aaron J. Seigo"),
                         i18nc("@info:credit", "Developer"),
-                        "aseigo@kde.org");
+                        QStringLiteral("aseigo@kde.org"));
     aboutData.addAuthor(i18nc("@info:credit", "Rafael Fernández López"),
                         i18nc("@info:credit", "Developer"),
-                        "ereslibre@kde.org");
+                        QStringLiteral("ereslibre@kde.org"));
     aboutData.addAuthor(i18nc("@info:credit", "Kevin Ottens"),
                         i18nc("@info:credit", "Developer"),
-                        "ervin@kde.org");
+                        QStringLiteral("ervin@kde.org"));
     aboutData.addAuthor(i18nc("@info:credit", "Holger Freyther"),
                         i18nc("@info:credit", "Developer"),
-                        "freyther@gmx.net");
+                        QStringLiteral("freyther@gmx.net"));
     aboutData.addAuthor(i18nc("@info:credit", "Max Blazejak"),
                         i18nc("@info:credit", "Developer"),
-                        "m43ksrocks@gmail.com");
+                        QStringLiteral("m43ksrocks@gmail.com"));
     aboutData.addAuthor(i18nc("@info:credit", "Michael Austin"),
                         i18nc("@info:credit", "Documentation"),
-                        "tuxedup@users.sourceforge.net");
+                        QStringLiteral("tuxedup@users.sourceforge.net"));
 
     KAboutData::setApplicationData(aboutData);
 
@@ -100,16 +100,16 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
     aboutData.setupCommandLine(&parser);
 
     // command line options
-    parser.addOption(QCommandLineOption(QStringList() << QLatin1String("select"), i18nc("@info:shell", "The files and directories passed as arguments "
+    parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("select"), i18nc("@info:shell", "The files and directories passed as arguments "
                                                                                         "will be selected.")));
-    parser.addOption(QCommandLineOption(QStringList() << QLatin1String("split"), i18nc("@info:shell", "Dolphin will get started with a split view.")));
-    parser.addOption(QCommandLineOption(QStringList() << QLatin1String("daemon"), i18nc("@info:shell", "Start Dolphin Daemon (only required for DBus Interface)")));
-    parser.addPositionalArgument(QLatin1String("+[Url]"), i18nc("@info:shell", "Document to open"));
+    parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("split"), i18nc("@info:shell", "Dolphin will get started with a split view.")));
+    parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("daemon"), i18nc("@info:shell", "Start Dolphin Daemon (only required for DBus Interface)")));
+    parser.addPositionalArgument(QStringLiteral("+[Url]"), i18nc("@info:shell", "Document to open"));
 
     parser.process(app);
     aboutData.processCommandLine(&parser);
 
-    if (parser.isSet("daemon")) {
+    if (parser.isSet(QStringLiteral("daemon"))) {
         return app.exec();
     }
 
@@ -121,7 +121,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
         urls.append(Dolphin::homeUrl());
     }
 
-    const bool splitView = parser.isSet("split") || GeneralSettings::splitView();
+    const bool splitView = parser.isSet(QStringLiteral("split")) || GeneralSettings::splitView();
     if (splitView && urls.size() < 2) {
         // Split view does only make sense if we have at least 2 URLs
         urls.append(urls.last());
@@ -130,7 +130,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
     DolphinMainWindow* mainWindow = new DolphinMainWindow();
     mainWindow->setAttribute(Qt::WA_DeleteOnClose);
 
-    if (parser.isSet("select")) {
+    if (parser.isSet(QStringLiteral("select"))) {
         mainWindow->openFiles(urls, splitView);
     } else {
         mainWindow->openDirectories(urls, splitView);
diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp
index 13df9019b..3ad1bf3ff 100644
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -109,7 +109,7 @@ void FoldersPanel::rename(const KFileItem& item)
 
 bool FoldersPanel::urlChanged()
 {
-    if (!url().isValid() || url().scheme().contains("search")) {
+    if (!url().isValid() || url().scheme().contains(QStringLiteral("search"))) {
         // Skip results shown by a search, as possible identical
         // directory names are useless without parent-path information.
         return false;
@@ -274,7 +274,7 @@ void FoldersPanel::slotLoadingCompleted()
         // animations.
         // TODO: Check whether it makes sense to allow accessing the
         // view-internal delay for usecases like this.
-        QTimer::singleShot(250, this, SLOT(startFadeInAnimation()));
+        QTimer::singleShot(250, this, &FoldersPanel::startFadeInAnimation);
     }
 
     if (!m_updateCurrentItem) {
diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp
index e45fcd67e..ec4186db2 100644
--- a/src/panels/folders/treeviewcontextmenu.cpp
+++ b/src/panels/folders/treeviewcontextmenu.cpp
@@ -64,17 +64,17 @@ void TreeViewContextMenu::open()
         KFileItemListProperties capabilities(KFileItemList() << m_fileItem);
 
         // insert 'Cut', 'Copy' and 'Paste'
-        QAction* cutAction = new QAction(QIcon::fromTheme("edit-cut"), i18nc("@action:inmenu", "Cut"), this);
+        QAction* cutAction = new QAction(QIcon::fromTheme(QStringLiteral("edit-cut")), i18nc("@action:inmenu", "Cut"), this);
         cutAction->setEnabled(capabilities.supportsMoving());
         connect(cutAction, &QAction::triggered, this, &TreeViewContextMenu::cut);
 
-        QAction* copyAction = new QAction(QIcon::fromTheme("edit-copy"), i18nc("@action:inmenu", "Copy"), this);
+        QAction* copyAction = new QAction(QIcon::fromTheme(QStringLiteral("edit-copy")), i18nc("@action:inmenu", "Copy"), this);
         connect(copyAction, &QAction::triggered, this, &TreeViewContextMenu::copy);
 
         const QMimeData *mimeData = QApplication::clipboard()->mimeData();
         bool canPaste;
         const QString text = KIO::pasteActionText(mimeData, &canPaste, m_fileItem);
-        QAction* pasteAction = new QAction(QIcon::fromTheme("edit-paste"), text, this);
+        QAction* pasteAction = new QAction(QIcon::fromTheme(QStringLiteral("edit-paste")), text, this);
         connect(pasteAction, &QAction::triggered, this, &TreeViewContextMenu::paste);
         pasteAction->setEnabled(canPaste);
 
@@ -86,18 +86,18 @@ void TreeViewContextMenu::open()
         // insert 'Rename'
         QAction* renameAction = new QAction(i18nc("@action:inmenu", "Rename..."), this);
         renameAction->setEnabled(capabilities.supportsMoving());
-        renameAction->setIcon(QIcon::fromTheme("edit-rename"));
+        renameAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-rename")));
         connect(renameAction, &QAction::triggered, this, &TreeViewContextMenu::rename);
         popup->addAction(renameAction);
 
         // insert 'Move to Trash' and (optionally) 'Delete'
-        KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals);
+        KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig(QStringLiteral("kdeglobals"), KConfig::IncludeGlobals);
         KConfigGroup configGroup(globalConfig, "KDE");
         bool showDeleteCommand = configGroup.readEntry("ShowDeleteCommand", false);
 
         const QUrl url = m_fileItem.url();
         if (url.isLocalFile()) {
-            QAction* moveToTrashAction = new QAction(QIcon::fromTheme("user-trash"),
+            QAction* moveToTrashAction = new QAction(QIcon::fromTheme(QStringLiteral("user-trash")),
                                                     i18nc("@action:inmenu", "Move to Trash"), this);
             const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving();
             moveToTrashAction->setEnabled(enableMoveToTrash);
@@ -108,7 +108,7 @@ void TreeViewContextMenu::open()
         }
 
         if (showDeleteCommand) {
-            QAction* deleteAction = new QAction(QIcon::fromTheme("edit-delete"), i18nc("@action:inmenu", "Delete"), this);
+            QAction* deleteAction = new QAction(QIcon::fromTheme(QStringLiteral("edit-delete")), i18nc("@action:inmenu", "Delete"), this);
             deleteAction->setEnabled(capabilities.supportsDeleting());
             connect(deleteAction, &QAction::triggered, this, &TreeViewContextMenu::deleteItem);
             popup->addAction(deleteAction);
@@ -136,7 +136,7 @@ void TreeViewContextMenu::open()
     if (!m_fileItem.isNull()) {
         // insert 'Properties' entry
         QAction* propertiesAction = new QAction(i18nc("@action:inmenu", "Properties"), this);
-        propertiesAction->setIcon(QIcon::fromTheme("document-properties"));
+        propertiesAction->setIcon(QIcon::fromTheme(QStringLiteral("document-properties")));
         connect(propertiesAction, &QAction::triggered, this, &TreeViewContextMenu::showProperties);
         popup->addAction(propertiesAction);
     }
@@ -199,7 +199,7 @@ void TreeViewContextMenu::moveToTrash()
     uiDelegate.setWindow(m_parent);
     if (uiDelegate.askDeleteConfirmation(list, KIO::JobUiDelegate::Trash, KIO::JobUiDelegate::DefaultConfirmation)) {
         KIO::Job* job = KIO::trash(list);
-        KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Trash, list, QUrl("trash:/"), job);
+        KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Trash, list, QUrl(QStringLiteral("trash:/")), job);
         KJobWidgets::setWindow(job, m_parent);
         job->ui()->setAutoErrorHandlingEnabled(true);
     }
diff --git a/src/panels/information/filemetadataconfigurationdialog.cpp b/src/panels/information/filemetadataconfigurationdialog.cpp
index 2f8c16037..5671d34ef 100644
--- a/src/panels/information/filemetadataconfigurationdialog.cpp
+++ b/src/panels/information/filemetadataconfigurationdialog.cpp
@@ -46,8 +46,8 @@ FileMetaDataConfigurationDialog::FileMetaDataConfigurationDialog(QWidget* parent
     QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
     okButton->setDefault(true);
     okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
-    connect(buttonBox, SIGNAL(accepted()), this, SLOT(slotAccepted()));
-    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &FileMetaDataConfigurationDialog::slotAccepted);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &FileMetaDataConfigurationDialog::reject);
     buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
 
     m_descriptionLabel = new QLabel(i18nc("@label::textbox",
@@ -68,16 +68,16 @@ FileMetaDataConfigurationDialog::FileMetaDataConfigurationDialog(QWidget* parent
     topLayout->addWidget(m_configWidget);
     mainLayout->addWidget(mainWidget);
     mainLayout->addWidget(buttonBox);
-    
 
-    const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
+
+    const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")),
                                     "FileMetaDataConfigurationDialog");
     KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig);
 }
 
 FileMetaDataConfigurationDialog::~FileMetaDataConfigurationDialog()
 {
-    KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
+    KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")),
                               "FileMetaDataConfigurationDialog");
     KWindowConfig::saveWindowSize(windowHandle(), dialogConfig);
 }
diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index c18d4738e..6bfc4ed01 100644
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -169,14 +169,14 @@ void InformationPanelContent::showItem(const KFileItem& item)
     }
 
     const QUrl itemUrl = item.url();
-    const bool isSearchUrl = itemUrl.scheme().contains("search") && item.localPath().isEmpty();
+    const bool isSearchUrl = itemUrl.scheme().contains(QStringLiteral("search")) && item.localPath().isEmpty();
     if (!applyPlace(itemUrl)) {
         setNameLabelText(item.text());
         if (isSearchUrl) {
             // in the case of a search-URL the URL is not readable for humans
             // (at least not useful to show in the Information Panel)
             KIconLoader iconLoader;
-            QPixmap icon = iconLoader.loadIcon("nepomuk",
+            QPixmap icon = iconLoader.loadIcon(QStringLiteral("nepomuk"),
                                                KIconLoader::NoGroup,
                                                KIconLoader::SizeEnormous);
             m_preview->setPixmap(icon);
@@ -213,7 +213,7 @@ void InformationPanelContent::showItem(const KFileItem& item)
 
     if (InformationPanelSettings::previewsShown()) {
         const QString mimeType = item.mimetype();
-        const bool usePhonon = mimeType.startsWith("audio/") || mimeType.startsWith("video/");
+        const bool usePhonon = mimeType.startsWith(QLatin1String("audio/")) || mimeType.startsWith(QLatin1String("video/"));
         if (usePhonon) {
             m_phononWidget->show();
             m_phononWidget->setUrl(item.targetUrl());
@@ -240,7 +240,7 @@ void InformationPanelContent::showItems(const KFileItemList& items)
     }
 
     KIconLoader iconLoader;
-    QPixmap icon = iconLoader.loadIcon("dialog-information",
+    QPixmap icon = iconLoader.loadIcon(QStringLiteral("dialog-information"),
                                        KIconLoader::NoGroup,
                                        KIconLoader::SizeEnormous);
     m_preview->setPixmap(icon);
@@ -290,12 +290,12 @@ void InformationPanelContent::configureSettings(const QList<QAction*>& customCon
     QMenu popup(this);
 
     QAction* previewAction = popup.addAction(i18nc("@action:inmenu", "Preview"));
-    previewAction->setIcon(QIcon::fromTheme("view-preview"));
+    previewAction->setIcon(QIcon::fromTheme(QStringLiteral("view-preview")));
     previewAction->setCheckable(true);
     previewAction->setChecked(InformationPanelSettings::previewsShown());
 
     QAction* configureAction = popup.addAction(i18nc("@action:inmenu", "Configure..."));
-    configureAction->setIcon(QIcon::fromTheme("configure"));
+    configureAction->setIcon(QIcon::fromTheme(QStringLiteral("configure")));
 
     popup.addSeparator();
     foreach (QAction* action, customContextMenuActions) {
@@ -403,7 +403,7 @@ void InformationPanelContent::setNameLabelText(const QString& text)
     QTextLine line = textLayout.createLine();
     while (line.isValid()) {
         line.setLineWidth(m_nameLabel->width());
-        wrappedText += processedText.mid(line.textStart(), line.textLength());
+        wrappedText += processedText.midRef(line.textStart(), line.textLength());
 
         line = textLayout.createLine();
         if (line.isValid()) {
diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
index 1d6361f19..e4885ab76 100644
--- a/src/panels/information/phononwidget.cpp
+++ b/src/panels/information/phononwidget.cpp
@@ -38,6 +38,8 @@
 
 class EmbeddedVideoPlayer : public Phonon::VideoWidget
 {
+    Q_OBJECT
+
     public:
         EmbeddedVideoPlayer(QWidget *parent = 0) :
             Phonon::VideoWidget(parent)
@@ -128,13 +130,13 @@ void PhononWidget::showEvent(QShowEvent *event)
 
         m_playButton->setToolTip(i18n("play"));
         m_playButton->setIconSize(buttonSize);
-        m_playButton->setIcon(QIcon::fromTheme("media-playback-start"));
+        m_playButton->setIcon(QIcon::fromTheme(QStringLiteral("media-playback-start")));
         m_playButton->setAutoRaise(true);
         connect(m_playButton, &QToolButton::clicked, this, &PhononWidget::play);
 
         m_stopButton->setToolTip(i18n("stop"));
         m_stopButton->setIconSize(buttonSize);
-        m_stopButton->setIcon(QIcon::fromTheme("media-playback-stop"));
+        m_stopButton->setIcon(QIcon::fromTheme(QStringLiteral("media-playback-stop")));
         m_stopButton->setAutoRaise(true);
         m_stopButton->hide();
         connect(m_stopButton, &QToolButton::clicked, this, &PhononWidget::stop);
@@ -231,3 +233,5 @@ void PhononWidget::applyVideoSize()
         m_videoPlayer->setSizeHint(m_videoSize);
     }
 }
+
+#include "phononwidget.moc"
diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp
index 2a9c88e4e..a04064d0b 100644
--- a/src/panels/places/placesitem.cpp
+++ b/src/panels/places/placesitem.cpp
@@ -58,7 +58,7 @@ void PlacesItem::setUrl(const QUrl &url)
     // like QUrl. Hence do a manual check to prevent that
     // setting an equal URL results in an itemsChanged()
     // signal.
-    if (dataValue("url").value<QUrl>() != url) {
+    if (dataValue("url").toUrl() != url) {
         delete m_trashDirLister;
         if (url.scheme() == QLatin1String("trash")) {
             // The trash icon must always be updated dependent on whether
@@ -79,7 +79,7 @@ void PlacesItem::setUrl(const QUrl &url)
 
 QUrl PlacesItem::url() const
 {
-    return dataValue("url").value<QUrl>();
+    return dataValue("url").toUrl();
 }
 
 void PlacesItem::setUdi(const QString& udi)
@@ -131,7 +131,7 @@ void PlacesItem::setBookmark(const KBookmark& bookmark)
     delete m_mtp;
 
 
-    const QString udi = bookmark.metaDataItem("UDI");
+    const QString udi = bookmark.metaDataItem(QStringLiteral("UDI"));
     if (udi.isEmpty()) {
         setIcon(bookmark.icon());
         setText(i18nc("KFile System Bookmarks", bookmark.text().toUtf8().constData()));
@@ -143,10 +143,10 @@ void PlacesItem::setBookmark(const KBookmark& bookmark)
     const GroupType type = groupType();
     if (icon().isEmpty()) {
         switch (type) {
-        case RecentlySavedType: setIcon("chronometer"); break;
-        case SearchForType:     setIcon("system-search"); break;
+        case RecentlySavedType: setIcon(QStringLiteral("chronometer")); break;
+        case SearchForType:     setIcon(QStringLiteral("system-search")); break;
         case PlacesType:
-        default:                setIcon("folder");
+        default:                setIcon(QStringLiteral("folder"));
         }
 
     }
@@ -159,7 +159,7 @@ void PlacesItem::setBookmark(const KBookmark& bookmark)
     default:                Q_ASSERT(false); break;
     }
 
-    setHidden(bookmark.metaDataItem("IsHidden") == QLatin1String("true"));
+    setHidden(bookmark.metaDataItem(QStringLiteral("IsHidden")) == QLatin1String("true"));
 }
 
 KBookmark PlacesItem::bookmark() const
@@ -206,7 +206,7 @@ KBookmark PlacesItem::createBookmark(KBookmarkManager* manager,
 
     KBookmark bookmark = root.addBookmark(text, url, iconName);
     bookmark.setFullText(text);
-    bookmark.setMetaDataItem("ID", generateNewId());
+    bookmark.setMetaDataItem(QStringLiteral("ID"), generateNewId());
 
     return bookmark;
 }
@@ -220,8 +220,8 @@ KBookmark PlacesItem::createDeviceBookmark(KBookmarkManager* manager,
     }
 
     KBookmark bookmark = root.createNewSeparator();
-    bookmark.setMetaDataItem("UDI", udi);
-    bookmark.setMetaDataItem("isSystemItem", "true");
+    bookmark.setMetaDataItem(QStringLiteral("UDI"), udi);
+    bookmark.setMetaDataItem(QStringLiteral("isSystemItem"), QStringLiteral("true"));
     return bookmark;
 }
 
@@ -270,8 +270,8 @@ void PlacesItem::initializeDevice(const QString& udi)
 
     if (m_access) {
         setUrl(QUrl::fromLocalFile(m_access->filePath()));
-        QObject::connect(m_access.data(), SIGNAL(accessibilityChanged(bool,QString)),
-                         m_signalHandler.data(), SLOT(onAccessibilityChanged()));
+        QObject::connect(m_access.data(), &Solid::StorageAccess::accessibilityChanged,
+                         m_signalHandler.data(), &PlacesItemSignalHandler::onAccessibilityChanged);
     } else if (m_disc && (m_disc->availableContent() & Solid::OpticalDisc::Audio) != 0) {
         Solid::Block *block = m_device.as<Solid::Block>();
         if (block) {
@@ -296,7 +296,7 @@ void PlacesItem::onTrashDirListerCompleted()
     Q_ASSERT(url().scheme() == QLatin1String("trash"));
 
     const bool isTrashEmpty = m_trashDirLister->items().isEmpty();
-    setIcon(isTrashEmpty ? "user-trash" : "user-trash-full");
+    setIcon(isTrashEmpty ? QStringLiteral("user-trash") : QStringLiteral("user-trash-full"));
 }
 
 void PlacesItem::updateBookmarkForRole(const QByteArray& role)
@@ -317,11 +317,11 @@ void PlacesItem::updateBookmarkForRole(const QByteArray& role)
     } else if (role == "url") {
         m_bookmark.setUrl(url());
     } else if (role == "udi)") {
-        m_bookmark.setMetaDataItem("UDI", udi());
+        m_bookmark.setMetaDataItem(QStringLiteral("UDI"), udi());
     } else if (role == "isSystemItem") {
-        m_bookmark.setMetaDataItem("isSystemItem", isSystemItem() ? "true" : "false");
+        m_bookmark.setMetaDataItem(QStringLiteral("isSystemItem"), isSystemItem() ? QStringLiteral("true") : QStringLiteral("false"));
     } else if (role == "isHidden") {
-        m_bookmark.setMetaDataItem("IsHidden", isHidden() ? "true" : "false");
+        m_bookmark.setMetaDataItem(QStringLiteral("IsHidden"), isHidden() ? QStringLiteral("true") : QStringLiteral("false"));
     }
 }
 
@@ -332,6 +332,6 @@ QString PlacesItem::generateNewId()
     // " (V2)" to indicate that the ID has been generated by
     // a new version of the places view.
     static int count = 0;
-    return QString::number(QDateTime::currentDateTime().toTime_t()) +
+    return QString::number(QDateTime::currentDateTimeUtc().toTime_t()) +
             '/' + QString::number(count++) + " (V2)";
 }
diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp
index d035b0403..7d365310f 100644
--- a/src/panels/places/placesitemeditdialog.cpp
+++ b/src/panels/places/placesitemeditdialog.cpp
@@ -119,8 +119,8 @@ void PlacesItemEditDialog::initialize()
     m_okButton = buttonBox->button(QDialogButtonBox::Ok);
     m_okButton->setDefault(true);
     m_okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
-    connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
-    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &PlacesItemEditDialog::accept);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &PlacesItemEditDialog::reject);
     setModal(true);
     m_okButton->setDefault(true);
 
diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp
index 0d8ac6981..a42cb0403 100644
--- a/src/panels/places/placesitemmodel.cpp
+++ b/src/panels/places/placesitemmodel.cpp
@@ -249,7 +249,7 @@ QAction* PlacesItemModel::ejectAction(int index) const
 {
     const PlacesItem* item = placesItem(index);
     if (item && item->device().is<Solid::OpticalDisc>()) {
-        return new QAction(QIcon::fromTheme("media-eject"), i18nc("@item", "Eject '%1'", item->text()), 0);
+        return new QAction(QIcon::fromTheme(QStringLiteral("media-eject")), i18nc("@item", "Eject '%1'", item->text()), 0);
     }
 
     return 0;
@@ -288,10 +288,10 @@ QAction* PlacesItemModel::teardownAction(int index) const
         text = i18nc("@item", "Release '%1'", label);
     } else if (removable || hotPluggable) {
         text = i18nc("@item", "Safely Remove '%1'", label);
-        iconName = "media-eject";
+        iconName = QStringLiteral("media-eject");
     } else {
         text = i18nc("@item", "Unmount '%1'", label);
-        iconName = "media-eject";
+        iconName = QStringLiteral("media-eject");
     }
 
     if (iconName.isEmpty()) {
@@ -367,7 +367,7 @@ QMimeData* PlacesItemModel::createMimeData(const KItemSet& indexes) const
 
     QDataStream stream(&itemData, QIODevice::WriteOnly);
 
-    foreach (int index, indexes) {
+    for (int index : indexes) {
         const QUrl itemUrl = placesItem(index)->url();
         if (itemUrl.isValid()) {
             urls << itemUrl;
@@ -416,7 +416,7 @@ void PlacesItemModel::dropMimeDataBefore(int index, const QMimeData* mimeData)
 
         const int dropIndex = groupedDropIndex(index, newItem);
         insertItem(dropIndex, newItem);
-    } else if (mimeData->hasFormat("text/uri-list")) {
+    } else if (mimeData->hasFormat(QStringLiteral("text/uri-list"))) {
         // One or more items must be added to the model
         const QList<QUrl> urls = KUrlMimeData::urlsFromMimeData(mimeData);
         for (int i = urls.count() - 1; i >= 0; --i) {
@@ -428,7 +428,7 @@ void PlacesItemModel::dropMimeDataBefore(int index, const QMimeData* mimeData)
             }
 
             if ((url.isLocalFile() && !QFileInfo(url.toLocalFile()).isDir())
-                    || url.scheme() == "trash") {
+                    || url.scheme() == QLatin1String("trash")) {
                 // Only directories outside the trash are allowed
                 continue;
             }
@@ -534,7 +534,7 @@ void PlacesItemModel::onItemChanged(int index, const QSet<QByteArray>& changedRo
     if (changedRoles.contains("isHidden")) {
         if (!m_hiddenItemsShown && changedItem->isHidden()) {
             m_hiddenItemToRemove = index;
-            QTimer::singleShot(0, this, SLOT(hideItem()));
+            QTimer::singleShot(0, this, static_cast<void (PlacesItemModel::*)()>(&PlacesItemModel::hideItem));
         }
     }
 }
@@ -638,7 +638,7 @@ void PlacesItemModel::updateBookmarks()
                     // a hidden item. The content of the bookmark might
                     // have been changed, so an update is done.
                     found = true;
-                    if (newBookmark.metaDataItem("UDI").isEmpty()) {
+                    if (newBookmark.metaDataItem(QStringLiteral("UDI")).isEmpty()) {
                         item->setBookmark(newBookmark);
                         item->setText(i18nc("KFile System Bookmarks", newBookmark.text().toUtf8().constData()));
                     }
@@ -647,7 +647,7 @@ void PlacesItemModel::updateBookmarks()
             }
 
             if (!found) {
-                const QString udi = newBookmark.metaDataItem("UDI");
+                const QString udi = newBookmark.metaDataItem(QStringLiteral("UDI"));
 
                 /*
                  * See Bug 304878
@@ -782,6 +782,7 @@ void PlacesItemModel::loadBookmarks()
     }
 
     // Create items for devices that have not been stored as bookmark yet
+    devicesItems.reserve(devicesItems.count() + devices.count());
     foreach (const QString& udi, devices) {
         const KBookmark bookmark = PlacesItem::createDeviceBookmark(m_bookmarkManager, udi);
         devicesItems.append(new PlacesItem(bookmark));
@@ -810,9 +811,9 @@ void PlacesItemModel::loadBookmarks()
 bool PlacesItemModel::acceptBookmark(const KBookmark& bookmark,
                                      const QSet<QString>& availableDevices) const
 {
-    const QString udi = bookmark.metaDataItem("UDI");
+    const QString udi = bookmark.metaDataItem(QStringLiteral("UDI"));
     const QUrl url = bookmark.url();
-    const QString appName = bookmark.metaDataItem("OnlyInApp");
+    const QString appName = bookmark.metaDataItem(QStringLiteral("OnlyInApp"));
     const bool deviceAvailable = availableDevices.contains(udi);
 
     const bool allowedHere = (appName.isEmpty()
@@ -837,7 +838,7 @@ PlacesItem* PlacesItemModel::createSystemPlacesItem(const SystemBookmarkData& da
         // for "Recently Saved" and "Search For" should be a setting available only
         // in the Places Panel (see description of AppNamePrefix for more details).
         const QString appName = KAboutData::applicationData().componentName() + AppNamePrefix;
-        bookmark.setMetaDataItem("OnlyInApp", appName);
+        bookmark.setMetaDataItem(QStringLiteral("OnlyInApp"), appName);
     }
 
     PlacesItem* item = new PlacesItem(bookmark);
@@ -869,7 +870,7 @@ PlacesItem* PlacesItemModel::createSystemPlacesItem(const SystemBookmarkData& da
                 props.setViewMode(DolphinView::IconsView);
                 props.setPreviewsShown(true);
                 props.setVisibleRoles({"text"});
-            } else if (data.url.scheme() == "timeline") {
+            } else if (data.url.scheme() == QLatin1String("timeline")) {
                 props.setViewMode(DolphinView::DetailsView);
                 props.setVisibleRoles({"text", "date"});
             }
@@ -889,42 +890,42 @@ void PlacesItemModel::createSystemBookmarks()
     // done here is because otherwise switching the language would not result in retranslating the
     // bookmarks.
     m_systemBookmarks.append(SystemBookmarkData(QUrl::fromLocalFile(KUser().homeDir()),
-                                                "user-home",
+                                                QStringLiteral("user-home"),
                                                 I18N_NOOP2("KFile System Bookmarks", "Home")));
-    m_systemBookmarks.append(SystemBookmarkData(QUrl("remote:/"),
-                                                "network-workgroup",
+    m_systemBookmarks.append(SystemBookmarkData(QUrl(QStringLiteral("remote:/")),
+                                                QStringLiteral("network-workgroup"),
                                                 I18N_NOOP2("KFile System Bookmarks", "Network")));
-    m_systemBookmarks.append(SystemBookmarkData(QUrl::fromLocalFile("/"),
-                                                "folder-red",
+    m_systemBookmarks.append(SystemBookmarkData(QUrl::fromLocalFile(QStringLiteral("/")),
+                                                QStringLiteral("folder-red"),
                                                 I18N_NOOP2("KFile System Bookmarks", "Root")));
-    m_systemBookmarks.append(SystemBookmarkData(QUrl("trash:/"),
-                                                "user-trash",
+    m_systemBookmarks.append(SystemBookmarkData(QUrl(QStringLiteral("trash:/")),
+                                                QStringLiteral("user-trash"),
                                                 I18N_NOOP2("KFile System Bookmarks", "Trash")));
 
     if (m_fileIndexingEnabled) {
-        m_systemBookmarks.append(SystemBookmarkData(QUrl("timeline:/today"),
-                                                    "go-jump-today",
+        m_systemBookmarks.append(SystemBookmarkData(QUrl(QStringLiteral("timeline:/today")),
+                                                    QStringLiteral("go-jump-today"),
                                                     I18N_NOOP2("KFile System Bookmarks", "Today")));
-        m_systemBookmarks.append(SystemBookmarkData(QUrl("timeline:/yesterday"),
-                                                    "view-calendar-day",
+        m_systemBookmarks.append(SystemBookmarkData(QUrl(QStringLiteral("timeline:/yesterday")),
+                                                    QStringLiteral("view-calendar-day"),
                                                     I18N_NOOP2("KFile System Bookmarks", "Yesterday")));
-        m_systemBookmarks.append(SystemBookmarkData(QUrl("timeline:/thismonth"),
-                                                    "view-calendar-month",
+        m_systemBookmarks.append(SystemBookmarkData(QUrl(QStringLiteral("timeline:/thismonth")),
+                                                    QStringLiteral("view-calendar-month"),
                                                     I18N_NOOP2("KFile System Bookmarks", "This Month")));
-        m_systemBookmarks.append(SystemBookmarkData(QUrl("timeline:/lastmonth"),
-                                                    "view-calendar-month",
+        m_systemBookmarks.append(SystemBookmarkData(QUrl(QStringLiteral("timeline:/lastmonth")),
+                                                    QStringLiteral("view-calendar-month"),
                                                     I18N_NOOP2("KFile System Bookmarks", "Last Month")));
-        m_systemBookmarks.append(SystemBookmarkData(QUrl("search:/documents"),
-                                                    "folder-text",
+        m_systemBookmarks.append(SystemBookmarkData(QUrl(QStringLiteral("search:/documents")),
+                                                    QStringLiteral("folder-text"),
                                                     I18N_NOOP2("KFile System Bookmarks", "Documents")));
-        m_systemBookmarks.append(SystemBookmarkData(QUrl("search:/images"),
-                                                    "folder-images",
+        m_systemBookmarks.append(SystemBookmarkData(QUrl(QStringLiteral("search:/images")),
+                                                    QStringLiteral("folder-images"),
                                                     I18N_NOOP2("KFile System Bookmarks", "Images")));
-        m_systemBookmarks.append(SystemBookmarkData(QUrl("search:/audio"),
-                                                    "folder-sound",
+        m_systemBookmarks.append(SystemBookmarkData(QUrl(QStringLiteral("search:/audio")),
+                                                    QStringLiteral("folder-sound"),
                                                     I18N_NOOP2("KFile System Bookmarks", "Audio Files")));
-        m_systemBookmarks.append(SystemBookmarkData(QUrl("search:/videos"),
-                                                    "folder-videos",
+        m_systemBookmarks.append(SystemBookmarkData(QUrl(QStringLiteral("search:/videos")),
+                                                    QStringLiteral("folder-videos"),
                                                     I18N_NOOP2("KFile System Bookmarks", "Videos")));
     }
 
@@ -940,16 +941,16 @@ void PlacesItemModel::clear() {
 
 void PlacesItemModel::initializeAvailableDevices()
 {
-    QString predicate("[[[[ StorageVolume.ignored == false AND [ StorageVolume.usage == 'FileSystem' OR StorageVolume.usage == 'Encrypted' ]]"
+    QString predicate(QStringLiteral("[[[[ StorageVolume.ignored == false AND [ StorageVolume.usage == 'FileSystem' OR StorageVolume.usage == 'Encrypted' ]]"
         " OR "
         "[ IS StorageAccess AND StorageDrive.driveType == 'Floppy' ]]"
         " OR "
         "OpticalDisc.availableContent & 'Audio' ]"
         " OR "
-        "StorageAccess.ignored == false ]");
+        "StorageAccess.ignored == false ]"));
 
 
-    if (KProtocolInfo::isKnownProtocol("mtp")) {
+    if (KProtocolInfo::isKnownProtocol(QStringLiteral("mtp"))) {
         predicate.prepend("[");
         predicate.append(" OR PortableMediaPlayer.supportedProtocols == 'mtp']");
     }
@@ -1076,12 +1077,12 @@ int PlacesItemModel::groupedDropIndex(int index, const PlacesItem* item) const
 
 bool PlacesItemModel::equalBookmarkIdentifiers(const KBookmark& b1, const KBookmark& b2)
 {
-    const QString udi1 = b1.metaDataItem("UDI");
-    const QString udi2 = b2.metaDataItem("UDI");
+    const QString udi1 = b1.metaDataItem(QStringLiteral("UDI"));
+    const QString udi2 = b2.metaDataItem(QStringLiteral("UDI"));
     if (!udi1.isEmpty() && !udi2.isEmpty()) {
         return udi1 == udi2;
     } else {
-        return b1.metaDataItem("ID") == b2.metaDataItem("ID");
+        return b1.metaDataItem(QStringLiteral("ID")) == b2.metaDataItem(QStringLiteral("ID"));
     }
 }
 
@@ -1140,13 +1141,13 @@ QUrl PlacesItemModel::createSearchUrl(const QUrl& url)
 #ifdef HAVE_BALOO
     const QString path = url.toDisplayString(QUrl::PreferLocalFile);
     if (path.endsWith(QLatin1String("documents"))) {
-        searchUrl = searchUrlForType("Document");
+        searchUrl = searchUrlForType(QStringLiteral("Document"));
     } else if (path.endsWith(QLatin1String("images"))) {
-        searchUrl = searchUrlForType("Image");
+        searchUrl = searchUrlForType(QStringLiteral("Image"));
     } else if (path.endsWith(QLatin1String("audio"))) {
-        searchUrl = searchUrlForType("Audio");
+        searchUrl = searchUrlForType(QStringLiteral("Audio"));
     } else if (path.endsWith(QLatin1String("videos"))) {
-        searchUrl = searchUrlForType("Video");
+        searchUrl = searchUrlForType(QStringLiteral("Video"));
     } else {
         Q_ASSERT(false);
     }
diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
index 50ed7e73a..037d27c51 100644
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -73,7 +73,7 @@ PlacesPanel::~PlacesPanel()
 
 bool PlacesPanel::urlChanged()
 {
-    if (!url().isValid() || url().scheme().contains("search")) {
+    if (!url().isValid() || url().scheme().contains(QStringLiteral("search"))) {
         // Skip results shown by a search, as possible identical
         // directory names are useless without parent-path information.
         return false;
@@ -186,26 +186,26 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
             mainSeparator = menu.addSeparator();
         }
     } else {
-        if (item->url() == QUrl("trash:/")) {
-            emptyTrashAction = menu.addAction(QIcon::fromTheme("trash-empty"), i18nc("@action:inmenu", "Empty Trash"));
-            emptyTrashAction->setEnabled(item->icon() == "user-trash-full");
+        if (item->url() == QUrl(QStringLiteral("trash:/"))) {
+            emptyTrashAction = menu.addAction(QIcon::fromTheme(QStringLiteral("trash-empty")), i18nc("@action:inmenu", "Empty Trash"));
+            emptyTrashAction->setEnabled(item->icon() == QLatin1String("user-trash-full"));
             menu.addSeparator();
         }
-        addAction = menu.addAction(QIcon::fromTheme("document-new"), i18nc("@item:inmenu", "Add Entry..."));
+        addAction = menu.addAction(QIcon::fromTheme(QStringLiteral("document-new")), i18nc("@item:inmenu", "Add Entry..."));
         mainSeparator = menu.addSeparator();
-        editAction = menu.addAction(QIcon::fromTheme("document-properties"), i18nc("@item:inmenu", "Edit '%1'...", label));
+        editAction = menu.addAction(QIcon::fromTheme(QStringLiteral("document-properties")), i18nc("@item:inmenu", "Edit '%1'...", label));
     }
 
     if (!addAction) {
-        addAction = menu.addAction(QIcon::fromTheme("document-new"), i18nc("@item:inmenu", "Add Entry..."));
+        addAction = menu.addAction(QIcon::fromTheme(QStringLiteral("document-new")), i18nc("@item:inmenu", "Add Entry..."));
     }
 
     QAction* openInNewTabAction = menu.addAction(i18nc("@item:inmenu", "Open '%1' in New Tab", label));
-    openInNewTabAction->setIcon(QIcon::fromTheme("tab-new"));
+    openInNewTabAction->setIcon(QIcon::fromTheme(QStringLiteral("tab-new")));
 
     QAction* removeAction = 0;
     if (!isDevice && !item->isSystemItem()) {
-        removeAction = menu.addAction(QIcon::fromTheme("edit-delete"), i18nc("@item:inmenu", "Remove '%1'", label));
+        removeAction = menu.addAction(QIcon::fromTheme(QStringLiteral("edit-delete")), i18nc("@item:inmenu", "Remove '%1'", label));
     }
 
     QAction* hideAction = menu.addAction(i18nc("@item:inmenu", "Hide '%1'", label));
@@ -240,7 +240,7 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
         {KIconLoader::SizeLarge,        I18N_NOOP2_NOSTRIP("Huge icon size", "Huge (%1x%2)")}
     };
 
-    QMap<QAction*, int> iconSizeActionMap;
+    QHash<QAction*, int> iconSizeActionMap;
     QActionGroup* iconSizeGroup = new QActionGroup(iconSizeSubMenu);
 
     for (int i = 0; i < iconSizeCount; ++i) {
@@ -309,7 +309,7 @@ void PlacesPanel::slotViewContextMenuRequested(const QPointF& pos)
 {
     QMenu menu(this);
 
-    QAction* addAction = menu.addAction(QIcon::fromTheme("document-new"), i18nc("@item:inmenu", "Add Entry..."));
+    QAction* addAction = menu.addAction(QIcon::fromTheme(QStringLiteral("document-new")), i18nc("@item:inmenu", "Add Entry..."));
 
     QAction* showAllAction = 0;
     if (m_model->hiddenCount() > 0) {
@@ -421,7 +421,7 @@ void PlacesPanel::slotTrashUpdated(KJob* job)
         emit errorMessage(job->errorString());
     }
     // as long as KIO doesn't do this, do it ourselves
-    KNotification::event("Trash: emptied", QString(), QPixmap(), 0, KNotification::DefaultEvent);
+    KNotification::event(QStringLiteral("Trash: emptied"), QString(), QPixmap(), 0, KNotification::DefaultEvent);
 }
 
 void PlacesPanel::slotStorageSetupDone(int index, bool success)
@@ -457,7 +457,7 @@ void PlacesPanel::emptyTrash()
 void PlacesPanel::addEntry()
 {
     const int index = m_controller->selectionManager()->currentItem();
-    const QUrl url = m_model->data(index).value("url").value<QUrl>();
+    const QUrl url = m_model->data(index).value("url").toUrl();
 
     QPointer<PlacesItemEditDialog> dialog = new PlacesItemEditDialog(this);
     dialog->setWindowTitle(i18nc("@title:window", "Add Places Entry"));
@@ -480,7 +480,7 @@ void PlacesPanel::editEntry(int index)
     dialog->setWindowTitle(i18nc("@title:window", "Edit Places Entry"));
     dialog->setIcon(data.value("iconName").toString());
     dialog->setText(data.value("text").toString());
-    dialog->setUrl(data.value("url").value<QUrl>());
+    dialog->setUrl(data.value("url").toUrl());
     dialog->setAllowGlobal(true);
     if (dialog->exec() == QDialog::Accepted) {
         PlacesItem* oldItem = m_model->placesItem(index);
@@ -522,7 +522,7 @@ void PlacesPanel::triggerItem(int index, Qt::MouseButton button)
     } else {
         m_triggerStorageSetupButton = Qt::NoButton;
 
-        const QUrl url = m_model->data(index).value("url").value<QUrl>();
+        const QUrl url = m_model->data(index).value("url").toUrl();
         if (!url.isEmpty()) {
             if (button == Qt::MiddleButton) {
                 emit placeMiddleClicked(PlacesItemModel::convertedUrl(url));
diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp
index ee88bd4c5..da68210c1 100644
--- a/src/panels/terminal/terminalpanel.cpp
+++ b/src/panels/terminal/terminalpanel.cpp
@@ -71,7 +71,7 @@ void TerminalPanel::dockVisibilityChanged()
                    this, SLOT(slotKonsolePartCurrentDirectoryChanged(QString)));
 
         // Make sure this terminal does not prevent unmounting any removable drives
-        changeDir(QUrl::fromLocalFile("/"));
+        changeDir(QUrl::fromLocalFile(QStringLiteral("/")));
 
         // Because we have disconnected from the part's currentDirectoryChanged()
         // signal, we have to update m_konsolePartCurrentDirectory manually. If this
@@ -105,7 +105,7 @@ void TerminalPanel::showEvent(QShowEvent* event)
     if (!m_terminal) {
         m_clearTerminal = true;
         KPluginFactory* factory = 0;
-        KService::Ptr service = KService::serviceByDesktopName("konsolepart");
+        KService::Ptr service = KService::serviceByDesktopName(QStringLiteral("konsolepart"));
         if (service) {
             factory = KPluginLoader(service->library()).factory();
         }
@@ -171,7 +171,7 @@ void TerminalPanel::sendCdToTerminal(const QString& dir)
     m_sendCdToTerminalHistory.enqueue(QDir(dir).canonicalPath());
 
     if (m_clearTerminal) {
-        m_terminal->sendInput(" clear\n");
+        m_terminal->sendInput(QStringLiteral(" clear\n"));
         m_clearTerminal = false;
     }
 }
diff --git a/src/search/dolphinfacetswidget.cpp b/src/search/dolphinfacetswidget.cpp
index 2425e0b35..023b30c68 100644
--- a/src/search/dolphinfacetswidget.cpp
+++ b/src/search/dolphinfacetswidget.cpp
@@ -129,7 +129,7 @@ QString DolphinFacetsWidget::ratingTerm() const
         }
 
         const int rating = stars * 2;
-        terms << QString::fromLatin1("rating>=%1").arg(rating);
+        terms << QStringLiteral("rating>=%1").arg(rating);
     }
 
     if (!m_anytime->isChecked()) {
@@ -144,7 +144,7 @@ QString DolphinFacetsWidget::ratingTerm() const
             date = date.addDays(1 - date.dayOfYear());
         }
 
-        terms << QString::fromLatin1("modified>=%1").arg(date.toString(Qt::ISODate));
+        terms << QStringLiteral("modified>=%1").arg(date.toString(Qt::ISODate));
     }
 
     return terms.join(QStringLiteral(" AND "));
@@ -153,13 +153,13 @@ QString DolphinFacetsWidget::ratingTerm() const
 QString DolphinFacetsWidget::facetType() const
 {
     if (m_documents->isChecked()) {
-        return QLatin1String("Document");
+        return QStringLiteral("Document");
     } else if (m_images->isChecked()) {
-        return QLatin1String("Image");
+        return QStringLiteral("Image");
     } else if (m_audio->isChecked()) {
-        return QLatin1String("Audio");
+        return QStringLiteral("Audio");
     } else if (m_videos->isChecked()) {
-        return QLatin1String("Video");
+        return QStringLiteral("Video");
     }
 
     return QString();
@@ -174,9 +174,9 @@ bool DolphinFacetsWidget::isRatingTerm(const QString& term) const
     bool containsModified = false;
 
     foreach (const QString& subTerm, subTerms) {
-        if (subTerm.startsWith("rating>=")) {
+        if (subTerm.startsWith(QLatin1String("rating>="))) {
             containsRating = true;
-        } else if (subTerm.startsWith("modified>=")) {
+        } else if (subTerm.startsWith(QLatin1String("modified>="))) {
             containsModified = true;
         }
     }
@@ -192,11 +192,11 @@ void DolphinFacetsWidget::setRatingTerm(const QString& term)
     QStringList subTerms = term.split(' ', QString::SkipEmptyParts);
 
     foreach (const QString& subTerm, subTerms) {
-        if (subTerm.startsWith("modified>=")) {
+        if (subTerm.startsWith(QLatin1String("modified>="))) {
             const QString value = subTerm.mid(10);
             const QDate date = QDate::fromString(value, Qt::ISODate);
             setTimespan(date);
-        } else if (subTerm.startsWith("rating>=")) {
+        } else if (subTerm.startsWith(QLatin1String("rating>="))) {
             const QString value = subTerm.mid(8);
             const int stars = value.toInt() / 2;
             setRating(stars);
diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index a925a97c9..26ddd27f8 100644
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -91,7 +91,7 @@ void DolphinSearchBox::setSearchPath(const QUrl& url)
     QString location = url.fileName();
     if (location.isEmpty()) {
         if (url.isLocalFile()) {
-            location = QLatin1String("/");
+            location = QStringLiteral("/");
         } else {
             location = url.scheme() + QLatin1String(" - ") + url.host();
         }
@@ -129,12 +129,12 @@ QUrl DolphinSearchBox::urlForSearching() const
     if (useBalooSearch) {
         url = balooUrlForSearching();
     } else {
-        url.setScheme("filenamesearch");
+        url.setScheme(QStringLiteral("filenamesearch"));
 
         QUrlQuery query;
-        query.addQueryItem("search", m_searchInput->text());
+        query.addQueryItem(QStringLiteral("search"), m_searchInput->text());
         if (m_contentButton->isChecked()) {
-            query.addQueryItem("checkContent", "yes");
+            query.addQueryItem(QStringLiteral("checkContent"), QStringLiteral("yes"));
         }
 
         QString encodedUrl;
@@ -146,7 +146,7 @@ QUrl DolphinSearchBox::urlForSearching() const
         } else {
             encodedUrl = m_searchPath.url();
         }
-        query.addQueryItem("url", encodedUrl);
+        query.addQueryItem(QStringLiteral("url"), encodedUrl);
 
         url.setQuery(query);
     }
@@ -156,13 +156,13 @@ QUrl DolphinSearchBox::urlForSearching() const
 
 void DolphinSearchBox::fromSearchUrl(const QUrl& url)
 {
-    if (url.scheme() == "baloosearch") {
+    if (url.scheme() == QLatin1String("baloosearch")) {
         fromBalooSearchUrl(url);
-    } else if (url.scheme() == "filenamesearch") {
+    } else if (url.scheme() == QLatin1String("filenamesearch")) {
         const QUrlQuery query(url);
-        setText(query.queryItemValue("search"));
-        setSearchPath(QUrl::fromUserInput(query.queryItemValue("url"), QString(), QUrl::AssumeLocalFile));
-        m_contentButton->setChecked(query.queryItemValue("checkContent") == "yes");
+        setText(query.queryItemValue(QStringLiteral("search")));
+        setSearchPath(QUrl::fromUserInput(query.queryItemValue(QStringLiteral("url")), QString(), QUrl::AssumeLocalFile));
+        m_contentButton->setChecked(query.queryItemValue(QStringLiteral("checkContent")) == QLatin1String("yes"));
     } else {
         setText(QString());
         setSearchPath(url);
@@ -314,8 +314,8 @@ void DolphinSearchBox::loadSettings()
 
 void DolphinSearchBox::saveSettings()
 {
-    SearchSettings::setLocation(m_fromHereButton->isChecked() ? "FromHere" : "Everywhere");
-    SearchSettings::setWhat(m_fileNameButton->isChecked() ? "FileName" : "Content");
+    SearchSettings::setLocation(m_fromHereButton->isChecked() ? QStringLiteral("FromHere") : QStringLiteral("Everywhere"));
+    SearchSettings::setWhat(m_fileNameButton->isChecked() ? QStringLiteral("FileName") : QStringLiteral("Content"));
     SearchSettings::setShowFacetsWidget(m_facetsToggleButton->isChecked());
     SearchSettings::self()->save();
 }
@@ -325,7 +325,7 @@ void DolphinSearchBox::init()
     // Create close button
     QToolButton* closeButton = new QToolButton(this);
     closeButton->setAutoRaise(true);
-    closeButton->setIcon(QIcon::fromTheme("dialog-close"));
+    closeButton->setIcon(QIcon::fromTheme(QStringLiteral("dialog-close")));
     closeButton->setToolTip(i18nc("@info:tooltip", "Quit searching"));
     connect(closeButton, &QToolButton::clicked, this, &DolphinSearchBox::emitCloseRequest);
 
@@ -449,14 +449,14 @@ QUrl DolphinSearchBox::balooUrlForSearching() const
     if (m_contentButton->isChecked()) {
         queryStrings << text;
     } else if (!text.isEmpty()) {
-        queryStrings << QString::fromLatin1("filename:\"%1\"").arg(text);
+        queryStrings << QStringLiteral("filename:\"%1\"").arg(text);
     }
 
     if (m_fromHereButton->isChecked()) {
         query.setIncludeFolder(m_searchPath.toLocalFile());
     }
 
-    query.setSearchString(queryStrings.join(" "));
+    query.setSearchString(queryStrings.join(QStringLiteral(" ")));
 
     return query.toSearchUrl(i18nc("@title UDS_DISPLAY_NAME for a KIO directory listing. %1 is the query the user entered.",
                                    "Query Results from '%1'", text));
@@ -490,7 +490,7 @@ void DolphinSearchBox::fromBalooSearchUrl(const QUrl& url)
 
     const QStringList subTerms = query.searchString().split(' ', QString::SkipEmptyParts);
     foreach (const QString& subTerm, subTerms) {
-        if (subTerm.startsWith("filename:")) {
+        if (subTerm.startsWith(QLatin1String("filename:"))) {
             const QString value = subTerm.mid(9);
             setText(value);
         } else if (m_facetsWidget->isRatingTerm(subTerm)) {
@@ -509,7 +509,7 @@ void DolphinSearchBox::updateFacetsToggleButton()
 {
     const bool facetsIsVisible = SearchSettings::showFacetsWidget();
     m_facetsToggleButton->setChecked(facetsIsVisible ? true : false);
-    m_facetsToggleButton->setIcon(QIcon::fromTheme(facetsIsVisible ? "arrow-up-double" : "arrow-down-double"));
+    m_facetsToggleButton->setIcon(QIcon::fromTheme(facetsIsVisible ? QStringLiteral("arrow-up-double") : QStringLiteral("arrow-down-double")));
     m_facetsToggleButton->setText(facetsIsVisible ? i18nc("action:button", "Fewer Options") : i18nc("action:button", "More Options"));
 }
 
diff --git a/src/settings/additionalinfodialog.cpp b/src/settings/additionalinfodialog.cpp
index 783f5685e..23a65b5ac 100644
--- a/src/settings/additionalinfodialog.cpp
+++ b/src/settings/additionalinfodialog.cpp
@@ -88,13 +88,13 @@ AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent,
     okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
     okButton->setDefault(true);
 
-    const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "AdditionalInfoDialog");
+    const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "AdditionalInfoDialog");
     KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig);
 }
 
 AdditionalInfoDialog::~AdditionalInfoDialog()
 {
-    KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "AdditionalInfoDialog");
+    KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "AdditionalInfoDialog");
     KWindowConfig::saveWindowSize(windowHandle(), dialogConfig);
 }
 
diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 4f9a20de4..9eb57f10b 100644
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -60,42 +60,42 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
     StartupSettingsPage* startupSettingsPage = new StartupSettingsPage(url, this);
     KPageWidgetItem* startupSettingsFrame = addPage(startupSettingsPage,
                                                     i18nc("@title:group", "Startup"));
-    startupSettingsFrame->setIcon(QIcon::fromTheme("go-home"));
+    startupSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("go-home")));
     connect(startupSettingsPage, &StartupSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // View Modes
     ViewSettingsPage* viewSettingsPage = new ViewSettingsPage(this);
     KPageWidgetItem* viewSettingsFrame = addPage(viewSettingsPage,
                                                  i18nc("@title:group", "View Modes"));
-    viewSettingsFrame->setIcon(QIcon::fromTheme("view-choose"));
+    viewSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("view-choose")));
     connect(viewSettingsPage, &ViewSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Navigation
     NavigationSettingsPage* navigationSettingsPage = new NavigationSettingsPage(this);
     KPageWidgetItem* navigationSettingsFrame = addPage(navigationSettingsPage,
                                                        i18nc("@title:group", "Navigation"));
-    navigationSettingsFrame->setIcon(QIcon::fromTheme("edit-select"));
+    navigationSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("edit-select")));
     connect(navigationSettingsPage, &NavigationSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Services
     ServicesSettingsPage* servicesSettingsPage = new ServicesSettingsPage(this);
     KPageWidgetItem* servicesSettingsFrame = addPage(servicesSettingsPage,
                                                        i18nc("@title:group", "Services"));
-    servicesSettingsFrame->setIcon(QIcon::fromTheme("flag"));
+    servicesSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("flag")));
     connect(servicesSettingsPage, &ServicesSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Trash
     TrashSettingsPage* trashSettingsPage = new TrashSettingsPage(this);
     KPageWidgetItem* trashSettingsFrame = addPage(trashSettingsPage,
                                                    i18nc("@title:group", "Trash"));
-    trashSettingsFrame->setIcon(QIcon::fromTheme("trash-empty"));
+    trashSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("trash-empty")));
     connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // General
     GeneralSettingsPage* generalSettingsPage = new GeneralSettingsPage(url, this);
     KPageWidgetItem* generalSettingsFrame = addPage(generalSettingsPage,
                                                     i18nc("@title:group General settings", "General"));
-    generalSettingsFrame->setIcon(QIcon::fromTheme("view-preview"));
+    generalSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("view-preview")));
     connect(generalSettingsPage, &GeneralSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     m_pages.append(startupSettingsPage);
@@ -105,13 +105,13 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
     m_pages.append(trashSettingsPage);
     m_pages.append(generalSettingsPage);
 
-    const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
+    const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "SettingsDialog");
     KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig);
 }
 
 DolphinSettingsDialog::~DolphinSettingsDialog()
 {
-    KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
+    KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "SettingsDialog");
     KWindowConfig::saveWindowSize(windowHandle(), dialogConfig);
 }
 
diff --git a/src/settings/general/confirmationssettingspage.cpp b/src/settings/general/confirmationssettingspage.cpp
index 264024abd..2419dc0f4 100644
--- a/src/settings/general/confirmationssettingspage.cpp
+++ b/src/settings/general/confirmationssettingspage.cpp
@@ -79,7 +79,7 @@ ConfirmationsSettingsPage::~ConfirmationsSettingsPage()
 
 void ConfirmationsSettingsPage::applySettings()
 {
-    KSharedConfig::Ptr kioConfig = KSharedConfig::openConfig("kiorc", KConfig::NoGlobals);
+    KSharedConfig::Ptr kioConfig = KSharedConfig::openConfig(QStringLiteral("kiorc"), KConfig::NoGlobals);
     KConfigGroup confirmationGroup(kioConfig, "Confirmations");
     confirmationGroup.writeEntry("ConfirmTrash", m_confirmMoveToTrash->isChecked());
     confirmationGroup.writeEntry("ConfirmDelete", m_confirmDelete->isChecked());
@@ -110,14 +110,14 @@ void ConfirmationsSettingsPage::restoreDefaults()
 
 void ConfirmationsSettingsPage::loadSettings()
 {
-    KSharedConfig::Ptr kioConfig = KSharedConfig::openConfig("kiorc", KConfig::IncludeGlobals);
+    KSharedConfig::Ptr kioConfig = KSharedConfig::openConfig(QStringLiteral("kiorc"), KConfig::IncludeGlobals);
     const KConfigGroup confirmationGroup(kioConfig, "Confirmations");
     m_confirmMoveToTrash->setChecked(confirmationGroup.readEntry("ConfirmTrash", ConfirmTrash));
     m_confirmDelete->setChecked(confirmationGroup.readEntry("ConfirmDelete", ConfirmDelete));
 
-    const KConfigGroup scriptExecutionGroup(KSharedConfig::openConfig("kiorc"), "Executable scripts");
+    const KConfigGroup scriptExecutionGroup(KSharedConfig::openConfig(QStringLiteral("kiorc")), "Executable scripts");
     const QString value = scriptExecutionGroup.readEntry("behaviourOnLaunch", "alwaysAsk");
-    m_confirmScriptExecution->setChecked(value == "alwaysAsk");
+    m_confirmScriptExecution->setChecked(value == QLatin1String("alwaysAsk"));
 
     m_confirmClosingMultipleTabs->setChecked(GeneralSettings::confirmClosingMultipleTabs());
 }
diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp
index 07cd73e33..f01d220dd 100644
--- a/src/settings/general/previewssettingspage.cpp
+++ b/src/settings/general/previewssettingspage.cpp
@@ -78,7 +78,7 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
 
     m_remoteFileSizeBox = new QSpinBox(this);
     m_remoteFileSizeBox->setSingleStep(1);
-    m_remoteFileSizeBox->setSuffix(QLatin1String(" MB"));
+    m_remoteFileSizeBox->setSuffix(QStringLiteral(" MB"));
     m_remoteFileSizeBox->setRange(0, 9999999); /* MB */
 
     QHBoxLayout* fileSizeBoxLayout = new QHBoxLayout(this);
@@ -115,7 +115,7 @@ void PreviewsSettingsPage::applySettings()
         }
     }
 
-    KConfigGroup globalConfig(KSharedConfig::openConfig(), QLatin1String("PreviewSettings"));
+    KConfigGroup globalConfig(KSharedConfig::openConfig(), QStringLiteral("PreviewSettings"));
     globalConfig.writeEntry("Plugins", m_enabledPreviewPlugins);
 
     const qulonglong maximumRemoteSize = static_cast<qulonglong>(m_remoteFileSizeBox->value()) * 1024 * 1024;
@@ -154,9 +154,9 @@ void PreviewsSettingsPage::loadPreviewPlugins()
 {
     QAbstractItemModel* model = m_listView->model();
 
-    const KService::List plugins = KServiceTypeTrader::self()->query(QLatin1String("ThumbCreator"));
+    const KService::List plugins = KServiceTypeTrader::self()->query(QStringLiteral("ThumbCreator"));
     foreach (const KService::Ptr& service, plugins) {
-        const bool configurable = service->property("Configurable", QVariant::Bool).toBool();
+        const bool configurable = service->property(QStringLiteral("Configurable"), QVariant::Bool).toBool();
         const bool show = m_enabledPreviewPlugins.contains(service->desktopEntryName());
 
         model->insertRow(0);
@@ -174,9 +174,9 @@ void PreviewsSettingsPage::loadSettings()
 {
     KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");
     m_enabledPreviewPlugins = globalConfig.readEntry("Plugins", QStringList()
-                                                     << QLatin1String("directorythumbnail")
-                                                     << QLatin1String("imagethumbnail")
-                                                     << QLatin1String("jpegthumbnail"));
+                                                     << QStringLiteral("directorythumbnail")
+                                                     << QStringLiteral("imagethumbnail")
+                                                     << QStringLiteral("jpegthumbnail"));
 
     const qulonglong defaultRemotePreview = static_cast<qulonglong>(MaxRemotePreviewSize) * 1024 * 1024;
     const qulonglong maxRemoteByteSize = globalConfig.readEntry("MaximumRemoteSize", defaultRemotePreview);
diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp
index fb3956880..6a02e0297 100644
--- a/src/settings/kcm/kcmdolphingeneral.cpp
+++ b/src/settings/kcm/kcmdolphingeneral.cpp
@@ -31,7 +31,7 @@
 #include <QVBoxLayout>
 #include <QTabWidget>
 
-K_PLUGIN_FACTORY(KCMDolphinGeneralConfigFactory, registerPlugin<DolphinGeneralConfigModule>("dolphingeneral");)
+K_PLUGIN_FACTORY(KCMDolphinGeneralConfigFactory, registerPlugin<DolphinGeneralConfigModule>(QStringLiteral("dolphingeneral"));)
 K_EXPORT_PLUGIN(KCMDolphinGeneralConfigFactory("kcmdolphingeneral"))
 
 DolphinGeneralConfigModule::DolphinGeneralConfigModule(QWidget* parent, const QVariantList& args) :
diff --git a/src/settings/kcm/kcmdolphinnavigation.cpp b/src/settings/kcm/kcmdolphinnavigation.cpp
index 0b2729c33..7bdcfc534 100644
--- a/src/settings/kcm/kcmdolphinnavigation.cpp
+++ b/src/settings/kcm/kcmdolphinnavigation.cpp
@@ -26,7 +26,7 @@
 
 #include <QVBoxLayout>
 
-K_PLUGIN_FACTORY(KCMDolphinNavigationConfigFactory, registerPlugin<DolphinNavigationConfigModule>("dolphinnavigation");)
+K_PLUGIN_FACTORY(KCMDolphinNavigationConfigFactory, registerPlugin<DolphinNavigationConfigModule>(QStringLiteral("dolphinnavigation"));)
 K_EXPORT_PLUGIN(KCMDolphinNavigationConfigFactory("kcmdolphinnavigation"))
 
 DolphinNavigationConfigModule::DolphinNavigationConfigModule(QWidget* parent, const QVariantList& args) :
diff --git a/src/settings/kcm/kcmdolphinservices.cpp b/src/settings/kcm/kcmdolphinservices.cpp
index 8bfdefebb..4885adf4f 100644
--- a/src/settings/kcm/kcmdolphinservices.cpp
+++ b/src/settings/kcm/kcmdolphinservices.cpp
@@ -26,7 +26,7 @@
 
 #include <QVBoxLayout>
 
-K_PLUGIN_FACTORY(KCMDolphinServicesConfigFactory, registerPlugin<DolphinServicesConfigModule>("dolphinservices");)
+K_PLUGIN_FACTORY(KCMDolphinServicesConfigFactory, registerPlugin<DolphinServicesConfigModule>(QStringLiteral("dolphinservices"));)
 K_EXPORT_PLUGIN(KCMDolphinServicesConfigFactory("kcmdolphinservices"))
 
 DolphinServicesConfigModule::DolphinServicesConfigModule(QWidget* parent, const QVariantList& args) :
diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp
index 0859e568a..9b4aa0dc7 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.cpp
+++ b/src/settings/kcm/kcmdolphinviewmodes.cpp
@@ -32,7 +32,7 @@
 #include <QVBoxLayout>
 #include <QTabWidget>
 
-K_PLUGIN_FACTORY(KCMDolphinViewModesConfigFactory, registerPlugin<DolphinViewModesConfigModule>("dolphinviewmodes");)
+K_PLUGIN_FACTORY(KCMDolphinViewModesConfigFactory, registerPlugin<DolphinViewModesConfigModule>(QStringLiteral("dolphinviewmodes"));)
 K_EXPORT_PLUGIN(KCMDolphinViewModesConfigFactory("kcmdolphinviewmodes"))
 
 DolphinViewModesConfigModule::DolphinViewModesConfigModule(QWidget* parent, const QVariantList& args) :
@@ -50,17 +50,17 @@ DolphinViewModesConfigModule::DolphinViewModesConfigModule(QWidget* parent, cons
 
     // Initialize 'Icons' tab
     ViewSettingsTab* iconsTab = new ViewSettingsTab(ViewSettingsTab::IconsMode, tabWidget);
-    tabWidget->addTab(iconsTab, QIcon::fromTheme("view-list-icons"), i18nc("@title:tab", "Icons"));
+    tabWidget->addTab(iconsTab, QIcon::fromTheme(QStringLiteral("view-list-icons")), i18nc("@title:tab", "Icons"));
     connect(iconsTab, &ViewSettingsTab::changed, this, &DolphinViewModesConfigModule::viewModeChanged);
 
     // Initialize 'Compact' tab
     ViewSettingsTab* compactTab = new ViewSettingsTab(ViewSettingsTab::CompactMode, tabWidget);
-    tabWidget->addTab(compactTab, QIcon::fromTheme("view-list-details"), i18nc("@title:tab", "Compact"));
+    tabWidget->addTab(compactTab, QIcon::fromTheme(QStringLiteral("view-list-details")), i18nc("@title:tab", "Compact"));
     connect(compactTab, &ViewSettingsTab::changed, this, &DolphinViewModesConfigModule::viewModeChanged);
 
     // Initialize 'Details' tab
     ViewSettingsTab* detailsTab = new ViewSettingsTab(ViewSettingsTab::DetailsMode, tabWidget);
-    tabWidget->addTab(detailsTab, QIcon::fromTheme("view-list-tree"), i18nc("@title:tab", "Details"));
+    tabWidget->addTab(detailsTab, QIcon::fromTheme(QStringLiteral("view-list-tree")), i18nc("@title:tab", "Details"));
     connect(detailsTab, &ViewSettingsTab::changed, this, &DolphinViewModesConfigModule::viewModeChanged);
 
     m_tabs.append(iconsTab);
@@ -92,7 +92,7 @@ void DolphinViewModesConfigModule::defaults()
 
 void DolphinViewModesConfigModule::reparseConfiguration()
 {
-    QDBusMessage message = QDBusMessage::createSignal("/KonqMain", "org.kde.Konqueror.Main", "reparseConfiguration");
+    QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/KonqMain"), QStringLiteral("org.kde.Konqueror.Main"), QStringLiteral("reparseConfiguration"));
     QDBusConnection::sessionBus().send(message);
 }
 
diff --git a/src/settings/serviceitemdelegate.cpp b/src/settings/serviceitemdelegate.cpp
index a72dd9ec8..e2398d7fb 100644
--- a/src/settings/serviceitemdelegate.cpp
+++ b/src/settings/serviceitemdelegate.cpp
@@ -110,7 +110,7 @@ void ServiceItemDelegate::updateItemWidgets(const QList<QWidget*> widgets,
     // Update the configuration button
     if (configurable) {
         configureButton->setEnabled(checkBox->isChecked());
-        configureButton->setIcon(QIcon::fromTheme("configure"));
+        configureButton->setIcon(QIcon::fromTheme(QStringLiteral("configure")));
         configureButton->resize(configureButton->sizeHint());
         configureButton->move(option.rect.right() - configureButton->width(),
                               (itemHeight - configureButton->height()) / 2);
diff --git a/src/settings/services/servicessettingspage.cpp b/src/settings/services/servicessettingspage.cpp
index f258b53e2..4cfa2327c 100644
--- a/src/settings/services/servicessettingspage.cpp
+++ b/src/settings/services/servicessettingspage.cpp
@@ -81,7 +81,7 @@ ServicesSettingsPage::ServicesSettingsPage(QWidget* parent) :
     connect(m_listView, &QListView::clicked, this, &ServicesSettingsPage::changed);
 
     KNS3::Button* downloadButton = new KNS3::Button(i18nc("@action:button", "Download New Services..."),
-                                                    "servicemenu.knsrc",
+                                                    QStringLiteral("servicemenu.knsrc"),
                                                     this);
     connect(downloadButton, &KNS3::Button::dialogFinished, this, &ServicesSettingsPage::loadServices);
 
@@ -103,7 +103,7 @@ void ServicesSettingsPage::applySettings()
         return;
     }
 
-    KConfig config("kservicemenurc", KConfig::NoGlobals);
+    KConfig config(QStringLiteral("kservicemenurc"), KConfig::NoGlobals);
     KConfigGroup showGroup = config.group("Show");
 
     QStringList enabledPlugins;
@@ -119,7 +119,7 @@ void ServicesSettingsPage::applySettings()
                 enabledPlugins.append(model->data(index, Qt::DisplayRole).toString());
             }
         } else if (service == QLatin1String(DeleteService)) {
-            KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
+            KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig(QStringLiteral("kdeglobals"), KConfig::NoGlobals);
             KConfigGroup configGroup(globalConfig, "KDE");
             configGroup.writeEntry("ShowDeleteCommand", checked);
             configGroup.sync();
@@ -141,7 +141,7 @@ void ServicesSettingsPage::applySettings()
                                  i18nc("@info", "Dolphin must be restarted to apply the "
                                                 "updated version control systems settings."),
                                  QString(), // default title
-                                 QLatin1String("ShowVcsRestartInformation"));
+                                 QStringLiteral("ShowVcsRestartInformation"));
     }
 }
 
@@ -167,15 +167,15 @@ void ServicesSettingsPage::showEvent(QShowEvent* event)
         loadVersionControlSystems();
 
         // Add "Show 'Delete' command" as service
-        KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals);
+        KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig(QStringLiteral("kdeglobals"), KConfig::IncludeGlobals);
         KConfigGroup configGroup(globalConfig, "KDE");
-        addRow("edit-delete",
+        addRow(QStringLiteral("edit-delete"),
                i18nc("@option:check", "Delete"),
                DeleteService,
                configGroup.readEntry("ShowDeleteCommand", ShowDeleteDefault));
 
         // Add "Show 'Copy To' and 'Move To' commands" as service
-        addRow("edit-copy",
+        addRow(QStringLiteral("edit-copy"),
                i18nc("@option:check", "'Copy To' and 'Move To' commands"),
                CopyToMoveToService,
                GeneralSettings::showCopyMoveMenu());
@@ -189,11 +189,11 @@ void ServicesSettingsPage::showEvent(QShowEvent* event)
 
 void ServicesSettingsPage::loadServices()
 {
-    const KConfig config("kservicemenurc", KConfig::NoGlobals);
+    const KConfig config(QStringLiteral("kservicemenurc"), KConfig::NoGlobals);
     const KConfigGroup showGroup = config.group("Show");
 
     // Load generic services
-    const KService::List entries = KServiceTypeTrader::self()->query("KonqPopupMenu/Plugin");
+    const KService::List entries = KServiceTypeTrader::self()->query(QStringLiteral("KonqPopupMenu/Plugin"));
     foreach (const KService::Ptr& service, entries) {
         const QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kservices5/" % service->entryPath());
         const QList<KServiceAction> serviceActions =
@@ -219,7 +219,7 @@ void ServicesSettingsPage::loadServices()
     }
 
     // Load service plugins that implement the KFileItemActionPlugin interface
-    const KService::List pluginServices = KServiceTypeTrader::self()->query("KFileItemAction/Plugin");
+    const KService::List pluginServices = KServiceTypeTrader::self()->query(QStringLiteral("KFileItemAction/Plugin"));
     foreach (const KService::Ptr& service, pluginServices) {
         const QString desktopEntryName = service->desktopEntryName();
         if (!isInServicesList(desktopEntryName)) {
@@ -236,10 +236,10 @@ void ServicesSettingsPage::loadVersionControlSystems()
     const QStringList enabledPlugins = VersionControlSettings::enabledPlugins();
 
     // Create a checkbox for each available version control plugin
-    const KService::List pluginServices = KServiceTypeTrader::self()->query("FileViewVersionControlPlugin");
+    const KService::List pluginServices = KServiceTypeTrader::self()->query(QStringLiteral("FileViewVersionControlPlugin"));
     for (KService::List::ConstIterator it = pluginServices.constBegin(); it != pluginServices.constEnd(); ++it) {
         const QString pluginName = (*it)->name();
-        addRow("code-class",
+        addRow(QStringLiteral("code-class"),
                pluginName,
                VersionControlServicePrefix + pluginName,
                enabledPlugins.contains(pluginName));
diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp
index 03258cf04..6554493d8 100644
--- a/src/settings/startup/startupsettingspage.cpp
+++ b/src/settings/startup/startupsettingspage.cpp
@@ -68,7 +68,7 @@ StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) :
     homeUrlBoxLayout->addWidget(m_homeUrl);
     m_homeUrl->setClearButtonEnabled(true);
 
-    QPushButton* selectHomeUrlButton = new QPushButton(QIcon::fromTheme("folder-open"), QString(), homeUrlBox);
+    QPushButton* selectHomeUrlButton = new QPushButton(QIcon::fromTheme(QStringLiteral("folder-open")), QString(), homeUrlBox);
     homeUrlBoxLayout->addWidget(selectHomeUrlButton);
 
 #ifndef QT_NO_ACCESSIBILITY
diff --git a/src/settings/trash/trashsettingspage.cpp b/src/settings/trash/trashsettingspage.cpp
index 237a17987..4c71aa3ec 100644
--- a/src/settings/trash/trashsettingspage.cpp
+++ b/src/settings/trash/trashsettingspage.cpp
@@ -31,7 +31,7 @@ TrashSettingsPage::TrashSettingsPage(QWidget* parent) :
     QVBoxLayout *vBoxVBoxLayout = new QVBoxLayout(vBox);
     vBoxVBoxLayout->setMargin(0);
 
-    m_proxy = new KCModuleProxy("kcmtrash");
+    m_proxy = new KCModuleProxy(QStringLiteral("kcmtrash"));
     topLayout->addWidget(m_proxy);
 
     // Add a dummy widget with no restriction regarding
diff --git a/src/settings/viewmodes/viewsettingspage.cpp b/src/settings/viewmodes/viewsettingspage.cpp
index 21bb1e178..3ed57715a 100644
--- a/src/settings/viewmodes/viewsettingspage.cpp
+++ b/src/settings/viewmodes/viewsettingspage.cpp
@@ -39,17 +39,17 @@ ViewSettingsPage::ViewSettingsPage(QWidget* parent) :
 
     // Initialize 'Icons' tab
     ViewSettingsTab* iconsTab = new ViewSettingsTab(ViewSettingsTab::IconsMode, tabWidget);
-    tabWidget->addTab(iconsTab, QIcon::fromTheme("view-list-icons"), i18nc("@title:tab", "Icons"));
+    tabWidget->addTab(iconsTab, QIcon::fromTheme(QStringLiteral("view-list-icons")), i18nc("@title:tab", "Icons"));
     connect(iconsTab, &ViewSettingsTab::changed, this, &ViewSettingsPage::changed);
 
     // Initialize 'Compact' tab
     ViewSettingsTab* compactTab = new ViewSettingsTab(ViewSettingsTab::CompactMode, tabWidget);
-    tabWidget->addTab(compactTab, QIcon::fromTheme("view-list-details"), i18nc("@title:tab", "Compact"));
+    tabWidget->addTab(compactTab, QIcon::fromTheme(QStringLiteral("view-list-details")), i18nc("@title:tab", "Compact"));
     connect(compactTab, &ViewSettingsTab::changed, this, &ViewSettingsPage::changed);
 
     // Initialize 'Details' tab
     ViewSettingsTab* detailsTab = new ViewSettingsTab(ViewSettingsTab::DetailsMode, tabWidget);
-    tabWidget->addTab(detailsTab, QIcon::fromTheme("view-list-tree"), i18nc("@title:tab", "Details"));
+    tabWidget->addTab(detailsTab, QIcon::fromTheme(QStringLiteral("view-list-tree")), i18nc("@title:tab", "Details"));
     connect(detailsTab, &ViewSettingsTab::changed, this, &ViewSettingsPage::changed);
 
     m_tabs.append(iconsTab);
diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index dc033365f..7407042d7 100644
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -91,9 +91,9 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
 
     QLabel* viewModeLabel = new QLabel(i18nc("@label:listbox", "View mode:"), propsGrid);
     m_viewMode = new KComboBox(propsGrid);
-    m_viewMode->addItem(QIcon::fromTheme("view-list-icons"), i18nc("@item:inlistbox", "Icons"), DolphinView::IconsView);
-    m_viewMode->addItem(QIcon::fromTheme("view-list-details"), i18nc("@item:inlistbox", "Compact"), DolphinView::CompactView);
-    m_viewMode->addItem(QIcon::fromTheme("view-list-tree"), i18nc("@item:inlistbox", "Details"), DolphinView::DetailsView);
+    m_viewMode->addItem(QIcon::fromTheme(QStringLiteral("view-list-icons")), i18nc("@item:inlistbox", "Icons"), DolphinView::IconsView);
+    m_viewMode->addItem(QIcon::fromTheme(QStringLiteral("view-list-details")), i18nc("@item:inlistbox", "Compact"), DolphinView::CompactView);
+    m_viewMode->addItem(QIcon::fromTheme(QStringLiteral("view-list-tree")), i18nc("@item:inlistbox", "Details"), DolphinView::DetailsView);
 
     QLabel* sortingLabel = new QLabel(i18nc("@label:listbox", "Sorting:"), propsGrid);
     QWidget* sortingBox = new QWidget(propsGrid);
@@ -207,7 +207,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
         applyButton->setEnabled(isDirty);
     });
 
-    const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "ViewPropertiesDialog");
+    const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "ViewPropertiesDialog");
     KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig);
 
     loadSettings();
@@ -219,7 +219,7 @@ ViewPropertiesDialog::~ViewPropertiesDialog()
     delete m_viewProps;
     m_viewProps = 0;
 
-    KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "ViewPropertiesDialog");
+    KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "ViewPropertiesDialog");
     KWindowConfig::saveWindowSize(windowHandle(), dialogConfig);
 }
 
diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp
index 166f6ab14..38b7ad4dd 100644
--- a/src/statusbar/dolphinstatusbar.cpp
+++ b/src/statusbar/dolphinstatusbar.cpp
@@ -81,7 +81,7 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) :
 
     // Initialize progress information
     m_stopButton = new QToolButton(this);
-    m_stopButton->setIcon(QIcon::fromTheme("process-stop"));
+    m_stopButton->setIcon(QIcon::fromTheme(QStringLiteral("process-stop")));
     m_stopButton->setAccessibleName(i18n("Stop"));
     m_stopButton->setAutoRaise(true);
     m_stopButton->setToolTip(i18nc("@tooltip", "Stop loading"));
diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp
index 29135566f..ed909cd28 100644
--- a/src/statusbar/statusbarspaceinfo.cpp
+++ b/src/statusbar/statusbarspaceinfo.cpp
@@ -76,7 +76,7 @@ void StatusBarSpaceInfo::mousePressEvent(QMouseEvent* event)
 
         // Note that this object must live long enough in case the user opens
         // the "Configure..." dialog
-        KMoreToolsMenuFactory menuFactory("dolphin/statusbar-diskspace-menu");
+        KMoreToolsMenuFactory menuFactory(QStringLiteral("dolphin/statusbar-diskspace-menu"));
         auto menu = menuFactory.createMenuFromGroupingNames(
             { "disk-usage", "more:", "disk-partitions" }, m_url);
 
diff --git a/src/views/dolphinfileitemlistwidget.cpp b/src/views/dolphinfileitemlistwidget.cpp
index f15230841..e7398af2d 100644
--- a/src/views/dolphinfileitemlistwidget.cpp
+++ b/src/views/dolphinfileitemlistwidget.cpp
@@ -93,25 +93,25 @@ QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin::ItemVe
     QString iconName;
     switch (version) {
     case KVersionControlPlugin::NormalVersion:
-        iconName = "vcs-normal";
+        iconName = QStringLiteral("vcs-normal");
         break;
     case KVersionControlPlugin::UpdateRequiredVersion:
-        iconName = "vcs-update-required";
+        iconName = QStringLiteral("vcs-update-required");
         break;
     case KVersionControlPlugin::LocallyModifiedVersion:
-        iconName = "vcs-locally-modified";
+        iconName = QStringLiteral("vcs-locally-modified");
         break;
     case KVersionControlPlugin::LocallyModifiedUnstagedVersion:
-        iconName = "vcs-locally-modified-unstaged";
+        iconName = QStringLiteral("vcs-locally-modified-unstaged");
         break;
     case KVersionControlPlugin::AddedVersion:
-        iconName = "vcs-added";
+        iconName = QStringLiteral("vcs-added");
         break;
     case KVersionControlPlugin::RemovedVersion:
-        iconName = "vcs-removed";
+        iconName = QStringLiteral("vcs-removed");
         break;
     case KVersionControlPlugin::ConflictingVersion:
-        iconName = "vcs-conflicting";
+        iconName = QStringLiteral("vcs-conflicting");
         break;
     case KVersionControlPlugin::UnversionedVersion:
     case KVersionControlPlugin::IgnoredVersion:
diff --git a/src/views/dolphinitemlistview.cpp b/src/views/dolphinitemlistview.cpp
index 60c8bb97c..a3740cb26 100644
--- a/src/views/dolphinitemlistview.cpp
+++ b/src/views/dolphinitemlistview.cpp
@@ -95,9 +95,9 @@ void DolphinItemListView::readSettings()
 
     const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");
     const QStringList plugins = globalConfig.readEntry("Plugins", QStringList()
-                                                       << "directorythumbnail"
-                                                       << "imagethumbnail"
-                                                       << "jpegthumbnail");
+                                                       << QStringLiteral("directorythumbnail")
+                                                       << QStringLiteral("imagethumbnail")
+                                                       << QStringLiteral("jpegthumbnail"));
     setEnabledPlugins(plugins);
 
     endTransaction();
diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp
index 961a7c800..116168a4b 100644
--- a/src/views/dolphinremoteencoding.cpp
+++ b/src/views/dolphinremoteencoding.cpp
@@ -39,7 +39,7 @@
 #include <KIO/Scheduler>
 #include <KConfigGroup>
 
-#define DATA_KEY        QLatin1String("Charset")
+#define DATA_KEY        QStringLiteral("Charset")
 
 DolphinRemoteEncoding::DolphinRemoteEncoding(QObject* parent, DolphinViewActionHandler* actionHandler)
    :QObject(parent),
@@ -47,8 +47,8 @@ DolphinRemoteEncoding::DolphinRemoteEncoding(QObject* parent, DolphinViewActionH
     m_loaded(false),
     m_idDefault(0)
 {
-    m_menu = new KActionMenu(QIcon::fromTheme("character-set"), i18n("Select Remote Charset"), this);
-    m_actionHandler->actionCollection()->addAction("change_remote_encoding", m_menu);
+    m_menu = new KActionMenu(QIcon::fromTheme(QStringLiteral("character-set")), i18n("Select Remote Charset"), this);
+    m_actionHandler->actionCollection()->addAction(QStringLiteral("change_remote_encoding"), m_menu);
     connect(m_menu->menu(), &QMenu::aboutToShow,
           this, &DolphinRemoteEncoding::slotAboutToShow);
 
@@ -206,7 +206,7 @@ void DolphinRemoteEncoding::slotDefault()
                 break;
             }
 
-            domains << partList.join(".");
+            domains << partList.join(QLatin1Char('.'));
             partList.erase(partList.begin());
         }
 
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 5023859df..c3df3a9a8 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -349,7 +349,9 @@ KFileItemList DolphinView::selectedItems() const
     const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
 
     KFileItemList selectedItems;
-    foreach (int index, selectionManager->selectedItems()) {
+    const auto items = selectionManager->selectedItems();
+    selectedItems.reserve(items.count());
+    for (int index : items) {
         selectedItems.append(m_model->fileItem(index));
     }
     return selectedItems;
@@ -671,7 +673,7 @@ void DolphinView::trashSelectedItems()
     uiDelegate.setWindow(window());
     if (uiDelegate.askDeleteConfirmation(list, KIO::JobUiDelegate::Trash, KIO::JobUiDelegate::DefaultConfirmation)) {
         KIO::Job* job = KIO::trash(list);
-        KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Trash, list, QUrl("trash:/"), job);
+        KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Trash, list, QUrl(QStringLiteral("trash:/")), job);
         KJobWidgets::setWindow(job, this);
         connect(job, &KIO::Job::result,
                 this, &DolphinView::slotTrashFileFinished);
@@ -816,7 +818,7 @@ void DolphinView::slotItemsActivated(const KItemSet& indexes)
     KFileItemList items;
     items.reserve(indexes.count());
 
-    foreach (int index, indexes) {
+    for (int index : indexes) {
         KFileItem item = m_model->fileItem(index);
         const QUrl& url = openItemAsFolderUrl(item);
 
@@ -939,6 +941,7 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
             // Apply the current column-widths as custom column-widths and turn
             // off the automatic resizing of the columns
             QList<int> columnWidths;
+            columnWidths.reserve(view->visibleRoles().count());
             foreach (const QByteArray& role, view->visibleRoles()) {
                 columnWidths.append(header->columnWidth(role));
             }
@@ -960,6 +963,7 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
 
             QList<int> columnWidths;
             if (!header->automaticColumnResizing()) {
+                columnWidths.reserve(view->visibleRoles().count());
                 foreach (const QByteArray& role, view->visibleRoles()) {
                     columnWidths.append(header->columnWidth(role));
                 }
@@ -1404,7 +1408,7 @@ void DolphinView::slotRenamingResult(KJob* job)
         const int index = m_model->index(newUrl);
         if (index >= 0) {
             QHash<QByteArray, QVariant> data;
-            const QUrl oldUrl = copyJob->srcUrls().first();
+            const QUrl oldUrl = copyJob->srcUrls().at(0);
             data.insert("text", oldUrl.fileName());
             m_model->setData(index, data);
         }
@@ -1427,7 +1431,7 @@ void DolphinView::slotDirectoryLoadingCompleted()
 {
     // Update the view-state. This has to be done asynchronously
     // because the view might not be in its final state yet.
-    QTimer::singleShot(0, this, SLOT(updateViewState()));
+    QTimer::singleShot(0, this, &DolphinView::updateViewState);
 
     emit directoryLoadingCompleted();
 
@@ -1671,6 +1675,7 @@ QList<QUrl> DolphinView::simplifiedSelectedUrls() const
     QList<QUrl> urls;
 
     const KFileItemList items = selectedItems();
+    urls.reserve(items.count());
     foreach (const KFileItem& item, items) {
         urls.append(item.url());
     }
diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index 99214d61b..858f9299b 100644
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -97,30 +97,30 @@ void DolphinViewActionHandler::createActions()
 {
     // This action doesn't appear in the GUI, it's for the shortcut only.
     // KNewFileMenu takes care of the GUI stuff.
-    QAction* newDirAction = m_actionCollection->addAction("create_dir");
+    QAction* newDirAction = m_actionCollection->addAction(QStringLiteral("create_dir"));
     newDirAction->setText(i18nc("@action", "Create Folder..."));
     m_actionCollection->setDefaultShortcut(newDirAction, Qt::Key_F10);
-    newDirAction->setIcon(QIcon::fromTheme("folder-new"));
+    newDirAction->setIcon(QIcon::fromTheme(QStringLiteral("folder-new")));
     newDirAction->setEnabled(false);    // Will be enabled in slotWriteStateChanged(bool) if the current URL is writable
     connect(newDirAction, &QAction::triggered, this, &DolphinViewActionHandler::createDirectory);
 
     // File menu
 
-    QAction* rename = m_actionCollection->addAction("rename");
+    QAction* rename = m_actionCollection->addAction(QStringLiteral("rename"));
     rename->setText(i18nc("@action:inmenu File", "Rename..."));
     m_actionCollection->setDefaultShortcut(rename, Qt::Key_F2);
-    rename->setIcon(QIcon::fromTheme("edit-rename"));
+    rename->setIcon(QIcon::fromTheme(QStringLiteral("edit-rename")));
     connect(rename, &QAction::triggered, this, &DolphinViewActionHandler::slotRename);
 
-    QAction* moveToTrash = m_actionCollection->addAction("move_to_trash");
+    QAction* moveToTrash = m_actionCollection->addAction(QStringLiteral("move_to_trash"));
     moveToTrash->setText(i18nc("@action:inmenu File", "Move to Trash"));
-    moveToTrash->setIcon(QIcon::fromTheme("user-trash"));
+    moveToTrash->setIcon(QIcon::fromTheme(QStringLiteral("user-trash")));
     m_actionCollection->setDefaultShortcut(moveToTrash, QKeySequence::Delete);
     connect(moveToTrash, &QAction::triggered,
             this, &DolphinViewActionHandler::slotTrashActivated);
 
-    QAction* deleteAction = m_actionCollection->addAction("delete");
-    deleteAction->setIcon(QIcon::fromTheme("edit-delete"));
+    QAction* deleteAction = m_actionCollection->addAction(QStringLiteral("delete"));
+    deleteAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete")));
     deleteAction->setText(i18nc("@action:inmenu File", "Delete"));
     m_actionCollection->setDefaultShortcut(deleteAction, Qt::SHIFT | Qt::Key_Delete);
     connect(deleteAction, &QAction::triggered, this, &DolphinViewActionHandler::slotDeleteItems);
@@ -129,17 +129,17 @@ void DolphinViewActionHandler::createActions()
     // disabled and "delete" is enabled (e.g. non-local files), so that Key_Del
     // can be used for deleting the file (#76016). It needs to be a separate action
     // so that the Edit menu isn't affected.
-    QAction* deleteWithTrashShortcut = m_actionCollection->addAction("delete_shortcut");
+    QAction* deleteWithTrashShortcut = m_actionCollection->addAction(QStringLiteral("delete_shortcut"));
     // The descriptive text is just for the shortcuts editor.
     deleteWithTrashShortcut->setText(i18nc("@action \"Move to Trash\" for non-local files, etc.", "Delete (using shortcut for Trash)"));
     m_actionCollection->setDefaultShortcut(deleteWithTrashShortcut, QKeySequence::Delete);
     deleteWithTrashShortcut->setEnabled(false);
     connect(deleteWithTrashShortcut, &QAction::triggered, this, &DolphinViewActionHandler::slotDeleteItems);
 
-    QAction *propertiesAction = m_actionCollection->addAction( "properties" );
+    QAction *propertiesAction = m_actionCollection->addAction( QStringLiteral("properties") );
     // Well, it's the File menu in dolphinmainwindow and the Edit menu in dolphinpart... :)
     propertiesAction->setText( i18nc("@action:inmenu File", "Properties") );
-    propertiesAction->setIcon(QIcon::fromTheme("document-properties"));
+    propertiesAction->setIcon(QIcon::fromTheme(QStringLiteral("document-properties")));
     m_actionCollection->setDefaultShortcuts(propertiesAction, {Qt::ALT + Qt::Key_Return, Qt::ALT + Qt::Key_Enter});
     connect(propertiesAction, &QAction::triggered, this, &DolphinViewActionHandler::slotProperties);
 
@@ -148,7 +148,7 @@ void DolphinViewActionHandler::createActions()
     KToggleAction* compactAction = compactModeAction();
     KToggleAction* detailsAction = detailsModeAction();
 
-    KSelectAction* viewModeActions = m_actionCollection->add<KSelectAction>("view_mode");
+    KSelectAction* viewModeActions = m_actionCollection->add<KSelectAction>(QStringLiteral("view_mode"));
     viewModeActions->setText(i18nc("@action:intoolbar", "View Mode"));
     viewModeActions->addAction(iconsAction);
     viewModeActions->addAction(compactAction);
@@ -164,24 +164,24 @@ void DolphinViewActionHandler::createActions()
                              SLOT(zoomOut()),
                              m_actionCollection);
 
-    KToggleAction* showPreview = m_actionCollection->add<KToggleAction>("show_preview");
+    KToggleAction* showPreview = m_actionCollection->add<KToggleAction>(QStringLiteral("show_preview"));
     showPreview->setText(i18nc("@action:intoolbar", "Preview"));
     showPreview->setToolTip(i18nc("@info", "Show preview of files and folders"));
-    showPreview->setIcon(QIcon::fromTheme("view-preview"));
+    showPreview->setIcon(QIcon::fromTheme(QStringLiteral("view-preview")));
     connect(showPreview, &KToggleAction::triggered, this, &DolphinViewActionHandler::togglePreview);
 
-    KToggleAction* sortDescending = m_actionCollection->add<KToggleAction>("descending");
+    KToggleAction* sortDescending = m_actionCollection->add<KToggleAction>(QStringLiteral("descending"));
     sortDescending->setText(i18nc("@action:inmenu Sort", "Descending"));
     connect(sortDescending, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleSortOrder);
 
-    KToggleAction* sortFoldersFirst = m_actionCollection->add<KToggleAction>("folders_first");
+    KToggleAction* sortFoldersFirst = m_actionCollection->add<KToggleAction>(QStringLiteral("folders_first"));
     sortFoldersFirst->setText(i18nc("@action:inmenu Sort", "Folders First"));
     connect(sortFoldersFirst, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleSortFoldersFirst);
 
     // View -> Sort By
-    QActionGroup* sortByActionGroup = createFileItemRolesActionGroup("sort_by_");
+    QActionGroup* sortByActionGroup = createFileItemRolesActionGroup(QStringLiteral("sort_by_"));
 
-    KActionMenu* sortByActionMenu = m_actionCollection->add<KActionMenu>("sort");
+    KActionMenu* sortByActionMenu = m_actionCollection->add<KActionMenu>(QStringLiteral("sort"));
     sortByActionMenu->setText(i18nc("@action:inmenu View", "Sort By"));
     sortByActionMenu->setDelayed(false);
 
@@ -193,9 +193,9 @@ void DolphinViewActionHandler::createActions()
     sortByActionMenu->addAction(sortFoldersFirst);
 
     // View -> Additional Information
-    QActionGroup* visibleRolesGroup = createFileItemRolesActionGroup("show_");
+    QActionGroup* visibleRolesGroup = createFileItemRolesActionGroup(QStringLiteral("show_"));
 
-    KActionMenu* visibleRolesMenu = m_actionCollection->add<KActionMenu>("additional_info");
+    KActionMenu* visibleRolesMenu = m_actionCollection->add<KActionMenu>(QStringLiteral("additional_info"));
     visibleRolesMenu->setText(i18nc("@action:inmenu View", "Additional Information"));
     visibleRolesMenu->setDelayed(false);
 
@@ -203,18 +203,18 @@ void DolphinViewActionHandler::createActions()
         visibleRolesMenu->addAction(action);
     }
 
-    KToggleAction* showInGroups = m_actionCollection->add<KToggleAction>("show_in_groups");
-    showInGroups->setIcon(QIcon::fromTheme("view-group"));
+    KToggleAction* showInGroups = m_actionCollection->add<KToggleAction>(QStringLiteral("show_in_groups"));
+    showInGroups->setIcon(QIcon::fromTheme(QStringLiteral("view-group")));
     showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups"));
     connect(showInGroups, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleGroupedSorting);
 
-    KToggleAction* showHiddenFiles = m_actionCollection->add<KToggleAction>("show_hidden_files");
+    KToggleAction* showHiddenFiles = m_actionCollection->add<KToggleAction>(QStringLiteral("show_hidden_files"));
     showHiddenFiles->setText(i18nc("@action:inmenu View", "Hidden Files"));
     showHiddenFiles->setToolTip(i18nc("@info", "Visibility of hidden files and folders"));
     m_actionCollection->setDefaultShortcuts(showHiddenFiles, {Qt::ALT + Qt::Key_Period, Qt::Key_F8});
     connect(showHiddenFiles, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleShowHiddenFiles);
 
-    QAction* adjustViewProps = m_actionCollection->addAction("view_properties");
+    QAction* adjustViewProps = m_actionCollection->addAction(QStringLiteral("view_properties"));
     adjustViewProps->setText(i18nc("@action:inmenu View", "Adjust View Properties..."));
     connect(adjustViewProps, &QAction::triggered, this, &DolphinViewActionHandler::slotAdjustViewProperties);
 }
@@ -301,7 +301,7 @@ void DolphinViewActionHandler::slotViewModeActionTriggered(QAction* action)
     const DolphinView::Mode mode = action->data().value<DolphinView::Mode>();
     m_currentView->setMode(mode);
 
-    QAction* viewModeMenu = m_actionCollection->action("view_mode");
+    QAction* viewModeMenu = m_actionCollection->action(QStringLiteral("view_mode"));
     viewModeMenu->setIcon(action->icon());
 }
 
@@ -341,11 +341,11 @@ QString DolphinViewActionHandler::currentViewModeActionName() const
 {
     switch (m_currentView->mode()) {
     case DolphinView::IconsView:
-        return "icons";
+        return QStringLiteral("icons");
     case DolphinView::DetailsView:
-        return "details";
+        return QStringLiteral("details");
     case DolphinView::CompactView:
-        return "compact";
+        return QStringLiteral("compact");
     default:
         Q_ASSERT(false);
         break;
@@ -364,11 +364,11 @@ void DolphinViewActionHandler::updateViewActions()
     if (viewModeAction) {
         viewModeAction->setChecked(true);
 
-        QAction* viewModeMenu = m_actionCollection->action("view_mode");
+        QAction* viewModeMenu = m_actionCollection->action(QStringLiteral("view_mode"));
         viewModeMenu->setIcon(viewModeAction->icon());
     }
 
-    QAction* showPreviewAction = m_actionCollection->action("show_preview");
+    QAction* showPreviewAction = m_actionCollection->action(QStringLiteral("show_preview"));
     showPreviewAction->setChecked(m_currentView->previewsShown());
 
     slotSortOrderChanged(m_currentView->sortOrder());
@@ -412,14 +412,14 @@ void DolphinViewActionHandler::toggleSortFoldersFirst()
 
 void DolphinViewActionHandler::slotSortOrderChanged(Qt::SortOrder order)
 {
-    QAction* descending = m_actionCollection->action("descending");
+    QAction* descending = m_actionCollection->action(QStringLiteral("descending"));
     const bool sortDescending = (order == Qt::DescendingOrder);
     descending->setChecked(sortDescending);
 }
 
 void DolphinViewActionHandler::slotSortFoldersFirstChanged(bool foldersFirst)
 {
-    m_actionCollection->action("folders_first")->setChecked(foldersFirst);
+    m_actionCollection->action(QStringLiteral("folders_first"))->setChecked(foldersFirst);
 }
 
 void DolphinViewActionHandler::toggleVisibleRole(QAction* action)
@@ -466,7 +466,7 @@ void DolphinViewActionHandler::toggleGroupedSorting(bool grouped)
 
 void DolphinViewActionHandler::slotGroupedSortingChanged(bool groupedSorting)
 {
-    QAction* showInGroupsAction = m_actionCollection->action("show_in_groups");
+    QAction* showInGroupsAction = m_actionCollection->action(QStringLiteral("show_in_groups"));
     showInGroupsAction->setChecked(groupedSorting);
 }
 
@@ -478,46 +478,46 @@ void DolphinViewActionHandler::toggleShowHiddenFiles(bool show)
 
 void DolphinViewActionHandler::slotHiddenFilesShownChanged(bool shown)
 {
-    QAction* showHiddenFilesAction = m_actionCollection->action("show_hidden_files");
+    QAction* showHiddenFilesAction = m_actionCollection->action(QStringLiteral("show_hidden_files"));
     showHiddenFilesAction->setChecked(shown);
 
-    showHiddenFilesAction->setIcon(QIcon::fromTheme(shown ? "visibility" : "hint"));
+    showHiddenFilesAction->setIcon(QIcon::fromTheme(shown ? QStringLiteral("visibility") : QStringLiteral("hint")));
 }
 
 void DolphinViewActionHandler::slotWriteStateChanged(bool isFolderWritable)
 {
-    m_actionCollection->action("create_dir")->setEnabled(isFolderWritable);
+    m_actionCollection->action(QStringLiteral("create_dir"))->setEnabled(isFolderWritable);
 }
 
 KToggleAction* DolphinViewActionHandler::iconsModeAction()
 {
-    KToggleAction* iconsView = m_actionCollection->add<KToggleAction>("icons");
+    KToggleAction* iconsView = m_actionCollection->add<KToggleAction>(QStringLiteral("icons"));
     iconsView->setText(i18nc("@action:inmenu View Mode", "Icons"));
     iconsView->setToolTip(i18nc("@info", "Icons view mode"));
     m_actionCollection->setDefaultShortcut(iconsView, Qt::CTRL | Qt::Key_1);
-    iconsView->setIcon(QIcon::fromTheme("view-list-icons"));
+    iconsView->setIcon(QIcon::fromTheme(QStringLiteral("view-list-icons")));
     iconsView->setData(QVariant::fromValue(DolphinView::IconsView));
     return iconsView;
 }
 
 KToggleAction* DolphinViewActionHandler::compactModeAction()
 {
-    KToggleAction* iconsView = m_actionCollection->add<KToggleAction>("compact");
+    KToggleAction* iconsView = m_actionCollection->add<KToggleAction>(QStringLiteral("compact"));
     iconsView->setText(i18nc("@action:inmenu View Mode", "Compact"));
     iconsView->setToolTip(i18nc("@info", "Compact view mode"));
     m_actionCollection->setDefaultShortcut(iconsView, Qt::CTRL | Qt::Key_2);
-    iconsView->setIcon(QIcon::fromTheme("view-list-details")); // TODO: discuss with Oxygen-team the wrong (?) name
+    iconsView->setIcon(QIcon::fromTheme(QStringLiteral("view-list-details"))); // TODO: discuss with Oxygen-team the wrong (?) name
     iconsView->setData(QVariant::fromValue(DolphinView::CompactView));
     return iconsView;
 }
 
 KToggleAction* DolphinViewActionHandler::detailsModeAction()
 {
-    KToggleAction* detailsView = m_actionCollection->add<KToggleAction>("details");
+    KToggleAction* detailsView = m_actionCollection->add<KToggleAction>(QStringLiteral("details"));
     detailsView->setText(i18nc("@action:inmenu View Mode", "Details"));
     detailsView->setToolTip(i18nc("@info", "Details view mode"));
     m_actionCollection->setDefaultShortcut(detailsView, Qt::CTRL | Qt::Key_3);
-    detailsView->setIcon(QIcon::fromTheme("view-list-tree"));
+    detailsView->setIcon(QIcon::fromTheme(QStringLiteral("view-list-tree")));
     detailsView->setData(QVariant::fromValue(DolphinView::DetailsView));
     return detailsView;
 }
@@ -529,7 +529,7 @@ void DolphinViewActionHandler::slotSortRoleChanged(const QByteArray& role)
         action->setChecked(true);
 
         if (!action->icon().isNull()) {
-            QAction* sortByMenu = m_actionCollection->action("sort");
+            QAction* sortByMenu = m_actionCollection->action(QStringLiteral("sort"));
             sortByMenu->setIcon(action->icon());
         }
     }
@@ -557,7 +557,7 @@ void DolphinViewActionHandler::slotSortTriggered(QAction* action)
     // action-group that assures an exclusive toggle-state between the main-menu
     // actions and the sub-menu-actions. If an action gets checked, it must
     // be assured that all other actions get unchecked.
-    QAction* sortByMenu =  m_actionCollection->action("sort");
+    QAction* sortByMenu =  m_actionCollection->action(QStringLiteral("sort"));
     foreach (QAction* groupAction, sortByMenu->menu()->actions()) {
         KActionMenu* actionMenu = qobject_cast<KActionMenu*>(groupAction);
         if (actionMenu) {
diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp
index c0044c96e..01b41f8b2 100644
--- a/src/views/draganddrophelper.cpp
+++ b/src/views/draganddrophelper.cpp
@@ -32,13 +32,13 @@
 KIO::DropJob* DragAndDropHelper::dropUrls(const QUrl& destUrl, QDropEvent* event, QWidget* window)
 {
     const QMimeData* mimeData = event->mimeData();
-    if (mimeData->hasFormat("application/x-kde-ark-dndextract-service") &&
-        mimeData->hasFormat("application/x-kde-ark-dndextract-path")) {
-        const QString remoteDBusClient = mimeData->data("application/x-kde-ark-dndextract-service");
-        const QString remoteDBusPath = mimeData->data("application/x-kde-ark-dndextract-path");
+    if (mimeData->hasFormat(QStringLiteral("application/x-kde-ark-dndextract-service")) &&
+        mimeData->hasFormat(QStringLiteral("application/x-kde-ark-dndextract-path"))) {
+        const QString remoteDBusClient = mimeData->data(QStringLiteral("application/x-kde-ark-dndextract-service"));
+        const QString remoteDBusPath = mimeData->data(QStringLiteral("application/x-kde-ark-dndextract-path"));
 
         QDBusMessage message = QDBusMessage::createMethodCall(remoteDBusClient, remoteDBusPath,
-                                                              "org.kde.ark.DndExtract", "extractSelectedFilesTo");
+                                                              QStringLiteral("org.kde.ark.DndExtract"), QStringLiteral("extractSelectedFilesTo"));
         message.setArguments({destUrl.toDisplayString(QUrl::PreferLocalFile)});
         QDBusConnection::sessionBus().call(message);
     } else {
diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index 60b7b16c1..a514ede1e 100644
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -60,11 +60,11 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
     m_okButton = buttonBox->button(QDialogButtonBox::Ok);
     m_okButton->setDefault(true);
     m_okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
-    connect(buttonBox, SIGNAL(accepted()), this, SLOT(slotAccepted()));
-    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &RenameDialog::slotAccepted);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &RenameDialog::reject);
     m_okButton->setDefault(true);
 
-    KGuiItem::assign(m_okButton, KGuiItem(i18nc("@action:button", "&Rename"), "dialog-ok-apply"));
+    KGuiItem::assign(m_okButton, KGuiItem(i18nc("@action:button", "&Rename"), QStringLiteral("dialog-ok-apply")));
 
     QWidget* page = new QWidget(this);
     mainLayout->addWidget(page);
diff --git a/src/views/tooltips/filemetadatatooltip.cpp b/src/views/tooltips/filemetadatatooltip.cpp
index 11b9ecd1d..8fbca290d 100644
--- a/src/views/tooltips/filemetadatatooltip.cpp
+++ b/src/views/tooltips/filemetadatatooltip.cpp
@@ -134,7 +134,7 @@ void FileMetaDataToolTip::setName(const QString& name)
     QTextLine line = textLayout.createLine();
     while (line.isValid()) {
         line.setLineWidth(m_name->maximumWidth());
-        wrappedText += processedName.mid(line.textStart(), line.textLength());
+        wrappedText += processedName.midRef(line.textStart(), line.textLength());
 
         line = textLayout.createLine();
         if (line.isValid()) {
diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp
index 4b0d65029..c79440882 100644
--- a/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/src/views/versioncontrol/versioncontrolobserver.cpp
@@ -274,7 +274,7 @@ KVersionControlPlugin* VersionControlObserver::searchPlugin(const QUrl& director
         // all fileview version control plugins and remember them in 'plugins'.
         const QStringList enabledPlugins = VersionControlSettings::enabledPlugins();
 
-        const KService::List pluginServices = KServiceTypeTrader::self()->query("FileViewVersionControlPlugin");
+        const KService::List pluginServices = KServiceTypeTrader::self()->query(QStringLiteral("FileViewVersionControlPlugin"));
         for (KService::List::ConstIterator it = pluginServices.constBegin(); it != pluginServices.constEnd(); ++it) {
             if (enabledPlugins.contains((*it)->name())) {
                 KVersionControlPlugin* plugin = (*it)->createInstance<KVersionControlPlugin>();
diff --git a/src/views/viewproperties.cpp b/src/views/viewproperties.cpp
index 05c993585..597baa293 100644
--- a/src/views/viewproperties.cpp
+++ b/src/views/viewproperties.cpp
@@ -59,12 +59,12 @@ ViewProperties::ViewProperties(const QUrl& url) :
     // If the directory is not writable by the user or the directory is not local,
     // we store the properties information in a local file.
     if (useGlobalViewProps) {
-        m_filePath = destinationDir("global");
-    } else if (url.scheme().contains("search")) {
-        m_filePath = destinationDir("search/") + directoryHashForUrl(url);
+        m_filePath = destinationDir(QStringLiteral("global"));
+    } else if (url.scheme().contains(QStringLiteral("search"))) {
+        m_filePath = destinationDir(QStringLiteral("search/")) + directoryHashForUrl(url);
         useDetailsViewWithPath = true;
     } else if (url.scheme() == QLatin1String("trash")) {
-        m_filePath = destinationDir("trash");
+        m_filePath = destinationDir(QStringLiteral("trash"));
         useDetailsViewWithPath = true;
     } else if (url.isLocalFile()) {
         m_filePath = url.toLocalFile();
@@ -79,10 +79,10 @@ ViewProperties::ViewProperties(const QUrl& url) :
 			// m_filePath probably begins with C:/ - the colon is not a valid character for paths though
 			m_filePath =  QDir::separator() + m_filePath.remove(QLatin1Char(':'));
 #endif
-            m_filePath = destinationDir("local") + m_filePath;
+            m_filePath = destinationDir(QStringLiteral("local")) + m_filePath;
         }
     } else {
-        m_filePath = destinationDir("remote") + m_filePath;
+        m_filePath = destinationDir(QStringLiteral("remote")) + m_filePath;
     }
 
     const QString file = m_filePath + QDir::separator() + ViewPropertiesFileName;
@@ -249,6 +249,7 @@ void ViewProperties::setVisibleRoles(const QList<QByteArray>& roles)
     }
 
     // Add the updated values for the current view-mode
+    newVisibleRoles.reserve(roles.count());
     foreach (const QByteArray& role, roles) {
         newVisibleRoles.append(prefix + role);
     }
@@ -385,9 +386,9 @@ QString ViewProperties::viewModePrefix() const
     QString prefix;
 
     switch (m_node->viewMode()) {
-    case DolphinView::IconsView:   prefix = "Icons_"; break;
-    case DolphinView::CompactView: prefix = "Compact_"; break;
-    case DolphinView::DetailsView: prefix = "Details_"; break;
+    case DolphinView::IconsView:   prefix = QStringLiteral("Icons_"); break;
+    case DolphinView::CompactView: prefix = QStringLiteral("Compact_"); break;
+    case DolphinView::DetailsView: prefix = QStringLiteral("Details_"); break;
     default: qCWarning(DolphinDebug) << "Unknown view-mode of the view properties";
     }
 
@@ -411,7 +412,7 @@ void ViewProperties::convertAdditionalInfo()
             if (index >= 0 && index + 1 < visibleRole.length()) {
                 ++index;
                 if (visibleRole[index] == QLatin1Char('L')) {
-                    visibleRole.replace("LinkDestination", "destination");
+                    visibleRole.replace(QLatin1String("LinkDestination"), QLatin1String("destination"));
                 } else {
                     visibleRole[index] = visibleRole[index].toLower();
                 }
@@ -438,7 +439,7 @@ void ViewProperties::convertNameRoleToTextRole()
 
     QString sortRole = m_node->sortRole();
     if (sortRole == QLatin1String("name")) {
-        sortRole = QLatin1String("text");
+        sortRole = QStringLiteral("text");
     }
 
     m_node->setVisibleRoles(visibleRoles);