Fix for show_filter_bar action of tools-menu, which is not correctly set (when the...

[dolphin.git] / src / applyviewpropsjob.cpp

diff --git a/src/applyviewpropsjob.cpp b/src/applyviewpropsjob.cpp
index c25c3bd5ae9fd205b3378bd75df7370729d40fde..4837ff538897460c9aed1203fdf7c16fd7374cde 100644 (file)
--- a/src/applyviewpropsjob.cpp
+++ b/src/applyviewpropsjob.cpp
@@ -23,9 +23,6 @@
 #include "applyviewpropsjob.h"
 #include "viewproperties.h"
 
-#include <assert.h>
-#include <kdebug.h>
-
 ApplyViewPropsJob::ApplyViewPropsJob(const KUrl& dir,
                                      const ViewProperties& viewProps) :
     KIO::Job(),
@@ -56,7 +53,7 @@ void ApplyViewPropsJob::processNextItem()
 
 void ApplyViewPropsJob::startNextJob(const KUrl& url)
 {
-    KIO::ListJob* listJob = KIO::listRecursive(url, false);
+    KIO::ListJob* listJob = KIO::listRecursive(url, KIO::HideProgressInfo);
     connect(listJob, SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList&)),
             SLOT(slotEntries(KIO::Job*, const KIO::UDSEntryList&)));
     addSubjob(listJob);
@@ -68,14 +65,14 @@ void ApplyViewPropsJob::slotEntries(KIO::Job*, const KIO::UDSEntryList& list)
     const KIO::UDSEntryList::ConstIterator end = list.end();
     for (; it != end; ++it) {
         const KIO::UDSEntry& entry = *it;
-        const QString name = entry.stringValue(KIO::UDS_NAME);
+        const QString name = entry.stringValue(KIO::UDSEntry::UDS_NAME);
         if ((name != ".") && (name != "..") && entry.isDir()) {
             ++m_progress;
 
             KUrl url(m_dir);
             url.addPath(name);
 
-            assert(m_viewProps != 0);
+            Q_ASSERT(m_viewProps != 0);
 
             ViewProperties props(url);
             props.setDirProperties(*m_viewProps);