Bug 1463266 - replace tabs with spaces in mailnews/addrbook. rs=white-space-only
authorJorg K <jorgk@jorgk.com>
Fri, 25 May 2018 20:01:21 +0200
changeset 23978 7692c0e19b399bfb9fa56a62e4e2c0c6e152db04
parent 23977 1a6333657ff72f39dc50bf6649f3b75e0d221f70
child 23979 c6dbf51f60175062c0ebf8627f523084cc0c2e69
push id14460
push usermozilla@jorgk.com
push dateFri, 25 May 2018 18:01:45 +0000
treeherdercomm-central@7692c0e19b39 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswhite-space-only
bugs1463266
Bug 1463266 - replace tabs with spaces in mailnews/addrbook. rs=white-space-only [skip-blame]
mailnews/addrbook/public/nsAbBaseCID.h
mailnews/addrbook/src/nsAbBSDirectory.cpp
mailnews/addrbook/src/nsAbBSDirectory.h
mailnews/addrbook/src/nsAbCardProperty.h
mailnews/addrbook/src/nsAbDirProperty.cpp
mailnews/addrbook/src/nsAbDirProperty.h
mailnews/addrbook/src/nsAbLDAPChangeLogData.cpp
mailnews/addrbook/src/nsAbLDAPReplicationService.cpp
mailnews/addrbook/src/nsAbMDBDirProperty.cpp
mailnews/addrbook/src/nsAbMDBDirProperty.h
mailnews/addrbook/src/nsAbMDBDirectory.h
mailnews/addrbook/src/nsAbManager.h
mailnews/addrbook/src/nsAbOutlookDirFactory.cpp
mailnews/addrbook/src/nsAbOutlookDirectory.cpp
mailnews/addrbook/src/nsAbView.cpp
mailnews/addrbook/src/nsAddbookProtocolHandler.cpp
mailnews/addrbook/src/nsAddbookProtocolHandler.h
mailnews/addrbook/src/nsDirPrefs.h
--- a/mailnews/addrbook/public/nsAbBaseCID.h
+++ b/mailnews/addrbook/public/nsAbBaseCID.h
@@ -26,420 +26,344 @@
 // nsAbManager
 //
 #define NS_ABMANAGER_CONTRACTID \
   "@mozilla.org/abmanager;1"
 
 #define NS_ABMANAGERSTARTUPHANDLER_CONTRACTID \
   "@mozilla.org/commandlinehandler/general-startup;1?type=addressbook"
 
-#define NS_ABMANAGER_CID \
-{ /* {ad81b321-8a8a-42ca-a508-fe659de84586} */ \
-  0xad81b321, 0x8a8a, 0x42ca, \
-  {0xa5, 0x08, 0xfe, 0x65, 0x9d, 0x8e, 0x45, 0x86} \
-}
+#define NS_ABMANAGER_CID      \
+{ 0xad81b321, 0x8a8a, 0x42ca, \
+{ 0xa5, 0x08, 0xfe, 0x65, 0x9d, 0x8e, 0x45, 0x86 }}
 
 //
 // nsAbContentHandler
 //
 #define NS_ABCONTENTHANDLER_CID \
-{ /* {a72ad552-0484-4b5f-8d45-2d79158d22e3} */ \
-  0xa72ad552, 0x0484, 0x4b5f, \
-	{0x8d, 0x45, 0x2d, 0x79, 0x15, 0x8d, 0x22, 0xe3}	\
-}
+{ 0xa72ad552, 0x0484, 0x4b5f,   \
+{ 0x8d, 0x45, 0x2d, 0x79, 0x15, 0x8d, 0x22, 0xe3 }}
 
 
 //
 // nsAbBSDirectory - the root address book
 //
 #define NS_ABDIRECTORY_CONTRACTID \
   NS_AB_DIRECTORY_TYPE_CONTRACTID_PREFIX "moz-abdirectory"
 
-#define NS_ABDIRECTORY_CID \
-{ /* {012D3C24-1DD2-11B2-BA79-B4AD359FC461}*/ \
-    0x012D3C24, 0x1DD2, 0x11B2, \
-    {0xBA, 0x79, 0xB4, 0xAD, 0x35, 0x9F, 0xC4, 0x61} \
-}
+#define NS_ABDIRECTORY_CID   \
+{ 0x012D3C24, 0x1DD2, 0x11B2,\
+{ 0xBA, 0x79, 0xB4, 0xAD, 0x35, 0x9F, 0xC4, 0x61 }}
 
 
 //
 // nsAddressBookDB
 //
 #define NS_ADDRDATABASE_CONTRACTID \
   "@mozilla.org/addressbook/carddatabase;1"
 
-#define NS_ADDRDATABASE_CID						\
-{ /* 63187917-1D19-11d3-A302-001083003D0C */		\
-    0x63187917, 0x1d19, 0x11d3,						\
-    {0xa3, 0x2, 0x0, 0x10, 0x83, 0x0, 0x3d, 0xc}	\
-}
+#define NS_ADDRDATABASE_CID   \
+{ 0x63187917, 0x1d19, 0x11d3, \
+{ 0xa3, 0x2, 0x0, 0x10, 0x83, 0x0, 0x3d, 0xc }}
 
 //
 // nsAbCardProperty
 //
 #define NS_ABCARDPROPERTY_CONTRACTID \
   "@mozilla.org/addressbook/cardproperty;1"
-#define NS_ABCARDPROPERTY_CID						\
-{ /* 2B722171-2CEA-11d3-9E0B-00A0C92B5F0D */		\
-    0x2b722171, 0x2cea, 0x11d3,						\
-    {0x9e, 0xb, 0x0, 0xa0, 0xc9, 0x2b, 0x5f, 0xd}	\
-}
+#define NS_ABCARDPROPERTY_CID \
+{ 0x2b722171, 0x2cea, 0x11d3, \
+{ 0x9e, 0xb, 0x0, 0xa0, 0xc9, 0x2b, 0x5f, 0xd }}
 
 //
 // nsAbDirProperty
 //
 #define NS_ABDIRPROPERTY_CONTRACTID \
   "@mozilla.org/addressbook/directoryproperty;1"
-#define NS_ABDIRPROPERTY_CID						\
-{ /* 6FD8EC67-3965-11d3-A316-001083003D0C */		\
-    0x6fd8ec67, 0x3965, 0x11d3,						\
-    {0xa3, 0x16, 0x0, 0x10, 0x83, 0x0, 0x3d, 0xc}	\
-}
+#define NS_ABDIRPROPERTY_CID  \
+{ 0x6fd8ec67, 0x3965, 0x11d3, \
+{ 0xa3, 0x16, 0x0, 0x10, 0x83, 0x0, 0x3d, 0xc }}
 
 //
 // nsAbDirectoryProperties
 //
 #define NS_ABDIRECTORYPROPERTIES_CONTRACTID \
   "@mozilla.org/addressbook/properties;1"
-#define NS_ABDIRECTORYPROPERTIES_CID						\
-{ /* 8b00a972-1dd2-11b2-9d9c-9c377a9c3dba */		\
-    0x8b00a972, 0x1dd2, 0x11b2, \
-    {0x9d, 0x9c, 0x9c, 0x37, 0x7a, 0x9c, 0x3d, 0xba} \
-}
+#define NS_ABDIRECTORYPROPERTIES_CID \
+{ 0x8b00a972, 0x1dd2, 0x11b2,        \
+{ 0x9d, 0x9c, 0x9c, 0x37, 0x7a, 0x9c, 0x3d, 0xba }}
 
 //
 // nsAbAddressCollector
 //
 #define NS_ABADDRESSCOLLECTOR_CONTRACTID \
   "@mozilla.org/addressbook/services/addressCollector;1"
 #define NS_ABADDRESSCOLLECTOR_CID \
