diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-05-14 14:10:33 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-15 10:10:05 +0200 |
| commit | 10cd7743aa8c30fc3a5f8485ba4c4aad6bb5365e (patch) | |
| tree | 4498b82fc104cf4e675241412d147de61147ed55 /src/bluetooth/qbluetoothsocket_bluez.cpp | |
| parent | de750dc7971b3dfda350b5602501b6215ef3da8d (diff) | |
Utilize QStringLiteral where possible
The only exception are generated files and cases where
QLatin1String based overloads are used (e.g. during QString comparisons)
Change-Id: I6f36789fb8acb3b30c1dc1f8a920b118a979d74f
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/bluetooth/qbluetoothsocket_bluez.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothsocket_bluez.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/bluetooth/qbluetoothsocket_bluez.cpp b/src/bluetooth/qbluetoothsocket_bluez.cpp index b9ed73a6..c3c51e45 100644 --- a/src/bluetooth/qbluetoothsocket_bluez.cpp +++ b/src/bluetooth/qbluetoothsocket_bluez.cpp @@ -271,7 +271,7 @@ QString QBluetoothSocketPrivate::localName() const if (address.isNull()) return QString(); - OrgBluezManagerInterface manager(QLatin1String("org.bluez"), QLatin1String("/"), + OrgBluezManagerInterface manager(QStringLiteral("org.bluez"), QStringLiteral("/"), QDBusConnection::systemBus()); QDBusPendingReply<QDBusObjectPath> reply = manager.FindAdapter(address.toString()); @@ -279,7 +279,7 @@ QString QBluetoothSocketPrivate::localName() const if (reply.isError()) return QString(); - OrgBluezAdapterInterface adapter(QLatin1String("org.bluez"), reply.value().path(), + OrgBluezAdapterInterface adapter(QStringLiteral("org.bluez"), reply.value().path(), QDBusConnection::systemBus()); QDBusPendingReply<QVariantMap> properties = adapter.GetProperties(); @@ -287,7 +287,7 @@ QString QBluetoothSocketPrivate::localName() const if (properties.isError()) return QString(); - return properties.value().value(QLatin1String("Name")).toString(); + return properties.value().value(QStringLiteral("Name")).toString(); } QBluetoothAddress QBluetoothSocketPrivate::localAddress() const @@ -362,7 +362,7 @@ QString QBluetoothSocketPrivate::peerName() const const QString peerAddress = QBluetoothAddress(bdaddr).toString(); const QString localAdapter = localAddress().toString(); - OrgBluezManagerInterface manager(QLatin1String("org.bluez"), QLatin1String("/"), + OrgBluezManagerInterface manager(QStringLiteral("org.bluez"), QStringLiteral("/"), QDBusConnection::systemBus()); QDBusPendingReply<QDBusObjectPath> reply = manager.FindAdapter(localAdapter); @@ -370,13 +370,13 @@ QString QBluetoothSocketPrivate::peerName() const if (reply.isError()) return QString(); - OrgBluezAdapterInterface adapter(QLatin1String("org.bluez"), reply.value().path(), + OrgBluezAdapterInterface adapter(QStringLiteral("org.bluez"), reply.value().path(), QDBusConnection::systemBus()); QDBusPendingReply<QDBusObjectPath> deviceObjectPath = adapter.CreateDevice(peerAddress); deviceObjectPath.waitForFinished(); if (deviceObjectPath.isError()) { - if (deviceObjectPath.error().name() != QLatin1String("org.bluez.Error.AlreadyExists")) + if (deviceObjectPath.error().name() != QStringLiteral("org.bluez.Error.AlreadyExists")) return QString(); deviceObjectPath = adapter.FindDevice(peerAddress); @@ -385,7 +385,7 @@ QString QBluetoothSocketPrivate::peerName() const return QString(); } - OrgBluezDeviceInterface device(QLatin1String("org.bluez"), deviceObjectPath.value().path(), + OrgBluezDeviceInterface device(QStringLiteral("org.bluez"), deviceObjectPath.value().path(), QDBusConnection::systemBus()); QDBusPendingReply<QVariantMap> properties = device.GetProperties(); @@ -393,7 +393,7 @@ QString QBluetoothSocketPrivate::peerName() const if (properties.isError()) return QString(); - return properties.value().value(QLatin1String("Alias")).toString(); + return properties.value().value(QStringLiteral("Alias")).toString(); } QBluetoothAddress QBluetoothSocketPrivate::peerAddress() const |