Skip to content

Commit ceda375

Browse files
committed
Issue #119: use QCoreApplication::arguments() instead of argv[] to have the proper encoding
(especially for Windows)
1 parent ccfedc3 commit ceda375

File tree

1 file changed

+10
-15
lines changed

1 file changed

+10
-15
lines changed

src/NgPost.cpp

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,22 +1215,24 @@ bool NgPost::hasMonitoringPostingJobs() const
12151215

12161216
bool NgPost::parseCommandLine(int argc, char *argv[])
12171217
{
1218-
QString appVersion = QString("%1_v%2").arg(sAppName).arg(sVersion);
1218+
Q_UNUSED(argc)
1219+
QString appVersion = QString("%1_v%2").arg(sAppName, sVersion);
12191220
QCommandLineParser parser;
12201221
parser.setApplicationDescription(appVersion);
12211222
parser.addOptions(sCmdOptions);
12221223

12231224

12241225
// Process the actual command line arguments given by the user
1225-
QStringList args;
1226-
for (int i = 0; i < argc; ++i)
1227-
args << argv[i];
1228-
1229-
bool res = parser.parse(args);
1226+
QStringList args = QCoreApplication::arguments();
1227+
if (!parser.parse(args))
1228+
{
12301229
#ifdef __DEBUG__
1231-
qDebug() << "args: " << args
1232-
<< "=> parsing: " << res << " (error: " << parser.errorText() << ")";
1230+
qDebug() << "cmd args: " << args;
12331231
#endif
1232+
_error(tr("Error syntax: %1\nTo list the available options use: %2 --help\n").arg(parser.errorText(), sAppName),
1233+
ERROR_CODE::ERR_WRONG_ARG);
1234+
return false;
1235+
}
12341236

12351237
if (parser.isSet(sOptionNames[Opt::QUIET]))
12361238
_quiet = true;
@@ -1261,13 +1263,6 @@ bool NgPost::parseCommandLine(int argc, char *argv[])
12611263
_dispFilesPosting = false;
12621264
}
12631265

1264-
if (!parser.parse(args))
1265-
{
1266-
_error(tr("Error syntax: %1\nTo list the available options use: %2 --help\n").arg(parser.errorText()).arg(argv[0]),
1267-
ERROR_CODE::ERR_WRONG_ARG);
1268-
return false;
1269-
}
1270-
12711266
if (parser.isSet(sOptionNames[Opt::LANG]))
12721267
{
12731268
QString lang = parser.value(sOptionNames[Opt::LANG]).toLower();

0 commit comments

Comments
 (0)