mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 939672 - Patch 2/2: Move NS_DECL_ISUPPORTS and NS_DECL_NSIOBSERVER into BluetoothProfileManagerBase.h
This commit is contained in:
parent
ccbb3da8ce
commit
2a9faeacea
@ -16,8 +16,6 @@ BEGIN_BLUETOOTH_NAMESPACE
|
||||
class BluetoothHidManager : public BluetoothProfileManagerBase
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIOBSERVER
|
||||
BT_DECL_PROFILE_MGR_BASE
|
||||
virtual void GetName(nsACString& aName)
|
||||
{
|
||||
|
@ -72,6 +72,8 @@ public:
|
||||
|
||||
#define BT_DECL_PROFILE_MGR_BASE \
|
||||
public: \
|
||||
NS_DECL_ISUPPORTS \
|
||||
NS_DECL_NSIOBSERVER \
|
||||
virtual void OnGetServiceChannel(const nsAString& aDeviceAddress, \
|
||||
const nsAString& aServiceUuid, \
|
||||
int aChannel) MOZ_OVERRIDE; \
|
||||
|
@ -547,7 +547,7 @@ BluetoothService::SetEnabled(bool aEnabled)
|
||||
* aEnabled: expected status of bluetooth
|
||||
*/
|
||||
if (mEnabled == aEnabled) {
|
||||
BT_WARNING("Bluetooth has already been enabled/disabled before"
|
||||
BT_WARNING("Bluetooth has already been enabled/disabled before "
|
||||
"or the toggling is failed.");
|
||||
}
|
||||
|
||||
|
@ -15,8 +15,6 @@ BEGIN_BLUETOOTH_NAMESPACE
|
||||
class BluetoothA2dpManager : public BluetoothProfileManagerBase
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIOBSERVER
|
||||
BT_DECL_PROFILE_MGR_BASE
|
||||
virtual void GetName(nsACString& aName)
|
||||
{
|
||||
|
@ -29,8 +29,6 @@ class BluetoothOppManager : public BluetoothSocketObserver
|
||||
, public BluetoothProfileManagerBase
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIOBSERVER
|
||||
BT_DECL_PROFILE_MGR_BASE
|
||||
virtual void GetName(nsACString& aName)
|
||||
{
|
||||
|
@ -22,8 +22,6 @@ BEGIN_BLUETOOTH_NAMESPACE
|
||||
class BluetoothHfpManager : public BluetoothHfpManagerBase
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIOBSERVER
|
||||
BT_DECL_HFP_MGR_BASE
|
||||
virtual void GetName(nsACString& aName)
|
||||
{
|
||||
|
@ -75,8 +75,6 @@ class BluetoothHfpManager : public BluetoothHfpManagerBase
|
||||
, public BatteryObserver
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIOBSERVER
|
||||
BT_DECL_HFP_MGR_BASE
|
||||
virtual void GetName(nsACString& aName)
|
||||
{
|
||||
|
@ -16,8 +16,6 @@ BEGIN_BLUETOOTH_NAMESPACE
|
||||
class BluetoothA2dpManager : public BluetoothProfileManagerBase
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIOBSERVER
|
||||
BT_DECL_PROFILE_MGR_BASE
|
||||
virtual void GetName(nsACString& aName)
|
||||
{
|
||||
|
@ -79,8 +79,6 @@ class BluetoothHfpManager : public BluetoothSocketObserver
|
||||
, public BatteryObserver
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIOBSERVER
|
||||
BT_DECL_HFP_MGR_BASE
|
||||
virtual void GetName(nsACString& aName)
|
||||
{
|
||||
|
@ -29,8 +29,6 @@ class BluetoothOppManager : public BluetoothSocketObserver
|
||||
, public BluetoothProfileManagerBase
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIOBSERVER
|
||||
BT_DECL_PROFILE_MGR_BASE
|
||||
virtual void GetName(nsACString& aName)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user