cleanFromOSCreatedFiles -> removeSystemGeneratedFiles

Change-Id: I282522e0219965b2865f1b3d0a77547903703ace
Reviewed-on: http://codereview.qt-project.org/6349
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>

4 files changed, 4 insertions, 4 deletions

diff --git a/installerbuilder/common/fileutils.cpp b/installerbuilder/common/fileutils.cpp
index 76dea1017..fff7e9da8 100644
--- a/installerbuilder/common/fileutils.cpp
+++ b/installerbuilder/common/fileutils.cpp
@@ -283,7 +283,7 @@ void QInstaller::removeDirectoryThreaded(const QString &path, bool ignoreErrors)
         throw Error(thread.error());
 }
 
-void QInstaller::cleanFromOSCreatedFiles(const QString &path)
+void QInstaller::removeSystemGeneratedFiles(const QString &path)
 {
     if (path.isEmpty())
         return;
diff --git a/installerbuilder/common/fileutils.h b/installerbuilder/common/fileutils.h
index b48b08044..76d096460 100644
--- a/installerbuilder/common/fileutils.h
+++ b/installerbuilder/common/fileutils.h
@@ -81,7 +81,7 @@ private:
     void INSTALLER_EXPORT removeFiles(const QString &path, bool ignoreErrors = false);
     void INSTALLER_EXPORT removeDirectory(const QString &path, bool ignoreErrors = false);
     void INSTALLER_EXPORT removeDirectoryThreaded(const QString &path, bool ignoreErrors = false);
-    void INSTALLER_EXPORT cleanFromOSCreatedFiles(const QString &path);
+    void INSTALLER_EXPORT removeSystemGeneratedFiles(const QString &path);
 
     /*!
         Creates a temporary directory
diff --git a/installerbuilder/libinstaller/extractarchiveoperation_p.h b/installerbuilder/libinstaller/extractarchiveoperation_p.h
index 1a3382b9d..8cd05947c 100644
--- a/installerbuilder/libinstaller/extractarchiveoperation_p.h
+++ b/installerbuilder/libinstaller/extractarchiveoperation_p.h
@@ -63,7 +63,7 @@ public:
                 op->deleteFileNowOrLater(fi.absoluteFilePath());
             } else if (fi.isDir()) {
                 const QDir d = fi.dir();
-                cleanFromOSCreatedFiles(file);
+                removeSystemGeneratedFiles(file);
                 d.rmdir(file); // directory may not exist
             }
         }
diff --git a/installerbuilder/libinstaller/installiconsoperation.cpp b/installerbuilder/libinstaller/installiconsoperation.cpp
index 7f65b5563..b2a1695e3 100644
--- a/installerbuilder/libinstaller/installiconsoperation.cpp
+++ b/installerbuilder/libinstaller/installiconsoperation.cpp
@@ -264,7 +264,7 @@ bool InstallIconsOperation::undoOperation()
     const QStringList createdDirectories = value(QLatin1String("createddirectories")).toStringList();
     for (QStringList::const_iterator it = createdDirectories.begin(); it != createdDirectories.end(); ++it) {
         const QDir dir(*it);
-        cleanFromOSCreatedFiles(dir.absolutePath());
+        removeSystemGeneratedFiles(dir.absolutePath());
         success = QDir::root().rmdir(dir.path());
     }