qiurui
/
qtdoc
mirror of https://github.com/qt/qtdoc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace uses of deprecated _qs with _s 

Task-number: QTBUG-101408
Change-Id: I011d5ed352298902158d0b1b89ad3b99b310fc83
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Sona Kurazyan 2022-03-21 10:59:12 +01:00
parent 4e7f9f6006
commit bd53f014a0
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/src/snippets/code/doc_src_i18n.cpp
View File

@ -48,6 +48,8 @@
** **
****************************************************************************/ ****************************************************************************/
using namespace Qt::StringLiterals;
//! [0] //! [0]
LoginWidget::LoginWidget() LoginWidget::LoginWidget()
{ {
@ -130,7 +132,7 @@ int main(int argc, char *argv[])
QApplication app(argc, argv); QApplication app(argc, argv);
QTranslator myappTranslator; QTranslator myappTranslator;
if (myappTranslator.load(QLocale::system(), u"myapp"_qs, u"_"_qs, u":/i18n"_qs)) if (myappTranslator.load(QLocale::system(), u"myapp"_s, u"_"_s, u":/i18n"_s))
app.installTranslator(&myappTranslator); app.installTranslator(&myappTranslator);
return app.exec(); return app.exec();
@ -197,7 +199,7 @@ void same_global_function(LoginWidget *logwid)
//! [14] //! [14]
QTranslator qtTranslator; QTranslator qtTranslator;
if (qtTranslator.load(QLocale::system(), u"qtbase"_qs, u"_"_qs, if (qtTranslator.load(QLocale::system(), u"qtbase"_s, u"_"_s,
QLibraryInfo::path(QLibraryInfo::TranslationsPath))) { QLibraryInfo::path(QLibraryInfo::TranslationsPath))) {
app.installTranslator(&qtTranslator); app.installTranslator(&qtTranslator);
} }

4
examples/tutorials/alarms/main.cpp
View File

@ -50,12 +50,14 @@
#include <QGuiApplication> #include <QGuiApplication>
#include <QQmlApplicationEngine> #include <QQmlApplicationEngine>
using namespace Qt::StringLiterals;
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
QGuiApplication app(argc, argv); QGuiApplication app(argc, argv);
QQmlApplicationEngine engine; QQmlApplicationEngine engine;
const QUrl url(u"qrc:/alarms/main.qml"_qs); const QUrl url(u"qrc:/alarms/main.qml"_s);
QObject::connect(&engine, &QQmlApplicationEngine::objectCreated, &app, QObject::connect(&engine, &QQmlApplicationEngine::objectCreated, &app,
[url](QObject *obj, const QUrl &objUrl) { [url](QObject *obj, const QUrl &objUrl) {
if (!obj && url == objUrl) if (!obj && url == objUrl)