Bug 461351 Drop unnecessary includes from some of Thunderbird's migration code. r=bienvenu
authorMark Banner <bugzilla@standard8.plus.com>
Thu, 23 Oct 2008 16:25:46 +0100
changeset 698 342b7a4fd2e3f5c9544baa321b8246baf188c885
parent 697 af77a08cc8ab2786bb47f67a34b0fbd6bd50cb7e
child 699 fc525adeab4c712dcb0a23a42ad456950d8f1c36
push idunknown
push userunknown
push dateunknown
reviewersbienvenu
bugs461351
Bug 461351 Drop unnecessary includes from some of Thunderbird's migration code. r=bienvenu
mail/components/migration/src/nsDogbertProfileMigrator.cpp
mail/components/migration/src/nsProfileMigratorBase.cpp
mail/components/migration/src/nsSeamonkeyProfileMigrator.cpp
--- a/mail/components/migration/src/nsDogbertProfileMigrator.cpp
+++ b/mail/components/migration/src/nsDogbertProfileMigrator.cpp
@@ -34,31 +34,24 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // this file is mostly a copy of nsPrefMigration.cpp.
 
 #include "nsMailProfileMigratorUtils.h"
 #include "nsDirectoryServiceDefs.h"
-#include "nsIObserverService.h"
-#include "nsIPasswordManagerInternal.h"
-#include "nsIPrefLocalizedString.h"
 #include "nsIPrefService.h"
-#include "nsIServiceManager.h"
 #include "nsISupportsPrimitives.h"
-#include "nsNetCID.h"
 #include "nsNetUtil.h"
 #include "nsDogbertProfileMigrator.h"
 #include "nsIRelativeFilePref.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsVoidArray.h"
-#include "prprf.h"
 #include "prmem.h"
-#include "prio.h"
 #include "prenv.h"
 #include "NSReg.h"
 #include "msgCore.h"
 #include "nsDirectoryServiceUtils.h"
 
 // lots of includes required for the nsPrefMigration.cpp code that we copied:
 #include "nsICharsetConverterManager.h"
 #include "nsIPlatformCharset.h"
--- a/mail/components/migration/src/nsProfileMigratorBase.cpp
+++ b/mail/components/migration/src/nsProfileMigratorBase.cpp
@@ -32,28 +32,18 @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsMailProfileMigratorUtils.h"
-#include "nsDirectoryServiceDefs.h"
-#include "nsIObserverService.h"
-#include "nsIPasswordManagerInternal.h"
-#include "nsIPrefLocalizedString.h"
-#include "nsIPrefService.h"
-#include "nsIServiceManager.h"
 #include "nsISupportsPrimitives.h"
-#include "nsNetCID.h"
-#include "nsNetUtil.h"
 #include "nsProfileMigratorBase.h"
-#include "nsIProfileMigrator.h"
-#include "nsVoidArray.h"
 #include "nsIMailProfileMigrator.h"
 
 #include "nsIImportSettings.h"
 #include "nsIImportFilters.h"
 
 #define kPersonalAddressbookUri "moz-abmdbdirectory://abook.mab"
 
 nsProfileMigratorBase::nsProfileMigratorBase()
--- a/mail/components/migration/src/nsSeamonkeyProfileMigrator.cpp
+++ b/mail/components/migration/src/nsSeamonkeyProfileMigrator.cpp
@@ -34,17 +34,16 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsMailProfileMigratorUtils.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsIObserverService.h"
-#include "nsIPasswordManagerInternal.h"
 #include "nsIPrefLocalizedString.h"
 #include "nsIPrefService.h"
 #include "nsIServiceManager.h"
 #include "nsArrayUtils.h"
 #include "nsISupportsPrimitives.h"
 #include "nsNetCID.h"
 #include "nsNetUtil.h"
 #include "nsSeamonkeyProfileMigrator.h"