reorder-bases
author Benjamin Smedberg <benjamin@smedbergs.us>
Sat, 26 Jul 2008 22:49:39 -0400
changeset 167 a4da40849f5436e629c5732f4368c6c48189637f
parent 162 3ae1ca70680d55840cbf5a60088ebaebfe2bddc5
permissions -rw-r--r--
State as of now

* * *
* * *

diff --git a/browser/components/migration/src/nsNetscapeProfileMigratorBase.h b/browser/components/migration/src/nsNetscapeProfileMigratorBase.h
--- a/browser/components/migration/src/nsNetscapeProfileMigratorBase.h
+++ b/browser/components/migration/src/nsNetscapeProfileMigratorBase.h
@@ -46,7 +46,7 @@ class nsIFile;
 class nsIFile;
 class nsIPrefBranch;
 
-class nsNetscapeProfileMigratorBase
+class nsNetscapeProfileMigratorBase : public XPCOMGCFinalizedObject
 {
 public:
   nsNetscapeProfileMigratorBase();
diff --git a/content/xbl/src/nsXBLPrototypeBinding.cpp b/content/xbl/src/nsXBLPrototypeBinding.cpp
--- a/content/xbl/src/nsXBLPrototypeBinding.cpp
+++ b/content/xbl/src/nsXBLPrototypeBinding.cpp
@@ -137,7 +137,10 @@ private:
 // The same insertion point may be in the insertion point table for multiple
 // keys, so we refcount the entries.
 
-class nsXBLInsertionPointEntry : public XPCOMGCFinalizedObject {
+class nsXBLInsertionPointEntry 
+  : public XPCOMGCFinalizedObject
+  , public MMgc::GCFinalizable
+{
 public:
   ~nsXBLInsertionPointEntry() {
     if (mDefaultContent) {
diff --git a/content/xslt/src/xpath/txExprResult.h b/content/xslt/src/xpath/txExprResult.h
--- a/content/xslt/src/xpath/txExprResult.h
+++ b/content/xslt/src/xpath/txExprResult.h
@@ -54,7 +54,9 @@
  * Note: for NodeSet, see NodeSet.h
 */
 
-class txAExprResult : public XPCOMGCFinalizedObject
+class txAExprResult
+    : public XPCOMGCFinalizedObject
+    , public MMgc::GCFinalizable
 {
 public:
     // Update txLiteralExpr::getReturnType and sTypes in txEXSLTFunctions.cpp if
diff --git a/content/xslt/src/xslt/txStylesheet.h b/content/xslt/src/xslt/txStylesheet.h
--- a/content/xslt/src/xslt/txStylesheet.h
+++ b/content/xslt/src/xslt/txStylesheet.h
@@ -55,7 +55,9 @@ class txStripSpaceTest;
 class txStripSpaceTest;
 class txXSLKey;
 
-class txStylesheet : public XPCOMGCFinalizedObject
+class txStylesheet
+    : public XPCOMGCFinalizedObject
+    , public MMgc::GCFinalizable
 {
 public:
     class ImportFrame;
diff --git a/content/xul/content/src/nsXULElement.h b/content/xul/content/src/nsXULElement.h
--- a/content/xul/content/src/nsXULElement.h
+++ b/content/xul/content/src/nsXULElement.h
@@ -184,7 +184,9 @@ public:
 
  */
 
-class nsXULPrototypeNode : public XPCOMGCFinalizedObject
+class nsXULPrototypeNode
+    : public XPCOMGCFinalizedObject
+    , public MMgc::GCFinalizable
 {
 public:
     enum Type { eType_Element, eType_Script, eType_Text, eType_PI };
diff --git a/docshell/shistory/src/nsSHistory.h b/docshell/shistory/src/nsSHistory.h
--- a/docshell/shistory/src/nsSHistory.h
+++ b/docshell/shistory/src/nsSHistory.h
@@ -60,10 +60,10 @@ class nsIDocShell;
 class nsIDocShell;
 class nsSHEnumerator;
 class nsSHistoryObserver;
-class nsSHistory: public PRCList,
-                  public nsISHistory,
+class nsSHistory: public nsISHistory,
                   public nsISHistoryInternal,
-                  public nsIWebNavigation
+                  public nsIWebNavigation,
+                  public PRCList
 {
 public:
 	nsSHistory();
diff --git a/extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.h b/extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.h
--- a/extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.h
+++ b/extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.h
@@ -105,9 +105,9 @@
 { 0xfcacef24, 0x2b40, 0x11d3, { 0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70 } }
 
 //=====================================================================
-class nsXPCOMDetector :  
-      public nsUniversalDetector,
-      public nsICharsetDetector
+class nsXPCOMDetector
+  : public nsICharsetDetector
+  , public nsUniversalDetector
 {
   NS_DECL_ISUPPORTS
   public:
@@ -124,9 +124,9 @@ class nsXPCOMDetector :
 
 
 //=====================================================================
-class nsXPCOMStringDetector :  
-      public nsUniversalDetector,
-      public nsIStringCharsetDetector
+class nsXPCOMStringDetector
+  : public nsIStringCharsetDetector
+  , public nsUniversalDetector
 {
   NS_DECL_ISUPPORTS
   public:
diff --git a/intl/chardet/src/nsCyrillicDetector.h b/intl/chardet/src/nsCyrillicDetector.h
--- a/intl/chardet/src/nsCyrillicDetector.h
+++ b/intl/chardet/src/nsCyrillicDetector.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -86,7 +86,9 @@ static const char * gUkrainian[5] = {
 
 #define NUM_CYR_CHARSET 5
 
-class nsCyrillicDetector 
+class nsCyrillicDetector
+  : public XPCOMGCFinalizedObject
+  , public MMgc::GCFinalizable
 {
   public:
     nsCyrillicDetector(PRUint8 aItems, 
diff --git a/layout/style/nsCSSDeclaration.h b/layout/style/nsCSSDeclaration.h
--- a/layout/style/nsCSSDeclaration.h
+++ b/layout/style/nsCSSDeclaration.h
@@ -55,7 +55,10 @@
 #include "nsCSSDataBlock.h"
 #include "nsCSSStruct.h"
 
-class nsCSSDeclaration : public XPCOMGCFinalizedObject {
+class nsCSSDeclaration
+  : public XPCOMGCFinalizedObject
+  , public MMgc::GCFinalizable
+{
 public:
   /**
    * Construct an |nsCSSDeclaration| that is in an invalid state (null
diff --git a/layout/style/nsCSSRule.h b/layout/style/nsCSSRule.h
--- a/layout/style/nsCSSRule.h
+++ b/layout/style/nsCSSRule.h
@@ -48,7 +48,10 @@ struct nsRuleData;
 struct nsRuleData;
 class nsICSSGroupRule;
 
-class nsCSSRule : public XPCOMGCFinalizedObject {
+class nsCSSRule
+  : public XPCOMGCFinalizedObject
+  , public MMgc::GCFinalizable
+{
 public:
   nsCSSRule(void);
   nsCSSRule(const nsCSSRule& aCopy);
diff --git a/widget/src/gtk2/nsNativeThemeGTK.h b/widget/src/gtk2/nsNativeThemeGTK.h
--- a/widget/src/gtk2/nsNativeThemeGTK.h
+++ b/widget/src/gtk2/nsNativeThemeGTK.h
@@ -45,8 +45,8 @@
 #include <gtk/gtkwidget.h>
 #include "gtkdrawing.h"
 
-class nsNativeThemeGTK: private nsNativeTheme,
-                        public nsITheme,
+class nsNativeThemeGTK: public nsITheme,
+                        private nsNativeTheme,
                         public nsIObserver {
 public:
   NS_DECL_ISUPPORTS