Bug 739840 - Make nsDOMEventTarget subclasses inherit from nsDOMEventTargetHelper first. r=khuey
authorMounir Lamouri <mounir.lamouri@gmail.com>
Wed, 28 Mar 2012 10:29:14 -0700
changeset 90541 7b18a4980189bde77a5c64b8f7e823694adf6f62
parent 90540 720badd8c3367ce3261fd1734dc33c2a06f54320
child 90542 35546f02ddb10a4094345a7c624fbc401333defa
push idunknown
push userunknown
push dateunknown
reviewerskhuey
bugs739840
milestone14.0a1
Bug 739840 - Make nsDOMEventTarget subclasses inherit from nsDOMEventTargetHelper first. r=khuey
dom/bluetooth/BluetoothAdapter.h
dom/bluetooth/BluetoothDevice.h
dom/sms/src/SmsManager.h
dom/sms/src/SmsRequest.h
--- a/dom/bluetooth/BluetoothAdapter.h
+++ b/dom/bluetooth/BluetoothAdapter.h
@@ -11,18 +11,18 @@
 #include "nsDOMEventTargetHelper.h"
 #include "nsIDOMBluetoothAdapter.h"
 #include "nsIDOMDOMRequest.h"
 
 class nsIEventTarget;
 
 BEGIN_BLUETOOTH_NAMESPACE
 
-class BluetoothAdapter : public nsIDOMBluetoothAdapter
-                       , public nsDOMEventTargetHelper
+class BluetoothAdapter : public nsDOMEventTargetHelper
+                       , public nsIDOMBluetoothAdapter
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIDOMBLUETOOTHADAPTER
 
   NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
 
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(BluetoothAdapter,
--- a/dom/bluetooth/BluetoothDevice.h
+++ b/dom/bluetooth/BluetoothDevice.h
@@ -7,18 +7,18 @@
 
 #include "BluetoothCommon.h"
 #include "nsDOMEventTargetHelper.h"
 #include "nsIDOMBluetoothDevice.h"
 #include "nsString.h"
 
 BEGIN_BLUETOOTH_NAMESPACE
 
-class BluetoothDevice : public nsIDOMBluetoothDevice
-                      , public nsDOMEventTargetHelper
+class BluetoothDevice : public nsDOMEventTargetHelper
+                      , public nsIDOMBluetoothDevice
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIDOMBLUETOOTHDEVICE
 
   NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
 
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(BluetoothDevice,
--- a/dom/sms/src/SmsManager.h
+++ b/dom/sms/src/SmsManager.h
@@ -43,19 +43,19 @@
 #include "nsDOMEventTargetHelper.h"
 
 class nsIDOMMozSmsMessage;
 
 namespace mozilla {
 namespace dom {
 namespace sms {
 
-class SmsManager : public nsIDOMMozSmsManager
+class SmsManager : public nsDOMEventTargetHelper
+                 , public nsIDOMMozSmsManager
                  , public nsIObserver
-                 , public nsDOMEventTargetHelper
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIOBSERVER
   NS_DECL_NSIDOMMOZSMSMANAGER
 
   NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
 
--- a/dom/sms/src/SmsRequest.h
+++ b/dom/sms/src/SmsRequest.h
@@ -44,18 +44,18 @@
 class nsIDOMMozSmsMessage;
 class nsIDOMMozSmsCursor;
 
 namespace mozilla {
 namespace dom {
 namespace sms {
 class SmsManager;
 
-class SmsRequest : public nsIDOMMozSmsRequest
-                 , public nsDOMEventTargetHelper
+class SmsRequest : public nsDOMEventTargetHelper
+                 , public nsIDOMMozSmsRequest
 {
 public:
   friend class SmsRequestManager;
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSIDOMMOZSMSREQUEST
 
   NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)