implement rmDirR by calling removeDirectoryWithContents

One implementation is enough.

Change-Id: I059cf334619692cd7b60d366d3513c5b947a0a9d
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

1 files changed, 5 insertions, 11 deletions

diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 0dcfdf022..e9cf0f20d 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -28,9 +28,11 @@
 ****************************************************************************/
 
 #include "tst_blackbox.h"
+#include <tools/fileinfo.h>
 #include <tools/hostosinfo.h>
 
-using namespace qbs;
+using qbs::HostOsInfo;
+using qbs::Internal::removeDirectoryWithContents;
 
 static QString initQbsExecutableFilePath()
 {
@@ -97,16 +99,8 @@ static void ccp(const QString &from, const QString &to)
 
 void TestBlackbox::rmDirR(const QString &dir)
 {
-    QDirIterator it(dir, QDir::Files | QDir::NoDotAndDotDot  | QDir::Hidden);
-    while (it.hasNext()) {
-        QFile(it.next()).remove();
-    }
-
-    QDirIterator it2(dir, QDir::Dirs | QDir::NoDotAndDotDot  | QDir::Hidden);
-    while (it2.hasNext()) {
-        rmDirR(it2.next());
-    }
-    QDir().rmdir(dir);
+    QString errorMessage;
+    removeDirectoryWithContents(dir, &errorMessage);
 }
 
 void TestBlackbox::touch(const QString &fn)