From bc00516d849cbce86cc0d63036c23ff032e6839b Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Fri, 22 Nov 2024 01:04:54 +0200 Subject: [PATCH] AndroidDeployQt: don't use QFile pointer The file is used only in the local scope so no need to have it as a pointer. As a pass-by, use WriteOnly open mode. Change-Id: I9999f4aed0f888af9a3e08ed6c3573432c29d195 Reviewed-by: Petri Virkkunen (cherry picked from commit 7539b659d9ffbb3c44e45bdb7d9669a6df8915c8) Reviewed-by: Qt Cherry-pick Bot --- src/tools/androiddeployqt/main.cpp | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index d8839a0ef6e..72dce2e2977 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -3716,18 +3716,17 @@ int generateJavaQmlComponents(const Options &options) return false; QTextStream outputStream; - std::unique_ptr outputFile; + QFile outputFile; if (!leafEqualsLibname) { - outputFile.reset(new QFile("%1/%2.java"_L1.arg(outputDir, libClassname))); - if (outputFile->exists()) - outputFile->remove(); - if (!outputFile->open(QFile::ReadWrite)) { - fprintf(stderr, "Cannot open %s file to write.\n", - qPrintable(outputFile->fileName())); + outputFile.setFileName("%1/%2.java"_L1.arg(outputDir, libClassname)); + if (outputFile.exists()) + outputFile.remove(); + if (!outputFile.open(QFile::WriteOnly)) { + fprintf(stderr, "Cannot open %s file to write.\n", qPrintable(outputFile.fileName())); return false; } - outputStream.setDevice(outputFile.get()); + outputStream.setDevice(&outputFile); createHeaderBlock(outputStream, javaPackage); beginLibraryBlock(outputStream, libClassname); } @@ -3759,15 +3758,15 @@ int generateJavaQmlComponents(const Options &options) outputStreamDevice->close(); } - outputFile.reset(new QFile("%1/%2.java"_L1.arg(outputDir,moduleClassname))); - if (outputFile->exists() && !outputFile->remove()) + outputFile.setFileName("%1/%2.java"_L1.arg(outputDir,moduleClassname)); + if (outputFile.exists() && !outputFile.remove()) return false; - if (!outputFile->open(QFile::ReadWrite)) { - fprintf(stderr, "Cannot open %s file to write.\n", qPrintable(outputFile->fileName())); + if (!outputFile.open(QFile::WriteOnly)) { + fprintf(stderr, "Cannot open %s file to write.\n", qPrintable(outputFile.fileName())); return false; } - outputStream.setDevice(outputFile.get()); + outputStream.setDevice(&outputFile); createHeaderBlock(outputStream, javaPackage); }