Ver0.23

[gefu/Gefu.git] / deleteworker.cpp

diff --git a/deleteworker.cpp b/deleteworker.cpp
index 0291108..65fcac1 100644 (file)
--- a/deleteworker.cpp
+++ b/deleteworker.cpp
@@ -4,7 +4,7 @@
 #include <QDebug>\r
 \r
 DeleteWorker::DeleteWorker(QObject *parent) :\r
-    IWorker(parent),\r
+    AbstractWorker(parent),\r
     m_DeleteList(NULL),\r
     m_Targets()\r
 {\r
@@ -19,7 +19,7 @@ void DeleteWorker::operate()
             emit canceled();\r
             return;\r
         }\r
-        Listup(info.absolutePath());\r
+        Listup(info.absoluteFilePath());\r
     }\r
 \r
     bool ret;\r
@@ -64,21 +64,22 @@ void DeleteWorker::operate()
 \r
 void DeleteWorker::Listup(const QString &path)\r
 {\r
-//    qDebug() << tr("Listup: ") << path;\r
-\r
     if (isStopRequested()) {\r
         return;\r
     }\r
 \r
-    QFileInfo info(path);\r
-\r
-    if (info.isDir()) {\r
+    if (QFileInfo(path).isDir()) {\r
         QDir dir(path);\r
-        foreach (QFileInfo info2, dir.entryInfoList(QDir::NoDotAndDotDot | QDir::System | QDir::Hidden | QDir::AllDirs | QDir::Files, QDir::DirsFirst)) {\r
-//            qDebug() << info2.fileName();\r
-            Listup(info2.absoluteFilePath());\r
+        QFileInfoList list = dir.entryInfoList(QDir::NoDotAndDotDot |\r
+                                               QDir::System |\r
+                                               QDir::Hidden |\r
+                                               QDir::AllDirs |\r
+                                               QDir::Files,\r
+                                               QDir::DirsFirst);\r
+        foreach (const QFileInfo &info, list) {\r
+            Listup(info.absoluteFilePath());\r
         }\r
     }\r
-//    qDebug() << "Targeting: " << path;\r
+\r
     m_Targets << path;\r
 }\r