SVN_SILENT made messages (.desktop file)

[dolphin.git] / src / applyviewpropsjob.cpp

diff --git a/src/applyviewpropsjob.cpp b/src/applyviewpropsjob.cpp
index 539c52ee1331108ab574edc1e35dacc994e74b55..ad9a22645f90fef4a9d1670e4ce561fd19c29bed 100644 (file)
--- a/src/applyviewpropsjob.cpp
+++ b/src/applyviewpropsjob.cpp
@@ -17,28 +17,30 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *

- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *

  ***************************************************************************/
 
 #include "applyviewpropsjob.h"
 #include "viewproperties.h"
 
  ***************************************************************************/
 
 #include "applyviewpropsjob.h"
 #include "viewproperties.h"
 

+#include <assert.h>

 #include <kdebug.h>
 
 ApplyViewPropsJob::ApplyViewPropsJob(const KUrl& dir,
                                      const ViewProperties& viewProps) :
 #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)
 {
     m_viewProps = new ViewProperties(dir);
     m_viewProps->setViewMode(viewProps.viewMode());
     m_viewProps(0),
     m_progress(0),
     m_dir(dir)
 {
     m_viewProps = new ViewProperties(dir);
     m_viewProps->setViewMode(viewProps.viewMode());

-    m_viewProps->setShowHiddenFilesEnabled(viewProps.isShowHiddenFilesEnabled());
+    m_viewProps->setShowPreview(viewProps.showPreview());
+    m_viewProps->setShowHiddenFiles(viewProps.showHiddenFiles());

     m_viewProps->setSorting(viewProps.sorting());
     m_viewProps->setSortOrder(viewProps.sortOrder());
 
     m_viewProps->setSorting(viewProps.sorting());
     m_viewProps->setSortOrder(viewProps.sortOrder());
 

-    startNextJob(dir, viewProps);
+    startNextJob(dir);

 }
 
 ApplyViewPropsJob::~ApplyViewPropsJob()
 }
 
 ApplyViewPropsJob::~ApplyViewPropsJob()


@@ -52,10 +54,9 @@ void ApplyViewPropsJob::processNextItem()
     emitResult();
 }
 
     emitResult();
 }
 

-void ApplyViewPropsJob::startNextJob(const KUrl& url,
-                                     const ViewProperties& viewProps)
+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);
     connect(listJob, SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList&)),
             SLOT(slotEntries(KIO::Job*, const KIO::UDSEntryList&)));
     addSubjob(listJob);


@@ -67,18 +68,17 @@ 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 KIO::UDSEntryList::ConstIterator end = list.end();
     for (; it != end; ++it) {
         const KIO::UDSEntry& entry = *it;

-        const QString name = entry.stringValue(KIO::UDS_NAME);
-        if ((name != ".") && (name != ".." ) && entry.isDir()) {
+        const QString name = entry.stringValue(KIO::UDSEntry::UDS_NAME);
+        if ((name != ".") && (name != "..") && entry.isDir()) {

             ++m_progress;
 
             KUrl url(m_dir);
             url.addPath(name);
 
             ++m_progress;
 
             KUrl url(m_dir);
             url.addPath(name);
 

+            assert(m_viewProps != 0);
+

             ViewProperties props(url);
             ViewProperties props(url);

-            props.setViewMode(m_viewProps->viewMode());
-            props.setShowHiddenFilesEnabled(m_viewProps->isShowHiddenFilesEnabled());
-            props.setSorting(m_viewProps->sorting());
-            props.setSortOrder(m_viewProps->sortOrder());
+            props.setDirProperties(*m_viewProps);

         }
     }
 }
         }
     }
 }


@@ -86,8 +86,8 @@ void ApplyViewPropsJob::slotEntries(KIO::Job*, const KIO::UDSEntryList& list)
 void ApplyViewPropsJob::slotResult(KJob* job)
 {
     if (job->error()) {
 void ApplyViewPropsJob::slotResult(KJob* job)
 {
     if (job->error()) {

-        setError( job->error() );
-        setErrorText( job->errorText() );
+        setError(job->error());
+        setErrorText(job->errorText());

     }
     emitResult();
 }
     }
     emitResult();
 }