Fix the problem of the crash related to commit 677667, taking in count we are in...

different than ListMode. Fix some comments.

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

diff --git a/src/kitemcategorizer.h b/src/kitemcategorizer.h
index 1d64206eb60cf24ae388fd2219e8d0f8824f35b2..5c6531a1de61544b02b08defce6d99bd75ddca0f 100644 (file)
--- 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 15c8b576ad73b99f7e17d3184a6d68791a02d479..7e4259be66ee8be48c937db245187249a9c17cc0 100644 (file)
--- 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 ee02b5ff70f3895569414e533ea6978f8fc6bb5e..725b6e82ed828b79a82e19249358af530481046a 100644 (file)
--- 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 47be30c5630189d2157efb31669779f4c7ddc8bd..58ac3486e280eb003197b7efe0743f7b017153c5 100644 (file)
--- 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 e547a5d40b1325ee3322c57ffb06cf12de51c59e..2748c64ec6ba2b682609136076128fc40c2c751f 100644 (file)
--- a/src/ksortfilterproxymodel.h
+++ b/src/ksortfilterproxymodel.h
@@ -51,4 +51,4 @@ private:
     Qt::SortOrder m_sortOrder;
 };
 
-#endif
+#endif // KSORTFILTERPROXYMODEL_H