diff options
author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-04-08 17:43:08 +0200 |
---|---|---|
committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-04-12 11:48:08 +0200 |
commit | 9662c7da8f09b6cfa071f4e1cbf4973af3a540a3 (patch) | |
tree | 87dace584b4ac1380537f6fe0e52fb1871cdbc90 /src/dbus/qdbusutil_p.h | |
parent | e9e43bff2933937eda873ed549e27f909a3b00b7 (diff) |
QtDBus: replace remaining uses of QLatin1String with QLatin1StringView
Task-number: QTBUG-98434
Change-Id: I733af3126f126e5025f709cfe023b9f6bbc13e3e
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/dbus/qdbusutil_p.h')
-rw-r--r-- | src/dbus/qdbusutil_p.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/dbus/qdbusutil_p.h b/src/dbus/qdbusutil_p.h index 50a2490fd0..08329d2a3c 100644 --- a/src/dbus/qdbusutil_p.h +++ b/src/dbus/qdbusutil_p.h @@ -99,11 +99,11 @@ namespace Q_DBUS_NO_EXPORT QDBusUtil { if (name.isEmpty()) { if (empty == EmptyAllowed) return true; - *error = QDBusError(QDBusError::InvalidInterface, QLatin1String("Interface name cannot be empty")); + *error = QDBusError(QDBusError::InvalidInterface, QLatin1StringView("Interface name cannot be empty")); return false; } if (isValidInterfaceName(name)) return true; - *error = QDBusError(QDBusError::InvalidInterface, QLatin1String("Invalid interface class: %1").arg(name)); + *error = QDBusError(QDBusError::InvalidInterface, QLatin1StringView("Invalid interface class: %1").arg(name)); return false; } @@ -111,11 +111,11 @@ namespace Q_DBUS_NO_EXPORT QDBusUtil { if (name.isEmpty()) { if (empty == EmptyAllowed) return true; - *error = QDBusError(QDBusError::InvalidService, QLatin1String("Service name cannot be empty")); + *error = QDBusError(QDBusError::InvalidService, QLatin1StringView("Service name cannot be empty")); return false; } if (isValidBusName(name)) return true; - *error = QDBusError(QDBusError::InvalidService, QLatin1String("Invalid service name: %1").arg(name)); + *error = QDBusError(QDBusError::InvalidService, QLatin1StringView("Invalid service name: %1").arg(name)); return false; } @@ -123,11 +123,11 @@ namespace Q_DBUS_NO_EXPORT QDBusUtil { if (path.isEmpty()) { if (empty == EmptyAllowed) return true; - *error = QDBusError(QDBusError::InvalidObjectPath, QLatin1String("Object path cannot be empty")); + *error = QDBusError(QDBusError::InvalidObjectPath, QLatin1StringView("Object path cannot be empty")); return false; } if (isValidObjectPath(path)) return true; - *error = QDBusError(QDBusError::InvalidObjectPath, QLatin1String("Invalid object path: %1").arg(path)); + *error = QDBusError(QDBusError::InvalidObjectPath, QLatin1StringView("Invalid object path: %1").arg(path)); return false; } @@ -136,12 +136,12 @@ namespace Q_DBUS_NO_EXPORT QDBusUtil if (!nameType) nameType = "member"; if (name.isEmpty()) { if (empty == EmptyAllowed) return true; - *error = QDBusError(QDBusError::InvalidMember, QLatin1String(nameType) + QLatin1String(" name cannot be empty")); + *error = QDBusError(QDBusError::InvalidMember, QLatin1StringView(nameType) + QLatin1StringView(" name cannot be empty")); return false; } if (isValidMemberName(name)) return true; - *error = QDBusError(QDBusError::InvalidMember, QLatin1String("Invalid %1 name: %2") - .arg(QLatin1String(nameType), name)); + *error = QDBusError(QDBusError::InvalidMember, QLatin1StringView("Invalid %1 name: %2") + .arg(QLatin1StringView(nameType), name)); return false; } @@ -149,11 +149,11 @@ namespace Q_DBUS_NO_EXPORT QDBusUtil { if (name.isEmpty()) { if (empty == EmptyAllowed) return true; - *error = QDBusError(QDBusError::InvalidInterface, QLatin1String("Error name cannot be empty")); + *error = QDBusError(QDBusError::InvalidInterface, QLatin1StringView("Error name cannot be empty")); return false; } if (isValidErrorName(name)) return true; - *error = QDBusError(QDBusError::InvalidInterface, QLatin1String("Invalid error name: %1").arg(name)); + *error = QDBusError(QDBusError::InvalidInterface, QLatin1StringView("Invalid error name: %1").arg(name)); return false; } @@ -166,7 +166,7 @@ namespace Q_DBUS_NO_EXPORT QDBusUtil inline QString dbusInterface() { // it's the same string, but just be sure - Q_ASSERT(dbusService() == QLatin1String(DBUS_INTERFACE_DBUS)); + Q_ASSERT(dbusService() == QLatin1StringView(DBUS_INTERFACE_DBUS)); return dbusService(); } inline QString dbusInterfaceProperties() |