diff options
author | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-08-12 13:16:27 +0200 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-08-20 00:58:13 +0200 |
commit | 2766322de37adba37e0d0d4b0054e55edff01c6c (patch) | |
tree | d487d502ee944963e103e11c9726c3efcd8fe041 /examples/widgets/tools/i18n | |
parent | eb7d1cf098df56f8ebf62f02af611a627435a4a1 (diff) |
Move QStringRef and remains to Qt5Compat
Export some private functions from QUtf8 to resolve
undefined symbols in Qt5Compat after moving QStringRef.
Task-number: QTBUG-84437
Change-Id: I9046dcb14ed520d8868a511d79da6e721e26f72b
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'examples/widgets/tools/i18n')
-rw-r--r-- | examples/widgets/tools/i18n/languagechooser.cpp | 6 | ||||
-rw-r--r-- | examples/widgets/tools/i18n/languagechooser.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/widgets/tools/i18n/languagechooser.cpp b/examples/widgets/tools/i18n/languagechooser.cpp index 51dfce915f..2f82fc678b 100644 --- a/examples/widgets/tools/i18n/languagechooser.cpp +++ b/examples/widgets/tools/i18n/languagechooser.cpp @@ -97,12 +97,12 @@ LanguageChooser::LanguageChooser(const QString &defaultLang, QWidget *parent) setWindowTitle("I18N"); } -bool LanguageChooser::languageMatch(const QString &lang, const QString &qmFile) +bool LanguageChooser::languageMatch(QStringView lang, QStringView qmFile) { //qmFile: i18n_xx.qm - const QString prefix = "i18n_"; + const QStringView prefix{ u"i18n_" }; const int langTokenLength = 2; /*FIXME: is checking two chars enough?*/ - return qmFile.midRef(qmFile.indexOf(prefix) + prefix.length(), langTokenLength) == lang.leftRef(langTokenLength); + return qmFile.mid(qmFile.indexOf(prefix) + prefix.length(), langTokenLength) == lang.left(langTokenLength); } bool LanguageChooser::eventFilter(QObject *object, QEvent *event) diff --git a/examples/widgets/tools/i18n/languagechooser.h b/examples/widgets/tools/i18n/languagechooser.h index 733cc50fd3..6193ab8756 100644 --- a/examples/widgets/tools/i18n/languagechooser.h +++ b/examples/widgets/tools/i18n/languagechooser.h @@ -83,7 +83,7 @@ private: static QStringList findQmFiles(); static QString languageName(const QString &qmFile); static QColor colorForLanguage(const QString &language); - static bool languageMatch(const QString &lang, const QString &qmFile); + static bool languageMatch(QStringView lang, QStringView qmFile); QGroupBox *groupBox; QDialogButtonBox *buttonBox; |