diff options
Diffstat (limited to 'core/btdiscovery.h')
| -rw-r--r-- | core/btdiscovery.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/btdiscovery.h b/core/btdiscovery.h index a7d68decd..d6c25d8b0 100644 --- a/core/btdiscovery.h +++ b/core/btdiscovery.h @@ -10,7 +10,6 @@ #include <QBluetoothDeviceDiscoveryAgent> #include <QBluetoothUuid> #include "core/libdivecomputer.h" -#include "core/singleton.h" #if defined(Q_OS_ANDROID) #include <QAndroidJniObject> @@ -24,12 +23,13 @@ QString extractBluetoothAddress(const QString &address); QString extractBluetoothNameAddress(const QString &address, QString &name); QBluetoothDeviceInfo getBtDeviceInfo(const QString &devaddr); -class BTDiscovery : public QObject, public SillySingleton<BTDiscovery> { +class BTDiscovery : public QObject { Q_OBJECT public: BTDiscovery(QObject *parent = NULL); ~BTDiscovery(); + static BTDiscovery *instance(); struct btPairedDevice { QString address; @@ -57,6 +57,7 @@ public: void discoverAddress(QString address); private: + static BTDiscovery *m_instance; bool m_btValid; bool m_showNonDiveComputers; |