diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-03-18 10:31:16 +0100 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-04-19 19:12:20 +0200 |
| commit | 908e85cc85d18f56575ee040589bcd5745c62adb (patch) | |
| tree | a7f28171c1465ea226018b73122f7b3e50721c18 /src/plugins | |
| parent | a1d8b9023f499560b967965ef52af2a7de981727 (diff) | |
Replace uses of _qs with _s in sources and examples
Task-number: QTBUG-101408
Change-Id: I48360ba3b23965cd3d90ac243c100a0656a4cde8
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/android/androidjniaccessibility.cpp | 6 |
2 files changed, 7 insertions, 3 deletions
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<QDBusObjectPath> QNetworkManagerInterface::primaryConnectionDevicePath() const { - auto it = propertyMap.constFind(u"PrimaryConnection"_qs); + auto it = propertyMap.constFind(u"PrimaryConnection"_s); if (it != propertyMap.cend()) return it->value<QDBusObjectPath>(); 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 { |