diff options
author | Rainer Keller <Rainer.Keller@qt.io> | 2016-10-24 15:54:18 +0200 |
---|---|---|
committer | Rainer Keller <Rainer.Keller@qt.io> | 2016-10-31 07:55:37 +0000 |
commit | c3007c5ecc24c43bb37e909298c73a3780bde1f9 (patch) | |
tree | ab13c596103d59ca46a4abb44badcab3039d15e0 /src/bluetoothsettings | |
parent | 197bed092d8d88446d3708cd393c8f9c3a8d0491 (diff) |
Fix compile error: No Qt keywords allowed in header files
Change-Id: I79dc9af286e6eca13524d29c478cac79e5d76707
Reviewed-by: Risto Avila <risto.avila@qt.io>
Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com>
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'src/bluetoothsettings')
-rw-r--r-- | src/bluetoothsettings/bluetoothdevice.h | 4 | ||||
-rw-r--r-- | src/bluetoothsettings/discoverymodel.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/bluetoothsettings/bluetoothdevice.h b/src/bluetoothsettings/bluetoothdevice.h index 5a77d62..8519044 100644 --- a/src/bluetoothsettings/bluetoothdevice.h +++ b/src/bluetoothsettings/bluetoothdevice.h @@ -50,11 +50,11 @@ public: Q_INVOKABLE void requestPairing(const QString& address); Q_INVOKABLE void requestConnect(const QString& address); Q_INVOKABLE void requestDisconnect(const QString& address); -signals: +Q_SIGNALS: void poweredChanged(); void scanningChanged(); -public slots: +public Q_SLOTS: void deviceStateChanged(QBluetoothLocalDevice::HostMode state); void scanFinished(); //These are not yet signaled diff --git a/src/bluetoothsettings/discoverymodel.h b/src/bluetoothsettings/discoverymodel.h index 61d0993..12554d7 100644 --- a/src/bluetoothsettings/discoverymodel.h +++ b/src/bluetoothsettings/discoverymodel.h @@ -65,7 +65,7 @@ public: bool connected() const; void setConnected(bool aConnected); -signals: +Q_SIGNALS: void connectedChanged(); protected: @@ -106,10 +106,10 @@ public: Connected }; -signals: +Q_SIGNALS: void scanFinished(); -private slots: +private Q_SLOTS: void deviceDiscovered(const QBluetoothDeviceInfo &device); private: QList<BtDeviceItem*> m_items; |