fix build of normalize utility

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2015-12-18 20:09:46 +02:00
parent b183f81775
commit cf2352ceef
2 changed files with 5 additions and 6 deletions

View file

@ -555,8 +555,7 @@ add_subdirectory(util/fixnonlatin1)
add_subdirectory(util/gencmap) add_subdirectory(util/gencmap)
add_subdirectory(util/lexgen) add_subdirectory(util/lexgen)
add_subdirectory(util/makeqpf) add_subdirectory(util/makeqpf)
# FIXME: needs deprecated argc and argv, port to qcommandlineparser? add_subdirectory(util/normalize)
# add_subdirectory(util/normalize)
# TODO: add_subdirectory(util/plugintest) # TODO: add_subdirectory(util/plugintest)
add_subdirectory(util/qlalr) add_subdirectory(util/qlalr)
add_subdirectory(util/qurl-generateTLDs) add_subdirectory(util/qurl-generateTLDs)

View file

@ -155,7 +155,7 @@ int main(int argc, char *argv[])
{ {
QCoreApplication app(argc, argv); QCoreApplication app(argc, argv);
if (app.argc() < 2 || (app.argc() == 2 && (app.argv()[1][0] == '-'))) { if (argc < 2 || (argc== 2 && (argv[1][0] == '-'))) {
printf("usage: normalize [--modify] <path>\n"); printf("usage: normalize [--modify] <path>\n");
printf(" <path> can be a single file or a directory (default: look for *.cpp recursively)"); printf(" <path> can be a single file or a directory (default: look for *.cpp recursively)");
printf(" Outputs all filenames that contain non-normalized SIGNALs and SLOTs\n"); printf(" Outputs all filenames that contain non-normalized SIGNALs and SLOTs\n");
@ -164,12 +164,12 @@ int main(int argc, char *argv[])
} }
QString path; QString path;
if (qstrcmp(app.argv()[1], "--modify") == 0) { if (qstrcmp(argv[1], "--modify") == 0) {
printFilename = false; printFilename = false;
modify = true; modify = true;
path = app.argv()[2]; path = argv[2];
} else { } else {
path = app.argv()[1]; path = argv[1];
} }
if (path.startsWith("-")) { if (path.startsWith("-")) {