diff options
| author | Kimmo Ollila <kimmo.ollila@theqtcompany.com> | 2016-02-23 09:13:21 +0200 |
|---|---|---|
| committer | Kimmo Ollila <kimmo.ollila@theqtcompany.com> | 2016-03-02 12:51:24 +0000 |
| commit | c6b5855b446c73f8a60cc3d4427fc445e0ba400d (patch) | |
| tree | b57f45df2a297335392f56953410a4c3ab599a8d /src/bluetoothsettings | |
| parent | f1d884b6dad5a93d7a3077b6b05d3ec7fcd9a6ea (diff) | |
Migrate settings UI to use Qt Quick Controls 2
Task-number: QTEE-1057
Change-Id: I389d784241d4b68384765dfde4b572e7652eb76c
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Diffstat (limited to 'src/bluetoothsettings')
| -rw-r--r-- | src/bluetoothsettings/bluez/bluetoothdevice_p.cpp | 5 | ||||
| -rw-r--r-- | src/bluetoothsettings/discoverymodel.cpp | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp b/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp index ded84f2..5badc74 100644 --- a/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp +++ b/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp @@ -68,8 +68,8 @@ OrgBluezDevice1Interface* BluetoothDevicePrivate::findDevice() const QString &iface = jt.key(); const QVariantMap &ifaceValues = jt.value(); if (iface == QStringLiteral("org.bluez.Device1")) { - if (ifaceValues["Address"] == m_address) { - OrgBluezDevice1Interface *devIf = new OrgBluezDevice1Interface("org.bluez", path.path(), QDBusConnection::systemBus()); + if (ifaceValues[QStringLiteral("Address")] == m_address) { + OrgBluezDevice1Interface *devIf = new OrgBluezDevice1Interface(QStringLiteral("org.bluez"), path.path(), QDBusConnection::systemBus()); return devIf; } } @@ -78,7 +78,6 @@ OrgBluezDevice1Interface* BluetoothDevicePrivate::findDevice() return NULL; } - void BluetoothDevicePrivate::connectDevice() { OrgBluezDevice1Interface *dev = findDevice(); diff --git a/src/bluetoothsettings/discoverymodel.cpp b/src/bluetoothsettings/discoverymodel.cpp index 36d3a2e..1a9410b 100644 --- a/src/bluetoothsettings/discoverymodel.cpp +++ b/src/bluetoothsettings/discoverymodel.cpp @@ -222,7 +222,7 @@ QVariant DiscoveryModel::data(const QModelIndex & index, int role) const case DiscoveryModel::Connected: return item->connected(); default: - return ""; + return QVariant(); } } |