-{	/* e7702d5a-99d8-4648-bab7-919ea29f30b6 */ \
-	0xe7702d5a, 0x99d8, 0x4648,	\
-	{0xba, 0xb7, 0x91, 0x9e, 0xa2, 0x9f, 0x30, 0xb6}	\
-}
+{ 0xe7702d5a, 0x99d8, 0x4648,     \
+{ 0xba, 0xb7, 0x91, 0x9e, 0xa2, 0x9f, 0x30, 0xb6 }}
 
 //
 // addbook URL
 //
 #define NS_ADDBOOKURL_CONTRACTID \
   "@mozilla.org/addressbook/services/url;1?type=addbook"
 
-#define NS_ADDBOOKURL_CID \
-{	/* ff04c8e6-501e-11d3-a527-0060b0fc0444 */		\
-	0xff04c8e6, 0x501e, 0x11d3,						\
-	{0xa5, 0x27, 0x0, 0x60, 0xb0, 0xfc, 0x4, 0x44}	\
-}
+#define NS_ADDBOOKURL_CID     \
+{ 0xff04c8e6, 0x501e, 0x11d3, \
+{ 0xa5, 0x27, 0x0, 0x60, 0xb0, 0xfc, 0x4, 0x44 }}
 
 //
 // addbook Protocol Handler
 //
 #define NS_ADDBOOK_HANDLER_CONTRACTID \
   "@mozilla.org/addressbook/services/addbook;1"
 #define NS_ADDBOOK_HANDLER_CID \
-{	/* ff04c8e6-501e-11d3-ffcc-0060b0fc0444 */		\
-	0xff04c8e6, 0x501e, 0x11d3,						\
-	{0xff, 0xcc, 0x0, 0x60, 0xb0, 0xfc, 0x4, 0x44}	\
-}
+{ 0xff04c8e6, 0x501e, 0x11d3,  \
+{ 0xff, 0xcc, 0x0, 0x60, 0xb0, 0xfc, 0x4, 0x44 }}
 
 //
 // directory factory service
 //
 #define NS_ABDIRFACTORYSERVICE_CONTRACTID \
   "@mozilla.org/addressbook/directory-factory-service;1"
 
-#define NS_ABDIRFACTORYSERVICE_CID				\
-{ /* {F8B212F2-742B-4A48-B7A0-4C44D4DDB121}*/			\
-	0xF8B212F2, 0x742B, 0x4A48,				\
-	{0xB7, 0xA0, 0x4C, 0x44, 0xD4, 0xDD, 0xB1, 0x21}	\
-}
+#define NS_ABDIRFACTORYSERVICE_CID \
+{ 0xF8B212F2, 0x742B, 0x4A48,      \
+{ 0xB7, 0xA0, 0x4C, 0x44, 0xD4, 0xDD, 0xB1, 0x21 }}
 
 //
 // mdb directory factory
 //
 #define NS_ABMDBDIRECTORY "moz-abmdbdirectory"
 
 #define NS_ABMDBDIRFACTORY_CONTRACTID \
   NS_AB_DIRECTORY_FACTORY_CONTRACTID_PREFIX NS_ABMDBDIRECTORY
 
-#define NS_ABMDBDIRFACTORY_CID				\
-{ /* {E1CB9C8A-722D-43E4-9D7B-7CCAE4B0338A}*/			\
-	0xE1CB9C8A, 0x722D, 0x43E4,				\
-	{0x9D, 0x7B, 0x7C, 0xCA, 0xE4, 0xB0, 0x33, 0x8A}	\
-}
+#define NS_ABMDBDIRFACTORY_CID \
+{ 0xE1CB9C8A, 0x722D, 0x43E4,  \
+{ 0x9D, 0x7B, 0x7C, 0xCA, 0xE4, 0xB0, 0x33, 0x8A }}
 
 //
 // nsAbMDBDirectory
 //
 #define NS_ABMDBDIRECTORY_CONTRACTID \
   NS_AB_DIRECTORY_TYPE_CONTRACTID_PREFIX NS_ABMDBDIRECTORY
 
 #define NS_ABMDBDIRECTORY_CID \
-{ /* {e618f894-1dd1-11b2-889c-9aaefaa90dde}*/ \
-  0xe618f894, 0x1dd1, 0x11b2, \
-  {0x88, 0x9c, 0x9a, 0xae, 0xfa, 0xa9, 0x0d, 0xde} \
-}
+{ 0xe618f894, 0x1dd1, 0x11b2, \
+{ 0x88, 0x9c, 0x9a, 0xae, 0xfa, 0xa9, 0x0d, 0xde }}
 
 //
 // nsAbMDBCard
 //
 #define NS_ABMDBCARD_CONTRACTID \
   "@mozilla.org/addressbook/moz-abmdbcard;1"
 
-#define NS_ABMDBCARD_CID				\
-{ /* {f578a5d2-1dd1-11b2-8841-f45cc5e765f8} */		\
-    0xf578a5d2, 0x1dd1, 0x11b2,				\
-    {0x88, 0x41, 0xf4, 0x5c, 0xc5, 0xe7, 0x65, 0xf8}	\
-}
+#define NS_ABMDBCARD_CID      \
+{ 0xf578a5d2, 0x1dd1, 0x11b2, \
+{ 0x88, 0x41, 0xf4, 0x5c, 0xc5, 0xe7, 0x65, 0xf8 }}
 
 #ifdef XP_WIN
 //
 // nsAbOutlookDirectory
 //
 #define NS_ABOUTLOOKDIRECTORY_CONTRACTID \
   NS_AB_DIRECTORY_TYPE_CONTRACTID_PREFIX "moz-aboutlookdirectory"
 
-#define NS_ABOUTLOOKDIRECTORY_CID                       \
-{ /* {9cc57822-0599-4c47-a399-1c6fa185a05c}*/           \
-        0x9cc57822, 0x0599, 0x4c47,                     \
-        {0xa3, 0x99, 0x1c, 0x6f, 0xa1, 0x85, 0xa0, 0x5c}        \
-}
+#define NS_ABOUTLOOKDIRECTORY_CID \
+{ 0x9cc57822, 0x0599, 0x4c47,     \
+{ 0xa3, 0x99, 0x1c, 0x6f, 0xa1, 0x85, 0xa0, 0x5c }}
 
 //
 // Outlook directory factory
 //
 #define NS_ABOUTLOOKDIRFACTORY_CONTRACTID \
   NS_AB_DIRECTORY_FACTORY_CONTRACTID_PREFIX "moz-aboutlookdirectory"
 
-#define NS_ABOUTLOOKDIRFACTORY_CID                                \
-{ /* {558ccc0f-2681-4dac-a066-debd8d26faf6}*/                   \
-        0x558ccc0f, 0x2681, 0x4dac,                             \
-        {0xa0, 0x66, 0xde, 0xbd, 0x8d, 0x26, 0xfa, 0xf6}        \
-}
+#define NS_ABOUTLOOKDIRFACTORY_CID \
+{ 0x558ccc0f, 0x2681, 0x4dac,      \
+{ 0xa0, 0x66, 0xde, 0xbd, 0x8d, 0x26, 0xfa, 0xf6 }}
 #endif
 
 //
 //  Addressbook Query support
 //
