diff options
Diffstat (limited to 'src/tools/qtpaths/qtpaths.cpp')
-rw-r--r-- | src/tools/qtpaths/qtpaths.cpp | 132 |
1 files changed, 46 insertions, 86 deletions
diff --git a/src/tools/qtpaths/qtpaths.cpp b/src/tools/qtpaths/qtpaths.cpp index 16fc1284f5..71f9fe4349 100644 --- a/src/tools/qtpaths/qtpaths.cpp +++ b/src/tools/qtpaths/qtpaths.cpp @@ -1,52 +1,5 @@ -/**************************************************************************** - * * - ** Copyright (C) 2016 Sune Vuorela <sune@kde.org> - ** Contact: http://www.qt-project.org/ - ** - ** This file is part of the tools applications of the Qt Toolkit. - ** - ** $QT_BEGIN_LICENSE:BSD$ - ** Commercial License Usage - ** Licensees holding valid commercial Qt licenses may use this file in - ** accordance with the commercial license agreement provided with the - ** Software or, alternatively, in accordance with the terms contained in - ** a written agreement between you and The Qt Company. For licensing terms - ** and conditions see https://www.qt.io/terms-conditions. For further - ** information use the contact form at https://www.qt.io/contact-us. - ** - ** BSD License Usage - ** Alternatively, you may use this file under the terms of the BSD license - ** as follows: - ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of The Qt Company Ltd nor the names of its - ** contributors may be used to endorse or promote products derived - ** from this software without specific prior written permission. - ** - ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - ** - ** $QT_END_LICENSE$ - ** - ****************************************************************************/ +// Copyright (C) 2016 Sune Vuorela <sune@kde.org> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include <QCoreApplication> #include <QCommandLineParser> @@ -108,9 +61,6 @@ static const StringEnum lookupTableData[] = { { "ApplicationsLocation", QStandardPaths::ApplicationsLocation, false }, { "CacheLocation", QStandardPaths::CacheLocation, true }, { "ConfigLocation", QStandardPaths::ConfigLocation, false }, -#if QT_VERSION < QT_VERSION_CHECK(6,0,0) - { "DataLocation", QStandardPaths::DataLocation, true }, -#endif { "DesktopLocation", QStandardPaths::DesktopLocation, false }, { "DocumentsLocation", QStandardPaths::DocumentsLocation, false }, { "DownloadLocation", QStandardPaths::DownloadLocation, false }, @@ -118,11 +68,15 @@ static const StringEnum lookupTableData[] = { { "GenericCacheLocation", QStandardPaths::GenericCacheLocation, false }, { "GenericConfigLocation", QStandardPaths::GenericConfigLocation, false }, { "GenericDataLocation", QStandardPaths::GenericDataLocation, false }, + { "GenericStateLocation", QStandardPaths::GenericStateLocation, false }, { "HomeLocation", QStandardPaths::HomeLocation, false }, { "MoviesLocation", QStandardPaths::MoviesLocation, false }, { "MusicLocation", QStandardPaths::MusicLocation, false }, { "PicturesLocation", QStandardPaths::PicturesLocation, false }, + { "PublicShareLocation", QStandardPaths::PublicShareLocation, false }, { "RuntimeLocation", QStandardPaths::RuntimeLocation, false }, + { "StateLocation", QStandardPaths::StateLocation, true }, + { "TemplatesLocation", QStandardPaths::TemplatesLocation, false }, { "TempLocation", QStandardPaths::TempLocation, false } }; @@ -145,10 +99,10 @@ static QStringList types() static const StringEnum &parseLocationOrError(const QString &locationString) { for (const StringEnum &se : lookupTableData) - if (locationString == QLatin1String(se.stringvalue)) + if (locationString == QLatin1StringView(se.stringvalue)) return se; - QString message = QCoreApplication::translate("qtpaths", "Unknown location: %1"); + QString message = QStringLiteral("Unknown location: %1"); error(message.arg(locationString)); } @@ -162,12 +116,13 @@ static QString searchStringOrError(QCommandLineParser *parser) { int positionalArgumentCount = parser->positionalArguments().size(); if (positionalArgumentCount != 1) - error(QCoreApplication::translate("qtpaths", "Exactly one argument needed as searchitem")); + error(QStringLiteral("Exactly one argument needed as searchitem")); return parser->positionalArguments().constFirst(); } int main(int argc, char **argv) { + QString qtconfManualPath; QCoreApplication app(argc, argv); app.setApplicationVersion(QTPATHS_VERSION_STR); @@ -178,86 +133,85 @@ int main(int argc, char **argv) #endif QCommandLineParser parser; - parser.setApplicationDescription(QCoreApplication::translate("qtpaths", "Command line client to QStandardPaths and QLibraryInfo")); - parser.addPositionalArgument(QCoreApplication::translate("qtpaths", "[name]"), QCoreApplication::tr("Name of file or directory")); - parser.addPositionalArgument(QCoreApplication::translate("qtpaths", "[properties]"), QCoreApplication::tr("List of the Qt properties to query by the --qt-query argument.")); + parser.setApplicationDescription(QStringLiteral("Command line client to QStandardPaths and QLibraryInfo")); + parser.addPositionalArgument(QStringLiteral("[name]"), QStringLiteral("Name of file or directory")); + parser.addPositionalArgument(QStringLiteral("[properties]"), QStringLiteral("List of the Qt properties to query by the --qt-query argument.")); parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions); parser.addHelpOption(); parser.addVersionOption(); //setting up options - QCommandLineOption types(QStringLiteral("types"), QCoreApplication::translate("qtpaths", "Available location types.")); + QCommandLineOption types(QStringLiteral("types"), QStringLiteral("Available location types.")); parser.addOption(types); - QCommandLineOption paths(QStringLiteral("paths"), QCoreApplication::translate("qtpaths", "Find paths for <type>."), QStringLiteral("type")); + QCommandLineOption paths(QStringLiteral("paths"), QStringLiteral("Find paths for <type>."), QStringLiteral("type")); parser.addOption(paths); QCommandLineOption writablePath(QStringLiteral("writable-path"), - QCoreApplication::translate("qtpaths", "Find writable path for <type>."), QStringLiteral("type")); + QStringLiteral("Find writable path for <type>."), QStringLiteral("type")); parser.addOption(writablePath); QCommandLineOption locateDir(QStringList() << QStringLiteral("locate-dir") << QStringLiteral("locate-directory"), - QCoreApplication::translate("qtpaths", "Locate directory [name] in <type>."), QStringLiteral("type")); + QStringLiteral("Locate directory [name] in <type>."), QStringLiteral("type")); parser.addOption(locateDir); QCommandLineOption locateDirs(QStringList() << QStringLiteral("locate-dirs") << QStringLiteral("locate-directories"), - QCoreApplication::translate("qtpaths", "Locate directories [name] in all paths for <type>."), QStringLiteral("type")); + QStringLiteral("Locate directories [name] in all paths for <type>."), QStringLiteral("type")); parser.addOption(locateDirs); QCommandLineOption locateFile(QStringLiteral("locate-file"), - QCoreApplication::translate("qtpaths", "Locate file [name] for <type>."), QStringLiteral("type")); + QStringLiteral("Locate file [name] for <type>."), QStringLiteral("type")); parser.addOption(locateFile); QCommandLineOption locateFiles(QStringLiteral("locate-files"), - QCoreApplication::translate("qtpaths", "Locate files [name] in all paths for <type>."), QStringLiteral("type")); + QStringLiteral("Locate files [name] in all paths for <type>."), QStringLiteral("type")); parser.addOption(locateFiles); QCommandLineOption findExe(QStringList() << QStringLiteral("find-exe") << QStringLiteral("find-executable"), - QCoreApplication::translate("qtpaths", "Find executable with [name].")); + QStringLiteral("Find executable with [name].")); parser.addOption(findExe); QCommandLineOption display(QStringList() << QStringLiteral("display"), - QCoreApplication::translate("qtpaths", "Prints user readable name for <type>."), QStringLiteral("type")); + QStringLiteral("Prints user readable name for <type>."), QStringLiteral("type")); parser.addOption(display); QCommandLineOption testmode(QStringList() << QStringLiteral("testmode") << QStringLiteral("test-mode"), - QCoreApplication::translate("qtpaths", "Use paths specific for unit testing.")); + QStringLiteral("Use paths specific for unit testing.")); parser.addOption(testmode); - QCommandLineOption qtversion(QStringLiteral("qt-version"), QCoreApplication::translate("qtpaths", "Qt version.")); + QCommandLineOption qtversion(QStringLiteral("qt-version"), QStringLiteral("Qt version.")); qtversion.setFlags(QCommandLineOption::HiddenFromHelp); parser.addOption(qtversion); - QCommandLineOption installprefix(QStringLiteral("install-prefix"), QCoreApplication::translate("qtpaths", "Installation prefix for Qt.")); + QCommandLineOption installprefix(QStringLiteral("install-prefix"), QStringLiteral("Installation prefix for Qt.")); installprefix.setFlags(QCommandLineOption::HiddenFromHelp); parser.addOption(installprefix); QCommandLineOption bindir(QStringList() << QStringLiteral("binaries-dir") << QStringLiteral("binaries-directory"), - QCoreApplication::translate("qtpaths", "Location of Qt executables.")); + QStringLiteral("Location of Qt executables.")); bindir.setFlags(QCommandLineOption::HiddenFromHelp); parser.addOption(bindir); QCommandLineOption plugindir(QStringList() << QStringLiteral("plugin-dir") << QStringLiteral("plugin-directory"), - QCoreApplication::translate("qtpaths", "Location of Qt plugins.")); + QStringLiteral("Location of Qt plugins.")); plugindir.setFlags(QCommandLineOption::HiddenFromHelp); parser.addOption(plugindir); QCommandLineOption query( QStringList() << QStringLiteral("qt-query") << QStringLiteral("query"), - QCoreApplication::translate("qtpaths", - "List of Qt properties. Can be used standalone or with the " - "--query-format and --qtconf options.")); + QStringLiteral("List of Qt properties. Can be used standalone or with the " + "--query-format and --qtconf options.")); parser.addOption(query); QCommandLineOption queryformat(QStringLiteral("query-format"), - QCoreApplication::translate("qtpaths", "Output format for --qt-query.\nSupported formats: qmake (default), json"), - QCoreApplication::translate("qtpaths", "format")); + QStringLiteral("Output format for --qt-query.\nSupported formats: qmake (default), json"), + QStringLiteral("format")); queryformat.setDefaultValue("qmake"); parser.addOption(queryformat); QCommandLineOption qtconf(QStringLiteral("qtconf"), - QCoreApplication::translate("qtpaths", "Path to qt.conf file that will be used to override the queried Qt properties."), - QCoreApplication::translate("qtpaths", "path")); + QStringLiteral("Path to qt.conf file that will be used to override the queried Qt properties."), + QStringLiteral("path")); parser.addOption(qtconf); parser.process(app); @@ -266,13 +220,14 @@ int main(int argc, char **argv) #if QT_CONFIG(settings) if (parser.isSet(qtconf)) { - QLibraryInfoPrivate::qtconfManualPath = parser.value(qtconf); + qtconfManualPath = parser.value(qtconf); + QLibraryInfoPrivate::setQtconfManualPath(&qtconfManualPath); } #endif QStringList results; if (parser.isSet(qtversion)) { - QString qtversionstring = QString::fromLatin1(qVersion()); + QString qtversionstring = QString::fromLatin1(QT_VERSION_STR); results << qtversionstring; } @@ -296,6 +251,10 @@ int main(int argc, char **argv) results << typesList.join('\n'); } + QT_WARNING_PUSH +#if defined(Q_CC_GNU_ONLY) && Q_CC_GNU >= 1300 && Q_CC_GNU < 1500 + QT_WARNING_DISABLE_GCC("-Wdangling-reference") +#endif if (parser.isSet(display)) { const StringEnum &location = parseLocationOrError(parser.value(display)); QString text = QStandardPaths::displayName(location.enumvalue); @@ -347,6 +306,7 @@ int main(int argc, char **argv) QStringList paths = QStandardPaths::locateAll(location.enumvalue, searchitem, QStandardPaths::LocateFile); results << location.mapName(paths.join(pathsep)); } + QT_WARNING_POP #if !QT_CONFIG(settings) if (parser.isSet(query) || parser.isSet(qtconf) || parser.isSet(queryformat)) { @@ -355,7 +315,7 @@ int main(int argc, char **argv) #else if (parser.isSet(query)) { if (!results.isEmpty()) { - QString errorMessage = QCoreApplication::translate("qtpaths", "Several options given, only one is supported at a time."); + QString errorMessage = QStringLiteral("Several options given, only one is supported at a time."); error(errorMessage); } @@ -365,7 +325,7 @@ int main(int argc, char **argv) if (formatValue == "json") { printer = jsonPropertyPrinter; } else if (formatValue != "qmake") { - QString errorMessage = QCoreApplication::translate("qtpaths", "Invalid output format %1. Supported formats: qmake, json").arg(formatValue); + QString errorMessage = QStringLiteral("Invalid output format %1. Supported formats: qmake, json").arg(formatValue); error(errorMessage); } } @@ -377,19 +337,19 @@ int main(int argc, char **argv) } return prop.queryProperty(optionProperties); } else if (parser.isSet(queryformat)) { - error(QCoreApplication::translate("qtpaths", "--query-format is set, but --qt-query is not requested.")); + error(QStringLiteral("--query-format is set, but --qt-query is not requested.")); } #endif if (results.isEmpty()) { parser.showHelp(); } else if (results.size() == 1) { - const QString &item = results.first(); + const QString &item = results.constFirst(); message(item); if (item.isEmpty()) return EXIT_FAILURE; } else { - QString errorMessage = QCoreApplication::translate("qtpaths", "Several options given, only one is supported at a time."); + QString errorMessage = QStringLiteral("Several options given, only one is supported at a time."); error(errorMessage); } return EXIT_SUCCESS; |