diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-11 17:17:13 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-11 17:17:51 +0200 |
commit | 4dac45c9ee59ff6586d90d423654da91523ab679 (patch) | |
tree | cd4a4adf2cbc9e77bf86d2d11e71ec66afdf3be4 /src/dbus/qdbusutil_p.h | |
parent | 078cd61751aeaa310d35a3d596a21a36004a1a0f (diff) | |
parent | f44850b5c3464cdda0ee9b1ee858d95f3ffaa3e2 (diff) |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I715b1d743d5f11560e7b3fbeb8fd64a5e5ddb277
Diffstat (limited to 'src/dbus/qdbusutil_p.h')
-rw-r--r-- | src/dbus/qdbusutil_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/dbus/qdbusutil_p.h b/src/dbus/qdbusutil_p.h index 5a4b461194..0814cc8050 100644 --- a/src/dbus/qdbusutil_p.h +++ b/src/dbus/qdbusutil_p.h @@ -106,7 +106,7 @@ namespace Q_DBUS_NO_EXPORT QDBusUtil return false; } if (isValidInterfaceName(name)) return true; - *error = QDBusError(QDBusError::InvalidInterface, QString::fromLatin1("Invalid interface class: %1").arg(name)); + *error = QDBusError(QDBusError::InvalidInterface, QLatin1String("Invalid interface class: %1").arg(name)); return false; } @@ -118,7 +118,7 @@ namespace Q_DBUS_NO_EXPORT QDBusUtil return false; } if (isValidBusName(name)) return true; - *error = QDBusError(QDBusError::InvalidService, QString::fromLatin1("Invalid service name: %1").arg(name)); + *error = QDBusError(QDBusError::InvalidService, QLatin1String("Invalid service name: %1").arg(name)); return false; } @@ -130,7 +130,7 @@ namespace Q_DBUS_NO_EXPORT QDBusUtil return false; } if (isValidObjectPath(path)) return true; - *error = QDBusError(QDBusError::InvalidObjectPath, QString::fromLatin1("Invalid object path: %1").arg(path)); + *error = QDBusError(QDBusError::InvalidObjectPath, QLatin1String("Invalid object path: %1").arg(path)); return false; } @@ -143,8 +143,8 @@ namespace Q_DBUS_NO_EXPORT QDBusUtil return false; } if (isValidMemberName(name)) return true; - *error = QDBusError(QDBusError::InvalidMember, QString::fromLatin1("Invalid %1 name: %2") - .arg(QString::fromLatin1(nameType), name)); + *error = QDBusError(QDBusError::InvalidMember, QLatin1String("Invalid %1 name: %2") + .arg(QLatin1String(nameType), name)); return false; } @@ -156,7 +156,7 @@ namespace Q_DBUS_NO_EXPORT QDBusUtil return false; } if (isValidErrorName(name)) return true; - *error = QDBusError(QDBusError::InvalidInterface, QString::fromLatin1("Invalid error name: %1").arg(name)); + *error = QDBusError(QDBusError::InvalidInterface, QLatin1String("Invalid error name: %1").arg(name)); return false; } |