-
 #define NS_ABDIRECTORYQUERYARGUMENTS_CONTRACTID \
   "@mozilla.org/addressbook/directory/query-arguments;1"
 
-#define NS_ABDIRECTORYQUERYARGUMENTS_CID                          \
-{ /* {f7dc2aeb-8e62-4750-965c-24b9e09ed8d2} */        \
-  0xf7dc2aeb, 0x8e62, 0x4750,                     \
-  { 0x96, 0x5c, 0x24, 0xb9, 0xe0, 0x9e, 0xd8, 0xd2 }  \
-}
-
+#define NS_ABDIRECTORYQUERYARGUMENTS_CID \
+{ 0xf7dc2aeb, 0x8e62, 0x4750,            \
+{ 0x96, 0x5c, 0x24, 0xb9, 0xe0, 0x9e, 0xd8, 0xd2 }}
 
 #define NS_BOOLEANCONDITIONSTRING_CONTRACTID \
   "@mozilla.org/boolean-expression/condition-string;1"
 
-#define NS_BOOLEANCONDITIONSTRING_CID                         \
-{ /* {ca1944a9-527e-4c77-895d-d0466dd41cf5} */        \
-  0xca1944a9, 0x527e, 0x4c77, \
-    { 0x89, 0x5d, 0xd0, 0x46, 0x6d, 0xd4, 0x1c, 0xf5 } \
-}
-
+#define NS_BOOLEANCONDITIONSTRING_CID \
+{ 0xca1944a9, 0x527e, 0x4c77,         \
+{ 0x89, 0x5d, 0xd0, 0x46, 0x6d, 0xd4, 0x1c, 0xf5 }}
 
 #define NS_BOOLEANEXPRESSION_CONTRACTID \
   "@mozilla.org/boolean-expression/n-peer;1"
 
-#define NS_BOOLEANEXPRESSION_CID                         \
-{ /* {2c2e75c8-6f56-4a50-af1c-72af5d0e8d41} */        \
-  0x2c2e75c8, 0x6f56, 0x4a50, \
-    { 0xaf, 0x1c, 0x72, 0xaf, 0x5d, 0x0e, 0x8d, 0x41 } \
-}
+#define NS_BOOLEANEXPRESSION_CID \
+{ 0x2c2e75c8, 0x6f56, 0x4a50,    \
+{ 0xaf, 0x1c, 0x72, 0xaf, 0x5d, 0x0e, 0x8d, 0x41 }}
 
 #define NS_ABDIRECTORYQUERYPROXY_CONTRACTID                     \
-        "@mozilla.org/addressbook/directory-query/proxy;1"
+  "@mozilla.org/addressbook/directory-query/proxy;1"
 
-#define NS_ABDIRECTORYQUERYPROXY_CID                            \
-{ /* {E162E335-541B-43B4-AAEA-FE591E240CAF}*/                   \
-        0xE162E335, 0x541B, 0x43B4,                             \
-        {0xAA, 0xEA, 0xFE, 0x59, 0x1E, 0x24, 0x0C, 0xAF}        \
-}
+#define NS_ABDIRECTORYQUERYPROXY_CID \
+{ 0xE162E335, 0x541B, 0x43B4,        \
+{ 0xAA, 0xEA, 0xFE, 0x59, 0x1E, 0x24, 0x0C, 0xAF }}
 
 // nsAbLDAPDirectory
 //
 #define NS_ABLDAPDIRECTORY_CONTRACTID \
   NS_AB_DIRECTORY_TYPE_CONTRACTID_PREFIX  "moz-abldapdirectory"
 
-#define NS_ABLDAPDIRECTORY_CID             			\
-{ /* {783E2777-66D7-4826-9E4B-8AB58C228A52}*/			\
-	0x783E2777, 0x66D7, 0x4826,				\
-	{0x9E, 0x4B, 0x8A, 0xB5, 0x8C, 0x22, 0x8A, 0x52}	\
-}
+#define NS_ABLDAPDIRECTORY_CID \
+{ 0x783E2777, 0x66D7, 0x4826,  \
+{ 0x9E, 0x4B, 0x8A, 0xB5, 0x8C, 0x22, 0x8A, 0x52 }}
 
 // nsAbLDAPDirectoryQuery
 //
 #define NS_ABLDAPDIRECTORYQUERY_CONTRACTID \
   "@mozilla.org/addressbook/ldap-directory-query;1"
 
-#define NS_ABLDAPDIRECTORYQUERY_CID             			\
-{ /* {783E2777-66D7-4826-9E4B-8AB58C228A53}*/			\
-	0x783E2777, 0x66D7, 0x4826,				\
-	{0x9E, 0x4B, 0x8A, 0xB5, 0x8C, 0x22, 0x8A, 0x53}	\
-}
+#define NS_ABLDAPDIRECTORYQUERY_CID \
+{ 0x783E2777, 0x66D7, 0x4826,       \
+{ 0x9E, 0x4B, 0x8A, 0xB5, 0x8C, 0x22, 0x8A, 0x53 }}
 
 //
 // nsAbLDAPCard
 //
 #define NS_ABLDAPCARD_CONTRACTID \
   "@mozilla.org/addressbook/moz-abldapcard"
 
-#define NS_ABLDAPCARD_CID					\
-{ /* {10307B01-EBD6-465F-B972-1630410F70E6}*/			\
-	0x10307B01, 0xEBD6, 0x465F,				\
-	{0xB9, 0x72, 0x16, 0x30, 0x41, 0x0F, 0x70, 0xE6}	\
-}
+#define NS_ABLDAPCARD_CID     \
+{ 0x10307B01, 0xEBD6, 0x465F, \
+{ 0xB9, 0x72, 0x16, 0x30, 0x41, 0x0F, 0x70, 0xE6 }}
 
 //
 // LDAP directory factory
 //
 #define NS_ABLDAPDIRFACTORY_CONTRACTID \
   NS_AB_DIRECTORY_FACTORY_CONTRACTID_PREFIX "moz-abldapdirectory"
 
-#define NS_ABLDAPDIRFACTORY_CID                                \
-{  /* {8e3701af-8828-426c-84ac-124825c778f8} */			\
-        0x8e3701af, 0x8828, 0x426c,                             \
-        {0x84, 0xac, 0x12, 0x48, 0x25, 0xc7, 0x78, 0xf8}        \
-}
+#define NS_ABLDAPDIRFACTORY_CID \
+{ 0x8e3701af, 0x8828, 0x426c,   \
+{ 0x84, 0xac, 0x12, 0x48, 0x25, 0xc7, 0x78, 0xf8 }}
 
 //
 // LDAP autocomplete directory factory
 //
 #define NS_ABLDAPACDIRFACTORY_CONTRACTID \
   NS_AB_DIRECTORY_FACTORY_CONTRACTID_PREFIX "ldap"
 #define NS_ABLDAPSACDIRFACTORY_CONTRACTID \
   NS_AB_DIRECTORY_FACTORY_CONTRACTID_PREFIX "ldaps"
 
 // nsAbLDAPAutoCompFormatter
-
-// 4e276d6d-9981-46b4-9070-92f344ac5f5a
-//
 #define NS_ABLDAPAUTOCOMPFORMATTER_CID \
