migration-class-inheritance
author Benjamin Smedberg <benjamin@smedbergs.us>
Sat, 26 Jul 2008 22:49:39 -0400
changeset 167 a4da40849f5436e629c5732f4368c6c48189637f
parent 80 07783adadb3b0f82cea9c4f71d2f410d3ccb5c17
permissions -rw-r--r--
State as of now

diff --git a/browser/components/migration/src/nsDogbertProfileMigrator.h b/browser/components/migration/src/nsDogbertProfileMigrator.h
--- a/browser/components/migration/src/nsDogbertProfileMigrator.h
+++ b/browser/components/migration/src/nsDogbertProfileMigrator.h
@@ -52,8 +52,7 @@
 
 class nsIFile;
 
-class nsDogbertProfileMigrator : public nsNetscapeProfileMigratorBase, 
-                                 public nsIBrowserProfileMigrator
+class nsDogbertProfileMigrator : public nsNetscapeProfileMigratorBase
 {
 public:
   NS_DECL_NSIBROWSERPROFILEMIGRATOR
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
@@ -42,11 +42,14 @@
 #include "nsIStringBundle.h"
 #include "nsISupportsArray.h"
 #include "nsStringAPI.h"
+#include "nsIBrowserProfileMigrator.h"
 
 class nsIFile;
 class nsIPrefBranch;
 
-class nsNetscapeProfileMigratorBase : public XPCOMGCFinalizedObject
+class nsNetscapeProfileMigratorBase
+  : public XPCOMGCFinalizedObject
+  , public nsIBrowserProfileMigrator
 {
 public:
   nsNetscapeProfileMigratorBase();
diff --git a/browser/components/migration/src/nsPhoenixProfileMigrator.h b/browser/components/migration/src/nsPhoenixProfileMigrator.h
--- a/browser/components/migration/src/nsPhoenixProfileMigrator.h
+++ b/browser/components/migration/src/nsPhoenixProfileMigrator.h
@@ -49,8 +49,7 @@ class nsIPrefBranch;
 class nsIPrefBranch;
 class nsIPrefService;
 
-class nsPhoenixProfileMigrator : public nsNetscapeProfileMigratorBase, 
-                                 public nsIBrowserProfileMigrator
+class nsPhoenixProfileMigrator : public nsNetscapeProfileMigratorBase
 {
 public:
   NS_DECL_NSIBROWSERPROFILEMIGRATOR
diff --git a/browser/components/migration/src/nsSeamonkeyProfileMigrator.h b/browser/components/migration/src/nsSeamonkeyProfileMigrator.h
--- a/browser/components/migration/src/nsSeamonkeyProfileMigrator.h
+++ b/browser/components/migration/src/nsSeamonkeyProfileMigrator.h
@@ -50,8 +50,7 @@ class nsIPrefBranch;
 class nsIPrefBranch;
 class nsIPrefService;
 
-class nsSeamonkeyProfileMigrator : public nsNetscapeProfileMigratorBase, 
-                                   public nsIBrowserProfileMigrator
+class nsSeamonkeyProfileMigrator : public nsNetscapeProfileMigratorBase
 {
 public:
   NS_DECL_NSIBROWSERPROFILEMIGRATOR