From: David Faure <faure@kde.org>
Date: Fri, 10 Jul 2009 11:46:48 +0000 (+0000)
Subject: Fix regression introduced by an obviously untested "krazy fix" (r973284). Setting a
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/ebd0f1b06fdf94fc7be5c44a434dd6fc96a34e4a

Fix regression introduced by an obviously untested "krazy fix" (r973284). Setting a
QVariant to QString() is not the same as calling clear on the QVariant (which makes the variant invalid).
(BUG 194502)

svn path=/trunk/KDE/kdebase/apps/; revision=994217
---

diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp
index f37452c80..819b37d2a 100644
--- a/src/dolphinmodel.cpp
+++ b/src/dolphinmodel.cpp
@@ -411,7 +411,8 @@ QVariant DolphinModel::sortRoleData(const QModelIndex& index) const
 
     case KDirModel::Type:
         if (item.isDir()) {
-            retVariant.clear(); // when sorting we want folders to be placed first
+            // when sorting we want folders to be placed first
+            retVariant = QString(); // krazy:exclude=nullstrassign
         } else {
             retVariant = item.mimeComment();
         }