-{ 0x4e276d6d, 0x9981, 0x46b4, \
- { 0x90, 0x70, 0x92, 0xf3, 0x44, 0xac, 0x5f, 0x5a }}
+{ 0x4e276d6d, 0x9981, 0x46b4,          \
+{ 0x90, 0x70, 0x92, 0xf3, 0x44, 0xac, 0x5f, 0x5a }}
 
 #define NS_ABLDAPAUTOCOMPFORMATTER_CONTRACTID \
  "@mozilla.org/ldap-autocomplete-formatter;1?type=addrbook"
 
-
 // nsAbLDAPReplicationService
-//
-// {ece81280-2639-11d6-b791-00b0d06e5f27}
-//
 #define NS_ABLDAP_REPLICATIONSERVICE_CID \
-  {0xece81280, 0x2639, 0x11d6, \
-    { 0xb7, 0x91, 0x00, 0xb0, 0xd0, 0x6e, 0x5f, 0x27 }}
+{ 0xece81280, 0x2639, 0x11d6,            \
+{ 0xb7, 0x91, 0x00, 0xb0, 0xd0, 0x6e, 0x5f, 0x27 }}
 
 #define NS_ABLDAP_REPLICATIONSERVICE_CONTRACTID \
  "@mozilla.org/addressbook/ldap-replication-service;1"
 
 // nsAbLDAPReplicationQuery
-//
-// {5414fff0-263b-11d6-b791-00b0d06e5f27}
-//
 #define NS_ABLDAP_REPLICATIONQUERY_CID \
-  {0x5414fff0, 0x263b, 0x11d6, \
-    { 0xb7, 0x91, 0x00, 0xb0, 0xd0, 0x6e, 0x5f, 0x27 }}
+{ 0x5414fff0, 0x263b, 0x11d6,          \
+{ 0xb7, 0x91, 0x00, 0xb0, 0xd0, 0x6e, 0x5f, 0x27 }}
 
 #define NS_ABLDAP_REPLICATIONQUERY_CONTRACTID \
  "@mozilla.org/addressbook/ldap-replication-query;1"
 
 
 // nsAbLDAPChangeLogQuery
-//
-// {63E11D51-3C9B-11d6-B7B9-00B0D06E5F27}
 #define NS_ABLDAP_CHANGELOGQUERY_CID \
-  {0x63e11d51, 0x3c9b, 0x11d6, \
-    { 0xb7, 0xb9, 0x0, 0xb0, 0xd0, 0x6e, 0x5f, 0x27 }}
+{ 0x63e11d51, 0x3c9b, 0x11d6,        \
+{ 0xb7, 0xb9, 0x0, 0xb0, 0xd0, 0x6e, 0x5f, 0x27 }}
 
 #define NS_ABLDAP_CHANGELOGQUERY_CONTRACTID \
  "@mozilla.org/addressbook/ldap-changelog-query;1"
 
 // nsAbLDAPProcessReplicationData
-//
-// {5414fff1-263b-11d6-b791-00b0d06e5f27}
-//
 #define NS_ABLDAP_PROCESSREPLICATIONDATA_CID \
-  {0x5414fff1, 0x263b, 0x11d6, \
-    { 0xb7, 0x91, 0x00, 0xb0, 0xd0, 0x6e, 0x5f, 0x27 }}
+{ 0x5414fff1, 0x263b, 0x11d6,                \
+{ 0xb7, 0x91, 0x00, 0xb0, 0xd0, 0x6e, 0x5f, 0x27 }}
 
 #define NS_ABLDAP_PROCESSREPLICATIONDATA_CONTRACTID \
  "@mozilla.org/addressbook/ldap-process-replication-data;1"
 
-
 // nsAbLDAPProcessChangeLogData
-//
-// {63E11D52-3C9B-11d6-B7B9-00B0D06E5F27}
 #define NS_ABLDAP_PROCESSCHANGELOGDATA_CID \
-  {0x63e11d52, 0x3c9b, 0x11d6, \
-    {0xb7, 0xb9, 0x0, 0xb0, 0xd0, 0x6e, 0x5f, 0x27 }}
+{ 0x63e11d52, 0x3c9b, 0x11d6,              \
+{ 0xb7, 0xb9, 0x0, 0xb0, 0xd0, 0x6e, 0x5f, 0x27 }}
 
 #define NS_ABLDAP_PROCESSCHANGELOGDATA_CONTRACTID \
  "@mozilla.org/addressbook/ldap-process-changelog-data;1"
 
 // nsABView
-
-#define NS_ABVIEW_CID \
+#define NS_ABVIEW_CID         \
 { 0xc5eb5d6a, 0x1dd1, 0x11b2, \
- { 0xa0, 0x25, 0x94, 0xd1, 0x18, 0x1f, 0xc5, 0x9c }}
+{ 0xa0, 0x25, 0x94, 0xd1, 0x18, 0x1f, 0xc5, 0x9c }}
 
 #define NS_ABVIEW_CONTRACTID \
  "@mozilla.org/addressbook/abview;1"
 
 #ifdef XP_MACOSX
 //
 // nsAbOSXDirectory
 //
 #define NS_ABOSXDIRECTORY_PREFIX "moz-abosxdirectory"
 #define NS_ABOSXCARD_PREFIX "moz-abosxcard"
 
 #define NS_ABOSXDIRECTORY_CONTRACTID \
   NS_AB_DIRECTORY_TYPE_CONTRACTID_PREFIX NS_ABOSXDIRECTORY_PREFIX
 
-#define NS_ABOSXDIRECTORY_CID                            \
-{ /* {83781cc6-c682-11d6-bdeb-0005024967b8}*/            \
-        0x83781cc6, 0xc682, 0x11d6,                      \
-        {0xbd, 0xeb, 0x00, 0x05, 0x02, 0x49, 0x67, 0xb8} \
-}
+#define NS_ABOSXDIRECTORY_CID  \
+{ 0x83781cc6, 0xc682, 0x11d6,  \
+{ 0xbd, 0xeb, 0x00, 0x05, 0x02, 0x49, 0x67, 0xb8 }}
 
 //
 // nsAbOSXCard
 //
 #define NS_ABOSXCARD_CONTRACTID \
   NS_AB_DIRECTORY_TYPE_CONTRACTID_PREFIX NS_ABOSXCARD_PREFIX
 
-#define NS_ABOSXCARD_CID                                 \
-{ /* {89bbf582-c682-11d6-bc9d-0005024967b8}*/            \
-        0x89bbf582, 0xc682, 0x11d6,                      \
-        {0xbc, 0x9d, 0x00, 0x05, 0x02, 0x49, 0x67, 0xb8} \
-}
+#define NS_ABOSXCARD_CID     \
+{ 0x89bbf582, 0xc682, 0x11d6, \
+{ 0xbc, 0x9d, 0x00, 0x05, 0x02, 0x49, 0x67, 0xb8 }}
 
 //
 // OS X directory factory
 //
 #define NS_ABOSXDIRFACTORY_CONTRACTID \
   NS_AB_DIRECTORY_FACTORY_CONTRACTID_PREFIX NS_ABOSXDIRECTORY_PREFIX
 
-#define NS_ABOSXDIRFACTORY_CID                           \
-{ /* {90efe2fe-c682-11d6-9c83-0005024967b8}*/            \
-        0x90efe2fe, 0xc682, 0x11d6,                      \
-        {0x9c, 0x83, 0x00, 0x05, 0x02, 0x49, 0x67, 0xb8} \
-}
+#define NS_ABOSXDIRFACTORY_CID \
+{ 0x90efe2fe, 0xc682, 0x11d6,  \
+{ 0x9c, 0x83, 0x00, 0x05, 0x02, 0x49, 0x67, 0xb8 }}
 #endif
 
 #define NS_MSGVCARDSERVICE_CID \
