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

QCoreApplication: move GetCommandLine() call to winCmdArgs()

Browse Source 
Gets rid of one QString allocation.

Drive-by change, remove redundant inline keyword from a static helper.

Change-Id: Ie34bbc541f661ef6f07d6384e51af461f917556e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Ahmad Samir 2024-11-04 18:49:07 +02:00
parent ee3933a3dd
commit 5cd6d227f9
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/corelib/kernel/qcoreapplication.cpp
View File

@ -2544,11 +2544,16 @@ qint64 QCoreApplication::applicationPid()
}
#ifdef Q_OS_WIN
static inline QStringList winCmdArgs(const QString &cmdLine)
static QStringList winCmdArgs()
{
// On Windows, it is possible to pass Unicode arguments on
// the command line, but we don't implement any of the wide
// entry-points (wmain/wWinMain), so get the arguments from
// the Windows API instead of using argv. Note that we only
// do this when argv were not modified by the user in main().
QStringList result;
int size;
if (wchar_t **argv = CommandLineToArgvW(reinterpret_cast<const wchar_t *>(cmdLine.utf16()), &size)) {
if (wchar_t **argv = CommandLineToArgvW(GetCommandLine(), &size)) {
result.reserve(size);
wchar_t **argvEnd = argv + size;
for (wchar_t **a = argv; a < argvEnd; ++a)
@ -2608,13 +2613,7 @@ QStringList QCoreApplication::arguments()
#if defined(Q_OS_WIN)
const bool argsModifiedByUser = d->origArgv == nullptr;
if (!argsModifiedByUser) {
// On Windows, it is possible to pass Unicode arguments on
// the command line, but we don't implement any of the wide
// entry-points (wmain/wWinMain), so get the arguments from
// the Windows API instead of using argv. Note that we only
// do this when argv were not modified by the user in main().
QString cmdline = QString::fromWCharArray(GetCommandLine());
QStringList commandLineArguments = winCmdArgs(cmdline);
QStringList commandLineArguments = winCmdArgs();
// Even if the user didn't modify argv before passing them
// on to QCoreApplication, derived QApplications might have.