1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AndroidDeployQt: don't use QFile pointer

Browse Source 
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 <petri.virkkunen@qt.io>
(cherry picked from commit 7539b659d9ffbb3c44e45bdb7d9669a6df8915c8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Assam Boudjelthia 2024-11-22 01:04:54 +02:00 committed by Qt Cherry-pick Bot
parent 4059ea60e5
commit bc00516d84
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/tools/androiddeployqt/main.cpp
View File

@ -3716,18 +3716,17 @@ int generateJavaQmlComponents(const Options &options)
return false; return false;
QTextStream outputStream; QTextStream outputStream;
std::unique_ptr<QFile> outputFile; QFile outputFile;
if (!leafEqualsLibname) { if (!leafEqualsLibname) {
outputFile.reset(new QFile("%1/%2.java"_L1.arg(outputDir, libClassname))); outputFile.setFileName("%1/%2.java"_L1.arg(outputDir, libClassname));
if (outputFile->exists()) if (outputFile.exists())
outputFile->remove(); outputFile.remove();
if (!outputFile->open(QFile::ReadWrite)) { if (!outputFile.open(QFile::WriteOnly)) {
fprintf(stderr, "Cannot open %s file to write.\n", fprintf(stderr, "Cannot open %s file to write.\n", qPrintable(outputFile.fileName()));
qPrintable(outputFile->fileName()));
return false; return false;
} }
outputStream.setDevice(outputFile.get()); outputStream.setDevice(&outputFile);
createHeaderBlock(outputStream, javaPackage); createHeaderBlock(outputStream, javaPackage);
beginLibraryBlock(outputStream, libClassname); beginLibraryBlock(outputStream, libClassname);
} }
@ -3759,15 +3758,15 @@ int generateJavaQmlComponents(const Options &options)
outputStreamDevice->close(); outputStreamDevice->close();
} }
outputFile.reset(new QFile("%1/%2.java"_L1.arg(outputDir,moduleClassname))); outputFile.setFileName("%1/%2.java"_L1.arg(outputDir,moduleClassname));
if (outputFile->exists() && !outputFile->remove()) if (outputFile.exists() && !outputFile.remove())
return false; return false;
if (!outputFile->open(QFile::ReadWrite)) { if (!outputFile.open(QFile::WriteOnly)) {
fprintf(stderr, "Cannot open %s file to write.\n", qPrintable(outputFile->fileName())); fprintf(stderr, "Cannot open %s file to write.\n", qPrintable(outputFile.fileName()));
return false; return false;
} }
outputStream.setDevice(outputFile.get()); outputStream.setDevice(&outputFile);
createHeaderBlock(outputStream, javaPackage); createHeaderBlock(outputStream, javaPackage);
} }