Fix the problem of the crash related to commit 677667, taking in count we are in IconMode, not in a mode

different than ListMode. Fix some comments.

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

5 files changed, 5 insertions, 5 deletions

diff --git a/src/kitemcategorizer.h b/src/kitemcategorizer.h
index 1d64206eb..5c6531a1d 100644
--- a/src/kitemcategorizer.h
+++ b/src/kitemcategorizer.h
@@ -40,4 +40,4 @@ public:
     virtual QString categoryForItem(const QModelIndex &index, int sortRole) = 0;
 };
 
-#endif
+#endif // KITEMCATEGORIZER_H
diff --git a/src/klistview.cpp b/src/klistview.cpp
index 15c8b576a..7e4259be6 100644
--- a/src/klistview.cpp
+++ b/src/klistview.cpp
@@ -956,7 +956,7 @@ void KListView::updateGeometries()
 
 void KListView::slotSortingRoleChanged()
 {
-    if ((viewMode() != KListView::ListMode) && d->proxyModel &&
+    if ((viewMode() == KListView::IconMode) && d->proxyModel &&
         d->itemCategorizer)
     {
         // Force the view to update all elements
diff --git a/src/klistview.h b/src/klistview.h
index ee02b5ff7..725b6e82e 100644
--- a/src/klistview.h
+++ b/src/klistview.h
@@ -89,4 +89,4 @@ private:
     Private *d;
 };
 
-#endif // __KLISTVIEW_H__
+#endif // KLISTVIEW_H
diff --git a/src/klistview_p.h b/src/klistview_p.h
index 47be30c56..58ac3486e 100644
--- a/src/klistview_p.h
+++ b/src/klistview_p.h
@@ -135,4 +135,4 @@ public:
     QModelIndex lastIndex;
 };
 
-#endif // __KLISTVIEW_P_H__
+#endif // KLISTVIEW_P_H
diff --git a/src/ksortfilterproxymodel.h b/src/ksortfilterproxymodel.h
index e547a5d40..2748c64ec 100644
--- a/src/ksortfilterproxymodel.h
+++ b/src/ksortfilterproxymodel.h
@@ -51,4 +51,4 @@ private:
     Qt::SortOrder m_sortOrder;
 };
 
-#endif
+#endif // KSORTFILTERPROXYMODEL_H