Utils: Fix FileUtils::copyRecursively with user interaction

CopyAskingForOverwrite got passed around as value, thus it got copied.
The messagebox results were stored into the fields of such copies, and
therefore had not the expected values across the recursion.

This change wraps the copy helper function into a lambda and the lambda
is passed around instead of the object. It may still be a bit much
decoupling architecture for a single use-case, but it works now (for
me).

Fixes: QTCREATORBUG-31174
Change-Id: I5444d18d7bf4ef59ab879e31e5233eadf1c935e4
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>

src/libs/utils/fileutils.cpp

@@ -305,10 +305,9 @@ FileUtils::CopyAskingForOverwrite::CopyAskingForOverwrite(QWidget *dialogParent,
     , m_postOperation(postOperation)
 {}
 
-bool FileUtils::CopyAskingForOverwrite::operator()(const FilePath &src,
+FileUtils::CopyHelper FileUtils::CopyAskingForOverwrite::operator()()
-                                                   const FilePath &dest,
-                                                   QString *error)
 {
+    CopyHelper helperFunction = [this](const FilePath &src, const FilePath &dest, QString *error) {
         bool copyFile = true;
         if (dest.exists()) {
             if (m_skipAll)
@@ -318,8 +317,8 @@ bool FileUtils::CopyAskingForOverwrite::operator()(const FilePath &src,
                     m_parent,
                     Tr::tr("Overwrite File?"),
                     Tr::tr("Overwrite existing file \"%1\"?").arg(dest.toUserOutput()),
-                QMessageBox::Yes | QMessageBox::YesToAll | QMessageBox::No | QMessageBox::NoToAll
+                    QMessageBox::Yes | QMessageBox::YesToAll | QMessageBox::No
-                    | QMessageBox::Cancel);
+                            | QMessageBox::NoToAll | QMessageBox::Cancel);
                 if (res == QMessageBox::Cancel) {
                     return false;
                 } else if (res == QMessageBox::No) {
@@ -348,6 +347,8 @@ bool FileUtils::CopyAskingForOverwrite::operator()(const FilePath &src,
         }
         m_files.append(dest.absoluteFilePath());
         return true;
+    };
+    return helperFunction;
 }
 
 FilePaths FileUtils::CopyAskingForOverwrite::files() const
@@ -694,11 +695,10 @@ FilePathInfo FileUtils::filePathInfoFromTriple(const QString &infos, int modeBas
     return {size, flags, dt};
 }
 
-bool FileUtils::copyRecursively(
+bool FileUtils::copyRecursively(const FilePath &srcFilePath,
-    const FilePath &srcFilePath,
                                 const FilePath &tgtFilePath,
                                 QString *error,
-    std::function<bool(const FilePath &, const FilePath &, QString *)> copyHelper)
+                                CopyHelper copyHelper)
 {
     if (srcFilePath.isDir()) {
         if (!tgtFilePath.ensureWritableDir()) {

src/libs/utils/fileutils.h

@@ -43,13 +43,14 @@ struct QTCREATOR_UTILS_EXPORT RunResult
 class QTCREATOR_UTILS_EXPORT FileUtils
 {
 public:
+    using CopyHelper = std::function<bool(const FilePath &, const FilePath &, QString *)>;
 #ifdef QT_GUI_LIB
     class QTCREATOR_UTILS_EXPORT CopyAskingForOverwrite
     {
     public:
         CopyAskingForOverwrite(QWidget *dialogParent,
                                const std::function<void(FilePath)> &postOperation = {});
-        bool operator()(const FilePath &src, const FilePath &dest, QString *error);
+        CopyHelper operator()();
         FilePaths files() const;
 
     private:
@@ -65,7 +66,7 @@ public:
         const FilePath &srcFilePath,
         const FilePath &tgtFilePath,
         QString *error,
-        std::function<bool(const FilePath &, const FilePath &, QString *)> helper);
+        CopyHelper helper);
 
     static bool copyIfDifferent(const FilePath &srcFilePath,
                                 const FilePath &tgtFilePath);

src/plugins/android/createandroidmanifestwizard.cpp

@@ -281,17 +281,17 @@ void CreateAndroidManifestWizard::createAndroidTemplateFiles()
         FileUtils::copyRecursively(version->prefix() / "src/android/java/AndroidManifest.xml",
                                    m_directory / "AndroidManifest.xml",
                                    nullptr,
-                                   copy);
+                                   copy());
     } else {
         FileUtils::copyRecursively(version->prefix() / "src/android/templates",
                                    m_directory,
                                    nullptr,
-                                   copy);
+                                   copy());
 
         if (m_copyGradle) {
             FilePath gradlePath = version->prefix() / "src/3rdparty/gradle";
             QTC_ASSERT(gradlePath.exists(), return);
-            FileUtils::copyRecursively(gradlePath, m_directory, nullptr, copy);
+            FileUtils::copyRecursively(gradlePath, m_directory, nullptr, copy());
         }
     }
 

src/plugins/coreplugin/plugininstallwizard.cpp

@@ -425,11 +425,12 @@ bool executePluginInstallWizard(const FilePath &archive)
             return copyPluginFile(data.sourcePath, installPath);
         } else {
             QString error;
+            FileUtils::CopyAskingForOverwrite copy(ICore::dialogParent(),
+                                              postCopyOperation());
             if (!FileUtils::copyRecursively(data.extractedPath,
                                             installPath,
                                             &error,
-                                            FileUtils::CopyAskingForOverwrite(ICore::dialogParent(),
+                                            copy())) {
-                                                                              postCopyOperation()))) {
                 QMessageBox::warning(ICore::dialogParent(),
                                      Tr::tr("Failed to Copy Plugin Files"),
                                      error);