5 files changed, 17 insertions, 21 deletions
diff --git a/examples/bluetooth/btfiletransfer/main.cpp b/examples/bluetooth/btfiletransfer/main.cpp
index 2c2b6df5..1871e207 100644
--- a/examples/bluetooth/btfiletransfer/main.cpp
+++ b/examples/bluetooth/btfiletransfer/main.cpp
@@ -54,6 +54,7 @@
 
 int main(int argc, char *argv[])
 {
+    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QApplication app(argc, argv);
 
     RemoteSelector d;
diff --git a/examples/bluetooth/btfiletransfer/pindisplay.h b/examples/bluetooth/btfiletransfer/pindisplay.h
index b7ad8866..7acc517e 100644
--- a/examples/bluetooth/btfiletransfer/pindisplay.h
+++ b/examples/bluetooth/btfiletransfer/pindisplay.h
@@ -64,7 +64,7 @@ class pinDisplay : public QDialog
     Q_OBJECT
 
 public:
-    explicit pinDisplay(QString title, QString pin, QWidget *parent = 0);
+    explicit pinDisplay(QString title, QString pin, QWidget *parent = nullptr);
     ~pinDisplay();
 
     void setOkCancel();
diff --git a/examples/bluetooth/btfiletransfer/progress.h b/examples/bluetooth/btfiletransfer/progress.h
index 64a19ca0..afd72153 100644
--- a/examples/bluetooth/btfiletransfer/progress.h
+++ b/examples/bluetooth/btfiletransfer/progress.h
@@ -52,7 +52,7 @@
 #define PROGRESS_H
 
 #include <QDialog>
-#include <QTime>
+#include <QElapsedTimer>
 
 QT_FORWARD_DECLARE_CLASS(QBluetoothTransferReply)
 
@@ -69,7 +69,7 @@ class Progress : public QDialog
     Q_OBJECT
 
 public:
-    explicit Progress(QWidget *parent = 0);
+    explicit Progress(QWidget *parent = nullptr);
     ~Progress();
 
     void setStatus(QString title, QString filename);
@@ -81,7 +81,7 @@ public Q_SLOTS:
 private:
     Ui::Progress *ui;
 
-    QTime start;
+    QElapsedTimer start;
 };
 
 #endif // PROGRESS_H
diff --git a/examples/bluetooth/btfiletransfer/remoteselector.cpp b/examples/bluetooth/btfiletransfer/remoteselector.cpp
index 766bd028..b3c60cb3 100644
--- a/examples/bluetooth/btfiletransfer/remoteselector.cpp
+++ b/examples/bluetooth/btfiletransfer/remoteselector.cpp
@@ -171,18 +171,17 @@ void RemoteSelector::serviceDiscovered(const QBluetoothServiceInfo &serviceInfo)
 //        new QListWidgetItem(QString::fromLatin1("%1\t%2\t%3").arg(serviceInfo.device().address().toString(),
 //                                                             serviceInfo.device().name(), serviceInfo.serviceName()));
 
-    QMutableMapIterator<int, QBluetoothServiceInfo> i(m_discoveredServices);
-    while (i.hasNext()){
-        i.next();
-        if (serviceInfo.device().address() == i.value().device().address()){
-            i.setValue(serviceInfo);
+    const QBluetoothAddress address = serviceInfo.device().address();
+    for (QBluetoothServiceInfo &info : m_discoveredServices) {
+        if (info.device().address() == address){
+            info = serviceInfo;
             return;
         }
     }
 
     int row = ui->remoteDevices->rowCount();
     ui->remoteDevices->insertRow(row);
-    QTableWidgetItem *item = new QTableWidgetItem(serviceInfo.device().address().toString());
+    QTableWidgetItem *item = new QTableWidgetItem(address.toString());
     ui->remoteDevices->setItem(row, 0, item);
     item = new QTableWidgetItem(serviceInfo.device().name());
     ui->remoteDevices->setItem(row, 1, item);
@@ -190,9 +189,7 @@ void RemoteSelector::serviceDiscovered(const QBluetoothServiceInfo &serviceInfo)
 
     ui->remoteDevices->setItem(row, 2, item);
 
-    QBluetoothLocalDevice::Pairing p;
-
-    p = m_localDevice->pairingStatus(serviceInfo.device().address());
+    QBluetoothLocalDevice::Pairing p = m_localDevice->pairingStatus(address);
 
     ui->remoteDevices->blockSignals(true);
 
@@ -275,13 +272,11 @@ void RemoteSelector::on_stopButton_clicked()
     m_discoveryAgent->stop();
 }
 
-QString RemoteSelector::addressToName(const QBluetoothAddress &address)
+QString RemoteSelector::addressToName(const QBluetoothAddress &address) const
 {
-    QMapIterator<int, QBluetoothServiceInfo> i(m_discoveredServices);
-    while (i.hasNext()){
-        i.next();
-        if (i.value().device().address() == address)
-            return i.value().device().name();
+    for (const QBluetoothServiceInfo &info : m_discoveredServices) {
+        if (info.device().address() == address)
+            return info.device().name();
     }
     return address.toString();
 }
diff --git a/examples/bluetooth/btfiletransfer/remoteselector.h b/examples/bluetooth/btfiletransfer/remoteselector.h
index b0850c41..8266c8c4 100644
--- a/examples/bluetooth/btfiletransfer/remoteselector.h
+++ b/examples/bluetooth/btfiletransfer/remoteselector.h
@@ -78,7 +78,7 @@ class RemoteSelector : public QDialog
     Q_OBJECT
 
 public:
-    explicit RemoteSelector(QWidget *parent = 0);
+    explicit RemoteSelector(QWidget *parent = nullptr);
     ~RemoteSelector();
 
     void startDiscovery(const QBluetoothUuid &uuid);
@@ -95,7 +95,7 @@ private:
     QPointer<pinDisplay> m_pindisplay;
     bool m_pairingError;
 
-    QString addressToName(const QBluetoothAddress &address);
+    QString addressToName(const QBluetoothAddress &address) const;
 
 public Q_SLOTS:
     void startDiscovery();