include cleanup

[dolphin.git] / src / applyviewpropsjob.cpp

diff --git a/src/applyviewpropsjob.cpp b/src/applyviewpropsjob.cpp
index 0be8f4d47d32969084f1f3c1af93159c635bf5f4..c25c3bd5ae9fd205b3378bd75df7370729d40fde 100644 (file)
--- a/src/applyviewpropsjob.cpp
+++ b/src/applyviewpropsjob.cpp
@@ -23,11 +23,12 @@
 #include "applyviewpropsjob.h"
 #include "viewproperties.h"
 
+#include <assert.h>
 #include <kdebug.h>
 
 ApplyViewPropsJob::ApplyViewPropsJob(const KUrl& dir,
                                      const ViewProperties& viewProps) :
-    KIO::Job(false),
+    KIO::Job(),
     m_viewProps(0),
     m_progress(0),
     m_dir(dir)
@@ -68,18 +69,16 @@ void ApplyViewPropsJob::slotEntries(KIO::Job*, const KIO::UDSEntryList& list)
     for (; it != end; ++it) {
         const KIO::UDSEntry& entry = *it;
         const QString name = entry.stringValue(KIO::UDS_NAME);
-        if ((name != ".") && (name != ".." ) && entry.isDir()) {
+        if ((name != ".") && (name != "..") && entry.isDir()) {
             ++m_progress;
 
             KUrl url(m_dir);
             url.addPath(name);
 
+            assert(m_viewProps != 0);
+
             ViewProperties props(url);
-            props.setViewMode(m_viewProps->viewMode());
-            props.setShowPreview(m_viewProps->showPreview());
-            props.setShowHiddenFiles(m_viewProps->showHiddenFiles());
-            props.setSorting(m_viewProps->sorting());
-            props.setSortOrder(m_viewProps->sortOrder());
+            props.setDirProperties(*m_viewProps);
         }
     }
 }
@@ -87,8 +86,8 @@ void ApplyViewPropsJob::slotEntries(KIO::Job*, const KIO::UDSEntryList& list)
 void ApplyViewPropsJob::slotResult(KJob* job)
 {
     if (job->error()) {
-        setError( job->error() );
-        setErrorText( job->errorText() );
+        setError(job->error());
+        setErrorText(job->errorText());
     }
     emitResult();
 }