X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/07ad9b3726d8d16041cd8bc6b394eaa784c063b1..60d555fa55f025f3ecaa82cf95f012cbbbeb8ddc:/src/dolphinmainwindow.cpp diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index f5d175482..399c662f8 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -84,7 +84,6 @@ #include #include #include -#include #include #include #include @@ -646,7 +645,7 @@ void DolphinMainWindow::selectAll() // URL instead of all items of the view KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator(); - QLineEdit* lineEdit = urlNavigator->editor()->lineEdit(); + QLineEdit* lineEdit = urlNavigator->editor()->lineEdit(); // krazy:exclude=qclasses const bool selectUrl = urlNavigator->isUrlEditable() && lineEdit->hasFocus(); if (selectUrl) { @@ -722,7 +721,7 @@ void DolphinMainWindow::replaceLocation() navigator->setFocus(); // select the whole text of the combo box editor - QLineEdit* lineEdit = navigator->editor()->lineEdit(); + QLineEdit* lineEdit = navigator->editor()->lineEdit(); // krazy:exclude=qclasses const QString text = lineEdit->text(); lineEdit->setSelection(0, text.length()); } @@ -1242,7 +1241,7 @@ void DolphinMainWindow::setupActions() KAction* openTerminal = actionCollection()->addAction("open_terminal"); openTerminal->setText(i18nc("@action:inmenu Tools", "Open Terminal")); - openTerminal->setIcon(KIcon("terminal")); + openTerminal->setIcon(KIcon("utilities-terminal")); openTerminal->setShortcut(Qt::SHIFT | Qt::Key_F4); connect(openTerminal, SIGNAL(triggered()), this, SLOT(openTerminal())); @@ -1342,7 +1341,7 @@ void DolphinMainWindow::setupDockWidgets() QAction* terminalAction = terminalDock->toggleViewAction(); terminalAction->setText(i18nc("@title:window Shell terminal", "Terminal")); terminalAction->setShortcut(Qt::Key_F4); - terminalAction->setIcon(KIcon("terminal")); + terminalAction->setIcon(KIcon("utilities-terminal")); actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction()); addDockWidget(Qt::BottomDockWidgetArea, terminalDock); @@ -1519,7 +1518,7 @@ QString DolphinMainWindow::tabName(const KUrl& url) const { QString name; if (url.equals(KUrl("file:///"))) { - name = "/"; + name = '/'; } else { name = url.fileName(); if (name.isEmpty()) {