[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.2/kdelibs/kio/kio
From:       David Faure <faure () kde ! org>
Date:       2009-01-12 12:34:19
Message-ID: 1231763659.464354.21610.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 909864 by dfaure:

Default to 0, not to (qulonglong)-1 when looking up UDS_SIZE, otherwise items
without a size (like trash:/) count as 16TB...
BUG: 157023


 M  +6 -6      directorysizejob.cpp  


--- branches/KDE/4.2/kdelibs/kio/kio/directorysizejob.cpp #909863:909864
@@ -147,19 +147,19 @@
     for (; it != end; ++it) {
 
         const KIO::UDSEntry& entry = *it;
-        const KIO::filesize_t size = entry.numberValue( KIO::UDSEntry::UDS_SIZE, -1 );
+        const KIO::filesize_t size = entry.numberValue(KIO::UDSEntry::UDS_SIZE, 0);
         const QString name = entry.stringValue( KIO::UDSEntry::UDS_NAME );
-        if ( name == "." )
+        if (name == ".") {
             m_totalSize += size;
-        else if ( name != ".." )
-        {
+            //kDebug(7007) << "'.': added" << size << "->" << m_totalSize;
+        } else if (name != "..") {
             if (!entry.isLink())
               m_totalSize += size;
             if (!entry.isDir())
               m_totalFiles++;
             else
               m_totalSubdirs++;
-            //kDebug(7007) << name << ":" << size;
+            //kDebug(7007) << name << ":" << size << "->" << m_totalSize;
         }
     }
 }
@@ -167,7 +167,7 @@
 void DirectorySizeJob::slotResult( KJob * job )
 {
     Q_D(DirectorySizeJob);
-    //kDebug(7007);
+    //kDebug(7007) << d->m_totalSize;
     removeSubjob(job);
     if (d->m_currentItem < d->m_lstItems.count())
     {
[prev in list] [next in list] [prev in thread] [next in thread]