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

uic: Refactor options parsing

Browse Source 
- Use modern string literals and initializer lists
- Move the Python-specific parts into if block

Pick-to: 6.5
Task-number: PYSIDE-2191
Change-Id: I529f461b330de72dba465ece2c03fa55819a575e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Yuhang Zhao <yuhangzhao@deepin.org>
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Friedemann Kleint 2023-01-16 17:12:18 +01:00
parent 457300ff60
commit 97a7e7b2d0
1 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
src/tools/uic/main.cpp
View File

@ -23,7 +23,8 @@ int runUic(int argc, char *argv[])
QHashSeed::setDeterministicGlobalSeed(); QHashSeed::setDeterministicGlobalSeed();
QCoreApplication app(argc, argv); QCoreApplication app(argc, argv);
QCoreApplication::setApplicationVersion(QString::fromLatin1(QT_VERSION_STR)); const QString version = QString::fromLatin1(qVersion());
QCoreApplication::setApplicationVersion(version);
Driver driver; Driver driver;
@ -31,75 +32,75 @@ int runUic(int argc, char *argv[])
// If you use this code as an example for a translated app, make sure to translate the strings. // If you use this code as an example for a translated app, make sure to translate the strings.
QCommandLineParser parser; QCommandLineParser parser;
parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions); parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
parser.setApplicationDescription(QStringLiteral("Qt User Interface Compiler version %1").arg(QString::fromLatin1(QT_VERSION_STR))); parser.setApplicationDescription(u"Qt User Interface Compiler version %1"_s.arg(version));
parser.addHelpOption(); parser.addHelpOption();
parser.addVersionOption(); parser.addVersionOption();
QCommandLineOption dependenciesOption(QStringList() << QStringLiteral("d") << QStringLiteral("dependencies")); QCommandLineOption dependenciesOption(QStringList{u"d"_s, u"dependencies"_s});
dependenciesOption.setDescription(QStringLiteral("Display the dependencies.")); dependenciesOption.setDescription(u"Display the dependencies."_s);
parser.addOption(dependenciesOption); parser.addOption(dependenciesOption);
QCommandLineOption outputOption(QStringList() << QStringLiteral("o") << QStringLiteral("output")); QCommandLineOption outputOption(QStringList{u"o"_s, u"output"_s});
outputOption.setDescription(QStringLiteral("Place the output into <file>")); outputOption.setDescription(u"Place the output into <file>"_s);
outputOption.setValueName(QStringLiteral("file")); outputOption.setValueName(u"file"_s);
parser.addOption(outputOption); parser.addOption(outputOption);
QCommandLineOption noAutoConnectionOption(QStringList() << QStringLiteral("a") << QStringLiteral("no-autoconnection")); QCommandLineOption noAutoConnectionOption(QStringList{u"a"_s, u"no-autoconnection"_s});
noAutoConnectionOption.setDescription(QStringLiteral("Do not generate a call to QObject::connectSlotsByName().")); noAutoConnectionOption.setDescription(u"Do not generate a call to QObject::connectSlotsByName()."_s);
parser.addOption(noAutoConnectionOption); parser.addOption(noAutoConnectionOption);
QCommandLineOption noProtOption(QStringList() << QStringLiteral("p") << QStringLiteral("no-protection")); QCommandLineOption noProtOption(QStringList{u"p"_s, u"no-protection"_s});
noProtOption.setDescription(QStringLiteral("Disable header protection.")); noProtOption.setDescription(u"Disable header protection."_s);
parser.addOption(noProtOption); parser.addOption(noProtOption);
QCommandLineOption noImplicitIncludesOption(QStringList() << QStringLiteral("n") << QStringLiteral("no-implicit-includes")); QCommandLineOption noImplicitIncludesOption(QStringList{u"n"_s, u"no-implicit-includes"_s});
noImplicitIncludesOption.setDescription(QStringLiteral("Disable generation of #include-directives.")); noImplicitIncludesOption.setDescription(u"Disable generation of #include-directives."_s);
parser.addOption(noImplicitIncludesOption); parser.addOption(noImplicitIncludesOption);
QCommandLineOption postfixOption(QStringLiteral("postfix")); QCommandLineOption postfixOption(u"postfix"_s);
postfixOption.setDescription(QStringLiteral("Postfix to add to all generated classnames.")); postfixOption.setDescription(u"Postfix to add to all generated classnames."_s);
postfixOption.setValueName(QStringLiteral("postfix")); postfixOption.setValueName(u"postfix"_s);
parser.addOption(postfixOption); parser.addOption(postfixOption);
QCommandLineOption translateOption(QStringList() << QStringLiteral("tr") << QStringLiteral("translate")); QCommandLineOption translateOption(QStringList{u"tr"_s, u"translate"_s});
translateOption.setDescription(QStringLiteral("Use <function> for i18n.")); translateOption.setDescription(u"Use <function> for i18n."_s);
translateOption.setValueName(QStringLiteral("function")); translateOption.setValueName(u"function"_s);
parser.addOption(translateOption); parser.addOption(translateOption);
QCommandLineOption includeOption(QStringList() << QStringLiteral("include")); QCommandLineOption includeOption(QStringList{u"include"_s});
includeOption.setDescription(QStringLiteral("Add #include <include-file> to <file>.")); includeOption.setDescription(u"Add #include <include-file> to <file>."_s);
includeOption.setValueName(QStringLiteral("include-file")); includeOption.setValueName(u"include-file"_s);
parser.addOption(includeOption); parser.addOption(includeOption);
QCommandLineOption generatorOption(QStringList() << QStringLiteral("g") << QStringLiteral("generator")); QCommandLineOption generatorOption(QStringList{u"g"_s, u"generator"_s});
generatorOption.setDescription(QStringLiteral("Select generator.")); generatorOption.setDescription(u"Select generator."_s);
generatorOption.setValueName(QStringLiteral("python|cpp")); generatorOption.setValueName(u"python|cpp"_s);
parser.addOption(generatorOption); parser.addOption(generatorOption);
QCommandLineOption connectionsOption(QStringList{QStringLiteral("c"), QStringLiteral("connections")}); QCommandLineOption connectionsOption(QStringList{u"c"_s, u"connections"_s});
connectionsOption.setDescription(QStringLiteral("Connection syntax.")); connectionsOption.setDescription(u"Connection syntax."_s);
connectionsOption.setValueName(QStringLiteral("pmf|string")); connectionsOption.setValueName(u"pmf|string"_s);
parser.addOption(connectionsOption); parser.addOption(connectionsOption);
QCommandLineOption idBasedOption(QStringLiteral("idbased")); QCommandLineOption idBasedOption(u"idbased"_s);
idBasedOption.setDescription(QStringLiteral("Use id based function for i18n")); idBasedOption.setDescription(u"Use id based function for i18n"_s);
parser.addOption(idBasedOption); parser.addOption(idBasedOption);
QCommandLineOption fromImportsOption(QStringLiteral("from-imports")); QCommandLineOption fromImportsOption(u"from-imports"_s);
fromImportsOption.setDescription(QStringLiteral("Python: generate imports relative to '.'")); fromImportsOption.setDescription(u"Python: generate imports relative to '.'"_s);
parser.addOption(fromImportsOption); parser.addOption(fromImportsOption);
// FIXME Qt 7: Flip the default? // FIXME Qt 7: Flip the default?
QCommandLineOption rcPrefixOption(QStringLiteral("rc-prefix")); QCommandLineOption rcPrefixOption(u"rc-prefix"_s);
rcPrefixOption.setDescription(QStringLiteral("Python: Generate \"rc_file\" instead of \"file_rc\" import")); rcPrefixOption.setDescription(uR"(Python: Generate "rc_file" instead of "file_rc" import)"_s);
parser.addOption(rcPrefixOption); parser.addOption(rcPrefixOption);
// FIXME Qt 7: Remove? // FIXME Qt 7: Remove?
QCommandLineOption useStarImportsOption(QStringLiteral("star-imports")); QCommandLineOption useStarImportsOption(u"star-imports"_s);
useStarImportsOption.setDescription(QStringLiteral("Python: Use * imports")); useStarImportsOption.setDescription(u"Python: Use * imports"_s);
parser.addOption(useStarImportsOption); parser.addOption(useStarImportsOption);
parser.addPositionalArgument(QStringLiteral("[uifile]"), QStringLiteral("Input file (*.ui), otherwise stdin.")); parser.addPositionalArgument(u"[uifile]"_s, u"Input file (*.ui), otherwise stdin."_s);
parser.process(app); parser.process(app);
@ -109,8 +110,6 @@ int runUic(int argc, char *argv[])
driver.option().headerProtection = !parser.isSet(noProtOption); driver.option().headerProtection = !parser.isSet(noProtOption);
driver.option().implicitIncludes = !parser.isSet(noImplicitIncludesOption); driver.option().implicitIncludes = !parser.isSet(noImplicitIncludesOption);
driver.option().idBased = parser.isSet(idBasedOption); driver.option().idBased = parser.isSet(idBasedOption);
driver.option().fromImports = parser.isSet(fromImportsOption);
driver.option().useStarImports = parser.isSet(useStarImportsOption);
driver.option().postfix = parser.value(postfixOption); driver.option().postfix = parser.value(postfixOption);
driver.option().translateFunction = parser.value(translateOption); driver.option().translateFunction = parser.value(translateOption);
driver.option().includeFile = parser.value(includeOption); driver.option().includeFile = parser.value(includeOption);
@ -122,8 +121,7 @@ int runUic(int argc, char *argv[])
driver.option().forceStringConnectionSyntax = 1; driver.option().forceStringConnectionSyntax = 1;
} }
if (parser.isSet(rcPrefixOption)) const QString inputFile = parser.positionalArguments().value(0);
driver.option().rcPrefix = 1;
Language language = Language::Cpp; Language language = Language::Cpp;
if (parser.isSet(generatorOption)) { if (parser.isSet(generatorOption)) {
@ -131,11 +129,14 @@ int runUic(int argc, char *argv[])
language = Language::Python; language = Language::Python;
} }
language::setLanguage(language); language::setLanguage(language);
if (language == Language::Python) {
driver.option().fromImports = parser.isSet(fromImportsOption);
driver.option().useStarImports = parser.isSet(useStarImportsOption);
if (parser.isSet(rcPrefixOption))
driver.option().rcPrefix = 1;
}
QString inputFile; if (inputFile.isEmpty()) // reading from stdin
if (!parser.positionalArguments().isEmpty())
inputFile = parser.positionalArguments().at(0);
else // reading from stdin
driver.option().headerProtection = false; driver.option().headerProtection = false;
if (driver.option().dependencies) { if (driver.option().dependencies) {