X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c6d0d2b92df9f53b7caa9fd041a14d33d03ecdf4..88a3ee8ac64efefc0bca70aa6560c8ce69f8487b:/src/dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index d5f50c653..dc23b5573 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -32,7 +32,7 @@
 #include "metadatawidget.h"
 #include "mainwindowadaptor.h"
 #include "treeviewsidebarpage.h"
-#include "urlnavigator.h"
+#include "kurlnavigator.h"
 #include "viewpropertiesdialog.h"
 #include "viewproperties.h"
 #include "kfileplacesmodel.h"
@@ -318,7 +318,7 @@ void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting)
 void DolphinMainWindow::slotSortOrderChanged(Qt::SortOrder order)
 {
     KToggleAction* descending = static_cast<KToggleAction*>(actionCollection()->action("descending"));
-    const bool sortDescending = (order == Qt::Descending);
+    const bool sortDescending = (order == Qt::DescendingOrder);
     descending->setChecked(sortDescending);
 }
 
@@ -720,9 +720,9 @@ void DolphinMainWindow::sortByGroup()
 
 void DolphinMainWindow::toggleSortOrder()
 {
-    const Qt::SortOrder order = (m_activeView->sortOrder() == Qt::Ascending) ?
-                                Qt::Descending :
-                                Qt::Ascending;
+    const Qt::SortOrder order = (m_activeView->sortOrder() == Qt::AscendingOrder) ?
+                                Qt::DescendingOrder :
+                                Qt::AscendingOrder;
     m_activeView->setSortOrder(order);
 }
 
@@ -1061,7 +1061,7 @@ void DolphinMainWindow::setupActions()
     // setup 'File' menu
     m_newMenu = new DolphinNewMenu(this);
     KMenu* menu = m_newMenu->menu();
-    menu->setTitle(i18n("Create New..."));
+    menu->setTitle(i18n("Create New"));
     menu->setIcon(KIcon("document-new"));
     connect(menu, SIGNAL(aboutToShow()),
             this, SLOT(updateNewMenu()));
@@ -1073,7 +1073,7 @@ void DolphinMainWindow::setupActions()
     connect(newWindow, SIGNAL(triggered()), this, SLOT(openNewMainWindow()));
 
     QAction* rename = actionCollection()->addAction("rename");
-    rename->setText(i18n("Rename"));
+    rename->setText(i18n("Rename..."));
     rename->setShortcut(Qt::Key_F2);
     connect(rename, SIGNAL(triggered()), this, SLOT(rename()));
 
@@ -1506,7 +1506,7 @@ void DolphinMainWindow::connectViewSignals(int viewIndex)
     connect(view, SIGNAL(urlChanged(KUrl)),
             this, SLOT(changeUrl(KUrl)));
 
-    const UrlNavigator* navigator = view->urlNavigator();
+    const KUrlNavigator* navigator = view->urlNavigator();
     connect(navigator, SIGNAL(urlChanged(const KUrl&)),
             this, SLOT(changeUrl(const KUrl&)));
     connect(navigator, SIGNAL(historyChanged()),