they must be really smaller (CID 3220)

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

diff --git a/src/dolphinsortfilterproxymodel.cpp b/src/dolphinsortfilterproxymodel.cpp
index a1dc3e3d0751d1a3215bcd2980d787776e1d95ac..8a7bccb78fc7027c7b0cf24ff7b172faf8e571bb 100644 (file)
--- a/src/dolphinsortfilterproxymodel.cpp
+++ b/src/dolphinsortfilterproxymodel.cpp
@@ -66,7 +66,7 @@ void DolphinSortFilterProxyModel::setSorting(DolphinView::Sorting sorting)
 {
     // Update the sort column by mapping DolpginView::Sorting to
     // KDirModel::ModelColumns. We will keep the sortOrder.
 {
     // Update the sort column by mapping DolpginView::Sorting to
     // KDirModel::ModelColumns. We will keep the sortOrder.

-    Q_ASSERT(static_cast<int>(sorting) >= 0 && static_cast<int>(sorting) <= dolphinMapSize);
+    Q_ASSERT(static_cast<int>(sorting) >= 0 && static_cast<int>(sorting) < dolphinMapSize);

     sort(dolphinViewToDirModelColumn[static_cast<int>(sorting)],
          m_sortOrder );
 }
     sort(dolphinViewToDirModelColumn[static_cast<int>(sorting)],
          m_sortOrder );
 }


@@ -81,7 +81,7 @@ void DolphinSortFilterProxyModel::sort(int column, Qt::SortOrder sortOrder)
 {
     m_sortColumn = column;
     m_sortOrder = sortOrder;
 {
     m_sortColumn = column;
     m_sortOrder = sortOrder;

-    m_sorting = (column >= 0) && (column <= dolphinMapSize) ?
+    m_sorting = (column >= 0) && (column < dolphinMapSize) ?

                 dirModelColumnToDolphinView[column]  :
                 DolphinView::SortByName;
     QSortFilterProxyModel::sort(column, sortOrder);
                 dirModelColumnToDolphinView[column]  :
                 DolphinView::SortByName;
     QSortFilterProxyModel::sort(column, sortOrder);