Qt::Ascending -> Qt::AscendingOrder

Qt::Descending -> Qt::DescendingOrder

svn path=/trunk/KDE/kdebase/apps/; revision=650398

diff --git a/src/dolphin_directoryviewpropertysettings.kcfg b/src/dolphin_directoryviewpropertysettings.kcfg
index 1d074100a5f3838092a4cf7f23411e9f0df8ca67..64a859173af4922a505a55835e2706bf1bdad015 100644 (file)
--- a/src/dolphin_directoryviewpropertysettings.kcfg
+++ b/src/dolphin_directoryviewpropertysettings.kcfg
@@ -39,9 +39,9 @@
 
         <entry name="SortOrder" type="Int" >
             <label>Order to sort files in</label>
-            <default code="true">Qt::Ascending</default>
-            <min code="true">Qt::Ascending</min>
-            <max code="true">Qt::Descending</max>
+            <default code="true">Qt::AscendingOrder</default>
+            <min code="true">Qt::AscendingOrder</min>
+            <max code="true">Qt::DescendingOrder</max>
         </entry>
 
         <entry name="AdditionalInfo" type="Int">

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index f77d45c72558e86c867adf0b87aefa9d77c7f5c9..9ff5c502449df371511d8c4d9b84f220a3b9636b 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -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);
 }
 

diff --git a/src/dolphinsortfilterproxymodel.cpp b/src/dolphinsortfilterproxymodel.cpp
index b81f1800f3323f71e33d0d3e67def7dfba2a127f..e42843cb43c9ffd73e868f48b9afe37bc486f0f9 100644 (file)
--- a/src/dolphinsortfilterproxymodel.cpp
+++ b/src/dolphinsortfilterproxymodel.cpp
@@ -48,14 +48,14 @@ DolphinSortFilterProxyModel::DolphinSortFilterProxyModel(QObject* parent) :
     QSortFilterProxyModel(parent),
     m_sortColumn(0),
     m_sorting(DolphinView::SortByName),
-    m_sortOrder(Qt::Ascending)
+    m_sortOrder(Qt::AscendingOrder)
 {
     setDynamicSortFilter(true);
 
     // sort by the user visible string for now
     setSortRole(Qt::DisplayRole);
     setSortCaseSensitivity(Qt::CaseInsensitive);
-    sort(KDirModel::Name, Qt::Ascending);
+    sort(KDirModel::Name, Qt::AscendingOrder);
 }
 
 DolphinSortFilterProxyModel::~DolphinSortFilterProxyModel()

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index 19142d6ea45b64e9b739368f01bd3cb9598a0777..7157e83539fa349d92e2feca6c0d06d2e1915f2f 100644 (file)
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -61,7 +61,7 @@ TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
     m_treeView->setModel(m_proxyModel);
 
     m_proxyModel->setSorting(DolphinView::SortByName);
-    m_proxyModel->setSortOrder(Qt::Ascending);
+    m_proxyModel->setSortOrder(Qt::AscendingOrder);
 
     connect(m_treeView, SIGNAL(clicked(const QModelIndex&)),
             this, SLOT(updateActiveView(const QModelIndex&)));

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index 41e9cfac5d17572bca478fa60c40e9e890978e26..a65c6c2d9513078193ca29ac1a500341d0b9cadf 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -91,7 +91,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     m_sortOrder = new QComboBox(sortingBox);
     m_sortOrder->addItem(i18n("Ascending"));
     m_sortOrder->addItem(i18n("Descending"));
-    const int sortOrderIdx = (m_viewProps->sortOrder() == Qt::Ascending) ? 0 : 1;
+    const int sortOrderIdx = (m_viewProps->sortOrder() == Qt::AscendingOrder) ? 0 : 1;
     m_sortOrder->setCurrentIndex(sortOrderIdx);
 
     m_sorting = new QComboBox(sortingBox);
@@ -228,7 +228,7 @@ void ViewPropertiesDialog::slotSortingChanged(int index)
 
 void ViewPropertiesDialog::slotSortOrderChanged(int index)
 {
-    Qt::SortOrder sortOrder = (index == 0) ? Qt::Ascending : Qt::Descending;
+    Qt::SortOrder sortOrder = (index == 0) ? Qt::AscendingOrder : Qt::DescendingOrder;
     m_viewProps->setSortOrder(sortOrder);
     m_isDirty = true;
 }