From 908e85cc85d18f56575ee040589bcd5745c62adb Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Fri, 18 Mar 2022 10:31:16 +0100 Subject: Replace uses of _qs with _s in sources and examples Task-number: QTBUG-101408 Change-Id: I48360ba3b23965cd3d90ac243c100a0656a4cde8 Reviewed-by: Marc Mutz --- .../networkinformation/networkmanager/qnetworkmanagerservice.cpp | 4 +++- src/plugins/platforms/android/androidjniaccessibility.cpp | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.cpp b/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.cpp index f892348992..f8fd100a7e 100644 --- a/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.cpp +++ b/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.cpp @@ -61,6 +61,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + QNetworkManagerInterfaceBase::QNetworkManagerInterfaceBase(QObject *parent) : QDBusAbstractInterface(QLatin1String(NM_DBUS_SERVICE), QLatin1String(NM_DBUS_PATH), NM_DBUS_INTERFACE, QDBusConnection::systemBus(), parent) @@ -137,7 +139,7 @@ static QDBusInterface getPrimaryDevice(const QDBusObjectPath &devicePath) std::optional QNetworkManagerInterface::primaryConnectionDevicePath() const { - auto it = propertyMap.constFind(u"PrimaryConnection"_qs); + auto it = propertyMap.constFind(u"PrimaryConnection"_s); if (it != propertyMap.cend()) return it->value(); return std::nullopt; diff --git a/src/plugins/platforms/android/androidjniaccessibility.cpp b/src/plugins/platforms/android/androidjniaccessibility.cpp index 087946ccbf..e00db7b8ef 100644 --- a/src/plugins/platforms/android/androidjniaccessibility.cpp +++ b/src/plugins/platforms/android/androidjniaccessibility.cpp @@ -58,6 +58,8 @@ static const char m_classErrorMsg[] = "Can't find class \"%s\""; QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + namespace QtAndroidAccessibility { static jmethodID m_addActionMethodID = 0; @@ -374,7 +376,7 @@ if (!clazz) { \ const double step = qAbs(valueIface->minimumStepSize().toDouble(&stepIsValid)); if (!stepIsValid || qFuzzyIsNull(step)) { // Ignore step, use default precision - valueStr = qFuzzyIsNull(val) ? u"0"_qs : QString::number(val, 'f'); + valueStr = qFuzzyIsNull(val) ? u"0"_s : QString::number(val, 'f'); } else { const int precision = [](double s) { int count = 0; @@ -398,7 +400,7 @@ if (!clazz) { \ } return count; }(step); - valueStr = qFuzzyIsNull(val / step) ? u"0"_qs + valueStr = qFuzzyIsNull(val / step) ? u"0"_s : QString::number(val, 'f', precision); } } else { -- cgit v1.2.3