Merge changes I0170eafa,I705df82d,I688cc19c,Iac48c5a1guppy_6.99.1guppy/6.99.16.99.1

* changes:
  libqtappfw: bluetooth: send out power event
  libqtappfw: bluetooth: update to rewrite of bluetooth binding
  libqtappfw: bluetooth: remove avrcp_controls
  Revert "libqtappfw: bluetooth: add binding version 2.0 verbs"

1 files changed, 1 insertions, 23 deletions

diff --git a/bluetooth/bluetoothmessage.h b/bluetooth/bluetoothmessage.h
index 0a26322..4fc9124 100644
--- a/bluetooth/bluetoothmessage.h
+++ b/bluetooth/bluetoothmessage.h
@@ -23,39 +23,17 @@ class BluetoothMessage : public Message
 {
     Q_OBJECT
     public:
-        explicit BluetoothMessage(QString api_version = "1.0", QObject *parent = 0) { m_api_version = api_version; };
-
-        // Bluetooth API Schema 1.0
-        bool isConnectionEvent() { return (this->eventName() == "connection"); };
-        bool isRequestConfirmationEvent() { return (this->eventName() == "request_confirmation"); };
-        bool isDeviceAddedEvent() { return (this->eventName() == "device_added"); };
-        bool isDeviceRemovedEvent() { return (this->eventName() == "device_removed"); };
-        bool isDeviceUpdatedEvent() { return (this->eventName() == "device_updated"); };
-
-        // Bluetooth API Schema 2.0
         bool isDeviceChangesEvent() { return (this->eventName() == "device_changes"); };
         bool isAgentEvent() { return (this->eventName() == "agent"); };
-
         bool createRequest(QString verb, QJsonObject parameter);
 
     private:
-        QStringList verbs_v1 {
-            "start_discovery" ,    "stop_discovery",    "power",
-            "remove_device",       "pair",              "cancel_pair",
-            "connect",             "disconnect",        "device_priorities",
-            "set_device_property", "set_property",      "discovery_result",
-            "set_avrcp_controls",  "send_confirmation", "version",
-            "subscribe",           "unsubscribe",
-        };
-
-        QStringList verbs_v2 {
+        QStringList verbs {
             "connect",             "disconnect",        "managed_objects",
             "adapter_state",       "pair",              "cancel_pairing",
             "confirm_pairing",     "remove_device",     "version",
             "subscribe",           "unsubscribe",
         };
-
-        QString m_api_version;
 };
 
 #endif // BLUETOOTH_MESSAGE_H