diff options
Diffstat (limited to 'src/designer/src/designer/qdesigner.cpp')
| -rw-r--r-- | src/designer/src/designer/qdesigner.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/designer/src/designer/qdesigner.cpp b/src/designer/src/designer/qdesigner.cpp index 8c218e8f5..099e7509c 100644 --- a/src/designer/src/designer/qdesigner.cpp +++ b/src/designer/src/designer/qdesigner.cpp @@ -55,13 +55,13 @@ QDesigner::QDesigner(int &argc, char **argv) m_client(nullptr), m_workbench(0), m_suppressNewFormShow(false) { - setOrganizationName(QStringLiteral("QtProject")); + setOrganizationName(u"QtProject"_s); QGuiApplication::setApplicationDisplayName(QLatin1String(designerDisplayName)); setApplicationName(QLatin1String(designerApplicationName)); QDesignerComponents::initializeResources(); #if !defined(Q_OS_OSX) && !defined(Q_OS_WIN) - setWindowIcon(QIcon(QStringLiteral(":/qt-project.org/designer/images/designer.png"))); + setWindowIcon(QIcon(u":/qt-project.org/designer/images/designer.png"_s)); #endif } @@ -147,28 +147,28 @@ static inline QDesigner::ParseArgumentsResult parseDesignerCommandLineArguments(QCommandLineParser &parser, Options *options, QString *errorMessage) { - parser.setApplicationDescription(QStringLiteral("Qt Designer ") + parser.setApplicationDescription(u"Qt Designer "_s + QLatin1String(QT_VERSION_STR) + QLatin1String("\n\nUI designer for QWidget-based applications.")); const QCommandLineOption helpOption = parser.addHelpOption(); parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions); - const QCommandLineOption serverOption(QStringLiteral("server"), - QStringLiteral("Server mode")); + const QCommandLineOption serverOption(u"server"_s, + u"Server mode"_s); parser.addOption(serverOption); - const QCommandLineOption clientOption(QStringLiteral("client"), - QStringLiteral("Client mode"), - QStringLiteral("port")); + const QCommandLineOption clientOption(u"client"_s, + u"Client mode"_s, + u"port"_s); parser.addOption(clientOption); - const QCommandLineOption resourceDirOption(QStringLiteral("resourcedir"), - QStringLiteral("Resource directory"), - QStringLiteral("directory")); + const QCommandLineOption resourceDirOption(u"resourcedir"_s, + u"Resource directory"_s, + u"directory"_s); parser.addOption(resourceDirOption); - const QCommandLineOption internalDynamicPropertyOption(QStringLiteral("enableinternaldynamicproperties"), - QStringLiteral("Enable internal dynamic properties")); + const QCommandLineOption internalDynamicPropertyOption(u"enableinternaldynamicproperties"_s, + u"Enable internal dynamic properties"_s); parser.addOption(internalDynamicPropertyOption); - parser.addPositionalArgument(QStringLiteral("files"), - QStringLiteral("The UI files to open.")); + parser.addPositionalArgument(u"files"_s, + u"The UI files to open."_s); if (!parser.parse(QCoreApplication::arguments())) { *errorMessage = parser.errorText(); @@ -186,7 +186,7 @@ static inline QDesigner::ParseArgumentsResult bool ok; options->clientPort = parser.value(clientOption).toUShort(&ok); if (!ok) { - *errorMessage = QStringLiteral("Non-numeric argument specified for -client"); + *errorMessage = u"Non-numeric argument specified for -client"_s; return QDesigner::ParseArgumentsError; } } @@ -219,10 +219,10 @@ QDesigner::ParseArgumentsResult QDesigner::parseCommandLineArguments() QDesignerPropertySheet::setInternalDynamicPropertiesEnabled(true); std::unique_ptr<QTranslator> designerTranslator(new QTranslator(this)); - if (designerTranslator->load(QLocale(), QStringLiteral("designer"), QStringLiteral("_"), options.resourceDir)) { + if (designerTranslator->load(QLocale(), u"designer"_s, u"_"_s, options.resourceDir)) { installTranslator(designerTranslator.release()); std::unique_ptr<QTranslator> qtTranslator(new QTranslator(this)); - if (qtTranslator->load(QLocale(), QStringLiteral("qt"), QStringLiteral("_"), options.resourceDir)) + if (qtTranslator->load(QLocale(), u"qt"_s, u"_"_s, options.resourceDir)) installTranslator(qtTranslator.release()); } |