SVN_SILENT: coding style cleanups (no change of behavior has been done)

svn path=/trunk/KDE/kdebase/apps/; revision=866787

diff --git a/src/applyviewpropsjob.cpp b/src/applyviewpropsjob.cpp
index 4837ff538897460c9aed1203fdf7c16fd7374cde..9250226e9d5d993f9d2d244d6f4fd55298d0f37a 100644 (file)
--- a/src/applyviewpropsjob.cpp
+++ b/src/applyviewpropsjob.cpp
@@ -37,7 +37,10 @@ ApplyViewPropsJob::ApplyViewPropsJob(const KUrl& dir,
     m_viewProps->setSorting(viewProps.sorting());
     m_viewProps->setSortOrder(viewProps.sortOrder());
 
-    startNextJob(dir);
+    KIO::ListJob* listJob = KIO::listRecursive(dir, KIO::HideProgressInfo);
+    connect(listJob, SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList&)),
+            SLOT(slotEntries(KIO::Job*, const KIO::UDSEntryList&)));
+    addSubjob(listJob);
 }
 
 ApplyViewPropsJob::~ApplyViewPropsJob()
@@ -46,25 +49,11 @@ ApplyViewPropsJob::~ApplyViewPropsJob()
     m_viewProps = 0;
 }
 
-void ApplyViewPropsJob::processNextItem()
-{
-    emitResult();
-}
-
-void ApplyViewPropsJob::startNextJob(const KUrl& url)
-{
-    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);
-}
-
 void ApplyViewPropsJob::slotEntries(KIO::Job*, const KIO::UDSEntryList& list)
 {
     KIO::UDSEntryList::ConstIterator it = list.begin();
     const KIO::UDSEntryList::ConstIterator end = list.end();
-    for (; it != end; ++it) {
-        const KIO::UDSEntry& entry = *it;
+    foreach(const KIO::UDSEntry& entry, list) {
         const QString name = entry.stringValue(KIO::UDSEntry::UDS_NAME);
         if ((name != ".") && (name != "..") && entry.isDir()) {
             ++m_progress;

diff --git a/src/applyviewpropsjob.h b/src/applyviewpropsjob.h
index 4ffc069a9d9ed4ce33f4dae97458f0779dac78b6..da18af966d28968d9fc9dc334ac4ed1c53abb518 100644 (file)
--- a/src/applyviewpropsjob.h
+++ b/src/applyviewpropsjob.h
@@ -62,18 +62,11 @@ public:
      */
     ApplyViewPropsJob(const KUrl& dir, const ViewProperties& viewProps);
     virtual ~ApplyViewPropsJob();
-    int progress() const
-    {
-        return m_progress;
-    }
-
-private:
-    void startNextJob(const KUrl & url);
+    int progress() const;
 
 private slots:
     virtual void slotResult(KJob* job);
     void slotEntries(KIO::Job*, const KIO::UDSEntryList&);
-    void processNextItem();
 
 private:
     ViewProperties* m_viewProps;
@@ -82,4 +75,9 @@ private:
     KUrl m_dir;
 };
 
+inline int ApplyViewPropsJob::progress() const
+{
+    return m_progress;
+}
+
 #endif