-{ 0x3c4ac0da, 0x2cda, 0x4018, \
- { 0x95, 0x51, 0xe1, 0x58, 0xb2, 0xe1, 0x22, 0xd3 }}
+{ 0x3c4ac0da, 0x2cda, 0x4018,  \
+{ 0x95, 0x51, 0xe1, 0x58, 0xb2, 0xe1, 0x22, 0xd3 }}
 
 #define NS_MSGVCARDSERVICE_CONTRACTID \
  "@mozilla.org/addressbook/msgvcardservice;1"
 
-#define NS_ABLDIFSERVICE_CID \
+#define NS_ABLDIFSERVICE_CID  \
 { 0xdb6f46da, 0x8de3, 0x478d, \
- { 0xb5, 0x39, 0x80, 0x13, 0x98, 0x65, 0x6c, 0xf6 }}
+{ 0xb5, 0x39, 0x80, 0x13, 0x98, 0x65, 0x6c, 0xf6 }}
 
 #define NS_ABLDIFSERVICE_CONTRACTID \
  "@mozilla.org/addressbook/abldifservice;1"
 
 #endif // nsAbBaseCID_h__
--- a/mailnews/addrbook/src/nsAbBSDirectory.cpp
+++ b/mailnews/addrbook/src/nsAbBSDirectory.cpp
@@ -40,17 +40,17 @@ nsresult nsAbBSDirectory::CreateDirector
                                                        bool aNotify)
 {
   nsresult rv;
 
   // Get the directory factory service
   nsCOMPtr<nsIAbDirFactoryService> dirFactoryService =
     do_GetService(NS_ABDIRFACTORYSERVICE_CONTRACTID,&rv);
   NS_ENSURE_SUCCESS (rv, rv);
-		
+
   // Get the directory factory from the URI
   nsCOMPtr<nsIAbDirFactory> dirFactory;
   rv = dirFactoryService->GetDirFactory(aURI, getter_AddRefs(dirFactory));
   NS_ENSURE_SUCCESS (rv, rv);
 
   // Create the directories
   nsCOMPtr<nsISimpleEnumerator> newDirEnumerator;
   rv = dirFactory->GetDirectories(NS_ConvertUTF8toUTF16(aServer->description),
@@ -170,17 +170,17 @@ NS_IMETHODIMP nsAbBSDirectory::CreateNew
   nsresult rv = EnsureInitialized();
   NS_ENSURE_SUCCESS(rv, rv);
 
   /*
    * TODO
    * This procedure is still MDB specific
    * due to the dependence on the current
    * nsDirPref.cpp code
-	 */
+   */
 
   nsCString URI(aURI);
 
   /*
    * The creation of the address book in the preferences
    * is very MDB implementation specific.
    * If the fileName attribute is null then it will
    * create an appropriate file name.
@@ -218,17 +218,17 @@ NS_IMETHODIMP nsAbBSDirectory::CreateDir
 
   DIR_Server * server = nullptr;
   rv = DIR_AddNewAddressBook(aDisplayName, fileName, aURI,
                              PABDirectory, EmptyCString(), &server);
   NS_ENSURE_SUCCESS(rv,rv);
 
   rv = CreateDirectoriesFromFactory(aURI, server, true /* notify */);
   NS_ENSURE_SUCCESS(rv,rv);
-	return rv;
+  return rv;
 }
 
 NS_IMETHODIMP nsAbBSDirectory::DeleteDirectory(nsIAbDirectory *directory)
 {
   NS_ENSURE_ARG_POINTER(directory);
 
   nsresult rv = EnsureInitialized();
   NS_ENSURE_SUCCESS(rv, rv);
--- a/mailnews/addrbook/src/nsAbBSDirectory.h
+++ b/mailnews/addrbook/src/nsAbBSDirectory.h
@@ -11,21 +11,21 @@
 #include "nsAbDirProperty.h"
 
 #include "nsDataHashtable.h"
 #include "nsCOMArray.h"
 
 class nsAbBSDirectory : public nsAbDirProperty
 {
 public:
-	NS_DECL_ISUPPORTS_INHERITED
+  NS_DECL_ISUPPORTS_INHERITED
 
-	nsAbBSDirectory();
+  nsAbBSDirectory();
 
-	// nsIAbDirectory methods
+  // nsIAbDirectory methods
   NS_IMETHOD Init(const char *aURI) override;
   NS_IMETHOD GetChildNodes(nsISimpleEnumerator* *result) override;
   NS_IMETHOD CreateNewDirectory(const nsAString &aDirName,
                                 const nsACString &aURI,
                                 uint32_t aType,
                                 const nsACString &aPrefName,
                                 nsACString &aResult) override;
   NS_IMETHOD CreateDirectoryByURI(const nsAString &aDisplayName,
@@ -33,18 +33,18 @@ public:
   NS_IMETHOD DeleteDirectory(nsIAbDirectory *directory) override;
   NS_IMETHOD HasDirectory(nsIAbDirectory *dir, bool *hasDir) override;
   NS_IMETHOD UseForAutocomplete(const nsACString &aIdentityKey, bool *aResult) override;
   NS_IMETHOD GetURI(nsACString &aURI) override;
 
 protected:
   virtual ~nsAbBSDirectory();
   nsresult EnsureInitialized();
-	nsresult CreateDirectoriesFromFactory(const nsACString &aURI,
+  nsresult CreateDirectoriesFromFactory(const nsACString &aURI,
                                         DIR_Server* aServer, bool aNotify);
 
 protected:
-	bool mInitialized;
-	nsCOMArray<nsIAbDirectory> mSubDirectories;
-	nsDataHashtable<nsISupportsHashKey, DIR_Server*> mServers;
+  bool mInitialized;
+  nsCOMArray<nsIAbDirectory> mSubDirectories;
+  nsDataHashtable<nsISupportsHashKey, DIR_Server*> mServers;
 };
 
 #endif
--- a/mailnews/addrbook/src/nsAbCardProperty.h
+++ b/mailnews/addrbook/src/nsAbCardProperty.h
@@ -33,18 +33,18 @@ public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIABCARD
   NS_DECL_NSIABITEM
 
   nsAbCardProperty();
 
 protected:
   virtual ~nsAbCardProperty();
-	bool     m_IsMailList;
-	nsCString m_MailListURI;
+  bool     m_IsMailList;
+  nsCString m_MailListURI;
 
   // Store most of the properties here
   nsInterfaceHashtable<nsCStringHashKey, nsIVariant> m_properties;
 
   nsCString m_directoryId, m_localId;
 private:
   nsresult AppendSection(const AppendItem *aArray, int16_t aCount, const nsString& aHeading, nsIStringBundle *aBundle, mozITXTToHTMLConv *aConv, nsString &aResult);
   nsresult AppendLine(const AppendItem &aItem, mozITXTToHTMLConv *aConv, nsString &aResult);
--- a/mailnews/addrbook/src/nsAbDirProperty.cpp
+++ b/mailnews/addrbook/src/nsAbDirProperty.cpp
@@ -18,17 +18,17 @@
 // From nsDirPrefs
 #define kDefaultPosition 1
 
 nsAbDirProperty::nsAbDirProperty(void)
   : m_LastModifiedDate(0),
     mIsValidURI(false),
     mIsQueryURI(false)
 {
-	m_IsMailList = false;
+  m_IsMailList = false;
 }
 
 nsAbDirProperty::~nsAbDirProperty(void)
 {
 #if 0
   // this code causes a regression #138647
   // don't turn it on until you figure it out
   if (m_AddressList) {
@@ -162,21 +162,21 @@ NS_IMETHODIMP nsAbDirProperty::GetLastMo
 {
   NS_ENSURE_ARG_POINTER(aLastModifiedDate);
   *aLastModifiedDate = m_LastModifiedDate;
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbDirProperty::SetLastModifiedDate(uint32_t aLastModifiedDate)
 {
-	if (aLastModifiedDate)
-	{
-		m_LastModifiedDate = aLastModifiedDate;
-	}
-	return NS_OK;
+  if (aLastModifiedDate)
+  {
+    m_LastModifiedDate = aLastModifiedDate;
+  }
+  return NS_OK;
 }
 
 NS_IMETHODIMP nsAbDirProperty::GetListNickName(nsAString &aListNickName)
 {
   aListNickName = m_ListNickName;
   return NS_OK;
 }
 
@@ -195,24 +195,24 @@ NS_IMETHODIMP nsAbDirProperty::GetDescri
 NS_IMETHODIMP nsAbDirProperty::SetDescription(const nsAString &aDescription)
 {
   m_Description = aDescription;
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbDirProperty::GetIsMailList(bool *aIsMailList)
 {
-	*aIsMailList = m_IsMailList;
-	return NS_OK;
+  *aIsMailList = m_IsMailList;
+  return NS_OK;
 }
 
 NS_IMETHODIMP nsAbDirProperty::SetIsMailList(bool aIsMailList)
 {
-	m_IsMailList = aIsMailList;
-	return NS_OK;
+  m_IsMailList = aIsMailList;
+  return NS_OK;
 }
 
 NS_IMETHODIMP nsAbDirProperty::GetAddressLists(nsIMutableArray * *aAddressLists)
 {
   if (!m_AddressList)
   {
     nsresult rv;
     m_AddressList = do_CreateInstance(NS_ARRAY_CONTRACTID, &rv);
--- a/mailnews/addrbook/src/nsAbDirProperty.h
+++ b/mailnews/addrbook/src/nsAbDirProperty.h
@@ -23,38 +23,38 @@
  /*
   * Address Book Directory
   */
 
 class nsAbDirProperty: public nsIAbDirectory,
                        public nsSupportsWeakReference
 {
 public:
-	nsAbDirProperty(void);
+  nsAbDirProperty(void);
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSIABITEM
   NS_DECL_NSIABCOLLECTION
   NS_DECL_NSIABDIRECTORY
 
 protected:
-	virtual ~nsAbDirProperty(void);
+  virtual ~nsAbDirProperty(void);
 
   /**
    * Initialise the directory prefs for this branch
    */
   nsresult InitDirectoryPrefs();
 
-	uint32_t m_LastModifiedDate;
+  uint32_t m_LastModifiedDate;
 
-	nsString m_ListDirName;
-	nsString m_ListName;
-	nsString m_ListNickName;
-	nsString m_Description;
-	bool     m_IsMailList;
+  nsString m_ListDirName;
+  nsString m_ListName;
+  nsString m_ListNickName;
+  nsString m_Description;
+  bool     m_IsMailList;
 
   nsCString mURI;
   nsCString mQueryString;
   nsCString mURINoQuery;
   bool mIsValidURI;
   bool mIsQueryURI;
 
 
--- a/mailnews/addrbook/src/nsAbLDAPChangeLogData.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPChangeLogData.cpp
@@ -57,17 +57,17 @@ NS_IMETHODIMP nsAbLDAPProcessChangeLogDa
 
    // Call the parent's Init now.
    return nsAbLDAPProcessReplicationData::Init(query, progressListener);
 }
 
 nsresult nsAbLDAPProcessChangeLogData::OnLDAPBind(nsILDAPMessage *aMessage)
 {
     NS_ENSURE_ARG_POINTER(aMessage);
-	if(!mInitialized)
+    if(!mInitialized)
         return NS_ERROR_NOT_INITIALIZED;
 
     int32_t errCode;
 
     nsresult rv = aMessage->GetErrorCode(&errCode);
     if(NS_FAILED(rv)) {
         Done(false);
         return rv;
@@ -267,17 +267,17 @@ nsresult nsAbLDAPProcessChangeLogData::G
     nsString desc;
     rv = bundle->GetStringFromName("AuthDlgDesc", desc);
     if (NS_FAILED (rv))
         return rv ;
 
     nsString username;
     nsString password;
     bool btnResult = false;
-	rv = dialog->PromptUsernameAndPassword(title, desc,
+    rv = dialog->PromptUsernameAndPassword(title, desc,
                                             NS_ConvertUTF8toUTF16(serverUri).get(),
                                             nsIAuthPrompt::SAVE_PASSWORD_PERMANENTLY,
                                             getter_Copies(username), getter_Copies(password),
                                             &btnResult);
     if(NS_SUCCEEDED(rv) && btnResult) {
         CopyUTF16toUTF8(username, mAuthUserID);
         CopyUTF16toUTF8(password, mAuthPswd);
     }
--- a/mailnews/addrbook/src/nsAbLDAPReplicationService.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPReplicationService.cpp
@@ -25,17 +25,17 @@ nsAbLDAPReplicationService::nsAbLDAPRepl
 }
 
 nsAbLDAPReplicationService::~nsAbLDAPReplicationService()
 {
 }
 
 /* void startReplication(in string aURI, in nsIWebProgressListener progressListener); */
 NS_IMETHODIMP nsAbLDAPReplicationService::StartReplication(nsIAbLDAPDirectory *aDirectory,
-							   nsIWebProgressListener *progressListener)
+                 nsIWebProgressListener *progressListener)
 {
   NS_ENSURE_ARG_POINTER(aDirectory);
 
 #ifdef DEBUG_rdayal
   printf("Start Replication called");
 #endif
 
   // Makes sure to allow only one replication at a time.
@@ -61,27 +61,27 @@ NS_IMETHODIMP nsAbLDAPReplicationService
 
   if (NS_SUCCEEDED(rv) && mQuery)
   {
     rv = mQuery->Init(mDirectory, progressListener);
     if (NS_SUCCEEDED(rv))
     {
       rv = mQuery->DoReplicationQuery();
       if (NS_SUCCEEDED(rv))
-	{
-	  mReplicating = true;
-	  return rv;
-	}
+      {
+        mReplicating = true;
+        return rv;
+      }
     }
   }
 
   if (progressListener && NS_FAILED(rv))
     progressListener->OnStateChange(nullptr, nullptr,
-				    nsIWebProgressListener::STATE_STOP,
-				    NS_OK);
+            nsIWebProgressListener::STATE_STOP,
+            NS_OK);
 
   if (NS_FAILED(rv))
   {
     mDirectory = nullptr;
     mQuery = nullptr;
   }
 
   return rv;
--- a/mailnews/addrbook/src/nsAbMDBDirProperty.cpp
+++ b/mailnews/addrbook/src/nsAbMDBDirProperty.cpp
@@ -31,24 +31,24 @@ NS_IMPL_ISUPPORTS_INHERITED(nsAbMDBDirPr
 ////////////////////////////////////////////////////////////////////////////////
 
 
 
 // nsIAbMDBDirectory attributes
 
 NS_IMETHODIMP nsAbMDBDirProperty::GetDbRowID(uint32_t *aDbRowID)
 {
-	*aDbRowID = m_dbRowID;
-	return NS_OK;
+  *aDbRowID = m_dbRowID;
+  return NS_OK;
 }
 
 NS_IMETHODIMP nsAbMDBDirProperty::SetDbRowID(uint32_t aDbRowID)
 {
-	m_dbRowID = aDbRowID;
-	return NS_OK;
+  m_dbRowID = aDbRowID;
+  return NS_OK;
 }
 
 
 // nsIAbMDBDirectory methods
 
 /* add mailing list to the parent directory */
 NS_IMETHODIMP nsAbMDBDirProperty::AddMailListToDirectory(nsIAbDirectory *mailList)
 {
@@ -80,28 +80,28 @@ NS_IMETHODIMP nsAbMDBDirProperty::AddAdd
   if (NS_FAILED(m_AddressList->IndexOf(0, card, &position)))
     m_AddressList->AppendElement(card);
 
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbMDBDirProperty::CopyDBMailList(nsIAbMDBDirectory* srcListDB)
 {
-	nsresult err = NS_OK;
-	nsCOMPtr<nsIAbDirectory> srcList(do_QueryInterface(srcListDB));
-	if (NS_FAILED(err))
-		return NS_ERROR_NULL_POINTER;
+  nsresult err = NS_OK;
+  nsCOMPtr<nsIAbDirectory> srcList(do_QueryInterface(srcListDB));
+  if (NS_FAILED(err))
+    return NS_ERROR_NULL_POINTER;
 
-	CopyMailList (srcList);
+  CopyMailList (srcList);
 
-	uint32_t rowID;
-	srcListDB->GetDbRowID(&rowID);
-	SetDbRowID(rowID);
+  uint32_t rowID;
+  srcListDB->GetDbRowID(&rowID);
+  SetDbRowID(rowID);
 
-	return NS_OK;
+  return NS_OK;
 }
 
 
 // nsIAbMDBDirectory NOT IMPLEMENTED methods
 
 /* nsIAbDirectory addDirectory (in string uriName); */
 NS_IMETHODIMP nsAbMDBDirProperty::AddDirectory(const char *uriName, nsIAbDirectory **_retval)
 {
--- a/mailnews/addrbook/src/nsAbMDBDirProperty.h
+++ b/mailnews/addrbook/src/nsAbMDBDirProperty.h
@@ -21,20 +21,20 @@
 
  /*
   * Address Book Directory
   */
 
 class nsAbMDBDirProperty: public nsIAbMDBDirectory, public nsAbDirProperty
 {
 public:
-	nsAbMDBDirProperty(void);
+  nsAbMDBDirProperty(void);
 
-	NS_DECL_ISUPPORTS
-	NS_DECL_NSIABMDBDIRECTORY
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIABMDBDIRECTORY
 
 protected:
   virtual ~nsAbMDBDirProperty();
 
-	uint32_t m_dbRowID;
+  uint32_t m_dbRowID;
 };
 
 #endif
--- a/mailnews/addrbook/src/nsAbMDBDirectory.h
+++ b/mailnews/addrbook/src/nsAbMDBDirectory.h
@@ -23,17 +23,17 @@
 #include "nsInterfaceHashtable.h"
 #include "nsIAddrDBListener.h"
 
 /*
  * Address Book Directory
  */
 
 class nsAbMDBDirectory:
-  public nsAbMDBDirProperty,	// nsIAbDirectory, nsIAbMDBDirectory
+  public nsAbMDBDirProperty,  // nsIAbDirectory, nsIAbMDBDirectory
   public nsIAbDirSearchListener,
   public nsIAddrDBListener,
   public nsIAbDirectorySearch
 {
 public:
   nsAbMDBDirectory(void);
 
   NS_DECL_ISUPPORTS_INHERITED
--- a/mailnews/addrbook/src/nsAbManager.h
+++ b/mailnews/addrbook/src/nsAbManager.h
@@ -18,27 +18,27 @@
 class nsIAbLDAPAttributeMap;
 
 class nsAbManager : public nsIAbManager,
                     public nsICommandLineHandler,
                     public nsIObserver
 {
 
 public:
-	nsAbManager();
+  nsAbManager();
 
-	NS_DECL_THREADSAFE_ISUPPORTS
- 	NS_DECL_NSIABMANAGER
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_NSIABMANAGER
   NS_DECL_NSIOBSERVER
   NS_DECL_NSICOMMANDLINEHANDLER
 
   nsresult Init();
 
 private:
-	virtual ~nsAbManager();
+  virtual ~nsAbManager();
   nsresult GetRootDirectory(nsIAbDirectory **aResult);
   nsresult ExportDirectoryToDelimitedText(nsIAbDirectory *aDirectory, const char *aDelim,
                                           uint32_t aDelimLen, nsIFile *aLocalFile, bool useUTF8);
   nsresult ExportDirectoryToVCard(nsIAbDirectory *aDirectory, nsIFile *aLocalFile);
   nsresult ExportDirectoryToLDIF(nsIAbDirectory *aDirectory, nsIFile *aLocalFile);
   nsresult AppendLDIFForMailList(nsIAbCard *aCard, nsIAbLDAPAttributeMap *aAttrMap, nsACString &aResult);
   nsresult AppendDNForCard(const char *aProperty, nsIAbCard *aCard, nsIAbLDAPAttributeMap *aAttrMap, nsACString &aResult);
   nsresult AppendBasicLDIFForCard(nsIAbCard *aCard, nsIAbLDAPAttributeMap *aAttrMap, nsACString &aResult);
--- a/mailnews/addrbook/src/nsAbOutlookDirFactory.cpp
+++ b/mailnews/addrbook/src/nsAbOutlookDirFactory.cpp
@@ -63,18 +63,18 @@ nsAbOutlookDirFactory::GetDirectories(co
   nsAutoCString entryId;
   nsAutoCString uri;
 
   for (ULONG i = 0; i < folders.mNbEntries; ++i) {
     folders.mEntries[i].ToString(entryId);
     buildAbWinUri(kOutlookDirectoryScheme, abType, uri);
     uri.Append(entryId);
 
-	nsCOMPtr<nsIAbDirectory> directory;
-	rv = abManager->GetDirectory(uri, getter_AddRefs(directory));
+    nsCOMPtr<nsIAbDirectory> directory;
+    rv = abManager->GetDirectory(uri, getter_AddRefs(directory));
     NS_ENSURE_SUCCESS(rv, rv);
     directories->AppendElement(directory);
   }
   return NS_NewArrayEnumerator(aDirectories, directories);
 }
 
 // No actual deletion, since you cannot create the address books from Mozilla.
 NS_IMETHODIMP nsAbOutlookDirFactory::DeleteDirectory(nsIAbDirectory *aDirectory)
--- a/mailnews/addrbook/src/nsAbOutlookDirectory.cpp
+++ b/mailnews/addrbook/src/nsAbOutlookDirectory.cpp
@@ -1155,17 +1155,17 @@ nsresult nsAbOutlookDirectory::CommitAdd
   }
   return DeleteCards(oldList);
 }
 
 nsresult nsAbOutlookDirectory::UpdateAddressList(void)
 {
     if (!m_AddressList)
     {
-	nsresult rv;
+        nsresult rv;
         m_AddressList = do_CreateInstance(NS_ARRAY_CONTRACTID, &rv);
         NS_ENSURE_SUCCESS(rv, rv);
     }
 
     return m_IsMailList ? GetChildCards(m_AddressList, nullptr) :
                           GetChildNodes(m_AddressList);
 }
 
--- a/mailnews/addrbook/src/nsAbView.cpp
+++ b/mailnews/addrbook/src/nsAbView.cpp
@@ -1397,17 +1397,17 @@ NS_IMETHODIMP nsAbView::GetSelectedAddre
       rv = abManager->GetDirectory(mailListURI, getter_AddRefs(mailList));
       NS_ENSURE_SUCCESS(rv, rv);
 
       nsCOMPtr<nsIMutableArray> mailListAddresses;
       rv = mailList->GetAddressLists(getter_AddRefs(mailListAddresses));
       NS_ENSURE_SUCCESS(rv,rv);
 
       uint32_t mailListCount = 0;
-      mailListAddresses->GetLength(&mailListCount);	
+      mailListAddresses->GetLength(&mailListCount);
 
       for (uint32_t j = 0; j < mailListCount; j++) {
         nsCOMPtr<nsIAbCard> mailListCard = do_QueryElementAt(mailListAddresses, j, &rv);
         NS_ENSURE_SUCCESS(rv,rv);
 
         rv = mailListCard->GetPrimaryEmail(primaryEmail);
         NS_ENSURE_SUCCESS(rv,rv);
 
--- a/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp
+++ b/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp
@@ -34,18 +34,18 @@ nsAddbookProtocolHandler::nsAddbookProto
 nsAddbookProtocolHandler::~nsAddbookProtocolHandler()
 {
 }
 
 NS_IMPL_ISUPPORTS(nsAddbookProtocolHandler, nsIProtocolHandler)
 
 NS_IMETHODIMP nsAddbookProtocolHandler::GetScheme(nsACString &aScheme)
 {
-	aScheme = "addbook";
-	return NS_OK;
+  aScheme = "addbook";
+  return NS_OK;
 }
 
 NS_IMETHODIMP nsAddbookProtocolHandler::GetDefaultPort(int32_t *aDefaultPort)
 {
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAddbookProtocolHandler::GetProtocolFlags(uint32_t *aUritype)
@@ -227,17 +227,17 @@ nsAddbookProtocolHandler::GeneratePrintO
 
   uri.Cut(0,2);
 
   /* step 2:
    turn "moz-abmdbdirectory/abook.mab?action=print"
    into "moz-abmdbdirectory/abook.mab"
    */
   int32_t pos = uri.Find("?action=print");
-	if (pos == -1)
+  if (pos == -1)
     return NS_ERROR_UNEXPECTED;
 
   uri.SetLength(pos);
 
   /* step 2:
    turn "moz-abmdbdirectory/abook.mab"
    into "moz-abmdbdirectory://abook.mab"
    */
--- a/mailnews/addrbook/src/nsAddbookProtocolHandler.h
+++ b/mailnews/addrbook/src/nsAddbookProtocolHandler.h
@@ -11,27 +11,27 @@
 #include "nsAddbookProtocolHandler.h"
 #include "nsIProtocolHandler.h"
 #include "nsIAddbookUrl.h"
 #include "nsIAbDirectory.h"
 
 class nsAddbookProtocolHandler : public nsIProtocolHandler
 {
 public:
-	nsAddbookProtocolHandler();
+  nsAddbookProtocolHandler();
 
   NS_DECL_ISUPPORTS
 
   //////////////////////////////////////////////////////////////////////////
   // We support the nsIProtocolHandler interface.
   //////////////////////////////////////////////////////////////////////////
   NS_DECL_NSIPROTOCOLHANDLER
 
 private:
-	virtual ~nsAddbookProtocolHandler();
+  virtual ~nsAddbookProtocolHandler();
   nsresult    GenerateXMLOutputChannel(nsString &aOutput,
                                          nsIAddbookUrl *addbookUrl,
                                          nsIURI *aURI,
                                          nsILoadInfo *aLoadInfo,
                                          nsIChannel **_retval);
 
   nsresult    GeneratePrintOutput(nsIAddbookUrl *addbookUrl,
                                    nsString &aOutput);
--- a/mailnews/addrbook/src/nsDirPrefs.h
+++ b/mailnews/addrbook/src/nsDirPrefs.h
@@ -19,68 +19,68 @@
 #define PREF_LDAP_VERSION_NAME     "ldap_2.version"
 #define PREF_LDAP_SERVER_TREE_NAME "ldap_2.servers"
 
 #define kMainLdapAddressBook "ldap.mab"   /* v3 main ldap address book file */
 
 /* DIR_Server.dirType */
 typedef enum
 {
-	LDAPDirectory,
-	HTMLDirectory,
+  LDAPDirectory,
+  HTMLDirectory,
   PABDirectory,
   MAPIDirectory,
   FixedQueryLDAPDirectory = 777
 } DirectoryType;
 
 typedef enum
 {
-	idNone = 0,					/* Special value                          */
-	idPrefName,
-	idPosition,
-	idDescription,
-	idFileName,
-	idUri,
-	idType
+  idNone = 0,  /* Special value */
+  idPrefName,
+  idPosition,
+  idDescription,
+  idFileName,
+  idUri,
+  idType
 } DIR_PrefId;
 
 #define DIR_Server_typedef 1     /* this quiets a redeclare warning in libaddr */
 
 typedef struct DIR_Server
 {
-	/* Housekeeping fields */
-	char   *prefName;			/* preference name, this server's subtree */
-	int32_t  position;			/* relative position in server list       */
+  /* Housekeeping fields */
+  char    *prefName;      /* preference name, this server's subtree */
+  int32_t  position;      /* relative position in server list       */
 
-	/* General purpose fields */
-	char   *description;		/* human readable name                    */
-	char   *fileName;			/* XP path name of local DB               */
-	DirectoryType dirType;	
-  char    *uri;       // URI of the address book
+  /* General purpose fields */
+  char   *description;    /* human readable name                    */
+  char   *fileName;       /* XP path name of local DB               */
+  DirectoryType dirType;
+  char   *uri;            // URI of the address book
 
   // Set whilst saving the server to avoid updating it again
   bool savingServer;
 } DIR_Server;
 
 /* We are developing a new model for managing DIR_Servers. In the 4.0x world, the FEs managed each list.
-	Calls to FE_GetDirServer caused the FEs to manage and return the DIR_Server list. In our new view of the
-	world, the back end does most of the list management so we are going to have the back end create and
-	manage the list. Replace calls to FE_GetDirServers() with DIR_GetDirServers(). */
+  Calls to FE_GetDirServer caused the FEs to manage and return the DIR_Server list. In our new view of the
+  world, the back end does most of the list management so we are going to have the back end create and
+  manage the list. Replace calls to FE_GetDirServers() with DIR_GetDirServers(). */
 
 nsTArray<DIR_Server*>* DIR_GetDirectories();
 DIR_Server* DIR_GetServerFromList(const char* prefName);
 nsresult DIR_ShutDown(void);  /* FEs should call this when the app is shutting down. It frees all DIR_Servers regardless of ref count values! */
 
 nsresult DIR_AddNewAddressBook(const nsAString &dirName,
                                const nsACString &fileName,
                                const nsACString &uri,
                                DirectoryType dirType,
                                const nsACString &prefName,
                                DIR_Server** pServer);
 nsresult DIR_ContainsServer(DIR_Server* pServer, bool *hasDir);
 
 nsresult DIR_DeleteServerFromList (DIR_Server *);
 
-void    DIR_SavePrefsForOneServer(DIR_Server *server);
+void DIR_SavePrefsForOneServer(DIR_Server *server);
 
 void DIR_SetServerFileName(DIR_Server* pServer);
 
 #endif /* dirprefs.h */