From bc0a72b7a748a65f54a4897406929bde996605c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hub=20Figui=C3=A8re?= <hfiguiere@mozilla.com>
Date: Tue, 8 May 2012 13:27:05 -0700
Subject: [PATCH] Bug 753067 - Fix some warnings. r=dbolter

---
 accessible/src/atk/ApplicationAccessibleWrap.cpp |  4 ++--
 accessible/src/atk/nsAccessibleWrap.cpp          |  5 +++--
 accessible/src/base/AccIterator.cpp              |  2 +-
 accessible/src/base/TextAttrs.h                  | 12 ++++++------
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/accessible/src/atk/ApplicationAccessibleWrap.cpp b/accessible/src/atk/ApplicationAccessibleWrap.cpp
index 9b970972c32..3b265651e1a 100644
--- a/accessible/src/atk/ApplicationAccessibleWrap.cpp
+++ b/accessible/src/atk/ApplicationAccessibleWrap.cpp
@@ -632,9 +632,9 @@ ApplicationAccessibleWrap::Init()
         if (NS_SUCCEEDED(rv)) {
             // init atk-bridge
             (*sAtkBridge.init)();
-        }
-        else
+        } else {
             MAI_LOG_DEBUG(("Fail to load lib: %s\n", sAtkBridge.libName));
+        }
 
         if (!sToplevel_event_hook_added) {
           sToplevel_event_hook_added = true;
diff --git a/accessible/src/atk/nsAccessibleWrap.cpp b/accessible/src/atk/nsAccessibleWrap.cpp
index 95bb791c47d..2bcffd265ae 100644
--- a/accessible/src/atk/nsAccessibleWrap.cpp
+++ b/accessible/src/atk/nsAccessibleWrap.cpp
@@ -1382,10 +1382,11 @@ nsresult
 nsAccessibleWrap::FireAtkShowHideEvent(AccEvent* aEvent,
                                        AtkObject *aObject, bool aIsAdded)
 {
-    if (aIsAdded)
+    if (aIsAdded) {
         MAI_LOG_DEBUG(("\n\nReceived: Show event\n"));
-    else
+    } else {
         MAI_LOG_DEBUG(("\n\nReceived: Hide event\n"));
+    }
 
     PRInt32 indexInParent = getIndexInParentCB(aObject);
     AtkObject *parentObject = getParentCB(aObject);
diff --git a/accessible/src/base/AccIterator.cpp b/accessible/src/base/AccIterator.cpp
index e8b305a4e51..dea63062ca0 100644
--- a/accessible/src/base/AccIterator.cpp
+++ b/accessible/src/base/AccIterator.cpp
@@ -280,7 +280,7 @@ XULDescriptionIterator::Next()
 IDRefsIterator::
   IDRefsIterator(nsDocAccessible* aDoc, nsIContent* aContent,
                  nsIAtom* aIDRefsAttr) :
-  mCurrIdx(0), mContent(aContent), mDoc(aDoc)
+  mContent(aContent), mDoc(aDoc), mCurrIdx(0)
 {
   if (mContent->IsInDoc())
     mContent->GetAttr(kNameSpaceID_None, aIDRefsAttr, mIDs);
diff --git a/accessible/src/base/TextAttrs.h b/accessible/src/base/TextAttrs.h
index 6d75d7402b4..1e84beff566 100644
--- a/accessible/src/base/TextAttrs.h
+++ b/accessible/src/base/TextAttrs.h
@@ -63,8 +63,8 @@ public:
    * Constructor. Used to expose default text attributes.
    */
   TextAttrsMgr(nsHyperTextAccessible* aHyperTextAcc) :
-    mHyperTextAcc(aHyperTextAcc), mIncludeDefAttrs(true),
-    mOffsetAcc(nsnull), mOffsetAccIdx(-1) { }
+    mOffsetAcc(nsnull),  mHyperTextAcc(aHyperTextAcc),
+    mOffsetAccIdx(-1), mIncludeDefAttrs(true) { }
 
   /**
    * Constructor. Used to expose text attributes at the given offset.
@@ -82,8 +82,8 @@ public:
                bool aIncludeDefAttrs,
                nsAccessible* aOffsetAcc,
                PRInt32 aOffsetAccIdx) :
-    mHyperTextAcc(aHyperTextAcc), mIncludeDefAttrs(aIncludeDefAttrs),
-    mOffsetAcc(aOffsetAcc), mOffsetAccIdx(aOffsetAccIdx) { }
+    mOffsetAcc(aOffsetAcc), mHyperTextAcc(aHyperTextAcc),
+    mOffsetAccIdx(aOffsetAccIdx), mIncludeDefAttrs(aIncludeDefAttrs) { }
 
   /*
    * Return text attributes and hyper text offsets where these attributes are
@@ -118,8 +118,8 @@ protected:
 private:
   nsAccessible* mOffsetAcc;
   nsHyperTextAccessible* mHyperTextAcc;
-  PRInt32 mOffsetAccIdx;
-  bool mIncludeDefAttrs;
+  PRInt32 mOffsetAccIdx;
+  bool mIncludeDefAttrs;
 
 protected: