Bug 763148 - put Relation into a11y namespace, r=surkov

accessible/src/base/AccIterator.cpp

@@ -11,6 +11,7 @@
 #include "nsBindingManager.h"
 
 using namespace mozilla;
+using namespace mozilla::a11y;
 
 ////////////////////////////////////////////////////////////////////////////////
 // AccIterator

accessible/src/base/AccIterator.h

@@ -22,7 +22,7 @@ public:
   virtual Accessible* Next() = 0;
 
 private:
-  friend class Relation;
+  friend class mozilla::a11y::Relation;
   nsAutoPtr<AccIterable> mNextIter;
 };
 

accessible/src/base/Relation.h

@@ -9,6 +9,9 @@
 
 #include "AccIterator.h"
 
+namespace mozilla {
+namespace a11y {
+
 /**
  * This class is used to return Relation objects from functions.  A copy
  * constructor doesn't work here because we need to mutate the old relation to
@@ -117,5 +120,8 @@ private:
   AccIterable* mLastIter;
 };
 
+} // namespace a11y
+} // namespace mozilla
+
 #endif
 

accessible/src/generic/Accessible.h

@@ -28,7 +28,6 @@ class KeyBinding;
 class Accessible;
 class HyperTextAccessible;
 struct nsRoleMapEntry;
-class Relation;
 
 namespace mozilla {
 namespace a11y {
@@ -36,6 +35,7 @@ namespace a11y {
 class HTMLImageMapAccessible;
 class HTMLLIAccessible;
 class ImageAccessible;
+class Relation;
 class TableAccessible;
 class TextLeafAccessible;
 class XULTreeAccessible;
@@ -306,7 +306,7 @@ public:
   /**
    * Get the relation of the given type.
    */
-  virtual Relation RelationByType(PRUint32 aType);
+  virtual mozilla::a11y::Relation RelationByType(PRUint32 aType);
 
   //////////////////////////////////////////////////////////////////////////////
   // Initializing methods

accessible/src/generic/RootAccessible.h

@@ -15,8 +15,6 @@
 #include "nsIDocument.h"
 #include "nsIDOMEventListener.h"
 
-class Relation;
-
 namespace mozilla {
 namespace a11y {
 

accessible/src/msaa/ia2AccessibleRelation.cpp

@@ -14,6 +14,8 @@
 
 #include "AccessibleRelation_i.c"
 
+using namespace mozilla::a11y;
+
 ia2AccessibleRelation::ia2AccessibleRelation(PRUint32 aType, Relation* aRel) :
   mType(aType), mReferences(0)
 {

accessible/src/msaa/ia2AccessibleRelation.h

@@ -14,6 +14,9 @@
 
 #include "AccessibleRelation.h"
 
+namespace mozilla {
+namespace a11y {
+
 class ia2AccessibleRelation : public IAccessibleRelation
 {
 public:
@@ -57,5 +60,8 @@ private:
   ULONG mReferences;
 };
 
+} // namespace a11y
+} // namespace mozilla
+
 #endif
 

accessible/src/xpcom/nsAccessibleRelation.cpp

@@ -11,6 +11,8 @@
 #include "nsArrayUtils.h"
 #include "nsComponentManagerUtils.h"
 
+using namespace mozilla::a11y;
+
 nsAccessibleRelation::nsAccessibleRelation(PRUint32 aType,
                                            Relation* aRel) :
   mType(aType)

accessible/src/xpcom/nsAccessibleRelation.h

@@ -11,6 +11,9 @@
 #include "nsCOMPtr.h"
 #include "nsIMutableArray.h"
 
+namespace mozilla {
+namespace a11y {
+
 class Relation;
 
 /**
@@ -33,4 +36,7 @@ private:
   nsCOMPtr<nsIMutableArray> mTargets;
 };
 
+} // namespace a11y
+} // namespace mozilla
+
 #endif