Changeset c145cbd in subsurface


Ignore:
Timestamp:
Jun 30, 2017, 1:12:53 PM (3 weeks ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
61fff713
Parents:
6837120
git-author:
Dirk Hohndel <dirk@…> (06/29/17 19:47:51)
git-committer:
Dirk Hohndel <dirk@…> (06/30/17 13:12:53)
Message:

QML UI: save BT address as string

And do the same LE: prefix marking as in the desktop version.

Signed-off-by: Dirk Hohndel <dirk@…>

Location:
core
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • core/btdiscovery.cpp

    r6837120 rc145cbd  
    7373#endif
    7474                for (int i = 0; i < btPairedDevices.length(); i++) {
    75                         qDebug() << "Paired =" << btPairedDevices[i].name << btPairedDevices[i].address.toString();
     75                        qDebug() << "Paired =" << btPairedDevices[i].name << btPairedDevices[i].address;
    7676                }
    7777#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
     
    122122#if defined(SSRF_CUSTOM_IO)
    123123        btPairedDevice this_d;
    124         this_d.address = device.address();
     124        this_d.address = markBLEAddress(&device);
    125125        this_d.name = device.name();
    126126        btPairedDevices.append(this_d);
     
    162162                }
    163163        }
    164         productList[QObject::tr("Paired Bluetooth Devices")].append(device.name + " (" + device.address.toString() + ")");
     164        productList[QObject::tr("Paired Bluetooth Devices")].append(device.name + " (" + device.address + ")");
    165165
    166166        btVP.btpdi = device;
     
    219219                        }
    220220
    221                         result.address = QBluetoothAddress(dev.callObjectMethod("getAddress","()Ljava/lang/String;").toString());
     221                        result.address = dev.callObjectMethod("getAddress","()Ljava/lang/String;").toString();
    222222                        result.name = dev.callObjectMethod("getName", "()Ljava/lang/String;").toString();
    223223
  • core/btdiscovery.h

    rbe8f20d rc145cbd  
    2828#if defined(BT_SUPPORT)
    2929        struct btPairedDevice {
    30                 QBluetoothAddress address;
     30                QString address;
    3131                QString name;
    3232        };
  • core/downloadfromdcthread.cpp

    rf5e1df0 rc145cbd  
    332332        // BT device
    333333        if (currentVendorText != QObject::tr("Paired Bluetooth Devices") && !btDCs.isEmpty()) {
    334                 QString btAddr = btDCs.first().btpdi.address.toString();
     334                QString btAddr = btDCs.first().btpdi.address;
    335335                qDebug() << "getDetectedDeviceAddress" << btAddr;
    336336                return btAddr;
     
    341341        if (currentVendorText == QObject::tr("Paired Bluetooth Devices")) {
    342342                int i =  productList[currentVendorText].indexOf(currentProductText);
    343                 QString btAddr = btAllDevices[i].btpdi.address.toString();
     343                QString btAddr = btAllDevices[i].btpdi.address;
    344344                qDebug() << "getDetectedDeviceAddress" << btAddr;
    345345                return btAddr;
Note: See TracChangeset for help on using the changeset viewer.