From 27a63dd497c25f9cc1c97b4decfacd618114521c Mon Sep 17 00:00:00 2001
From: kh1 <karsten.heimrich@digia.com>
Date: Wed, 16 Oct 2013 12:48:21 +0200
Subject: Be more verbose on the resource tree.

Change-Id: I1e079f94767d95d997ebb6d758c40e605fd36c75
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
---
 src/sdk/installerbase.cpp | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp
index 15073cf07..e188107f9 100644
--- a/src/sdk/installerbase.cpp
+++ b/src/sdk/installerbase.cpp
@@ -61,6 +61,7 @@
 #include <kdrunoncechecker.h>
 #include <kdupdaterfiledownloaderfactory.h>
 
+#include <QDirIterator>
 #include <QtCore/QTranslator>
 #include <QMessageBox>
 
@@ -254,11 +255,10 @@ int main(int argc, char *argv[])
             qDebug() << "Resource tree before loading the in-binary resource:";
             qDebug() << "Language: " << QLocale().uiLanguages().value(0, QLatin1String("No UI language set"));
 
-            QDir dir(QLatin1String(":/"));
-            foreach (const QString &i, dir.entryList()) {
-                const QByteArray ba = i.toUtf8();
-                qDebug().nospace() << "    :/" << ba.constData();
-            }
+            QDirIterator it(QLatin1String(":/"), QDir::NoDotAndDotDot | QDir::AllEntries | QDir::Hidden,
+                QDirIterator::Subdirectories);
+            while (it.hasNext())
+                qDebug() << QString::fromLatin1("    %1").arg(it.next());
         }
 
         // register custom operations before reading the binary content cause they may used in
@@ -362,18 +362,10 @@ int main(int argc, char *argv[])
 
         if (QInstaller::isVerbose()) {
             qDebug() << "Resource tree after loading the in-binary resource:";
-
-            QDir dir = QDir(QLatin1String(":/"));
-            foreach (const QString &i, dir.entryList())
-                qDebug() << QString::fromLatin1("    :/%1").arg(i);
-
-            dir = QDir(QLatin1String(":/metadata/"));
-            foreach (const QString &i, dir.entryList())
-                qDebug() << QString::fromLatin1("    :/metadata/%1").arg(i);
-
-            dir = QDir(QLatin1String(":/translations/"));
-            foreach (const QString &i, dir.entryList())
-                qDebug() << QString::fromLatin1("    :/translations/%1").arg(i);
+            QDirIterator it(QLatin1String(":/"), QDir::NoDotAndDotDot | QDir::AllEntries | QDir::Hidden,
+                QDirIterator::Subdirectories);
+            while (it.hasNext())
+                qDebug() << QString::fromLatin1("    %1").arg(it.next());
         }
 
         const QString directory = QLatin1String(":/translations");
-- 
cgit v1.2.3