Bug 681188 - Switch from PRBool to bool on a CLOSED TREE , r=standard8
authorMichael Wu <mwu@mozilla.com>
Thu, 29 Sep 2011 00:02:19 -0700
changeset 9431 1c8c69af4d1df163082aba68b7602e37e8a80363
parent 9430 0700a7d70b3164b89112ba63ec613839574b17a9
child 9432 a2a93cb77d7c500e4577e3c1ed83f11bca9bf41b
push idunknown
push userunknown
push dateunknown
reviewersstandard8
bugs681188
Bug 681188 - Switch from PRBool to bool on a CLOSED TREE , r=standard8
calendar/base/src/calDateTime.cpp
calendar/base/src/calDateTime.h
calendar/base/src/calDuration.cpp
calendar/base/src/calDuration.h
calendar/base/src/calICSService.cpp
calendar/base/src/calPeriod.cpp
calendar/base/src/calPeriod.h
calendar/base/src/calRecurrenceDate.cpp
calendar/base/src/calRecurrenceDate.h
calendar/base/src/calRecurrenceDateSet.cpp
calendar/base/src/calRecurrenceDateSet.h
calendar/base/src/calRecurrenceRule.cpp
calendar/base/src/calRecurrenceRule.h
calendar/base/src/calTimezone.cpp
calendar/base/src/calUtils.cpp
db/mork/src/morkStore.cpp
db/mork/src/morkStore.h
ldap/xpcom/src/nsLDAPConnection.cpp
ldap/xpcom/src/nsLDAPConnection.h
ldap/xpcom/src/nsLDAPControl.cpp
ldap/xpcom/src/nsLDAPControl.h
ldap/xpcom/src/nsLDAPMessage.cpp
ldap/xpcom/src/nsLDAPMessage.h
ldap/xpcom/src/nsLDAPModification.cpp
ldap/xpcom/src/nsLDAPOperation.cpp
ldap/xpcom/src/nsLDAPOperation.h
ldap/xpcom/src/nsLDAPService.cpp
ldap/xpcom/src/nsLDAPService.h
ldap/xpcom/src/nsLDAPSyncQuery.h
ldap/xpcom/src/nsLDAPURL.cpp
mail/components/migration/src/nsEudoraProfileMigrator.cpp
mail/components/migration/src/nsMailProfileMigratorUtils.cpp
mail/components/migration/src/nsMailProfileMigratorUtils.h
mail/components/migration/src/nsNetscapeProfileMigratorBase.cpp
mail/components/migration/src/nsNetscapeProfileMigratorBase.h
mail/components/migration/src/nsOEProfileMigrator.cpp
mail/components/migration/src/nsOutlookProfileMigrator.cpp
mail/components/migration/src/nsProfileMigrator.cpp
mail/components/migration/src/nsProfileMigrator.h
mail/components/migration/src/nsProfileMigratorBase.cpp
mail/components/migration/src/nsProfileMigratorBase.h
mail/components/migration/src/nsSeamonkeyProfileMigrator.cpp
mail/components/migration/src/nsSeamonkeyProfileMigrator.h
mail/components/search/nsMailWinSearchHelper.cpp
mail/components/shell/nsMailGNOMEIntegration.cpp
mail/components/shell/nsMailGNOMEIntegration.h
mail/components/shell/nsMailMacIntegration.cpp
mail/components/shell/nsMailMacIntegration.h
mail/components/shell/nsMailWinIntegration.cpp
mail/components/shell/nsMailWinIntegration.h
mailnews/addrbook/src/nsAbAddressCollector.cpp
mailnews/addrbook/src/nsAbAddressCollector.h
mailnews/addrbook/src/nsAbBSDirectory.cpp
mailnews/addrbook/src/nsAbBSDirectory.h
mailnews/addrbook/src/nsAbCardProperty.cpp
mailnews/addrbook/src/nsAbCardProperty.h
mailnews/addrbook/src/nsAbDirProperty.cpp
mailnews/addrbook/src/nsAbDirProperty.h
mailnews/addrbook/src/nsAbDirectoryQuery.cpp
mailnews/addrbook/src/nsAbDirectoryQuery.h
mailnews/addrbook/src/nsAbDirectoryQueryProxy.h
mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp
mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.h
mailnews/addrbook/src/nsAbLDAPChangeLogData.cpp
mailnews/addrbook/src/nsAbLDAPChangeLogData.h
mailnews/addrbook/src/nsAbLDAPDirectory.cpp
mailnews/addrbook/src/nsAbLDAPDirectory.h
mailnews/addrbook/src/nsAbLDAPDirectoryModify.cpp
mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp
mailnews/addrbook/src/nsAbLDAPDirectoryQuery.h
mailnews/addrbook/src/nsAbLDAPListenerBase.cpp
mailnews/addrbook/src/nsAbLDAPListenerBase.h
mailnews/addrbook/src/nsAbLDAPReplicationData.cpp
mailnews/addrbook/src/nsAbLDAPReplicationData.h
mailnews/addrbook/src/nsAbLDAPReplicationQuery.cpp
mailnews/addrbook/src/nsAbLDAPReplicationQuery.h
mailnews/addrbook/src/nsAbLDAPReplicationService.cpp
mailnews/addrbook/src/nsAbLDAPReplicationService.h
mailnews/addrbook/src/nsAbLDIFService.cpp
mailnews/addrbook/src/nsAbLDIFService.h
mailnews/addrbook/src/nsAbMDBCard.cpp
mailnews/addrbook/src/nsAbMDBCard.h
mailnews/addrbook/src/nsAbMDBDirectory.cpp
mailnews/addrbook/src/nsAbMDBDirectory.h
mailnews/addrbook/src/nsAbManager.cpp
mailnews/addrbook/src/nsAbManager.h
mailnews/addrbook/src/nsAbOSXCard.h
mailnews/addrbook/src/nsAbOSXCard.mm
mailnews/addrbook/src/nsAbOSXDirectory.h
mailnews/addrbook/src/nsAbOSXDirectory.mm
mailnews/addrbook/src/nsAbOutlookDirectory.cpp
mailnews/addrbook/src/nsAbOutlookDirectory.h
mailnews/addrbook/src/nsAbUtils.h
mailnews/addrbook/src/nsAbView.cpp
mailnews/addrbook/src/nsAbView.h
mailnews/addrbook/src/nsAddbookProtocolHandler.cpp
mailnews/addrbook/src/nsAddbookUrl.cpp
mailnews/addrbook/src/nsAddrDatabase.cpp
mailnews/addrbook/src/nsAddrDatabase.h
mailnews/addrbook/src/nsDirPrefs.cpp
mailnews/addrbook/src/nsDirPrefs.h
mailnews/addrbook/src/nsLDAPAutoCompleteSession.cpp
mailnews/addrbook/src/nsLDAPAutoCompleteSession.h
mailnews/addrbook/src/nsMsgVCardService.cpp
mailnews/addrbook/src/nsVCardObj.cpp
mailnews/addrbook/src/nsVCardObj.h
mailnews/base/public/nsIMsgIncomingServer.idl
mailnews/base/search/public/nsMsgBodyHandler.h
mailnews/base/search/public/nsMsgSearchAdapter.h
mailnews/base/search/public/nsMsgSearchBoolExpression.h
mailnews/base/search/public/nsMsgSearchScopeTerm.h
mailnews/base/search/public/nsMsgSearchTerm.h
mailnews/base/search/src/nsMsgBodyHandler.cpp
mailnews/base/search/src/nsMsgFilter.cpp
mailnews/base/search/src/nsMsgFilter.h
mailnews/base/search/src/nsMsgFilterList.cpp
mailnews/base/search/src/nsMsgFilterList.h
mailnews/base/search/src/nsMsgFilterService.cpp
mailnews/base/search/src/nsMsgImapSearch.cpp
mailnews/base/search/src/nsMsgLocalSearch.cpp
mailnews/base/search/src/nsMsgLocalSearch.h
mailnews/base/search/src/nsMsgSearchAdapter.cpp
mailnews/base/search/src/nsMsgSearchImap.h
mailnews/base/search/src/nsMsgSearchNews.cpp
mailnews/base/search/src/nsMsgSearchNews.h
mailnews/base/search/src/nsMsgSearchSession.cpp
mailnews/base/search/src/nsMsgSearchSession.h
mailnews/base/search/src/nsMsgSearchTerm.cpp
mailnews/base/src/MailNewsDLF.cpp
mailnews/base/src/nsCidProtocolHandler.cpp
mailnews/base/src/nsCopyMessageStreamListener.cpp
mailnews/base/src/nsMailDirProvider.cpp
mailnews/base/src/nsMessenger.cpp
mailnews/base/src/nsMessenger.h
mailnews/base/src/nsMessengerBootstrap.cpp
mailnews/base/src/nsMessengerOS2Integration.cpp
mailnews/base/src/nsMessengerOSXIntegration.h
mailnews/base/src/nsMessengerOSXIntegration.mm
mailnews/base/src/nsMessengerUnixIntegration.cpp
mailnews/base/src/nsMessengerUnixIntegration.h
mailnews/base/src/nsMessengerWinIntegration.cpp
mailnews/base/src/nsMessengerWinIntegration.h
mailnews/base/src/nsMsgAccount.cpp
mailnews/base/src/nsMsgAccountManager.cpp
mailnews/base/src/nsMsgAccountManager.h
mailnews/base/src/nsMsgAccountManagerDS.cpp
mailnews/base/src/nsMsgAccountManagerDS.h
mailnews/base/src/nsMsgBiffManager.cpp
mailnews/base/src/nsMsgBiffManager.h
mailnews/base/src/nsMsgContentPolicy.cpp
mailnews/base/src/nsMsgContentPolicy.h
mailnews/base/src/nsMsgCopyService.cpp
mailnews/base/src/nsMsgCopyService.h
mailnews/base/src/nsMsgDBView.cpp
mailnews/base/src/nsMsgDBView.h
mailnews/base/src/nsMsgFolderCache.cpp
mailnews/base/src/nsMsgFolderCache.h
mailnews/base/src/nsMsgFolderCompactor.cpp
mailnews/base/src/nsMsgFolderCompactor.h
mailnews/base/src/nsMsgFolderDataSource.cpp
mailnews/base/src/nsMsgFolderDataSource.h
mailnews/base/src/nsMsgFolderNotificationService.cpp
mailnews/base/src/nsMsgGroupThread.cpp
mailnews/base/src/nsMsgGroupThread.h
mailnews/base/src/nsMsgGroupView.cpp
mailnews/base/src/nsMsgGroupView.h
mailnews/base/src/nsMsgMailSession.cpp
mailnews/base/src/nsMsgMailSession.h
mailnews/base/src/nsMsgOfflineManager.cpp
mailnews/base/src/nsMsgOfflineManager.h
mailnews/base/src/nsMsgPrintEngine.cpp
mailnews/base/src/nsMsgPrintEngine.h
mailnews/base/src/nsMsgProgress.cpp
mailnews/base/src/nsMsgProgress.h
mailnews/base/src/nsMsgPurgeService.cpp
mailnews/base/src/nsMsgPurgeService.h
mailnews/base/src/nsMsgQuickSearchDBView.cpp
mailnews/base/src/nsMsgQuickSearchDBView.h
mailnews/base/src/nsMsgRDFDataSource.cpp
mailnews/base/src/nsMsgRDFDataSource.h
mailnews/base/src/nsMsgRDFUtils.cpp
mailnews/base/src/nsMsgRDFUtils.h
mailnews/base/src/nsMsgSearchDBView.cpp
mailnews/base/src/nsMsgSearchDBView.h
mailnews/base/src/nsMsgServiceProvider.cpp
mailnews/base/src/nsMsgSpecialViews.cpp
mailnews/base/src/nsMsgSpecialViews.h
mailnews/base/src/nsMsgStatusFeedback.cpp
mailnews/base/src/nsMsgStatusFeedback.h
mailnews/base/src/nsMsgTagService.cpp
mailnews/base/src/nsMsgThreadedDBView.cpp
mailnews/base/src/nsMsgThreadedDBView.h
mailnews/base/src/nsMsgWindow.cpp
mailnews/base/src/nsMsgWindow.h
mailnews/base/src/nsMsgXFViewThread.cpp
mailnews/base/src/nsMsgXFViewThread.h
mailnews/base/src/nsMsgXFVirtualFolderDBView.cpp
mailnews/base/src/nsMsgXFVirtualFolderDBView.h
mailnews/base/src/nsSpamSettings.cpp
mailnews/base/src/nsSpamSettings.h
mailnews/base/src/nsStatusBarBiffManager.cpp
mailnews/base/src/nsStatusBarBiffManager.h
mailnews/base/src/nsSubscribableServer.cpp
mailnews/base/src/nsSubscribableServer.h
mailnews/base/src/nsSubscribeDataSource.cpp
mailnews/base/src/nsSubscribeDataSource.h
mailnews/base/test/TestMsgStripRE.cpp
mailnews/base/util/nsImapMoveCoalescer.cpp
mailnews/base/util/nsImapMoveCoalescer.h
mailnews/base/util/nsMsgCompressIStream.cpp
mailnews/base/util/nsMsgCompressIStream.h
mailnews/base/util/nsMsgCompressOStream.cpp
mailnews/base/util/nsMsgDBFolder.cpp
mailnews/base/util/nsMsgDBFolder.h
mailnews/base/util/nsMsgFileStream.cpp
mailnews/base/util/nsMsgFileStream.h
mailnews/base/util/nsMsgI18N.cpp
mailnews/base/util/nsMsgI18N.h
mailnews/base/util/nsMsgIdentity.cpp
mailnews/base/util/nsMsgIdentity.h
mailnews/base/util/nsMsgIncomingServer.cpp
mailnews/base/util/nsMsgIncomingServer.h
mailnews/base/util/nsMsgKeySet.cpp
mailnews/base/util/nsMsgKeySet.h
mailnews/base/util/nsMsgLineBuffer.cpp
mailnews/base/util/nsMsgLineBuffer.h
mailnews/base/util/nsMsgMailNewsUrl.cpp
mailnews/base/util/nsMsgMailNewsUrl.h
mailnews/base/util/nsMsgProtocol.cpp
mailnews/base/util/nsMsgProtocol.h
mailnews/base/util/nsMsgReadStateTxn.cpp
mailnews/base/util/nsMsgReadStateTxn.h
mailnews/base/util/nsMsgTxn.cpp
mailnews/base/util/nsMsgTxn.h
mailnews/base/util/nsMsgUtils.cpp
mailnews/base/util/nsMsgUtils.h
mailnews/compose/public/nsIMsgSend.idl
mailnews/compose/src/nsMsgAppleCodes.h
mailnews/compose/src/nsMsgAppleDouble.h
mailnews/compose/src/nsMsgAppleDoubleEncode.cpp
mailnews/compose/src/nsMsgAppleEncode.cpp
mailnews/compose/src/nsMsgAttachment.cpp
mailnews/compose/src/nsMsgAttachment.h
mailnews/compose/src/nsMsgAttachmentHandler.cpp
mailnews/compose/src/nsMsgAttachmentHandler.h
mailnews/compose/src/nsMsgCompFields.cpp
mailnews/compose/src/nsMsgCompFields.h
mailnews/compose/src/nsMsgCompUtils.cpp
mailnews/compose/src/nsMsgCompUtils.h
mailnews/compose/src/nsMsgCompose.cpp
mailnews/compose/src/nsMsgCompose.h
mailnews/compose/src/nsMsgComposeParams.cpp
mailnews/compose/src/nsMsgComposeParams.h
mailnews/compose/src/nsMsgComposeService.cpp
mailnews/compose/src/nsMsgComposeService.h
mailnews/compose/src/nsMsgCopy.cpp
mailnews/compose/src/nsMsgCopy.h
mailnews/compose/src/nsMsgEncoders.cpp
mailnews/compose/src/nsMsgEncoders.h
mailnews/compose/src/nsMsgPrompts.cpp
mailnews/compose/src/nsMsgPrompts.h
mailnews/compose/src/nsMsgQuote.cpp
mailnews/compose/src/nsMsgQuote.h
mailnews/compose/src/nsMsgSend.cpp
mailnews/compose/src/nsMsgSend.h
mailnews/compose/src/nsMsgSendLater.cpp
mailnews/compose/src/nsMsgSendLater.h
mailnews/compose/src/nsMsgSendPart.cpp
mailnews/compose/src/nsMsgSendPart.h
mailnews/compose/src/nsMsgSendReport.cpp
mailnews/compose/src/nsMsgSendReport.h
mailnews/compose/src/nsSmtpProtocol.cpp
mailnews/compose/src/nsSmtpProtocol.h
mailnews/compose/src/nsSmtpServer.cpp
mailnews/compose/src/nsSmtpServer.h
mailnews/compose/src/nsSmtpService.cpp
mailnews/compose/src/nsSmtpService.h
mailnews/compose/src/nsSmtpUrl.cpp
mailnews/compose/src/nsSmtpUrl.h
mailnews/compose/src/nsURLFetcher.cpp
mailnews/compose/src/nsURLFetcher.h
mailnews/db/msgdb/public/nsDBFolderInfo.h
mailnews/db/msgdb/public/nsImapMailDatabase.h
mailnews/db/msgdb/public/nsMailDatabase.h
mailnews/db/msgdb/public/nsMsgDatabase.h
mailnews/db/msgdb/public/nsMsgHdr.h
mailnews/db/msgdb/public/nsMsgThread.h
mailnews/db/msgdb/public/nsNewsDatabase.h
mailnews/db/msgdb/src/nsDBFolderInfo.cpp
mailnews/db/msgdb/src/nsImapMailDatabase.cpp
mailnews/db/msgdb/src/nsMailDatabase.cpp
mailnews/db/msgdb/src/nsMsgDatabase.cpp
mailnews/db/msgdb/src/nsMsgHdr.cpp
mailnews/db/msgdb/src/nsMsgOfflineImapOperation.cpp
mailnews/db/msgdb/src/nsMsgThread.cpp
mailnews/db/msgdb/src/nsNewsDatabase.cpp
mailnews/extensions/bayesian-spam-filter/src/nsBayesianFilter.cpp
mailnews/extensions/bayesian-spam-filter/src/nsBayesianFilter.h
mailnews/extensions/fts3/src/nsFts3Tokenizer.cpp
mailnews/extensions/mailviews/src/nsMsgMailViewList.cpp
mailnews/extensions/mdn/src/nsMsgMdnGenerator.cpp
mailnews/extensions/mdn/src/nsMsgMdnGenerator.h
mailnews/extensions/smime/src/nsEncryptedSMIMEURIsService.cpp
mailnews/extensions/smime/src/nsMsgComposeSecure.cpp
mailnews/extensions/smime/src/nsMsgComposeSecure.h
mailnews/extensions/smime/src/nsSMimeJSHelper.cpp
mailnews/imap/public/nsIIMAPHostSessionList.h
mailnews/imap/src/nsAutoSyncManager.cpp
mailnews/imap/src/nsAutoSyncManager.h
mailnews/imap/src/nsAutoSyncState.cpp
mailnews/imap/src/nsAutoSyncState.h
mailnews/imap/src/nsIMAPBodyShell.cpp
mailnews/imap/src/nsIMAPBodyShell.h
mailnews/imap/src/nsIMAPGenericParser.cpp
mailnews/imap/src/nsIMAPGenericParser.h
mailnews/imap/src/nsIMAPHostSessionList.cpp
mailnews/imap/src/nsIMAPHostSessionList.h
mailnews/imap/src/nsIMAPNamespace.cpp
mailnews/imap/src/nsIMAPNamespace.h
mailnews/imap/src/nsImapCore.h
mailnews/imap/src/nsImapFlagAndUidState.cpp
mailnews/imap/src/nsImapFlagAndUidState.h
mailnews/imap/src/nsImapIncomingServer.cpp
mailnews/imap/src/nsImapIncomingServer.h
mailnews/imap/src/nsImapMailFolder.cpp
mailnews/imap/src/nsImapMailFolder.h
mailnews/imap/src/nsImapOfflineSync.cpp
mailnews/imap/src/nsImapOfflineSync.h
mailnews/imap/src/nsImapProtocol.cpp
mailnews/imap/src/nsImapProtocol.h
mailnews/imap/src/nsImapServerResponseParser.cpp
mailnews/imap/src/nsImapServerResponseParser.h
mailnews/imap/src/nsImapService.cpp
mailnews/imap/src/nsImapService.h
mailnews/imap/src/nsImapUndoTxn.cpp
mailnews/imap/src/nsImapUndoTxn.h
mailnews/imap/src/nsImapUrl.cpp
mailnews/imap/src/nsImapUrl.h
mailnews/imap/src/nsImapUtils.cpp
mailnews/imap/src/nsImapUtils.h
mailnews/import/applemail/src/nsAppleMailImport.cpp
mailnews/import/comm4x/src/nsComm4xMail.cpp
mailnews/import/comm4x/src/nsComm4xMailImport.cpp
mailnews/import/comm4x/src/nsComm4xMailImport.h
mailnews/import/comm4x/src/nsComm4xProfile.cpp
mailnews/import/eudora/src/nsEudoraAddress.cpp
mailnews/import/eudora/src/nsEudoraAddress.h
mailnews/import/eudora/src/nsEudoraCompose.cpp
mailnews/import/eudora/src/nsEudoraCompose.h
mailnews/import/eudora/src/nsEudoraEditor.cpp
mailnews/import/eudora/src/nsEudoraEditor.h
mailnews/import/eudora/src/nsEudoraFilters.cpp
mailnews/import/eudora/src/nsEudoraFilters.h
mailnews/import/eudora/src/nsEudoraImport.cpp
mailnews/import/eudora/src/nsEudoraMac.cpp
mailnews/import/eudora/src/nsEudoraMac.h
mailnews/import/eudora/src/nsEudoraMailbox.cpp
mailnews/import/eudora/src/nsEudoraMailbox.h
mailnews/import/eudora/src/nsEudoraSettings.cpp
mailnews/import/eudora/src/nsEudoraWin32.cpp
mailnews/import/eudora/src/nsEudoraWin32.h
mailnews/import/oexpress/WabObject.cpp
mailnews/import/oexpress/WabObject.h
mailnews/import/oexpress/nsOE5File.cpp
mailnews/import/oexpress/nsOE5File.h
mailnews/import/oexpress/nsOEAddressIterator.cpp
mailnews/import/oexpress/nsOEAddressIterator.h
mailnews/import/oexpress/nsOEImport.cpp
mailnews/import/oexpress/nsOEMailbox.cpp
mailnews/import/oexpress/nsOEMailbox.h
mailnews/import/oexpress/nsOEScanBoxes.cpp
mailnews/import/oexpress/nsOEScanBoxes.h
mailnews/import/oexpress/nsOESettings.cpp
mailnews/import/outlook/src/MapiMessage.cpp
mailnews/import/outlook/src/nsOutlookCompose.cpp
mailnews/import/outlook/src/nsOutlookEditor.cpp
mailnews/import/outlook/src/nsOutlookEditor.h
mailnews/import/outlook/src/nsOutlookImport.cpp
mailnews/import/outlook/src/nsOutlookMail.cpp
mailnews/import/outlook/src/nsOutlookMail.h
mailnews/import/outlook/src/nsOutlookSettings.cpp
mailnews/import/src/ImportCharSet.h
mailnews/import/src/ImportOutFile.cpp
mailnews/import/src/ImportOutFile.h
mailnews/import/src/ImportTranslate.cpp
mailnews/import/src/ImportTranslate.h
mailnews/import/src/nsImportABDescriptor.h
mailnews/import/src/nsImportAddressBooks.cpp
mailnews/import/src/nsImportEncodeScan.cpp
mailnews/import/src/nsImportEncodeScan.h
mailnews/import/src/nsImportFieldMap.cpp
mailnews/import/src/nsImportFieldMap.h
mailnews/import/src/nsImportMail.cpp
mailnews/import/src/nsImportMailboxDescriptor.h
mailnews/import/src/nsImportMimeEncode.cpp
mailnews/import/src/nsImportMimeEncode.h
mailnews/import/src/nsImportScanFile.cpp
mailnews/import/src/nsImportScanFile.h
mailnews/import/src/nsImportService.cpp
mailnews/import/src/nsImportService.h
mailnews/import/src/nsImportTranslator.cpp
mailnews/import/src/nsImportTranslator.h
mailnews/import/text/src/nsTextAddress.cpp
mailnews/import/text/src/nsTextAddress.h
mailnews/import/text/src/nsTextImport.cpp
mailnews/import/vcard/src/nsVCardAddress.cpp
mailnews/import/vcard/src/nsVCardAddress.h
mailnews/import/vcard/src/nsVCardImport.cpp
mailnews/import/winlivemail/nsWMImport.cpp
mailnews/import/winlivemail/nsWMSettings.cpp
mailnews/local/src/nsLocalMailFolder.cpp
mailnews/local/src/nsLocalMailFolder.h
mailnews/local/src/nsLocalUndoTxn.cpp
mailnews/local/src/nsLocalUndoTxn.h
mailnews/local/src/nsMailboxProtocol.cpp
mailnews/local/src/nsMailboxProtocol.h
mailnews/local/src/nsMailboxService.cpp
mailnews/local/src/nsMailboxService.h
mailnews/local/src/nsMailboxUrl.cpp
mailnews/local/src/nsMailboxUrl.h
mailnews/local/src/nsMovemailIncomingServer.cpp
mailnews/local/src/nsMovemailIncomingServer.h
mailnews/local/src/nsMovemailService.cpp
mailnews/local/src/nsNoIncomingServer.cpp
mailnews/local/src/nsNoIncomingServer.h
mailnews/local/src/nsNoneService.cpp
mailnews/local/src/nsParseMailbox.cpp
mailnews/local/src/nsParseMailbox.h
mailnews/local/src/nsPop3IncomingServer.cpp
mailnews/local/src/nsPop3IncomingServer.h
mailnews/local/src/nsPop3Protocol.cpp
mailnews/local/src/nsPop3Protocol.h
mailnews/local/src/nsPop3Service.cpp
mailnews/local/src/nsPop3Service.h
mailnews/local/src/nsPop3Sink.cpp
mailnews/local/src/nsPop3Sink.h
mailnews/local/src/nsRssIncomingServer.cpp
mailnews/local/src/nsRssIncomingServer.h
mailnews/local/src/nsRssService.cpp
mailnews/mapi/mapihook/src/msgMapiFactory.cpp
mailnews/mapi/mapihook/src/msgMapiHook.cpp
mailnews/mapi/mapihook/src/msgMapiHook.h
mailnews/mapi/mapihook/src/msgMapiImp.cpp
mailnews/mapi/mapihook/src/msgMapiMain.cpp
mailnews/mapi/mapihook/src/msgMapiMain.h
mailnews/mime/cthandlers/glue/mimexpcom.cpp
mailnews/mime/cthandlers/glue/mimexpcom.h
mailnews/mime/cthandlers/smimestub/nsSMIMEStub.cpp
mailnews/mime/cthandlers/vcard/mimevcrd.cpp
mailnews/mime/emitters/src/nsEmitterUtils.cpp
mailnews/mime/emitters/src/nsEmitterUtils.h
mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp
mailnews/mime/emitters/src/nsMimeBaseEmitter.h
mailnews/mime/emitters/src/nsMimeHtmlEmitter.cpp
mailnews/mime/emitters/src/nsMimeHtmlEmitter.h
mailnews/mime/emitters/src/nsMimePlainEmitter.cpp
mailnews/mime/emitters/src/nsMimePlainEmitter.h
mailnews/mime/emitters/src/nsMimeXmlEmitter.cpp
mailnews/mime/emitters/src/nsMimeXmlEmitter.h
mailnews/mime/public/nsIMimeContentTypeHandler.h
mailnews/mime/public/nsIMimeObjectClassAccess.h
mailnews/mime/src/comi18n.cpp
mailnews/mime/src/comi18n.h
mailnews/mime/src/mimebuf.cpp
mailnews/mime/src/mimebuf.h
mailnews/mime/src/mimecms.cpp
mailnews/mime/src/mimecom.cpp
mailnews/mime/src/mimecom.h
mailnews/mime/src/mimecont.cpp
mailnews/mime/src/mimecryp.cpp
mailnews/mime/src/mimecryp.h
mailnews/mime/src/mimecth.h
mailnews/mime/src/mimedrft.cpp
mailnews/mime/src/mimeebod.cpp
mailnews/mime/src/mimeenc.cpp
mailnews/mime/src/mimeeobj.cpp
mailnews/mime/src/mimefilt.cpp
mailnews/mime/src/mimehdrs.cpp
mailnews/mime/src/mimehdrs.h
mailnews/mime/src/mimei.cpp
mailnews/mime/src/mimei.h
mailnews/mime/src/mimeiimg.cpp
mailnews/mime/src/mimeleaf.cpp
mailnews/mime/src/mimemalt.cpp
mailnews/mime/src/mimemapl.cpp
mailnews/mime/src/mimemcms.cpp
mailnews/mime/src/mimemoz2.cpp
mailnews/mime/src/mimemoz2.h
mailnews/mime/src/mimemrel.cpp
mailnews/mime/src/mimemrel.h
mailnews/mime/src/mimemsg.cpp
mailnews/mime/src/mimemsg.h
mailnews/mime/src/mimemsig.cpp
mailnews/mime/src/mimemsig.h
mailnews/mime/src/mimemult.cpp
mailnews/mime/src/mimemult.h
mailnews/mime/src/mimeobj.cpp
mailnews/mime/src/mimeobj.h
mailnews/mime/src/mimesun.cpp
mailnews/mime/src/mimetext.cpp
mailnews/mime/src/mimetext.h
mailnews/mime/src/mimethpl.cpp
mailnews/mime/src/mimethsa.cpp
mailnews/mime/src/mimethtm.cpp
mailnews/mime/src/mimetpfl.cpp
mailnews/mime/src/mimetpfl.h
mailnews/mime/src/mimetpla.cpp
mailnews/mime/src/mimetpla.h
mailnews/mime/src/mimetric.cpp
mailnews/mime/src/mimetric.h
mailnews/mime/src/mimeunty.cpp
mailnews/mime/src/modlmime.h
mailnews/mime/src/modmimee.h
mailnews/mime/src/nsMimeConverter.cpp
mailnews/mime/src/nsMimeHeaders.cpp
mailnews/mime/src/nsMimeObjectClassAccess.cpp
mailnews/mime/src/nsMimeObjectClassAccess.h
mailnews/mime/src/nsMsgHeaderParser.cpp
mailnews/mime/src/nsSimpleMimeConverterStub.cpp
mailnews/mime/src/nsStreamConverter.cpp
mailnews/mime/src/nsStreamConverter.h
mailnews/news/src/nsNNTPNewsgroupList.cpp
mailnews/news/src/nsNNTPNewsgroupList.h
mailnews/news/src/nsNNTPNewsgroupPost.cpp
mailnews/news/src/nsNNTPNewsgroupPost.h
mailnews/news/src/nsNNTPProtocol.cpp
mailnews/news/src/nsNNTPProtocol.h
mailnews/news/src/nsNewsDownloadDialogArgs.cpp
mailnews/news/src/nsNewsDownloadDialogArgs.h
mailnews/news/src/nsNewsDownloader.cpp
mailnews/news/src/nsNewsDownloader.h
mailnews/news/src/nsNewsFolder.cpp
mailnews/news/src/nsNewsFolder.h
mailnews/news/src/nsNntpIncomingServer.cpp
mailnews/news/src/nsNntpIncomingServer.h
mailnews/news/src/nsNntpMockChannel.cpp
mailnews/news/src/nsNntpService.cpp
mailnews/news/src/nsNntpService.h
mailnews/news/src/nsNntpUrl.cpp
mailnews/news/src/nsNntpUrl.h
suite/feeds/src/nsFeedSniffer.cpp
suite/profile/migration/src/nsNetscapeProfileMigratorBase.cpp
suite/profile/migration/src/nsNetscapeProfileMigratorBase.h
suite/profile/migration/src/nsProfileMigrator.cpp
suite/profile/migration/src/nsSeamonkeyProfileMigrator.cpp
suite/profile/migration/src/nsSeamonkeyProfileMigrator.h
suite/profile/migration/src/nsSuiteProfileMigratorUtils.cpp
suite/profile/migration/src/nsSuiteProfileMigratorUtils.h
suite/profile/migration/src/nsThunderbirdProfileMigrator.cpp
suite/profile/migration/src/nsThunderbirdProfileMigrator.h
suite/profile/nsSuiteDirectoryProvider.cpp
suite/shell/src/nsGNOMEShellService.cpp
suite/shell/src/nsGNOMEShellService.h
suite/shell/src/nsMacShellService.cpp
suite/shell/src/nsMacShellService.h
suite/shell/src/nsWindowsShellService.cpp
suite/shell/src/nsWindowsShellService.h
--- a/calendar/base/src/calDateTime.cpp
+++ b/calendar/base/src/calDateTime.cpp
@@ -71,17 +71,17 @@ calDateTime::calDateTime()
 
 calDateTime::calDateTime(icaltimetype const* atimeptr, calITimezone *tz)
     : mImmutable(PR_FALSE)
 {
     FromIcalTime(atimeptr, tz);
 }
 
 NS_IMETHODIMP
-calDateTime::GetIsMutable(PRBool *aResult)
+calDateTime::GetIsMutable(bool *aResult)
 {
     NS_ENSURE_ARG_POINTER(aResult);
     *aResult = !mImmutable;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calDateTime::MakeImmutable()
@@ -145,18 +145,18 @@ calDateTime::Reset()
 }
 
 CAL_VALUETYPE_ATTR(calDateTime, PRInt16, Year)
 CAL_VALUETYPE_ATTR(calDateTime, PRInt16, Month)
 CAL_VALUETYPE_ATTR(calDateTime, PRInt16, Day)
 CAL_VALUETYPE_ATTR(calDateTime, PRInt16, Hour)
 CAL_VALUETYPE_ATTR(calDateTime, PRInt16, Minute)
 CAL_VALUETYPE_ATTR(calDateTime, PRInt16, Second)
-CAL_VALUETYPE_ATTR(calDateTime, PRBool, IsDate)
-CAL_VALUETYPE_ATTR_GETTER(calDateTime, PRBool, IsValid)
+CAL_VALUETYPE_ATTR(calDateTime, bool, IsDate)
+CAL_VALUETYPE_ATTR_GETTER(calDateTime, bool, IsValid)
 CAL_VALUETYPE_ATTR_GETTER(calDateTime, PRTime, NativeTime)
 CAL_VALUETYPE_ATTR_GETTER(calDateTime, PRInt16, Weekday)
 CAL_VALUETYPE_ATTR_GETTER(calDateTime, PRInt16, Yearday)
 
 
 NS_IMETHODIMP
 calDateTime::GetTimezone(calITimezone **aResult)
 {
@@ -572,17 +572,17 @@ PRTime calDateTime::IcaltimeToPRTime(ica
     }
     et.tm_mday = static_cast<PRInt16>(tt.day);
     et.tm_month = static_cast<PRInt16>(tt.month-1);
     et.tm_year = static_cast<PRInt16>(tt.year);
 
     return PR_ImplodeTime(&et);
 }
 
-void calDateTime::PRTimeToIcaltime(PRTime time, PRBool isdate,
+void calDateTime::PRTimeToIcaltime(PRTime time, bool isdate,
                                    icaltimezone const* tz,
                                    icaltimetype * icalt)
 {
     PRExplodedTime et;
     PR_ExplodeTime(time, PR_GMTParameters, &et);
 
     icalt->year   = et.tm_year;
     icalt->month  = et.tm_month + 1;
@@ -610,17 +610,17 @@ void calDateTime::PRTimeToIcaltime(PRTim
 }
 
 NS_IMETHODIMP
 calDateTime::Compare(calIDateTime * aOther, PRInt32 * aResult)
 {
     NS_ENSURE_ARG_POINTER(aOther);
     NS_ENSURE_ARG_POINTER(aResult);
 
-    PRBool otherIsDate = PR_FALSE;
+    bool otherIsDate = false;
     aOther->GetIsDate(&otherIsDate);
 
     icaltimetype a, b;
     ToIcalTime(&a);
     aOther->ToIcalTime(&b);
 
     // If either this or aOther is floating, both objects are treated
     // as floating for the comparison.
@@ -661,20 +661,20 @@ calDateTime::GetScriptableFlags(PRUint32
     NS_ENSURE_ARG_POINTER(aScriptableFlags);
     *aScriptableFlags = nsIXPCScriptable::WANT_GETPROPERTY |
                         nsIXPCScriptable::WANT_SETPROPERTY |
                         nsIXPCScriptable::WANT_NEWRESOLVE |
                         nsIXPCScriptable::ALLOW_PROP_MODS_DURING_RESOLVE;
     return NS_OK;
 }
 
-/* PRBool getProperty (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in jsid id, in JSValPtr vp); */
+/* bool getProperty (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in jsid id, in JSValPtr vp); */
 NS_IMETHODIMP
 calDateTime::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext * cx,
-                         JSObject * obj_, jsid id, jsval * vp, PRBool *_retval)
+                         JSObject * obj_, jsid id, jsval * vp, bool *_retval)
 {
     NS_ENSURE_ARG_POINTER(vp);
     NS_ENSURE_ARG_POINTER(_retval);
 
     if (JSID_IS_STRING(id)) {
         size_t length;
         JSString *idString = JSID_TO_STRING(id);
         const jschar *str = JS_GetStringCharsAndLength(cx, idString, &length);
@@ -685,17 +685,17 @@ calDateTime::GetProperty(nsIXPConnectWra
             PRTime tmp, thousand;
             jsdouble msec;
             LL_I2L(thousand, 1000);
             LL_DIV(tmp, mNativeTime, thousand);
             LL_L2D(msec, tmp);
             ensureTimezone();
 
             JSObject *obj;
-            PRBool b;
+            bool b;
             if (NS_SUCCEEDED(mTimezone->GetIsFloating(&b)) && b) {
                 obj = js_NewDateObject(cx, mYear, mMonth, mDay, mHour, mMinute, mSecond);
             } else {
                 obj = js_NewDateObjectMsec(cx, msec);
             }
 
             *vp = OBJECT_TO_JSVAL(obj);
             *_retval = PR_TRUE;
@@ -703,20 +703,20 @@ calDateTime::GetProperty(nsIXPConnectWra
         }
     }
 
     *_retval = PR_TRUE;
     return NS_OK;
 }
 
 
-/* PRBool setProperty (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in jsid id, in JSValPtr vp); */
+/* bool setProperty (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in jsid id, in JSValPtr vp); */
 NS_IMETHODIMP
 calDateTime::SetProperty(nsIXPConnectWrappedNative *wrapper, JSContext * cx,
-                         JSObject * obj, jsid id, jsval * vp, PRBool *_retval)
+                         JSObject * obj, jsid id, jsval * vp, bool *_retval)
 {
     NS_ENSURE_ARG_POINTER(_retval);
 
     if (JSID_IS_STRING(id)) {
         size_t length;
         JSString *idString = JSID_TO_STRING(id);
         const jschar *str = JS_GetStringCharsAndLength(cx, idString, &length);
 
@@ -773,53 +773,53 @@ calDateTime::PostCreate(nsIXPConnectWrap
 }
 
 NS_IMETHODIMP
 calDateTime::PostCreatePrototype(JSContext * cx, JSObject * proto)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-/* PRBool addProperty (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in jsid id, in JSValPtr vp); */
+/* bool addProperty (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in jsid id, in JSValPtr vp); */
 NS_IMETHODIMP
 calDateTime::AddProperty(nsIXPConnectWrappedNative *wrapper, JSContext * cx,
-                         JSObject * obj, jsid id, jsval * vp, PRBool *_retval)
+                         JSObject * obj, jsid id, jsval * vp, bool *_retval)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-/* PRBool delProperty (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in jsid id, in JSValPtr vp); */
+/* bool delProperty (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in jsid id, in JSValPtr vp); */
 NS_IMETHODIMP
 calDateTime::DelProperty(nsIXPConnectWrappedNative *wrapper, JSContext * cx,
-                         JSObject * obj, jsid id, jsval * vp, PRBool *_retval)
+                         JSObject * obj, jsid id, jsval * vp, bool *_retval)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-/* PRBool enumerate (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj); */
+/* bool enumerate (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj); */
 NS_IMETHODIMP
 calDateTime::Enumerate(nsIXPConnectWrappedNative *wrapper, JSContext * cx,
-                       JSObject * obj, PRBool *_retval)
+                       JSObject * obj, bool *_retval)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-/* PRBool newEnumerate (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in PRUint32 enum_op, in JSValPtr statep, out JSID idp); */
+/* bool newEnumerate (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in PRUint32 enum_op, in JSValPtr statep, out JSID idp); */
 NS_IMETHODIMP
 calDateTime::NewEnumerate(nsIXPConnectWrappedNative *wrapper, JSContext * cx,
-                          JSObject * obj, PRUint32 enum_op, jsval * statep, jsid *idp, PRBool *_retval)
+                          JSObject * obj, PRUint32 enum_op, jsval * statep, jsid *idp, bool *_retval)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-/* PRBool newResolve (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in jsid id, in PRUint32 flags, out JSObjectPtr objp); */
+/* bool newResolve (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in jsid id, in PRUint32 flags, out JSObjectPtr objp); */
 NS_IMETHODIMP
 calDateTime::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext * cx,
                         JSObject * obj, jsid id, PRUint32 flags,
-                        JSObject * *objp, PRBool *_retval)
+                        JSObject * *objp, bool *_retval)
 {
     NS_ENSURE_ARG_POINTER(objp);
     NS_ENSURE_ARG_POINTER(_retval);
 
     if (JSID_IS_STRING(id)) {
         size_t length;
         JSString *idString = JSID_TO_STRING(id);
         const jschar *str = JS_GetStringCharsAndLength(cx, idString, &length);
@@ -835,74 +835,74 @@ calDateTime::NewResolve(nsIXPConnectWrap
             return *_retval ? NS_OK : NS_ERROR_FAILURE;
         }
     }
 
     *_retval = PR_TRUE;
     return NS_OK;
 }
 
-/* PRBool convert (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in PRUint32 type, in JSValPtr vp); */
+/* bool convert (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in PRUint32 type, in JSValPtr vp); */
 NS_IMETHODIMP
 calDateTime::Convert(nsIXPConnectWrappedNative *wrapper, JSContext * cx,
-                     JSObject * obj, PRUint32 type, jsval * vp, PRBool *_retval)
+                     JSObject * obj, PRUint32 type, jsval * vp, bool *_retval)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 /* void finalize (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj); */
 NS_IMETHODIMP
 calDateTime::Finalize(nsIXPConnectWrappedNative *wrapper, JSContext * cx, JSObject * obj)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-/* PRBool checkAccess (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in jsid id, in PRUint32 mode, in JSValPtr vp); */
+/* bool checkAccess (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in jsid id, in PRUint32 mode, in JSValPtr vp); */
 NS_IMETHODIMP
 calDateTime::CheckAccess(nsIXPConnectWrappedNative *wrapper, JSContext * cx,
-                         JSObject * obj, jsid id, PRUint32 mode, jsval * vp, PRBool *_retval)
+                         JSObject * obj, jsid id, PRUint32 mode, jsval * vp, bool *_retval)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-/* PRBool call (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in PRUint32 argc, in JSValPtr argv, in JSValPtr vp); */
+/* bool call (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in PRUint32 argc, in JSValPtr argv, in JSValPtr vp); */
 NS_IMETHODIMP
 calDateTime::Call(nsIXPConnectWrappedNative *wrapper, JSContext * cx,
-                  JSObject * obj, PRUint32 argc, jsval * argv, jsval * vp, PRBool *_retval)
+                  JSObject * obj, PRUint32 argc, jsval * argv, jsval * vp, bool *_retval)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-/* PRBool construct (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in PRUint32 argc, in JSValPtr argv, in JSValPtr vp); */
+/* bool construct (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in PRUint32 argc, in JSValPtr argv, in JSValPtr vp); */
 NS_IMETHODIMP
 calDateTime::Construct(nsIXPConnectWrappedNative *wrapper, JSContext * cx,
-                       JSObject * obj, PRUint32 argc, jsval * argv, jsval * vp, PRBool *_retval)
+                       JSObject * obj, PRUint32 argc, jsval * argv, jsval * vp, bool *_retval)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-/* PRBool hasInstance (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in JSVal val, out PRBool bp); */
+/* bool hasInstance (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in JSVal val, out bool bp); */
 NS_IMETHODIMP
 calDateTime::HasInstance(nsIXPConnectWrappedNative *wrapper, JSContext * cx,
-                         JSObject * obj, const jsval &val, PRBool *bp, PRBool *_retval)
+                         JSObject * obj, const jsval &val, bool *bp, bool *_retval)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 /* void trace (in nsIXPConnectWrappedNative wrapper, in JSTracePtr trc, in JSObjectPtr obj); */
 NS_IMETHODIMP
 calDateTime::Trace(nsIXPConnectWrappedNative *wrapper, JSTracer *trc, JSObject *obj)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-/* PRBool equality(in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in JSVal val); */
+/* bool equality(in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in JSVal val); */
 NS_IMETHODIMP
 calDateTime::Equality(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
-                      JSObject *obj, const jsval &val, PRBool *_retval)
+                      JSObject *obj, const jsval &val, bool *_retval)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 /* JSObjectPtr outerObject(in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj); */
 NS_IMETHODIMP
 calDateTime::OuterObject(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                          JSObject *obj, JSObject **_retval)
--- a/calendar/base/src/calDateTime.h
+++ b/calendar/base/src/calDateTime.h
@@ -55,19 +55,19 @@ public:
     calDateTime();
     calDateTime(icaltimetype const* icalt, calITimezone * tz);
 
     NS_DECL_ISUPPORTS
     NS_DECL_CALIDATETIME
     NS_DECL_NSIXPCSCRIPTABLE
 
 protected:
-    PRBool mImmutable;
-    PRBool mIsValid;
-    PRBool mIsDate;
+    bool mImmutable;
+    bool mIsValid;
+    bool mIsDate;
 
     PRInt16 mYear;
     PRInt16 mMonth;
     PRInt16 mDay;
     PRInt16 mHour;
     PRInt16 mMinute;
     PRInt16 mSecond;
     PRInt16 mWeekday;
@@ -76,13 +76,13 @@ protected:
     PRTime mNativeTime;
     nsCOMPtr<calITimezone> mTimezone;
 
     void Normalize();
     void FromIcalTime(icaltimetype const* icalt, calITimezone *tz);
     void ensureTimezone();
 
     static PRTime IcaltimeToPRTime(icaltimetype const* icalt, icaltimezone const* tz);
-    static void PRTimeToIcaltime(PRTime time, PRBool isdate,
+    static void PRTimeToIcaltime(PRTime time, bool isdate,
                                  icaltimezone const* tz, icaltimetype *icalt);
 };
 
 #endif // INCLUDED_CALDATETIME_H
--- a/calendar/base/src/calDuration.cpp
+++ b/calendar/base/src/calDuration.cpp
@@ -76,17 +76,17 @@ calDuration::calDuration(const calDurati
 
 calDuration::calDuration(const struct icaldurationtype * const aDurationPtr)
     : mImmutable(PR_FALSE)
 {
     FromIcalDuration(aDurationPtr);
 }
 
 NS_IMETHODIMP
-calDuration::GetIsMutable(PRBool *aResult)
+calDuration::GetIsMutable(bool *aResult)
 {
     NS_ENSURE_ARG_POINTER(aResult);
 
     *aResult = !mImmutable;
     return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -118,22 +118,22 @@ calDuration::Reset()
     mDuration.days = 0;
     mDuration.hours = 0;
     mDuration.minutes = 0;
     mDuration.seconds = 0;
 
     return NS_OK;
 }
 
-NS_IMETHODIMP calDuration::GetIsNegative(PRBool *_retval)
+NS_IMETHODIMP calDuration::GetIsNegative(bool *_retval)
 {
     *_retval = mDuration.is_neg;
     return NS_OK;
 }
-NS_IMETHODIMP calDuration::SetIsNegative(PRBool aValue)
+NS_IMETHODIMP calDuration::SetIsNegative(bool aValue)
 {
     if (mImmutable) return NS_ERROR_CALENDAR_IMMUTABLE;
     mDuration.is_neg = aValue;
     return NS_OK;
 }
 
 NS_IMETHODIMP calDuration::GetWeeks(PRInt16 *_retval)
 {
--- a/calendar/base/src/calDuration.h
+++ b/calendar/base/src/calDuration.h
@@ -53,17 +53,17 @@ public:
 
     // nsISupports interface
     NS_DECL_ISUPPORTS
 
     // calIDateTime interface
     NS_DECL_CALIDURATION
 
 protected:
-    PRBool mImmutable;
+    bool mImmutable;
 
     struct icaldurationtype mDuration;
 
     void FromIcalDuration(const struct icaldurationtype * const icald);
 };
 
 #endif /* CALDURATION_H_ */
 
--- a/calendar/base/src/calICSService.cpp
+++ b/calendar/base/src/calICSService.cpp
@@ -734,17 +734,17 @@ nsresult calIcalComponent::GetDateTimeAt
     }
     return calIcalProperty::getDatetime_(this, prop, dtp);
 }
 
 nsresult calIcalComponent::SetDateTimeAttribute(icalproperty_kind kind,
                                                 calIDateTime * dt)
 {
     ClearAllProperties(kind);
-    PRBool isValid;
+    bool isValid;
     if (!dt || NS_FAILED(dt->GetIsValid(&isValid)) || !isValid) {
         return NS_OK;
     }
     icalproperty *prop = icalproperty_new(kind);
     CAL_ENSURE_MEMORY(prop);
     nsresult rc = calIcalProperty::setDatetime_(this, prop, dt);
     if (NS_SUCCEEDED(rc))
         icalcomponent_add_property(mComponent, prop);
@@ -777,17 +777,17 @@ nsresult calIcalProperty::setDatetime_(c
             NS_ENSURE_SUCCESS(rv, rv);
             if (itt.zone) {
                 rv = parent->getParentVCalendarOrThis()->AddTimezoneReference(tz);
                 NS_ENSURE_SUCCESS(rv, rv);
                 icalparameter * const param = icalparameter_new_from_value_string(
                     ICAL_TZID_PARAMETER, icaltimezone_get_tzid(const_cast<icaltimezone *>(itt.zone)));
                 icalproperty_set_parameter(prop, param);
             } else { // either floating or phantom:
-                PRBool b = PR_FALSE;
+                bool b = false;
                 if (NS_FAILED(tz->GetIsFloating(&b)) || !b) {
                     // restore the same phantom TZID:
                     nsCAutoString tzid;
                     rv = tz->GetTzid(tzid);
                     NS_ENSURE_SUCCESS(rv, rv);
                     icalparameter * const param = icalparameter_new_from_value_string(ICAL_TZID_PARAMETER,
                                                                                       tzid.get());
                     icalproperty_set_parameter(prop, param);
@@ -1078,17 +1078,17 @@ calIcalComponent::AddSubcomponent(calIIc
     calIcalComponent * const ical = toIcalComponent(comp);
 
     PRUint32 tzCount = 0;
     calITimezone ** timezones = nsnull;
     nsresult rv = ical->GetReferencedTimezones(&tzCount, &timezones);
     NS_ENSURE_SUCCESS(rv, rv);
 
     calIcalComponent * const vcal = getParentVCalendarOrThis();
-    PRBool failed = PR_FALSE;
+    bool failed = false;
     for (PRUint32 i = 0; i < tzCount; i++) {
         if (!failed) {
             rv = vcal->AddTimezoneReference(timezones[i]);
             if (NS_FAILED(rv))
                 failed = PR_TRUE;
         }
 
         NS_RELEASE(timezones[i]);
--- a/calendar/base/src/calPeriod.cpp
+++ b/calendar/base/src/calPeriod.cpp
@@ -62,17 +62,17 @@ calPeriod::calPeriod(const calPeriod& cp
 
 calPeriod::calPeriod(struct icalperiodtype const* aPeriodPtr)
     : mImmutable(PR_FALSE)
 {
     FromIcalPeriod(aPeriodPtr);
 }
 
 NS_IMETHODIMP
-calPeriod::GetIsMutable(PRBool *aResult)
+calPeriod::GetIsMutable(bool *aResult)
 {
     NS_ENSURE_ARG_POINTER(aResult);
 
     *aResult = !mImmutable;
     return NS_OK;
 }
 
 NS_IMETHODIMP
--- a/calendar/base/src/calPeriod.h
+++ b/calendar/base/src/calPeriod.h
@@ -59,17 +59,17 @@ public:
     NS_DECL_ISUPPORTS
 
     // calIPeriod interface
     NS_DECL_CALIPERIOD
 
 protected:
     calPeriod const& operator=(calPeriod const&);
 
-    PRBool mImmutable;
+    bool mImmutable;
 
     //struct icaldurationtype mPeriod;
     nsCOMPtr<calIDateTime> mStart;
     nsCOMPtr<calIDateTime> mEnd;
     
     void FromIcalPeriod(struct icalperiodtype const* icalp);
 };
 
--- a/calendar/base/src/calRecurrenceDate.cpp
+++ b/calendar/base/src/calRecurrenceDate.cpp
@@ -61,17 +61,17 @@ NS_IMPL_ISUPPORTS2_CI(calRecurrenceDate,
 
 calRecurrenceDate::calRecurrenceDate()
     : mImmutable(PR_FALSE),
       mIsNegative(PR_FALSE)
 {
 }
 
 NS_IMETHODIMP
-calRecurrenceDate::GetIsMutable(PRBool *aResult)
+calRecurrenceDate::GetIsMutable(bool *aResult)
 {
     NS_ENSURE_ARG_POINTER(aResult);
 
     *aResult = !mImmutable;
     return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -98,37 +98,37 @@ calRecurrenceDate::Clone(calIRecurrenceI
         crd->mDate = nsnull;
 
     NS_ADDREF(*_retval = crd);
     return NS_OK;
 }
 
 /* attribute boolean isNegative; */
 NS_IMETHODIMP
-calRecurrenceDate::GetIsNegative(PRBool *_retval)
+calRecurrenceDate::GetIsNegative(bool *_retval)
 {
     NS_ENSURE_ARG_POINTER(_retval);
 
     *_retval = mIsNegative;
     return NS_OK;
 }
 
 NS_IMETHODIMP
-calRecurrenceDate::SetIsNegative(PRBool aIsNegative)
+calRecurrenceDate::SetIsNegative(bool aIsNegative)
 {
     if (mImmutable)
         return NS_ERROR_FAILURE; // XXX CAL_ERROR_ITEM_IS_IMMUTABLE
 
     mIsNegative = aIsNegative;
     return NS_OK;
 }
 
 /* readonly attribute boolean isFinite; */
 NS_IMETHODIMP
-calRecurrenceDate::GetIsFinite(PRBool *_retval)
+calRecurrenceDate::GetIsFinite(bool *_retval)
 {
     NS_ENSURE_ARG_POINTER(_retval);
     *_retval = PR_TRUE;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calRecurrenceDate::GetDate(calIDateTime **aDate)
--- a/calendar/base/src/calRecurrenceDate.h
+++ b/calendar/base/src/calRecurrenceDate.h
@@ -50,15 +50,15 @@ public:
     calRecurrenceDate();
 
     NS_DECL_ISUPPORTS
 
     NS_DECL_CALIRECURRENCEITEM
 
     NS_DECL_CALIRECURRENCEDATE
 protected:
-    PRBool mImmutable;
-    PRBool mIsNegative;
+    bool mImmutable;
+    bool mIsNegative;
 
     nsCOMPtr<calIDateTime> mDate;
 };
 
 #endif /* CALRECURRENCEDATE_H_ */
--- a/calendar/base/src/calRecurrenceDateSet.cpp
+++ b/calendar/base/src/calRecurrenceDateSet.cpp
@@ -57,17 +57,17 @@ NS_IMPL_ISUPPORTS2_CI(calRecurrenceDateS
 calRecurrenceDateSet::calRecurrenceDateSet()
     : mImmutable(PR_FALSE),
       mIsNegative(PR_FALSE),
       mSorted(PR_FALSE)
 {
 }
 
 NS_IMETHODIMP
-calRecurrenceDateSet::GetIsMutable(PRBool *aResult)
+calRecurrenceDateSet::GetIsMutable(bool *aResult)
 {
     NS_ENSURE_ARG_POINTER(aResult);
 
     *aResult = !mImmutable;
     return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -102,37 +102,37 @@ calRecurrenceDateSet::Clone(calIRecurren
     crds->mSorted = mSorted;
 
     NS_ADDREF(*_retval = crds);
     return NS_OK;
 }
 
 /* attribute boolean isNegative; */
 NS_IMETHODIMP
-calRecurrenceDateSet::GetIsNegative(PRBool *_retval)
+calRecurrenceDateSet::GetIsNegative(bool *_retval)
 {
     NS_ENSURE_ARG_POINTER(_retval);
 
     *_retval = mIsNegative;
     return NS_OK;
 }
 
 NS_IMETHODIMP
-calRecurrenceDateSet::SetIsNegative(PRBool aIsNegative)
+calRecurrenceDateSet::SetIsNegative(bool aIsNegative)
 {
     if (mImmutable)
         return NS_ERROR_FAILURE; // XXX CAL_ERROR_ITEM_IS_IMMUTABLE
 
     mIsNegative = aIsNegative;
     return NS_OK;
 }
 
 /* readonly attribute boolean isFinite; */
 NS_IMETHODIMP
-calRecurrenceDateSet::GetIsFinite(PRBool *_retval)
+calRecurrenceDateSet::GetIsFinite(bool *_retval)
 {
     NS_ENSURE_ARG_POINTER(_retval);
     *_retval = PR_TRUE;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calRecurrenceDateSet::GetDates(PRUint32 *aCount, calIDateTime ***aDates)
--- a/calendar/base/src/calRecurrenceDateSet.h
+++ b/calendar/base/src/calRecurrenceDateSet.h
@@ -51,18 +51,18 @@ public:
     calRecurrenceDateSet();
 
     NS_DECL_ISUPPORTS
 
     NS_DECL_CALIRECURRENCEITEM
 
     NS_DECL_CALIRECURRENCEDATESET
 protected:
-    PRBool mImmutable;
-    PRBool mIsNegative;
-    PRBool mSorted;
+    bool mImmutable;
+    bool mIsNegative;
+    bool mSorted;
 
     void EnsureSorted();
 
     nsCOMArray<calIDateTime> mDates;
 };
 
 #endif /* CALRECURRENCEDATESET_H_ */
--- a/calendar/base/src/calRecurrenceRule.cpp
+++ b/calendar/base/src/calRecurrenceRule.cpp
@@ -58,17 +58,17 @@ calRecurrenceRule::calRecurrenceRule()
     : mImmutable(PR_FALSE),
       mIsNegative(PR_FALSE),
       mIsByCount(PR_FALSE)
 {
     icalrecurrencetype_clear(&mIcalRecur);
 }
 
 NS_IMETHODIMP
-calRecurrenceRule::GetIsMutable(PRBool *aResult)
+calRecurrenceRule::GetIsMutable(bool *aResult)
 {
     NS_ENSURE_ARG_POINTER(aResult);
     *aResult = !mImmutable;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calRecurrenceRule::MakeImmutable()
@@ -88,35 +88,35 @@ calRecurrenceRule::Clone(calIRecurrenceI
     crc->mIcalRecur = mIcalRecur;
 
     NS_ADDREF(*aResult = crc);
     return NS_OK;
 }
 
 /* attribute boolean isNegative; */
 NS_IMETHODIMP
-calRecurrenceRule::GetIsNegative(PRBool *_retval)
+calRecurrenceRule::GetIsNegative(bool *_retval)
 {
     NS_ENSURE_ARG_POINTER(_retval);
     *_retval = mIsNegative;
     return NS_OK;
 }
 
 NS_IMETHODIMP
-calRecurrenceRule::SetIsNegative(PRBool aIsNegative)
+calRecurrenceRule::SetIsNegative(bool aIsNegative)
 {
     if (mImmutable)
         return NS_ERROR_OBJECT_IS_IMMUTABLE;
     mIsNegative = aIsNegative;
     return NS_OK;
 }
 
 /* readonly attribute boolean isFinite; */
 NS_IMETHODIMP
-calRecurrenceRule::GetIsFinite(PRBool *_retval)
+calRecurrenceRule::GetIsFinite(bool *_retval)
 {
     NS_ENSURE_ARG_POINTER(_retval);
 
     if ((mIsByCount && mIcalRecur.count == 0) ||
         (!mIsByCount && icaltime_is_null_time(mIcalRecur.until)))
     {
         *_retval = PR_FALSE;
     } else {
@@ -229,17 +229,17 @@ calRecurrenceRule::GetUntilDate(calIDate
 
 NS_IMETHODIMP
 calRecurrenceRule::SetUntilDate(calIDateTime * aRecurEnd)
 {
     if (aRecurEnd) {
         nsCOMPtr<calIDateTime> dt(aRecurEnd);
         nsCOMPtr<calITimezone> tz;
         aRecurEnd->GetTimezone(getter_AddRefs(tz));
-        PRBool b;
+        bool b;
         if (NS_SUCCEEDED(tz->GetIsUTC(&b)) && !b &&
             NS_SUCCEEDED(tz->GetIsFloating(&b)) && !b) {
             // convert to UTC:
             aRecurEnd->GetInTimezone(cal::UTC(), getter_AddRefs(dt));
         }
         struct icaltimetype itt;
         dt->ToIcalTime(&itt);
 
@@ -252,17 +252,17 @@ calRecurrenceRule::SetUntilDate(calIDate
 
     mIsByCount = PR_FALSE;
 
     return NS_OK;
 }
 
 /* readonly attribute boolean isByCount; */
 NS_IMETHODIMP
-calRecurrenceRule::GetIsByCount (PRBool *aIsByCount)
+calRecurrenceRule::GetIsByCount (bool *aIsByCount)
 {
     *aIsByCount = mIsByCount;
     return NS_OK;
 }
 
 /* attribute long interval; */
 NS_IMETHODIMP
 calRecurrenceRule::GetInterval(PRInt32 *aInterval)
--- a/calendar/base/src/calRecurrenceRule.h
+++ b/calendar/base/src/calRecurrenceRule.h
@@ -52,14 +52,14 @@ public:
     calRecurrenceRule();
 
     NS_DECL_ISUPPORTS
     NS_DECL_CALIRECURRENCEITEM
     NS_DECL_CALIRECURRENCERULE
 protected:
     icalrecurrencetype mIcalRecur;
 
-    PRBool mImmutable;
-    PRBool mIsNegative;
-    PRBool mIsByCount;
+    bool mImmutable;
+    bool mIsNegative;
+    bool mIsByCount;
 };
 
 #endif // INCLUDED_CAL_RECURRENCERULE_H
--- a/calendar/base/src/calTimezone.cpp
+++ b/calendar/base/src/calTimezone.cpp
@@ -39,24 +39,24 @@
 #include "calAttributeHelpers.h"
 
 NS_IMPL_ISUPPORTS1(calTimezone, calITimezone)
 
 CAL_ISUPPORTS_ATTR_GETTER(calTimezone, calIIcalComponent, IcalComponent)
 CAL_STRINGTYPE_ATTR_GETTER(calTimezone, nsACString, Tzid)
 
 NS_IMETHODIMP
-calTimezone::GetIsFloating(PRBool * _retval) {
+calTimezone::GetIsFloating(bool * _retval) {
     NS_ENSURE_ARG_POINTER(_retval);
     *_retval = PR_FALSE;
     return NS_OK;
 }
 
 NS_IMETHODIMP
-calTimezone::GetIsUTC(PRBool * _retval) {
+calTimezone::GetIsUTC(bool * _retval) {
     NS_ENSURE_ARG_POINTER(_retval);
     *_retval = PR_FALSE;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calTimezone::GetDisplayName(nsAString & _retval) {
     _retval = NS_ConvertUTF8toUTF16(mTzid);
--- a/calendar/base/src/calUtils.cpp
+++ b/calendar/base/src/calUtils.cpp
@@ -100,17 +100,17 @@ void logMissingTimezone(char const* tzid
 
 icaltimezone * getIcalTimezone(calITimezone * tz) {
     icaltimezone * icaltz = nsnull;
     if (!tz) {
         NS_ASSERTION(false, "No Timezone passed to getIcalTimezone");
         return nsnull;
     }
 
-    PRBool b;
+    bool b;
     tz->GetIsUTC(&b);
     if (b) {
         icaltz = icaltimezone_get_utc_timezone();
     } else {
         nsCOMPtr<calIIcalComponent> tzComp;
         tz->GetIcalComponent(getter_AddRefs(tzComp));
         if (tzComp) {
             icaltz = tzComp->GetIcalTimezone();
--- a/db/mork/src/morkStore.cpp
+++ b/db/mork/src/morkStore.cpp
@@ -700,17 +700,17 @@ morkStore::CopyAtom(morkEnv* ev, const m
     mdbYarn yarn;
     if ( inAtom->AliasYarn(&yarn) )
       outAtom = this->YarnToAtom(ev, &yarn, PR_TRUE /* create */);
   }
   return outAtom;
 }
  
 morkAtom*
-morkStore::YarnToAtom(morkEnv* ev, const mdbYarn* inYarn, PRBool createIfMissing /* = PR_TRUE */)
+morkStore::YarnToAtom(morkEnv* ev, const mdbYarn* inYarn, bool createIfMissing /* = true */)
 {
   morkAtom* outAtom = 0;
   if ( ev->Good() )
   {
     morkAtomSpace* groundSpace = this->LazyGetGroundAtomSpace(ev);
     if ( groundSpace )
     {
       morkFarBookAtom* keyAtom =
--- a/db/mork/src/morkStore.h
+++ b/db/mork/src/morkStore.h
@@ -668,17 +668,17 @@ public: // dynamic type identification
 
 public: // typing
   static void NonStoreTypeError(morkEnv* ev);
   static void NilStoreFileError(morkEnv* ev);
   static void CannotAutoAssignAtomIdentityError(morkEnv* ev);
   
 public: //  store utilties
   
-  morkAtom* YarnToAtom(morkEnv* ev, const mdbYarn* inYarn, PRBool createIfMissing = PR_TRUE);
+  morkAtom* YarnToAtom(morkEnv* ev, const mdbYarn* inYarn, bool createIfMissing = true);
   morkAtom* AddAlias(morkEnv* ev, const morkMid& inMid,
     mork_cscode inForm);
 
 public: // other store methods
 
   void RenumberAllCollectableContent(morkEnv* ev);
 
   nsIMdbStore* AcquireStoreHandle(morkEnv* ev); // mObject_Handle
--- a/ldap/xpcom/src/nsLDAPConnection.cpp
+++ b/ldap/xpcom/src/nsLDAPConnection.cpp
@@ -464,17 +464,17 @@ NS_IMETHODIMP nsOnLDAPInitMessageRunnabl
 {
   return m_listener->OnLDAPInit(m_conn, m_status);
 }
 
 nsresult
 nsLDAPConnection::InvokeMessageCallback(LDAPMessage *aMsgHandle,
                                         nsILDAPMessage *aMsg,
                                         PRInt32 aOperation,
-                                        PRBool aRemoveOpFromConnQ)
+                                        bool aRemoveOpFromConnQ)
 {
 #if defined(DEBUG)
   // We only want this being logged for debug builds so as not to affect performance too much.
   PR_LOG(gLDAPLogModule, PR_LOG_DEBUG, ("InvokeMessageCallback entered\n"));
 #endif
 
   nsresult rv;
   // Get the operation.
@@ -535,17 +535,17 @@ nsLDAPConnection::OnLookupComplete(nsICa
 
         PRInt32 index = 0;
         char addrbuf[64];
         PRNetAddr addr;
 
         while (NS_SUCCEEDED(aRecord->GetNextAddr(0, &addr))) {
             // We can only use v4 addresses
             //
-            PRBool v4mapped = PR_FALSE;
+            bool v4mapped = false;
             if (addr.raw.family == PR_AF_INET6)
                 v4mapped = PR_IsNetAddrType(&addr, PR_IpAddrV4Mapped);
             if (addr.raw.family == PR_AF_INET || v4mapped) {
                 // If there are more IPs in the list, we separate them with
                 // a space, as supported/used by the LDAP C-SDK.
                 //
                 if (index++)
                     mResolvedIP.Append(' ');
@@ -681,17 +681,17 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsLDAPConn
 NS_IMETHODIMP nsLDAPConnectionRunnable::Run()
 {
   if (!mOperationID) {
     NS_ERROR("mOperationID is null");
     return NS_ERROR_NULL_POINTER;
   }
 
   LDAPMessage *msgHandle;
-  PRBool operationFinished = PR_TRUE;
+  bool operationFinished = true;
   nsRefPtr<nsLDAPMessage> msg;
 
   struct timeval timeout = { 0, 0 };
 
   nsCOMPtr<nsIThread> thread = do_GetCurrentThread();
   PRInt32 returnCode = ldap_result(mConnection->mConnectionHandle, mOperationID, LDAP_MSG_ONE, &timeout, &msgHandle);
   switch (returnCode)
   {
--- a/ldap/xpcom/src/nsLDAPConnection.h
+++ b/ldap/xpcom/src/nsLDAPConnection.h
@@ -88,17 +88,17 @@ class nsLDAPConnection : public nsILDAPC
 
   protected:
     // invoke the callback associated with a given message, and possibly
     // delete it from the connection queue
     //
     nsresult InvokeMessageCallback(LDAPMessage *aMsgHandle,
                                    nsILDAPMessage *aMsg,
                                    PRInt32 aOperation,
-                                   PRBool aRemoveOpFromConnQ);
+                                   bool aRemoveOpFromConnQ);
     /**
      * Add an nsILDAPOperation to the list of operations pending on
      * this connection.  This is mainly intended for use by the
      * nsLDAPOperation code.  Used so that the thread waiting on messages
      * for this connection has an operation to callback to.
      *
      * @param aOperation                    operation to add
      * @exception NS_ERROR_ILLEGAL_VALUE    aOperation was NULL
@@ -122,17 +122,17 @@ class nsLDAPConnection : public nsILDAPC
     void Close();                       // close the connection
     LDAP *mConnectionHandle;            // the LDAP C SDK's connection object
     nsCString mBindName;                // who to bind as
     nsCOMPtr<nsIThread> mThread;        // thread which marshals results
 
     nsInterfaceHashtableMT<nsUint32HashKey, nsILDAPOperation> mPendingOperations;
 
     PRInt32 mPort;                      // The LDAP port we're binding to
-    PRBool mSSL;                        // the options
+    bool mSSL;                        // the options
     PRUint32 mVersion;                  // LDAP protocol version
 
     nsCString mResolvedIP;              // Preresolved list of host IPs
     nsCOMPtr<nsILDAPMessageListener> mInitListener; // Init callback
     nsCOMPtr<nsICancelable> mDNSRequest;   // The "active" DNS request
     nsCString               mDNSHost;   // The hostname being resolved
     nsCOMPtr<nsISupports> mClosure;     // private parameter (anything caller desires)
 };
--- a/ldap/xpcom/src/nsLDAPControl.cpp
+++ b/ldap/xpcom/src/nsLDAPControl.cpp
@@ -77,23 +77,23 @@ NS_IMETHODIMP
 nsLDAPControl::SetValue(nsILDAPBERValue * aValue)
 {
   mValue = aValue;
   return NS_OK;
 }
 
 /* attribute boolean isCritical; */
 NS_IMETHODIMP 
-nsLDAPControl::GetIsCritical(PRBool *aIsCritical)
+nsLDAPControl::GetIsCritical(bool *aIsCritical)
 {
   *aIsCritical = mIsCritical;
   return NS_OK;
 }
 NS_IMETHODIMP
-nsLDAPControl::SetIsCritical(PRBool aIsCritical)
+nsLDAPControl::SetIsCritical(bool aIsCritical)
 {
   mIsCritical = aIsCritical;
   return NS_OK;
 }
 
 /**
  * utility routine for use inside the LDAP XPCOM SDK
  */
--- a/ldap/xpcom/src/nsLDAPControl.h
+++ b/ldap/xpcom/src/nsLDAPControl.h
@@ -65,11 +65,11 @@ public:
    */
   nsresult ToLDAPControl(LDAPControl **aControl);
 
 private:
   ~nsLDAPControl();
 
 protected:
   nsCOMPtr<nsILDAPBERValue> mValue;	// the value portion of this control
-  PRBool mIsCritical;      // should server abort if control not understood?
+  bool mIsCritical;      // should server abort if control not understood?
   nsCString mOid;          // Object ID for this control
 };
--- a/ldap/xpcom/src/nsLDAPMessage.cpp
+++ b/ldap/xpcom/src/nsLDAPMessage.cpp
@@ -328,17 +328,17 @@ nsLDAPMessage::GetAttributes(PRUint32 *a
 // if getP is PR_TRUE, we get the attributes by recursing once
 // (without getP set) in order to fill in *attrCount, then allocate
 // and fill in the *aAttributes.  
 // 
 // if getP is PR_FALSE, just fill in *attrCount and return
 // 
 nsresult
 nsLDAPMessage::IterateAttributes(PRUint32 *aAttrCount, char** *aAttributes, 
-                 PRBool getP)
+                 bool getP)
 {
     BerElement *position;
     nsresult rv;
 
     if (!aAttrCount || !aAttributes ) {
         return NS_ERROR_INVALID_POINTER;
     }
 
--- a/ldap/xpcom/src/nsLDAPMessage.h
+++ b/ldap/xpcom/src/nsLDAPMessage.h
@@ -67,17 +67,17 @@ class nsLDAPMessage : public nsILDAPMess
     //
     nsLDAPMessage();
     virtual ~nsLDAPMessage();
 
   protected:
     nsresult IterateAttrErrHandler(PRInt32 aLderrno, PRUint32 *aAttrCount,
                             char** *aAttributes, BerElement *position);
     nsresult IterateAttributes(PRUint32 *aAttrCount, char** *aAttributes,
-                              PRBool getP);
+                              bool getP);
     nsresult Init(nsILDAPConnection *aConnection,
                   LDAPMessage *aMsgHandle);
     LDAPMessage *mMsgHandle; // the message we're wrapping
     nsCOMPtr<nsILDAPOperation> mOperation;  // operation this msg relates to
 
     LDAP *mConnectionHandle; // cached connection this op is on
 
     // since we're caching the connection handle (above), we need to
--- a/ldap/xpcom/src/nsLDAPModification.cpp
+++ b/ldap/xpcom/src/nsLDAPModification.cpp
@@ -123,17 +123,17 @@ nsLDAPModification::SetValues(nsIArray* 
     rv = mValues->Clear();
 
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsISimpleEnumerator> enumerator;
   rv = aValues->Enumerate(getter_AddRefs(enumerator));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  PRBool hasMoreElements;
+  bool hasMoreElements;
   rv = enumerator->HasMoreElements(&hasMoreElements);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsISupports> value;
 
   while (hasMoreElements)
   {
     rv = enumerator->GetNext(getter_AddRefs(value));
--- a/ldap/xpcom/src/nsLDAPOperation.cpp
+++ b/ldap/xpcom/src/nsLDAPOperation.cpp
@@ -378,17 +378,17 @@ convertControlArray(nsIArray *aXpcomArra
         static_cast<LDAPControl **>
                    (PR_Calloc(length+1, sizeof(LDAPControl)));
 
     // prepare to enumerate the array
     nsCOMPtr<nsISimpleEnumerator> enumerator;
     rv = aXpcomArray->Enumerate(getter_AddRefs(enumerator));
     NS_ENSURE_SUCCESS(rv, rv);
 
-    PRBool moreElements;
+    bool moreElements;
     rv = enumerator->HasMoreElements(&moreElements);
     NS_ENSURE_SUCCESS(rv, rv);
 
     PRUint32 i = 0;
     while (moreElements) {
 
         // get the next array element
         nsCOMPtr<nsISupports> isupports;
@@ -892,17 +892,17 @@ nsLDAPOperation::ModifyExt(const nsACStr
 }
 
 // wrappers for ldap_rename
 //
 nsresult
 nsLDAPOperation::Rename(const char *base,
                         const char *newRDn,
                         const char *newParent,
-                        PRBool deleteOldRDn,
+                        bool deleteOldRDn,
                         LDAPControl **serverctrls,
                         LDAPControl **clientctrls)
 {
   if (mMessageListener == 0) {
     NS_ERROR("nsLDAPOperation::Rename(): mMessageListener not set");
     return NS_ERROR_NOT_INITIALIZED;
   }
 
@@ -923,17 +923,17 @@ nsLDAPOperation::Rename(const char *base
  *
  * void rename(in AUTF8String aBaseDn, in AUTF8String aNewRDn,
  *             in AUTF8String aNewParent, in boolean aDeleteOldRDn);
  */
 NS_IMETHODIMP
 nsLDAPOperation::Rename(const nsACString& aBaseDn,
                         const nsACString& aNewRDn,
                         const nsACString& aNewParent,
-                        PRBool aDeleteOldRDn)
+                        bool aDeleteOldRDn)
 {
   PR_LOG(gLDAPLogModule, PR_LOG_DEBUG,
          ("nsLDAPOperation::Rename(): called with aBaseDn = '%s'",
           PromiseFlatCString(aBaseDn).get()));
 
   nsresult rv = Rename(PromiseFlatCString(aBaseDn).get(),
                        PromiseFlatCString(aNewRDn).get(),
                        PromiseFlatCString(aNewParent).get(),
--- a/ldap/xpcom/src/nsLDAPOperation.h
+++ b/ldap/xpcom/src/nsLDAPOperation.h
@@ -105,17 +105,17 @@ class nsLDAPOperation : public nsILDAPOp
     /**
      * wrapper for ldap_rename()
      *
      * XXX should move to idl, once LDAPControls have an IDL representation
      */
     nsresult Rename(const char *base, // base DN to rename
                     const char *newRDn, // new RDN
                     const char *newParent, // DN of the new parent
-                    PRBool deleteOldRDn, // remove old RDN in the entry?
+                    bool deleteOldRDn, // remove old RDN in the entry?
                     LDAPControl **serverctrls,
                     LDAPControl **clientctrls);
 
     /**
      * Helper function to copy the values of an nsILDAPModification into an
      * array of berval's.
      */
     static nsresult CopyValues(nsILDAPModification* aMod, berval*** aBValues);
--- a/ldap/xpcom/src/nsLDAPService.cpp
+++ b/ldap/xpcom/src/nsLDAPService.cpp
@@ -75,17 +75,17 @@ nsLDAPServiceEntry::nsLDAPServiceEntry()
 // destructor
 //
 nsLDAPServiceEntry::~nsLDAPServiceEntry()
 {
 }
 
 // Init function
 //
-PRBool nsLDAPServiceEntry::Init()
+bool nsLDAPServiceEntry::Init()
 {
     return PR_TRUE;
 }
 
 // Set/Get the timestamp when this server was last used. We might have
 // to use an "interval" here instead, see Bug #76887.
 //
 PRTime nsLDAPServiceEntry::GetTimestamp()
@@ -100,17 +100,17 @@ void nsLDAPServiceEntry::SetTimestamp()
 
 // Increment, decrement and Get the leases. This code might go away
 // with bug #75954.
 //
 void nsLDAPServiceEntry::IncrementLeases()
 {
     mLeases++;
 }
-PRBool nsLDAPServiceEntry::DecrementLeases()
+bool nsLDAPServiceEntry::DecrementLeases()
 {
     if (!mLeases) {
         return PR_FALSE;
     }
     mLeases--;
 
     return PR_TRUE;
 }
@@ -123,17 +123,17 @@ PRUint32 nsLDAPServiceEntry::GetLeases()
 //
 already_AddRefed<nsILDAPServer> nsLDAPServiceEntry::GetServer()
 {
     nsILDAPServer *server;
 
     NS_IF_ADDREF(server = mServer);
     return server;
 }
-PRBool nsLDAPServiceEntry::SetServer(nsILDAPServer *aServer)
+bool nsLDAPServiceEntry::SetServer(nsILDAPServer *aServer)
 {
     if (!aServer) {
         return PR_FALSE;
     }
     mServer = aServer;
 
     return PR_TRUE;
 }
@@ -180,41 +180,41 @@ already_AddRefed<nsILDAPMessageListener>
     }
 
     listener = mListeners[0];
     NS_ADDREF(listener); // keep it alive
     mListeners.RemoveObjectAt(0);
 
     return listener;
 }
-PRBool nsLDAPServiceEntry::PushListener(nsILDAPMessageListener *listener)
+bool nsLDAPServiceEntry::PushListener(nsILDAPMessageListener *listener)
 {
-    PRBool ret;
+    bool ret;
     ret = mListeners.InsertObjectAt(listener, mListeners.Count());
 
     return ret;
 }
 
 // Mark this server to currently be rebinding. This is to avoid a
 // race condition where multiple consumers could potentially request
 // to reconnect the connection.
 //
-PRBool nsLDAPServiceEntry::IsRebinding()
+bool nsLDAPServiceEntry::IsRebinding()
 {
     return mRebinding;
 }
-void nsLDAPServiceEntry::SetRebinding(PRBool aState)
+void nsLDAPServiceEntry::SetRebinding(bool aState)
 {
     mRebinding = aState;
 }
 
 // Mark a service entry for deletion, this is "dead" code right now,
 // see bug #75966.
 //
-PRBool nsLDAPServiceEntry::DeleteEntry()
+bool nsLDAPServiceEntry::DeleteEntry()
 {
     mDelete = PR_TRUE;
 
     return PR_TRUE;
 }
 // This is the end of the nsLDAPServiceEntry class
 
 
--- a/ldap/xpcom/src/nsLDAPService.h
+++ b/ldap/xpcom/src/nsLDAPService.h
@@ -61,47 +61,47 @@
 // This is a little "helper" class, we use to store information
 // related to one Service entry (one LDAP server).
 //
 class nsLDAPServiceEntry
 {
   public:
     nsLDAPServiceEntry();
     virtual ~nsLDAPServiceEntry();
-    PRBool Init();
+    bool Init();
 
     inline PRUint32 GetLeases();
     inline void IncrementLeases();
-    inline PRBool DecrementLeases();
+    inline bool DecrementLeases();
 
     inline PRTime GetTimestamp();
     inline void SetTimestamp();
 
     inline already_AddRefed<nsILDAPServer> GetServer();
-    inline PRBool SetServer(nsILDAPServer *aServer);
+    inline bool SetServer(nsILDAPServer *aServer);
 
     inline already_AddRefed<nsILDAPConnection> GetConnection();
     inline void SetConnection(nsILDAPConnection *aConnection);
 
     inline already_AddRefed<nsILDAPMessage> GetMessage();
     inline void SetMessage(nsILDAPMessage *aMessage);
 
     inline already_AddRefed<nsILDAPMessageListener> PopListener();
-    inline PRBool PushListener(nsILDAPMessageListener *);
+    inline bool PushListener(nsILDAPMessageListener *);
 
-    inline PRBool IsRebinding();
-    inline void SetRebinding(PRBool);
+    inline bool IsRebinding();
+    inline void SetRebinding(bool);
 
-    inline PRBool DeleteEntry();
+    inline bool DeleteEntry();
 
   protected:
     PRUint32 mLeases;         // The number of leases currently granted
     PRTime mTimestamp;        // Last time this server was "used"
-    PRBool mDelete;           // This entry is due for deletion
-    PRBool mRebinding;        // Keep state if we are rebinding or not
+    bool mDelete;           // This entry is due for deletion
+    bool mRebinding;        // Keep state if we are rebinding or not
 
     nsCOMPtr<nsILDAPServer> mServer;
     nsCOMPtr<nsILDAPConnection> mConnection;
     nsCOMPtr<nsILDAPMessage> mMessage;
 
     // Array holding all the pending callbacks (listeners) for this entry
     nsCOMArray<nsILDAPMessageListener> mListeners;  
 };
--- a/ldap/xpcom/src/nsLDAPSyncQuery.h
+++ b/ldap/xpcom/src/nsLDAPSyncQuery.h
@@ -64,17 +64,17 @@ class nsLDAPSyncQuery : public nsILDAPSy
     nsLDAPSyncQuery();
     virtual ~nsLDAPSyncQuery();
 
   protected:
 
     nsCOMPtr<nsILDAPConnection> mConnection; // connection used for search
     nsCOMPtr<nsILDAPOperation> mOperation;   // current ldap op
     nsCOMPtr<nsILDAPURL> mServerURL;         // LDAP URL
-    PRBool mFinished;                        // control variable for eventQ
+    bool mFinished;                        // control variable for eventQ
     nsString mResults;                       // values to return
     PRUint32 mProtocolVersion;               // LDAP version to use
 
     nsresult InitConnection();
     // check that we bound ok and start then call StartLDAPSearch
     nsresult OnLDAPBind(nsILDAPMessage *aMessage); 
 
     // add to the results set
--- a/ldap/xpcom/src/nsLDAPURL.cpp
+++ b/ldap/xpcom/src/nsLDAPURL.cpp
@@ -370,17 +370,17 @@ NS_IMETHODIMP nsLDAPURL::GetOriginCharse
   if (!mBaseURL)
     return NS_ERROR_NOT_INITIALIZED;
 
   return mBaseURL->GetOriginCharset(result);
 }
 
 // boolean equals (in nsIURI other)
 // (based on nsSimpleURI::Equals)
-NS_IMETHODIMP nsLDAPURL::Equals(nsIURI *other, PRBool *_retval)
+NS_IMETHODIMP nsLDAPURL::Equals(nsIURI *other, bool *_retval)
 {
   *_retval = PR_FALSE;
   if (other)
   {
     nsresult rv;
     nsCOMPtr<nsILDAPURL> otherURL(do_QueryInterface(other, &rv));
     if (NS_SUCCEEDED(rv))
     {
@@ -400,17 +400,17 @@ NS_IMETHODIMP nsLDAPURL::Equals(nsIURI *
         *_retval = PR_TRUE;
     }
   }
   return NS_OK;
 }
 
 // boolean schemeIs(in const char * scheme);
 //
-NS_IMETHODIMP nsLDAPURL::SchemeIs(const char *aScheme, PRBool *aEquals)
+NS_IMETHODIMP nsLDAPURL::SchemeIs(const char *aScheme, bool *aEquals)
 {
   if (!mBaseURL)
     return NS_ERROR_NOT_INITIALIZED;
 
   return mBaseURL->SchemeIs(aScheme, aEquals);
 }
 
 // nsIURI clone ();
@@ -597,17 +597,17 @@ NS_IMETHODIMP nsLDAPURL::RemoveAttribute
   nsCString newPath;
   GetPathInternal(newPath);
 
   // and update the base url
   return mBaseURL->SetPath(newPath);
 }
 
 NS_IMETHODIMP nsLDAPURL::HasAttribute(const nsACString &aAttribute,
-                                      PRBool *_retval)
+                                      bool *_retval)
 {
   NS_ENSURE_ARG_POINTER(_retval);
 
   nsCAutoString findAttribute(',');
   findAttribute.Append(aAttribute);
   findAttribute.Append(',');
 
   *_retval = mAttributes.Find(findAttribute, CaseInsensitiveCompare) != -1;
@@ -691,17 +691,17 @@ NS_IMETHODIMP nsLDAPURL::SetRef(const ns
 }
 
 NS_IMETHODIMP
 nsLDAPURL::GetRef(nsACString &result)
 {
   return mBaseURL->GetRef(result);
 }
 
-NS_IMETHODIMP nsLDAPURL::EqualsExceptRef(nsIURI *other, PRBool *result)
+NS_IMETHODIMP nsLDAPURL::EqualsExceptRef(nsIURI *other, bool *result)
 {
   return mBaseURL->EqualsExceptRef(other, result);
 }
 
 NS_IMETHODIMP
 nsLDAPURL::CloneIgnoringRef(nsIURI** result)
 {
   return mBaseURL->CloneIgnoringRef(result);
@@ -709,12 +709,12 @@ nsLDAPURL::CloneIgnoringRef(nsIURI** res
 
 NS_IMETHODIMP
 nsLDAPURL::GetSpecIgnoringRef(nsACString &result)
 {
   return mBaseURL->GetSpecIgnoringRef(result);
 }
 
 NS_IMETHODIMP
-nsLDAPURL::GetHasRef(PRBool *result)
+nsLDAPURL::GetHasRef(bool *result)
 {
   return mBaseURL->GetHasRef(result);
 }
--- a/mail/components/migration/src/nsEudoraProfileMigrator.cpp
+++ b/mail/components/migration/src/nsEudoraProfileMigrator.cpp
@@ -123,27 +123,27 @@ nsEudoraProfileMigrator::Migrate(PRUint1
   rv = ImportAddressBook(mImportModule);
 
   // don't broadcast an on end migration here. We aren't done until our asynch import process says we are done.
   return rv;
 }
 
 NS_IMETHODIMP
 nsEudoraProfileMigrator::GetMigrateData(const PRUnichar* aProfile,
-                                           PRBool aReplace,
+                                           bool aReplace,
                                            PRUint16* aResult)
 {
   // There's no harm in assuming everything is available.
   *aResult = nsIMailProfileMigrator::ACCOUNT_SETTINGS | nsIMailProfileMigrator::ADDRESSBOOK_DATA |
              nsIMailProfileMigrator::MAILDATA | nsIMailProfileMigrator::FILTERS;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsEudoraProfileMigrator::GetSourceExists(PRBool* aResult)
+nsEudoraProfileMigrator::GetSourceExists(bool* aResult)
 {
   *aResult = PR_FALSE;
 
   nsCOMPtr<nsIImportSettings> importSettings;
   mImportModule->GetImportInterface(NS_IMPORT_SETTINGS_STR, getter_AddRefs(importSettings));
 
   if (importSettings)
   {
@@ -151,17 +151,17 @@ nsEudoraProfileMigrator::GetSourceExists
     nsCOMPtr<nsIFile> location;
     importSettings->AutoLocate(getter_Copies(description), getter_AddRefs(location), aResult);
   }
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsEudoraProfileMigrator::GetSourceHasMultipleProfiles(PRBool* aResult)
+nsEudoraProfileMigrator::GetSourceHasMultipleProfiles(bool* aResult)
 {
   *aResult = PR_FALSE;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsEudoraProfileMigrator::GetSourceProfiles(nsIArray** aResult)
 {
--- a/mail/components/migration/src/nsMailProfileMigratorUtils.cpp
+++ b/mail/components/migration/src/nsMailProfileMigratorUtils.cpp
@@ -85,21 +85,21 @@ void ParseOverrideServers(const char* aS
       break;
     left = right + 1;
     override.Replace(right, 1, NS_LITERAL_CSTRING(","));
   }
   aBranch->SetCharPref("network.proxy.no_proxies_on", override.get());
 }
 
 void GetMigrateDataFromArray(MigrationData* aDataArray, PRInt32 aDataArrayLength,
-                             PRBool aReplace, nsIFile* aSourceProfile,
+                             bool aReplace, nsIFile* aSourceProfile,
                              PRUint16* aResult)
 {
   nsCOMPtr<nsIFile> sourceFile;
-  PRBool exists;
+  bool exists;
   MigrationData* cursor;
   MigrationData* end = aDataArray + aDataArrayLength;
   for (cursor = aDataArray; cursor < end && cursor->fileName; ++cursor) {
     // When in replace mode, all items can be imported.
     // When in non-replace mode, only items that do not require file replacement
     // can be imported.
     if (aReplace || !cursor->replaceOnly) {
       aSourceProfile->Clone(getter_AddRefs(sourceFile));
--- a/mail/components/migration/src/nsMailProfileMigratorUtils.h
+++ b/mail/components/migration/src/nsMailProfileMigratorUtils.h
@@ -65,23 +65,23 @@ class nsIProfileStartup;
 // Proxy utilities shared by the Opera and IE migrators
 void ParseOverrideServers(const char* aServers, nsIPrefBranch* aBranch);
 void SetProxyPref(const nsACString& aHostPort, const char* aPref, 
                   const char* aPortPref, nsIPrefBranch* aPrefs);
 
 struct MigrationData { 
   PRUnichar* fileName; 
   PRUint32 sourceFlag;
-  PRBool replaceOnly;
+  bool replaceOnly;
 };
 
 class nsILocalFile;
 void GetMigrateDataFromArray(MigrationData* aDataArray, 
                              PRInt32 aDataArrayLength,
-                             PRBool aReplace,
+                             bool aReplace,
                              nsIFile* aSourceProfile, 
                              PRUint16* aResult);
 
 
 // get the base directory of the *target* profile
 // this is already cloned, modify it to your heart's content
 void GetProfilePath(nsIProfileStartup* aStartup, nsCOMPtr<nsIFile>& aProfileDir);
 
--- a/mail/components/migration/src/nsNetscapeProfileMigratorBase.cpp
+++ b/mail/components/migration/src/nsNetscapeProfileMigratorBase.cpp
@@ -98,29 +98,29 @@ nsNetscapeProfileMigratorBase::GetProfil
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsILocalFile> profileIni(do_QueryInterface(dataDir, &rv));
   NS_ENSURE_SUCCESS(rv, rv);
 
   profileIni->Append(NS_LITERAL_STRING("profiles.ini"));
 
   // Does it exist?
-  PRBool profileFileExists = PR_FALSE;
+  bool profileFileExists = false;
   rv = profileIni->Exists(&profileFileExists);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (!profileFileExists)
     return NS_ERROR_FILE_NOT_FOUND;
 
   nsINIParser parser;
   rv = parser.Init(profileIni);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCAutoString buffer, filePath;
-  PRBool isRelative;
+  bool isRelative;
 
   // This is an infinite loop that is broken when we no longer find profiles
   // for profileID with IsRelative option.
   for (unsigned int c = 0; PR_TRUE; ++c) {
     nsCAutoString profileID("Profile");
     profileID.AppendInt(c);
 
     if (NS_FAILED(parser.GetString(profileID.get(), "IsRelative", buffer)))
@@ -144,17 +144,17 @@ nsNetscapeProfileMigratorBase::GetProfil
     rv = NS_NewNativeLocalFile(EmptyCString(), PR_TRUE, getter_AddRefs(rootDir));
     NS_ENSURE_SUCCESS(rv, rv);
 
     rv = isRelative ? rootDir->SetRelativeDescriptor(aDataDir, filePath) :
                       rootDir->SetPersistentDescriptor(filePath);
     if (NS_FAILED(rv))
       continue;
 
-    PRBool exists = PR_FALSE;
+    bool exists = false;
     rootDir->Exists(&exists);
 
     if (exists) {
       aProfileLocations->AppendElement(rootDir, PR_FALSE);
 
       nsCOMPtr<nsISupportsString> profileNameString(
         do_CreateInstance("@mozilla.org/supports-string;1"));
 
@@ -168,17 +168,17 @@ nsNetscapeProfileMigratorBase::GetProfil
 nsresult
 nsNetscapeProfileMigratorBase::GetProfileDataFromRegistry(nsILocalFile* aRegistryFile,
                                                           nsIMutableArray* aProfileNames,
                                                           nsIMutableArray* aProfileLocations)
 {
   REGERR errCode;
 
   // Ensure aRegistryFile exists before opening it
-  PRBool regFileExists = PR_FALSE;
+  bool regFileExists = false;
   nsresult rv = aRegistryFile->Exists(&regFileExists);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (!regFileExists)
     return NS_ERROR_FILE_NOT_FOUND;
 
   // Open It
   nsCAutoString regPath;
@@ -243,17 +243,17 @@ nsNetscapeProfileMigratorBase::GetProfil
     if (NS_FAILED(rv)) break;
     dir->SetPersistentDescriptor(dirStr);
 #else
     rv = NS_NewLocalFile(NS_ConvertUTF8toUTF16(dirStr), PR_TRUE,
                          getter_AddRefs(dir));
     if (NS_FAILED(rv)) break;
 #endif
 
-    PRBool exists;
+    bool exists;
     dir->Exists(&exists);
 
     if (exists) {
       aProfileLocations->AppendElement(dir, PR_FALSE);
 
       // Add the profile name to the names array
       nsCOMPtr<nsISupportsString> profileNameString(
         do_CreateInstance("@mozilla.org/supports-string;1"));
@@ -330,34 +330,34 @@ nsNetscapeProfileMigratorBase::SetInt(Pr
 
 nsresult
 nsNetscapeProfileMigratorBase::CopyFile(const nsAString& aSourceFileName, const nsAString& aTargetFileName)
 {
   nsCOMPtr<nsIFile> sourceFile;
   mSourceProfile->Clone(getter_AddRefs(sourceFile));
 
   sourceFile->Append(aSourceFileName);
-  PRBool exists = PR_FALSE;
+  bool exists = false;
   sourceFile->Exists(&exists);
   if (!exists)
     return NS_OK;
 
   nsCOMPtr<nsIFile> targetFile;
   mTargetProfile->Clone(getter_AddRefs(targetFile));
 
   targetFile->Append(aTargetFileName);
   targetFile->Exists(&exists);
   if (exists)
     targetFile->Remove(PR_FALSE);
 
   return sourceFile->CopyTo(mTargetProfile, aTargetFileName);
 }
 
 nsresult
-nsNetscapeProfileMigratorBase::GetSignonFileName(PRBool aReplace, char** aFileName)
+nsNetscapeProfileMigratorBase::GetSignonFileName(bool aReplace, char** aFileName)
 {
   nsresult rv;
   if (aReplace) {
     // Find out what the signons file was called, this is stored in a pref
     // in Seamonkey.
     nsCOMPtr<nsIPrefService> psvc(do_GetService(NS_PREFSERVICE_CONTRACTID));
     psvc->ResetPrefs();
 
@@ -378,17 +378,17 @@ nsresult
 nsNetscapeProfileMigratorBase::LocateSignonsFile(char** aResult)
 {
   nsCOMPtr<nsISimpleEnumerator> entries;
   nsresult rv = mSourceProfile->GetDirectoryEntries(getter_AddRefs(entries));
   if (NS_FAILED(rv)) return rv;
 
   nsCAutoString fileName;
   do {
-    PRBool hasMore = PR_FALSE;
+    bool hasMore = false;
     rv = entries->HasMoreElements(&hasMore);
     if (NS_FAILED(rv) || !hasMore) break;
 
     nsCOMPtr<nsISupports> supp;
     rv = entries->GetNext(getter_AddRefs(supp));
     if (NS_FAILED(rv)) break;
 
     nsCOMPtr<nsIFile> currFile(do_QueryInterface(supp));
@@ -421,29 +421,29 @@ nsNetscapeProfileMigratorBase::LocateSig
 }
 
 // helper function, copies the contents of srcDir into destDir.
 // destDir will be created if it doesn't exist.
 
 nsresult nsNetscapeProfileMigratorBase::RecursiveCopy(nsIFile* srcDir, nsIFile* destDir)
 {
   nsresult rv;
-  PRBool isDir;
+  bool isDir;
 
   rv = srcDir->IsDirectory(&isDir);
   if (NS_FAILED(rv)) return rv;
   if (!isDir) return NS_ERROR_INVALID_ARG;
 
-  PRBool exists;
+  bool exists;
   rv = destDir->Exists(&exists);
   if (NS_SUCCEEDED(rv) && !exists)
     rv = destDir->Create(nsIFile::DIRECTORY_TYPE, 0775);
   if (NS_FAILED(rv)) return rv;
 
-  PRBool hasMore = PR_FALSE;
+  bool hasMore = false;
   nsCOMPtr<nsISimpleEnumerator> dirIterator;
   rv = srcDir->GetDirectoryEntries(getter_AddRefs(dirIterator));
   if (NS_FAILED(rv)) return rv;
 
   rv = dirIterator->HasMoreElements(&hasMore);
   if (NS_FAILED(rv)) return rv;
 
   nsCOMPtr<nsIFile> dirEntry;
@@ -550,34 +550,34 @@ void nsNetscapeProfileMigratorBase::EndC
   nsAutoString index;
   index.AppendInt(nsIMailProfileMigrator::MAILDATA);
   NOTIFY_OBSERVERS(MIGRATION_ITEMAFTERMIGRATE, index.get());
 
   NOTIFY_OBSERVERS(MIGRATION_ENDED, nsnull);
 }
 
 NS_IMETHODIMP
-nsNetscapeProfileMigratorBase::GetSourceHasMultipleProfiles(PRBool* aResult)
+nsNetscapeProfileMigratorBase::GetSourceHasMultipleProfiles(bool* aResult)
 {
   nsCOMPtr<nsIArray> profiles;
   GetSourceProfiles(getter_AddRefs(profiles));
 
   if (profiles) {
     PRUint32 count;
     profiles->GetLength(&count);
     *aResult = count > 1;
   }
   else
     *aResult = PR_FALSE;
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsNetscapeProfileMigratorBase::GetSourceExists(PRBool* aResult)
+nsNetscapeProfileMigratorBase::GetSourceExists(bool* aResult)
 {
   nsCOMPtr<nsIArray> profiles;
   GetSourceProfiles(getter_AddRefs(profiles));
 
   if (profiles) {
     PRUint32 count;
     profiles->GetLength(&count);
     *aResult = count > 0;
--- a/mail/components/migration/src/nsNetscapeProfileMigratorBase.h
+++ b/mail/components/migration/src/nsNetscapeProfileMigratorBase.h
@@ -70,42 +70,42 @@ class nsNetscapeProfileMigratorBase : pu
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSITIMERCALLBACK
 
   nsNetscapeProfileMigratorBase();
   virtual ~nsNetscapeProfileMigratorBase() { };
 
-  NS_IMETHOD GetSourceHasMultipleProfiles(PRBool* aResult);
-  NS_IMETHOD GetSourceExists(PRBool* aResult);
+  NS_IMETHOD GetSourceHasMultipleProfiles(bool* aResult);
+  NS_IMETHOD GetSourceExists(bool* aResult);
 
   struct PrefTransform;
   typedef nsresult(*prefConverter)(PrefTransform*, nsIPrefBranch*);
 
   struct PrefTransform {
     const char*   sourcePrefName;
     const char*   targetPrefName;
     prefConverter prefGetterFunc;
     prefConverter prefSetterFunc;
-    PRBool        prefHasValue;
+    bool          prefHasValue;
     union {
       PRInt32     intValue;
-      PRBool      boolValue;
+      bool        boolValue;
       char*       stringValue;
     };
   };
 
   struct PrefBranchStruct {
     char*         prefName;
     PRInt32       type;
     union {
       char*       stringValue;
       PRInt32     intValue;
-      PRBool      boolValue;
+      bool        boolValue;
     };
   };
 
   typedef nsTArray<PrefBranchStruct*> PBStructArray;
 
   static nsresult GetString(PrefTransform* aTransform, nsIPrefBranch* aBranch);
   static nsresult SetString(PrefTransform* aTransform, nsIPrefBranch* aBranch);
   static nsresult GetBool(PrefTransform* aTransform, nsIPrefBranch* aBranch);
@@ -123,17 +123,17 @@ protected:
                                          nsIMutableArray* aProfileNames,
                                          nsIMutableArray* aProfileLocations);
   nsresult GetProfileDataFromRegistry(nsILocalFile* aRegistryFile,
                                       nsIMutableArray* aProfileNames,
                                       nsIMutableArray* aProfileLocations);
 
   nsresult CopyFile(const nsAString& aSourceFileName, const nsAString& aTargetFileName);
 
-  nsresult GetSignonFileName(PRBool aReplace, char** aFileName);
+  nsresult GetSignonFileName(bool aReplace, char** aFileName);
   nsresult LocateSignonsFile(char** aResult);
 
   nsCOMPtr<nsILocalFile> mSourceProfile;
   nsCOMPtr<nsIFile> mTargetProfile;
 
   // List of src/destination files we still have to copy into the new profile
   // directory.
   nsTArray<fileTransactionEntry> mFileCopyTransactions;
--- a/mail/components/migration/src/nsOEProfileMigrator.cpp
+++ b/mail/components/migration/src/nsOEProfileMigrator.cpp
@@ -119,27 +119,27 @@ nsOEProfileMigrator::Migrate(PRUint16 aI
   rv = ImportAddressBook(mImportModule);
 
   // don't broadcast an on end migration here. We aren't done until our asynch import process says we are done.
   return rv;
 }
 
 NS_IMETHODIMP
 nsOEProfileMigrator::GetMigrateData(const PRUnichar* aProfile,
-                                           PRBool aReplace,
+                                           bool aReplace,
                                            PRUint16* aResult)
 {
   // There's no harm in assuming everything is available.
   *aResult = nsIMailProfileMigrator::ACCOUNT_SETTINGS | nsIMailProfileMigrator::ADDRESSBOOK_DATA |
              nsIMailProfileMigrator::MAILDATA;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsOEProfileMigrator::GetSourceExists(PRBool* aResult)
+nsOEProfileMigrator::GetSourceExists(bool* aResult)
 {
   *aResult = PR_FALSE;
 
   nsCOMPtr<nsIImportSettings> importSettings;
   mImportModule->GetImportInterface(NS_IMPORT_SETTINGS_STR, getter_AddRefs(importSettings));
 
   if (importSettings)
   {
@@ -147,17 +147,17 @@ nsOEProfileMigrator::GetSourceExists(PRB
     nsCOMPtr<nsIFile> location;
     importSettings->AutoLocate(getter_Copies(description), getter_AddRefs(location), aResult);
   }
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsOEProfileMigrator::GetSourceHasMultipleProfiles(PRBool* aResult)
+nsOEProfileMigrator::GetSourceHasMultipleProfiles(bool* aResult)
 {
   *aResult = PR_FALSE;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsOEProfileMigrator::GetSourceProfiles(nsIArray** aResult)
 {
--- a/mail/components/migration/src/nsOutlookProfileMigrator.cpp
+++ b/mail/components/migration/src/nsOutlookProfileMigrator.cpp
@@ -114,26 +114,26 @@ nsOutlookProfileMigrator::Migrate(PRUint
   // the final migration step, copying the mail folders over.
   rv = ImportAddressBook(mImportModule);
 
   // don't broadcast an on end migration here. We aren't done until our asynch import process says we are done.
   return rv;
 }
 
 NS_IMETHODIMP
-nsOutlookProfileMigrator::GetMigrateData(const PRUnichar* aProfile, PRBool aReplace, PRUint16* aResult)
+nsOutlookProfileMigrator::GetMigrateData(const PRUnichar* aProfile, bool aReplace, PRUint16* aResult)
 {
   // There's no harm in assuming everything is available.
   *aResult = nsIMailProfileMigrator::ACCOUNT_SETTINGS | nsIMailProfileMigrator::ADDRESSBOOK_DATA |
              nsIMailProfileMigrator::MAILDATA;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsOutlookProfileMigrator::GetSourceExists(PRBool* aResult)
+nsOutlookProfileMigrator::GetSourceExists(bool* aResult)
 {
   *aResult = PR_FALSE;
 
   nsCOMPtr<nsIImportSettings> importSettings;
   mImportModule->GetImportInterface(NS_IMPORT_SETTINGS_STR, getter_AddRefs(importSettings));
 
   if (importSettings)
   {
@@ -141,17 +141,17 @@ nsOutlookProfileMigrator::GetSourceExist
     nsCOMPtr<nsIFile> location;
     importSettings->AutoLocate(getter_Copies(description), getter_AddRefs(location), aResult);
   }
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsOutlookProfileMigrator::GetSourceHasMultipleProfiles(PRBool* aResult)
+nsOutlookProfileMigrator::GetSourceHasMultipleProfiles(bool* aResult)
 {
   *aResult = PR_FALSE;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsOutlookProfileMigrator::GetSourceProfiles(nsIArray** aResult)
 {
--- a/mail/components/migration/src/nsProfileMigrator.cpp
+++ b/mail/components/migration/src/nsProfileMigrator.cpp
@@ -132,17 +132,17 @@ nsProfileMigrator::GetDefaultMailMigrato
 
   // if we are being forced to migrate to a particular migration type, then create an instance of that migrator
   // and return it.
   NS_NAMED_LITERAL_CSTRING(migratorPrefix,
                            NS_MAILPROFILEMIGRATOR_CONTRACTID_PREFIX);
   nsCAutoString migratorID;
   if (!forceMigrationType.IsEmpty())
   {
-    PRBool exists = PR_FALSE;
+    bool exists = false;
     migratorID = migratorPrefix;
     migratorID.Append(forceMigrationType);
     mailMigrator = do_CreateInstance(migratorID.get());
     if (!mailMigrator)
       return NS_ERROR_NOT_AVAILABLE;
 
     mailMigrator->GetSourceExists(&exists);
     /* trying to force migration on a source which doesn't
@@ -165,17 +165,17 @@ nsProfileMigrator::GetDefaultMailMigrato
   for (PRUint32 i = 0; sources[i][0]; ++i)
   {
     migratorID = migratorPrefix;
     migratorID.Append(sources[i]);
     mailMigrator = do_CreateInstance(migratorID.get());
     if (!mailMigrator)
       continue;
 
-    PRBool exists = PR_FALSE;
+    bool exists = false;
     mailMigrator->GetSourceExists(&exists);
     if (exists)
     {
       mailMigrator = nsnull;
       return NS_OK;
     }
   }
 
@@ -186,17 +186,17 @@ NS_IMETHODIMP
 nsProfileMigrator::Import()
 {
   if (ImportRegistryProfiles(NS_LITERAL_CSTRING("Thunderbird")))
     return NS_OK;
 
   return NS_ERROR_FAILURE;
 }
 
-PRBool
+bool
 nsProfileMigrator::ImportRegistryProfiles(const nsACString& aAppName)
 {
   nsresult rv;
 
   nsCOMPtr<nsIToolkitProfileService> profileSvc
     (do_GetService(NS_PROFILESERVICE_CONTRACTID));
   NS_ENSURE_TRUE(profileSvc, PR_FALSE);
 
@@ -243,17 +243,17 @@ nsProfileMigrator::ImportRegistryProfile
 
   nsCAutoString path;
   rv = regFile->GetNativePath(path);
   NS_ENSURE_SUCCESS(rv, PR_FALSE);
 
   if (NR_StartupRegistry())
     return PR_FALSE;
 
-  PRBool migrated = PR_FALSE;
+  bool migrated = false;
   HREG reg = nsnull;
   RKEY profiles = 0;
   REGENUM enumstate = 0;
   char profileName[MAXREGNAMELEN];
 
   if (NR_RegOpen(path.get(), &reg))
     goto cleanup;
 
--- a/mail/components/migration/src/nsProfileMigrator.h
+++ b/mail/components/migration/src/nsProfileMigrator.h
@@ -63,10 +63,10 @@ protected:
   ~nsProfileMigrator() { };
 
   nsresult GetDefaultMailMigratorKey(nsACString& key, nsCOMPtr<nsIMailProfileMigrator>& mailMigrator);
 
   /**
    * Import profiles from ~/.thunderbird/ 
    * @return PR_TRUE if any profiles imported.
    */
-  PRBool ImportRegistryProfiles(const nsACString& aAppName);
+  bool ImportRegistryProfiles(const nsACString& aAppName);
 };
--- a/mail/components/migration/src/nsProfileMigratorBase.cpp
+++ b/mail/components/migration/src/nsProfileMigratorBase.cpp
@@ -65,17 +65,17 @@ nsresult nsProfileMigratorBase::ImportSe
   nsAutoString index;
   index.AppendInt(nsIMailProfileMigrator::ACCOUNT_SETTINGS);
   NOTIFY_OBSERVERS(MIGRATION_ITEMBEFOREMIGRATE, index.get());
 
   nsCOMPtr<nsIImportSettings> importSettings;
   rv = aImportModule->GetImportInterface(NS_IMPORT_SETTINGS_STR, getter_AddRefs(importSettings));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  PRBool importedSettings = PR_FALSE;
+  bool importedSettings = false;
 
   rv = importSettings->Import(getter_AddRefs(mLocalFolderAccount), &importedSettings);
 
   NOTIFY_OBSERVERS(MIGRATION_ITEMAFTERMIGRATE, index.get());
 
   return rv;
 }
 
@@ -92,18 +92,18 @@ nsresult nsProfileMigratorBase::ImportAd
 
   nsCOMPtr<nsISupportsCString> pabString = do_CreateInstance(NS_SUPPORTS_CSTRING_CONTRACTID, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // we want to migrate the outlook express addressbook into our personal address book
   pabString->SetData(nsDependentCString(kPersonalAddressbookUri));
   mGenericImporter->SetData("addressDestination", pabString);
 
-  PRBool importResult;
-  PRBool wantsProgress;
+  bool importResult;
+  bool wantsProgress;
   mGenericImporter->WantsProgress(&wantsProgress);
   rv = mGenericImporter->BeginImport(nsnull, nsnull, &importResult);
 
   if (wantsProgress)
     ContinueImport();
   else
     FinishCopyingAddressBookData();
 
@@ -136,18 +136,18 @@ nsresult nsProfileMigratorBase::ImportMa
   nsCOMPtr<nsISupportsPRBool> migrating = do_CreateInstance(NS_SUPPORTS_PRBOOL_CONTRACTID, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // by setting the migration flag, we force the import utility to install local folders from OE
   // directly into Local Folders and not as a subfolder
   migrating->SetData(PR_TRUE);
   mGenericImporter->SetData("migration", migrating);
 
-  PRBool importResult;
-  PRBool wantsProgress;
+  bool importResult;
+  bool wantsProgress;
   mGenericImporter->WantsProgress(&wantsProgress);
   rv = mGenericImporter->BeginImport(nsnull, nsnull, &importResult);
 
   mProcessingMailFolders = PR_TRUE;
 
   if (wantsProgress)
     ContinueImport();
   else
@@ -174,17 +174,17 @@ nsresult nsProfileMigratorBase::ImportFi
   nsresult rv2 = aImportModule->GetImportInterface(NS_IMPORT_FILTERS_STR, getter_AddRefs(importFilters));
 
   if (NS_SUCCEEDED(rv2))
   {
     nsAutoString index;
     index.AppendInt(nsIMailProfileMigrator::FILTERS);
     NOTIFY_OBSERVERS(MIGRATION_ITEMBEFOREMIGRATE, index.get());
 
-    PRBool importedFilters = PR_FALSE;
+    bool importedFilters = false;
     PRUnichar* error;
 
     rv = importFilters->Import(&error, &importedFilters);
 
     NOTIFY_OBSERVERS(MIGRATION_ITEMAFTERMIGRATE, index.get());
   }
 
   // migration is now done...notify the UI.
--- a/mail/components/migration/src/nsProfileMigratorBase.h
+++ b/mail/components/migration/src/nsProfileMigratorBase.h
@@ -62,12 +62,12 @@ protected:
   nsresult FinishCopyingAddressBookData();
   nsresult FinishCopyingMailFolders();
 
   nsCOMPtr<nsIObserverService> mObserverService;
   nsCOMPtr<nsITimer> mFileIOTimer;
   nsCOMPtr<nsIImportGeneric> mGenericImporter;
   nsCOMPtr<nsIImportModule> mImportModule;
   nsCOMPtr<nsIMsgAccount> mLocalFolderAccount; // needed for nsIImportSettings::Import
-  PRBool mProcessingMailFolders; // we are either asynchronously parsing address books or mail folders
+  bool mProcessingMailFolders; // we are either asynchronously parsing address books or mail folders
 };
 
 #endif
--- a/mail/components/migration/src/nsSeamonkeyProfileMigrator.cpp
+++ b/mail/components/migration/src/nsSeamonkeyProfileMigrator.cpp
@@ -67,17 +67,17 @@
 #define FILE_NAME_USER_PREFS      NS_LITERAL_STRING("user.js")
 
 struct PrefBranchStruct {
   char*         prefName;
   PRInt32       type;
   union {
     char*       stringValue;
     PRInt32     intValue;
-    PRBool      boolValue;
+    bool        boolValue;
     PRUnichar*  wstringValue;
   };
 };
 
 NS_IMPL_ISUPPORTS2(nsSeamonkeyProfileMigrator, nsIMailProfileMigrator, nsITimerCallback)
 
 
 nsSeamonkeyProfileMigrator::nsSeamonkeyProfileMigrator()
@@ -90,17 +90,17 @@ nsSeamonkeyProfileMigrator::~nsSeamonkey
 
 ///////////////////////////////////////////////////////////////////////////////
 // nsIMailProfileMigrator
 
 NS_IMETHODIMP
 nsSeamonkeyProfileMigrator::Migrate(PRUint16 aItems, nsIProfileStartup* aStartup, const PRUnichar* aProfile)
 {
   nsresult rv = NS_OK;
-  PRBool aReplace = aStartup ? PR_TRUE : PR_FALSE;
+  bool aReplace = aStartup ? true : false;
 
   if (!mTargetProfile) {
     GetProfilePath(aStartup, mTargetProfile);
     if (!mTargetProfile) return NS_ERROR_FAILURE;
   }
   if (!mSourceProfile) {
     GetSourceProfile(aProfile);
     if (!mSourceProfile)
@@ -139,17 +139,17 @@ nsSeamonkeyProfileMigrator::Migrate(PRUi
 
   CopyNextFolder();
 
   return rv;
 }
 
 NS_IMETHODIMP
 nsSeamonkeyProfileMigrator::GetMigrateData(const PRUnichar* aProfile,
-                                           PRBool aReplace,
+                                           bool aReplace,
                                            PRUint16* aResult)
 {
   *aResult = 0;
 
   if (!mSourceProfile) {
     GetSourceProfile(aProfile);
     if (!mSourceProfile)
       return NS_ERROR_FILE_NOT_FOUND;
@@ -173,17 +173,17 @@ nsSeamonkeyProfileMigrator::GetMigrateDa
 
   if (!signonsFileName.IsEmpty()) {
     nsAutoString fileName;
     CopyASCIItoUTF16(signonsFileName, fileName);
     nsCOMPtr<nsIFile> sourcePasswordsFile;
     mSourceProfile->Clone(getter_AddRefs(sourcePasswordsFile));
     sourcePasswordsFile->Append(fileName);
 
-    PRBool exists;
+    bool exists;
     sourcePasswordsFile->Exists(&exists);
     if (exists)
       *aResult |= nsIMailProfileMigrator::PASSWORDS;
   }
 
   // add some extra migration fields for things we also migrate
   *aResult |= nsIMailProfileMigrator::ACCOUNT_SETTINGS
            | nsIMailProfileMigrator::MAILDATA
@@ -488,17 +488,17 @@ nsSeamonkeyProfileMigrator::CopySignatur
         do_CreateInstance(NS_LOCAL_FILE_CONTRACTID);
       srcSigFile->SetPersistentDescriptor(nsDependentCString(pref->stringValue));
 
       nsCOMPtr<nsIFile> targetSigFile;
       rv = mTargetProfile->Clone(getter_AddRefs(targetSigFile));
       NS_ENSURE_SUCCESS(rv, rv);
 
       // now make the copy
-      PRBool exists;
+      bool exists;
       srcSigFile->Exists(&exists);
       if (exists)
       {
         nsAutoString leafName;
         srcSigFile->GetLeafName(leafName);
         srcSigFile->CopyTo(targetSigFile,leafName); // will fail if we've already copied a sig file here
         targetSigFile->Append(leafName);
 
@@ -614,17 +614,17 @@ nsSeamonkeyProfileMigrator::CopyMailFold
       mTargetProfile->Clone(getter_AddRefs(targetNewsRCFile));
       targetNewsRCFile->Append(NEWS_DIR_50_NAME);
 
       // turn the pref into a nsILocalFile
       nsCOMPtr<nsILocalFile> srcNewsRCFile = do_CreateInstance(NS_LOCAL_FILE_CONTRACTID);
       srcNewsRCFile->SetPersistentDescriptor(nsDependentCString(pref->stringValue));
 
       // now make the copy
-      PRBool exists;
+      bool exists;
       srcNewsRCFile->Exists(&exists);
       if (exists)
       {
         nsAutoString leafName;
         srcNewsRCFile->GetLeafName(leafName);
         srcNewsRCFile->CopyTo(targetNewsRCFile,leafName); // will fail if we've already copied a newsrc file here
         targetNewsRCFile->Append(leafName);
 
@@ -637,17 +637,17 @@ nsSeamonkeyProfileMigrator::CopyMailFold
       }
     }
   }
 
   return NS_OK;
 }
 
 nsresult
-nsSeamonkeyProfileMigrator::CopyPreferences(PRBool aReplace)
+nsSeamonkeyProfileMigrator::CopyPreferences(bool aReplace)
 {
   nsresult rv = NS_OK;
   if (!aReplace)
     return rv;
 
   rv |= TransformPreferences(FILE_NAME_PREFS, FILE_NAME_PREFS);
   rv |= CopyFile(FILE_NAME_USER_PREFS, FILE_NAME_USER_PREFS);
 
@@ -741,30 +741,30 @@ nsSeamonkeyProfileMigrator::WriteBranch(
     NS_Free(pref->prefName);
     pref->prefName = nsnull;
     delete pref;
     pref = nsnull;
   }
   aPrefs.Clear();
 }
 
-nsresult nsSeamonkeyProfileMigrator::DummyCopyRoutine(PRBool aReplace)
+nsresult nsSeamonkeyProfileMigrator::DummyCopyRoutine(bool aReplace)
 {
   // place holder function only to fake the UI out into showing some migration process.
   return NS_OK;
 }
 
 nsresult
-nsSeamonkeyProfileMigrator::CopyJunkTraining(PRBool aReplace)
+nsSeamonkeyProfileMigrator::CopyJunkTraining(bool aReplace)
 {
   return aReplace ? CopyFile(FILE_NAME_JUNKTRAINING, FILE_NAME_JUNKTRAINING) : NS_OK;
 }
 
 nsresult
-nsSeamonkeyProfileMigrator::CopyPasswords(PRBool aReplace)
+nsSeamonkeyProfileMigrator::CopyPasswords(bool aReplace)
 {
   nsresult rv;
 
   nsCString signonsFileName;
   GetSignonFileName(aReplace, getter_Copies(signonsFileName));
 
   if (signonsFileName.IsEmpty())
     return NS_ERROR_FILE_NOT_FOUND;
--- a/mail/components/migration/src/nsSeamonkeyProfileMigrator.h
+++ b/mail/components/migration/src/nsSeamonkeyProfileMigrator.h
@@ -51,31 +51,31 @@ public:
   NS_DECL_ISUPPORTS
 
   nsSeamonkeyProfileMigrator();
   virtual ~nsSeamonkeyProfileMigrator();
 
   // nsIMailProfileMigrator methods
   NS_IMETHOD Migrate(PRUint16 aItems, nsIProfileStartup* aStartup,
                         const PRUnichar* aProfile);
-  NS_IMETHOD GetMigrateData(const PRUnichar* aProfile, PRBool aReplace,
+  NS_IMETHOD GetMigrateData(const PRUnichar* aProfile, bool aReplace,
                             PRUint16* aResult);
   NS_IMETHOD GetSourceProfiles(nsIArray** aResult);
 
 protected:
   nsresult FillProfileDataFromSeamonkeyRegistry();
   nsresult GetSourceProfile(const PRUnichar* aProfile);
 
-  nsresult CopyPreferences(PRBool aReplace);
+  nsresult CopyPreferences(bool aReplace);
   nsresult TransformPreferences(const nsAString& aSourcePrefFileName,
                                 const nsAString& aTargetPrefFileName);
 
-  nsresult DummyCopyRoutine(PRBool aReplace);
-  nsresult CopyJunkTraining(PRBool aReplace);  
-  nsresult CopyPasswords(PRBool aReplace);
+  nsresult DummyCopyRoutine(bool aReplace);
+  nsresult CopyJunkTraining(bool aReplace);  
+  nsresult CopyPasswords(bool aReplace);
   nsresult CopyMailFolders(PBStructArray &aMailServers,
                            nsIPrefService* aPrefBranch);
   nsresult CopyAddressBookDirectories(PBStructArray &aLdapServers,
                                       nsIPrefService* aPrefService);
   nsresult CopySignatureFiles(PBStructArray &aIdentities,
                               nsIPrefService* aPrefBranch);
 
   void ReadBranch(const char *branchName,  nsIPrefService *aPrefService,
--- a/mail/components/search/nsMailWinSearchHelper.cpp
+++ b/mail/components/search/nsMailWinSearchHelper.cpp
@@ -75,23 +75,23 @@ nsresult nsMailWinSearchHelper::Init()
 nsMailWinSearchHelper::~nsMailWinSearchHelper()
 {
   CoUninitialize();
 }
 
 NS_IMPL_ISUPPORTS1(nsMailWinSearchHelper, nsIMailWinSearchHelper)
 
 
-NS_IMETHODIMP nsMailWinSearchHelper::GetFoldersInCrawlScope(PRBool* aResult)
+NS_IMETHODIMP nsMailWinSearchHelper::GetFoldersInCrawlScope(bool* aResult)
 {
   *aResult = PR_FALSE;
   NS_ENSURE_ARG_POINTER(mProfD);
 
   // If the service isn't present or running, we shouldn't proceed.
-  PRBool serviceRunning;
+  bool serviceRunning;
   nsresult rv = GetServiceRunning(&serviceRunning);
   if (!serviceRunning || NS_FAILED(rv))
     return rv;
 
   // We need to do this every time so that we have the latest data
   nsRefPtr<ISearchManager> searchManager;
   HRESULT hr = CoCreateInstance(CLSID_CSearchManager, NULL, CLSCTX_ALL, IID_ISearchManager, getter_AddRefs(searchManager));
   if (FAILED(hr))
@@ -134,17 +134,17 @@ NS_IMETHODIMP nsMailWinSearchHelper::Get
     // If even one of the folders isn't there, we return false
     if (!included)
       return NS_OK;
   }
   *aResult = PR_TRUE;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsMailWinSearchHelper::GetServiceRunning(PRBool* aResult)
+NS_IMETHODIMP nsMailWinSearchHelper::GetServiceRunning(bool* aResult)
 {
   *aResult = PR_FALSE;
   SC_HANDLE hSCManager = OpenSCManager(nsnull, SERVICES_ACTIVE_DATABASE, SERVICE_QUERY_STATUS);
   if (!hSCManager)
     return NS_ERROR_FAILURE;
 
   SC_HANDLE hService = OpenService(hSCManager, "wsearch", SERVICE_QUERY_STATUS);
   CloseServiceHandle(hSCManager);
@@ -159,21 +159,21 @@ NS_IMETHODIMP nsMailWinSearchHelper::Get
     return NS_ERROR_FAILURE;
   }
 
   *aResult = (status.dwCurrentState == SERVICE_RUNNING);
   CloseServiceHandle(hService);
   return NS_OK;
 }
 
-NS_IMETHODIMP nsMailWinSearchHelper::SetFANCIBit(nsIFile* aFile, PRBool aBit, PRBool aRecurse)
+NS_IMETHODIMP nsMailWinSearchHelper::SetFANCIBit(nsIFile* aFile, bool aBit, bool aRecurse)
 {
   NS_ENSURE_ARG_POINTER(aFile);
 
-  PRBool exists;
+  bool exists;
   nsresult rv = aFile->Exists(&exists);
   NS_ENSURE_SUCCESS(rv, rv);
   if (!exists)
     return NS_ERROR_FILE_NOT_FOUND;
 
   nsString filePath;
   rv = aFile->GetPath(filePath);
   NS_ENSURE_SUCCESS(rv, rv);
@@ -191,38 +191,38 @@ NS_IMETHODIMP nsMailWinSearchHelper::Set
   }
   else
   {
     if (dwAttrs & FILE_ATTRIBUTE_NOT_CONTENT_INDEXED)
       SetFileAttributesW(pathStr, dwAttrs & ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED);
   }
 
   // We should only try to recurse if it's a directory
-  PRBool isDirectory;
+  bool isDirectory;
   rv = aFile->IsDirectory(&isDirectory);
   NS_ENSURE_SUCCESS(rv, rv);
   if (aRecurse && isDirectory)
   {
     nsCOMPtr<nsISimpleEnumerator> children;
     rv = aFile->GetDirectoryEntries(getter_AddRefs(children));
     NS_ENSURE_SUCCESS(rv, rv);
     
-    PRBool hasMore;
+    bool hasMore;
     while (NS_SUCCEEDED(rv) && NS_SUCCEEDED(children->HasMoreElements(&hasMore)) && hasMore)
     {
       nsCOMPtr<nsIFile> childFile;
       rv = children->GetNext(getter_AddRefs(childFile));
       NS_ENSURE_SUCCESS(rv, rv);
       rv = SetFANCIBit(childFile, aBit, aRecurse);
     }
   }
   return rv;
 }
 
-NS_IMETHODIMP nsMailWinSearchHelper::GetIsFileAssociationSet(PRBool *aResult)
+NS_IMETHODIMP nsMailWinSearchHelper::GetIsFileAssociationSet(bool *aResult)
 {
   NS_ENSURE_ARG_POINTER(aResult);
   *aResult = PR_FALSE;
 
   // We'll use the Vista method here
   nsRefPtr<IApplicationAssociationRegistration> pAAR;
   HRESULT hr = CoCreateInstance(CLSID_ApplicationAssociationRegistration,
                                 NULL,
@@ -245,17 +245,17 @@ NS_IMETHODIMP nsMailWinSearchHelper::Set
                                 IID_IApplicationAssociationRegistration,
                                 getter_AddRefs(pAAR));
   if (SUCCEEDED(hr))
     hr = pAAR->SetAppAsDefault(APP_REG_NAME_MAIL, L".wdseml", AT_FILEEXTENSION);
 
   return SUCCEEDED(hr) ? NS_OK : NS_ERROR_FAILURE;
 }
 
-NS_IMETHODIMP nsMailWinSearchHelper::RunSetup(PRBool aEnable)
+NS_IMETHODIMP nsMailWinSearchHelper::RunSetup(bool aEnable)
 {
   nsresult rv;
   if (!mCurProcD)
   {
     rv = NS_GetSpecialDirectory("CurProcD", getter_AddRefs(mCurProcD));
     NS_ENSURE_SUCCESS(rv, rv);
     rv = mCurProcD->Append(NS_LITERAL_STRING("WSEnable.exe"));
     NS_ENSURE_SUCCESS(rv, rv);
--- a/mail/components/shell/nsMailGNOMEIntegration.cpp
+++ b/mail/components/shell/nsMailGNOMEIntegration.cpp
@@ -105,17 +105,17 @@ nsMailGNOMEIntegration::Init()
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = appPath->GetNativePath(mAppPath);
   return rv;
 }
 
 NS_IMPL_ISUPPORTS1(nsMailGNOMEIntegration, nsIShellService)
 
-PRBool
+bool
 nsMailGNOMEIntegration::GetAppPathFromLauncher()
 {
   gchar *tmp;
 
   const char *launcher = PR_GetEnv("MOZ_APP_LAUNCHER");
   if (!launcher)
     return PR_FALSE;
 
@@ -135,17 +135,17 @@ nsMailGNOMEIntegration::GetAppPathFromLa
     mAppIsInPath = PR_TRUE;
   }
 
   g_free(tmp);
   return PR_TRUE;
 }
 
 NS_IMETHODIMP
-nsMailGNOMEIntegration::IsDefaultClient(PRBool aStartupCheck, PRUint16 aApps, PRBool * aIsDefaultClient)
+nsMailGNOMEIntegration::IsDefaultClient(bool aStartupCheck, PRUint16 aApps, bool * aIsDefaultClient)
 {
   *aIsDefaultClient = PR_TRUE;
   if (aApps & nsIShellService::MAIL)
     *aIsDefaultClient &= checkDefault(sMailProtocols, NS_ARRAY_LENGTH(sMailProtocols));
   if (aApps & nsIShellService::NEWS)
     *aIsDefaultClient &= checkDefault(sNewsProtocols, NS_ARRAY_LENGTH(sNewsProtocols));
   if (aApps & nsIShellService::RSS)
     *aIsDefaultClient &= checkDefault(sFeedProtocols, NS_ARRAY_LENGTH(sFeedProtocols));
@@ -154,50 +154,50 @@ nsMailGNOMEIntegration::IsDefaultClient(
   // checked this session (so that subsequent window opens don't show the 
   // default client dialog).
   if (aStartupCheck)
     mCheckedThisSession = PR_TRUE;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsMailGNOMEIntegration::SetDefaultClient(PRBool aForAllUsers, PRUint16 aApps)
+nsMailGNOMEIntegration::SetDefaultClient(bool aForAllUsers, PRUint16 aApps)
 {
   nsresult rv = NS_OK;
   if (aApps & nsIShellService::MAIL)
     rv |= MakeDefault(sMailProtocols, NS_ARRAY_LENGTH(sMailProtocols));
   if (aApps & nsIShellService::NEWS)
     rv |= MakeDefault(sNewsProtocols, NS_ARRAY_LENGTH(sNewsProtocols));
   if (aApps & nsIShellService::RSS)
     rv |= MakeDefault(sFeedProtocols, NS_ARRAY_LENGTH(sFeedProtocols));
   
   return rv;	
 }
 
 NS_IMETHODIMP
-nsMailGNOMEIntegration::GetShouldCheckDefaultClient(PRBool* aResult)
+nsMailGNOMEIntegration::GetShouldCheckDefaultClient(bool* aResult)
 {
   if (mCheckedThisSession) 
   {
     *aResult = PR_FALSE;
     return NS_OK;
   }
 
   nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
   return prefs->GetBoolPref("mail.shell.checkDefaultClient", aResult);
 }
 
 NS_IMETHODIMP
-nsMailGNOMEIntegration::SetShouldCheckDefaultClient(PRBool aShouldCheck)
+nsMailGNOMEIntegration::SetShouldCheckDefaultClient(bool aShouldCheck)
 {
   nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
   return prefs->SetBoolPref("mail.shell.checkDefaultClient", aShouldCheck);
 }
 
-PRBool
+bool
 nsMailGNOMEIntegration::KeyMatchesAppName(const char *aKeyValue) const
 {
   gchar *commandPath;
   if (mUseLocaleFilenames) {
     gchar *nativePath = g_filename_from_utf8(aKeyValue, -1, NULL, NULL, NULL);
     if (!nativePath) {
       NS_ERROR("Error converting path to filesystem encoding");
       return PR_FALSE;
@@ -207,45 +207,45 @@ nsMailGNOMEIntegration::KeyMatchesAppNam
     g_free(nativePath);
   } else {
     commandPath = g_find_program_in_path(aKeyValue);
   }
 
   if (!commandPath)
     return PR_FALSE;
 
-  PRBool matches = mAppPath.Equals(commandPath);
+  bool matches = mAppPath.Equals(commandPath);
   g_free(commandPath);
   return matches;
 }
 
-PRBool
+bool
 nsMailGNOMEIntegration::CheckHandlerMatchesAppName(const nsACString &handler) const
 {
   gint argc;
   gchar **argv;
   nsCAutoString command(handler);
 
   if (g_shell_parse_argv(command.get(), &argc, &argv, NULL)) {
     command.Assign(argv[0]);
     g_strfreev(argv);
   } else {
     return PR_FALSE;
   }
 
   return KeyMatchesAppName(command.get());
 }
 
-PRBool
+bool
 nsMailGNOMEIntegration::checkDefault(const char* const *aProtocols, unsigned int aLength)
 {
   nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
   nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
 
-  PRBool enabled;
+  bool enabled;
   nsCAutoString handler;
   nsresult rv;
 
   for (unsigned int i = 0; i < aLength; ++i) {
     if (gconf) {
       handler.Truncate();
       rv = gconf->GetAppForProtocol(nsDependentCString(aProtocols[i]),
                                     &enabled, handler);
--- a/mail/components/shell/nsMailGNOMEIntegration.h
+++ b/mail/components/shell/nsMailGNOMEIntegration.h
@@ -54,21 +54,21 @@ public:
   NS_DECL_NSISHELLSERVICE
 
   NS_HIDDEN_(nsresult) Init();
   nsMailGNOMEIntegration();
 
 protected:
   virtual ~nsMailGNOMEIntegration() {};
 
-  PRBool KeyMatchesAppName(const char *aKeyValue) const;
-  PRBool checkDefault(const char* const *aProtocols, unsigned int aLength);
+  bool KeyMatchesAppName(const char *aKeyValue) const;
+  bool checkDefault(const char* const *aProtocols, unsigned int aLength);
   nsresult MakeDefault(const char* const *aProtocols, unsigned int aLength);
 private:
-  PRBool GetAppPathFromLauncher();
-  PRBool CheckHandlerMatchesAppName(const nsACString& handler) const;
-  PRPackedBool mUseLocaleFilenames;
-  PRPackedBool mCheckedThisSession;
+  bool GetAppPathFromLauncher();
+  bool CheckHandlerMatchesAppName(const nsACString& handler) const;
+  bool mUseLocaleFilenames;
+  bool mCheckedThisSession;
   nsCString mAppPath;
-  PRPackedBool mAppIsInPath;
+  bool mAppIsInPath;
 };
 
 #endif
--- a/mail/components/shell/nsMailMacIntegration.cpp
+++ b/mail/components/shell/nsMailMacIntegration.cpp
@@ -60,17 +60,17 @@ extern "C" {
 }
 
 NS_IMPL_ISUPPORTS1(nsMailMacIntegration, nsIShellService)
 
 nsMailMacIntegration::nsMailMacIntegration(): mCheckedThisSession(PR_FALSE)
 {}
 
 NS_IMETHODIMP
-nsMailMacIntegration::IsDefaultClient(PRBool aStartupCheck, PRUint16 aApps, PRBool * aIsDefaultClient)
+nsMailMacIntegration::IsDefaultClient(bool aStartupCheck, PRUint16 aApps, bool * aIsDefaultClient)
 {
   *aIsDefaultClient = PR_TRUE;
   if (aApps & nsIShellService::MAIL)
     *aIsDefaultClient &= isDefaultHandlerForProtocol(CFSTR("mailto"));
   if (aApps & nsIShellService::NEWS)
     *aIsDefaultClient &= isDefaultHandlerForProtocol(CFSTR("news"));
   if (aApps & nsIShellService::RSS)
     *aIsDefaultClient &= isDefaultHandlerForProtocol(CFSTR("feed"));
@@ -80,53 +80,53 @@ nsMailMacIntegration::IsDefaultClient(PR
   // default client dialog.
   
   if (aStartupCheck)
     mCheckedThisSession = PR_TRUE;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsMailMacIntegration::SetDefaultClient(PRBool aForAllUsers, PRUint16 aApps)
+nsMailMacIntegration::SetDefaultClient(bool aForAllUsers, PRUint16 aApps)
 {
   nsresult rv = NS_OK;
   if (aApps & nsIShellService::MAIL)
     rv |= setAsDefaultHandlerForProtocol(CFSTR("mailto"));
   if (aApps & nsIShellService::NEWS)
     rv |= setAsDefaultHandlerForProtocol(CFSTR("news"));
   if (aApps & nsIShellService::RSS)
     rv |= setAsDefaultHandlerForProtocol(CFSTR("feed"));
   
   return rv;	
 }
 
 NS_IMETHODIMP
-nsMailMacIntegration::GetShouldCheckDefaultClient(PRBool* aResult)
+nsMailMacIntegration::GetShouldCheckDefaultClient(bool* aResult)
 {
   if (mCheckedThisSession) 
   {
     *aResult = PR_FALSE;
     return NS_OK;
   }
 
   nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
   return prefs->GetBoolPref("mail.shell.checkDefaultClient", aResult);
 }
 
 NS_IMETHODIMP
-nsMailMacIntegration::SetShouldCheckDefaultClient(PRBool aShouldCheck)
+nsMailMacIntegration::SetShouldCheckDefaultClient(bool aShouldCheck)
 {
   nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
   return prefs->SetBoolPref("mail.shell.checkDefaultClient", aShouldCheck);
 }
 
-PRBool
+bool
 nsMailMacIntegration::isDefaultHandlerForProtocol(CFStringRef aScheme)
 {
-  PRBool isDefault = PR_FALSE;
+  bool isDefault = false;
   // Since neither Launch Services nor Internet Config actually differ between 
   // bundles which have the same bundle identifier (That is, if we set our
   // URL of our bundle as the default handler for the given protocol,
   // Launch Service might return the URL of another thunderbird bundle as the
   // defualt handler for that protocol), we are comparing the identifiers of the
   // bundles rather than their URLs.
 
   CFStringRef tbirdID = ::CFBundleGetIdentifier(CFBundleGetMainBundle());
--- a/mail/components/shell/nsMailMacIntegration.h
+++ b/mail/components/shell/nsMailMacIntegration.h
@@ -50,16 +50,16 @@
 class nsMailMacIntegration : public nsIShellService
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSISHELLSERVICE
   nsMailMacIntegration();
 
 protected:
-  PRBool isDefaultHandlerForProtocol(CFStringRef aScheme);
+  bool isDefaultHandlerForProtocol(CFStringRef aScheme);
   nsresult setAsDefaultHandlerForProtocol(CFStringRef aScheme);
 
 private:
   virtual ~nsMailMacIntegration() {};
-  PRBool mCheckedThisSession;
+  bool mCheckedThisSession;
 };
 #endif
--- a/mail/components/shell/nsMailWinIntegration.cpp
+++ b/mail/components/shell/nsMailWinIntegration.cpp
@@ -202,17 +202,17 @@ nsWindowsShellService::ShortcutMaintenan
   // have a chance to trap links created by users who do control the install/
   // update process of the browser.
 
   nsCOMPtr<nsIWinTaskbar> taskbarInfo = do_GetService(NS_TASKBAR_CONTRACTID);
   if (!taskbarInfo) // If we haven't built with win7 sdk features, this fails.
     return NS_OK;
 
   // Avoid if this isn't Win7+
-  PRBool isSupported = PR_FALSE;
+  bool isSupported = false;
   taskbarInfo->GetAvailable(&isSupported);
   if (!isSupported)
     return NS_OK;
 
   nsAutoString appId;
   if (NS_FAILED(taskbarInfo->GetDefaultGroupId(appId)))
     return NS_ERROR_UNEXPECTED;
 
@@ -282,17 +282,17 @@ nsresult nsWindowsShellService::Init()
 }
 
 nsWindowsShellService::nsWindowsShellService()
 :mCheckedThisSession(PR_FALSE)
 {
 }
 
 NS_IMETHODIMP
-nsWindowsShellService::IsDefaultClient(PRBool aStartupCheck, PRUint16 aApps, PRBool *aIsDefaultClient)
+nsWindowsShellService::IsDefaultClient(bool aStartupCheck, PRUint16 aApps, bool *aIsDefaultClient)
 {
   // If this is the first mail window, maintain internal state that we've
   // checked this session (so that subsequent window opens don't show the
   // default client dialog).
   if (aStartupCheck)
     mCheckedThisSession = PR_TRUE;
 
   *aIsDefaultClient = PR_TRUE;
@@ -319,17 +319,17 @@ nsWindowsShellService::IsDefaultClient(P
   if (aApps & nsIShellService::RSS)
     *aIsDefaultClient &= PR_TRUE;
 //    *aIsDefaultClient &= TestForDefault(gFeedSettings, sizeof(gFeedSettings)/sizeof(SETTING));
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsWindowsShellService::SetDefaultClient(PRBool aForAllUsers, PRUint16 aApps)
+nsWindowsShellService::SetDefaultClient(bool aForAllUsers, PRUint16 aApps)
 {
   nsAutoString appHelperPath;
   if (NS_FAILED(GetHelperPath(appHelperPath)))
     return NS_ERROR_FAILURE;
 
   nsAutoString params;
   if (aForAllUsers)
   {
@@ -344,40 +344,40 @@ nsWindowsShellService::SetDefaultClient(
     if (aApps & nsIShellService::NEWS)
       params.AppendLiteral(" News");
   }
 
   return LaunchHelper(appHelperPath, params);
 }
 
 NS_IMETHODIMP
-nsWindowsShellService::GetShouldCheckDefaultClient(PRBool* aResult)
+nsWindowsShellService::GetShouldCheckDefaultClient(bool* aResult)
 {
   if (mCheckedThisSession)
   {
     *aResult = PR_FALSE;
     return NS_OK;
   }
 
   nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
   return prefs->GetBoolPref("mail.shell.checkDefaultClient", aResult);
 }
 
 NS_IMETHODIMP
-nsWindowsShellService::SetShouldCheckDefaultClient(PRBool aShouldCheck)
+nsWindowsShellService::SetShouldCheckDefaultClient(bool aShouldCheck)
 {
   nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
   return prefs->SetBoolPref("mail.shell.checkDefaultClient", aShouldCheck);
 }
 
 /* helper routine. Iterate over the passed in settings object. */
-PRBool
+bool
 nsWindowsShellService::TestForDefault(SETTING aSettings[], PRInt32 aSize)
 {
-  PRBool isDefault = PR_TRUE;
+  bool isDefault = true;
   PRUnichar currValue[MAX_BUF];
   SETTING* end = aSettings + aSize;
   for (SETTING * settings = aSettings; settings < end; ++settings)
   {
     NS_ConvertUTF8toUTF16 dataLongPath(settings->valueData);
     NS_ConvertUTF8toUTF16 key(settings->keyName);
     NS_ConvertUTF8toUTF16 value(settings->valueName);
     if (settings->flags & APP_PATH_SUBSTITUTION)
@@ -408,32 +408,32 @@ nsWindowsShellService::TestForDefault(SE
       isDefault = PR_FALSE;
       break;
     }
   }  // for each registry key we want to look at
 
   return isDefault;
 }
 
-PRBool
-nsWindowsShellService::IsDefaultClientVista(PRUint16 aApps, PRBool* aIsDefaultClient)
+bool
+nsWindowsShellService::IsDefaultClientVista(PRUint16 aApps, bool* aIsDefaultClient)
 {
 #if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
   IApplicationAssociationRegistration* pAAR;
 
   HRESULT hr = CoCreateInstance (CLSID_ApplicationAssociationRegistration,
                                  NULL,
                                  CLSCTX_INPROC,
                                  IID_IApplicationAssociationRegistration,
                                  (void**)&pAAR);
 
   if (SUCCEEDED(hr))
   {
-    PRBool isDefaultMail = PR_TRUE;
-    PRBool isDefaultNews = PR_TRUE;
+    bool isDefaultMail = true;
+    bool isDefaultNews = true;
     if (aApps & nsIShellService::MAIL)
       pAAR->QueryAppIsDefaultAll(AL_EFFECTIVE, APP_REG_NAME_MAIL, &isDefaultMail);
     if (aApps & nsIShellService::NEWS)
       pAAR->QueryAppIsDefaultAll(AL_EFFECTIVE, APP_REG_NAME_NEWS, &isDefaultNews);
 
     *aIsDefaultClient = isDefaultNews && isDefaultMail;
 
     pAAR->Release();
--- a/mail/components/shell/nsMailWinIntegration.h
+++ b/mail/components/shell/nsMailWinIntegration.h
@@ -63,17 +63,17 @@ public:
   virtual ~nsWindowsShellService() {};
   NS_HIDDEN_(nsresult) Init();
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSISHELLSERVICE
   NS_DECL_NSIWINDOWSSHELLSERVICE
 
 protected:
-  PRBool TestForDefault(SETTING aSettings[], PRInt32 aSize);
-  PRBool IsDefaultClientVista(PRUint16 aApps, PRBool* aIsDefaultClient);
+  bool TestForDefault(SETTING aSettings[], PRInt32 aSize);
+  bool IsDefaultClientVista(PRUint16 aApps, bool* aIsDefaultClient);
 
 private:
-  PRBool mCheckedThisSession;
+  bool mCheckedThisSession;
   nsAutoString mAppLongPath;
  };
 
 #endif
--- a/mailnews/addrbook/src/nsAbAddressCollector.cpp
+++ b/mailnews/addrbook/src/nsAbAddressCollector.cpp
@@ -80,17 +80,17 @@ nsAbAddressCollector::GetCardFromPropert
   nsresult rv;
   nsCOMPtr<nsIAbManager> abManager(do_GetService(NS_ABMANAGER_CONTRACTID, &rv));
   NS_ENSURE_SUCCESS(rv, nsnull);
 
   nsCOMPtr<nsISimpleEnumerator> enumerator;
   rv = abManager->GetDirectories(getter_AddRefs(enumerator));
   NS_ENSURE_SUCCESS(rv, nsnull);
 
-  PRBool hasMore;
+  bool hasMore;
   nsCOMPtr<nsISupports> supports;
   nsCOMPtr<nsIAbDirectory> directory;
   nsIAbCard *result = nsnull;
   while (NS_SUCCEEDED(enumerator->HasMoreElements(&hasMore)) && hasMore)
   {
     rv = enumerator->GetNext(getter_AddRefs(supports));
     NS_ENSURE_SUCCESS(rv, nsnull);
 
@@ -111,17 +111,17 @@ nsAbAddressCollector::GetCardFromPropert
       return result;
     }
   }
   return nsnull;
 }
 
 NS_IMETHODIMP
 nsAbAddressCollector::CollectAddress(const nsACString &aAddresses,
-                                     PRBool aCreateCard,
+                                     bool aCreateCard,
                                      PRUint32 aSendFormat)
 {
   // If we've not got a valid directory, no point in going any further
   if (!mDirectory)
     return NS_OK;
 
   // note that we're now setting the whole recipient list,
   // not just the pretty name of the first recipient.
@@ -168,26 +168,26 @@ nsAbAddressCollector::CollectAddress(con
   PR_FREEIF(addresses);
   PR_FREEIF(names);
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsAbAddressCollector::CollectSingleAddress(const nsACString &aEmail,
                                            const nsACString &aDisplayName,
-                                           PRBool aCreateCard,
+                                           bool aCreateCard,
                                            PRUint32 aSendFormat,
-                                           PRBool aSkipCheckExisting)
+                                           bool aSkipCheckExisting)
 {
   if (!mDirectory)
     return NS_OK;
 
   nsresult rv;
   nsCOMPtr<nsIAbCard> card;
-  PRBool emailAddressIn2ndEmailColumn = PR_FALSE;
+  bool emailAddressIn2ndEmailColumn = false;
 
   nsCOMPtr<nsIAbDirectory> originDirectory;
 
   if (!aSkipCheckExisting)
   {
     card = GetCardFromProperty(kPriEmailProperty, aEmail,
                                getter_AddRefs(originDirectory));
     // We've not found a card, but is this address actually in the additional
@@ -219,25 +219,25 @@ nsAbAddressCollector::CollectSingleAddre
         NS_ASSERTION(NS_SUCCEEDED(rv), "failed to add card");
       }
     }
   }
   else if (card && !emailAddressIn2ndEmailColumn && originDirectory)
   {
     // It could be that the origin directory is read-only, so don't try and
     // write to it if it is.
-    PRBool readOnly;
+    bool readOnly;
     rv = originDirectory->GetReadOnly(&readOnly);
     NS_ENSURE_SUCCESS(rv, rv);
 
     if (readOnly)
       return NS_OK;
 
     // address is already in the AB, so update the names
-    PRBool modifiedCard = PR_FALSE;
+    bool modifiedCard = false;
 
     nsString displayName;
     card->GetDisplayName(displayName);
     // If we already have a display name, don't set the names on the card.
     if (displayName.IsEmpty() && !aDisplayName.IsEmpty())
       modifiedCard = SetNamesForCard(card, aDisplayName);
 
     if (aSendFormat != nsIAbPreferMailFormat::unknown)
@@ -282,23 +282,23 @@ nsAbAddressCollector::AutoCollectScreenN
   // are all AIM screennames.  autocollect that info.
   if (!domain.IsEmpty() &&
       (domain.Equals("aol.com") || domain.Equals("cs.com") ||
        domain.Equals("netscape.net")))
     aCard->SetPropertyAsAUTF8String(kScreenNameProperty, Substring(aEmail, 0, atPos));
 }
 
 // Returns true if the card was modified successfully.
-PRBool
+bool
 nsAbAddressCollector::SetNamesForCard(nsIAbCard *aSenderCard,
                                       const nsACString &aFullName)
 {
   nsCString firstName;
   nsCString lastName;
-  PRBool modifiedCard = PR_FALSE;
+  bool modifiedCard = false;
 
   if (NS_SUCCEEDED(aSenderCard->SetDisplayName(NS_ConvertUTF8toUTF16(aFullName))))
     modifiedCard = PR_TRUE;
 
   // Now split up the full name.
   SplitFullName(nsCString(aFullName), firstName, lastName);
 
   if (!firstName.IsEmpty() &&
@@ -379,17 +379,17 @@ nsAbAddressCollector::SetUpAbFromPrefs(n
 
   nsresult rv;
   nsCOMPtr<nsIAbManager> abManager(do_GetService(NS_ABMANAGER_CONTRACTID, &rv));
   NS_ENSURE_SUCCESS(rv, );
 
   rv = abManager->GetDirectory(mABURI, getter_AddRefs(mDirectory));
   NS_ENSURE_SUCCESS(rv, );
 
-  PRBool readOnly;
+  bool readOnly;
   rv = mDirectory->GetReadOnly(&readOnly);
   NS_ENSURE_SUCCESS(rv, );
 
   // If the directory is read-only, we can't write to it, so just blank it out
   // here, and warn because we shouldn't hit this (UI is wrong).
   if (readOnly)
   {
     NS_ERROR("Address Collection book preferences is set to a read-only book. "
--- a/mailnews/addrbook/src/nsAbAddressCollector.h
+++ b/mailnews/addrbook/src/nsAbAddressCollector.h
@@ -61,17 +61,17 @@ public:
 
   nsresult Init();
 
 private:
   already_AddRefed<nsIAbCard> GetCardFromProperty(const char *aName,
                                                   const nsACString &aValue,
                                                   nsIAbDirectory **aDirectory);
   void AutoCollectScreenName(nsIAbCard *aCard, const nsACString &aEmail);
-  PRBool SetNamesForCard(nsIAbCard *aSenderCard, const nsACString &aFullName);
+  bool SetNamesForCard(nsIAbCard *aSenderCard, const nsACString &aFullName);
   void SplitFullName(const nsCString &aFullName, nsCString &aFirstName,
                      nsCString &aLastName);
   void SetUpAbFromPrefs(nsIPrefBranch *aPrefBranch);
   nsCOMPtr <nsIAbDirectory> mDirectory;
   nsCString mABURI;
 };
 
 #endif  // _nsAbAddressCollector_H_
--- a/mailnews/addrbook/src/nsAbBSDirectory.cpp
+++ b/mailnews/addrbook/src/nsAbBSDirectory.cpp
@@ -69,17 +69,17 @@ NS_IMETHODIMP nsAbBSDirectory::Init(cons
   mURI = aURI;
   return NS_OK;
 }
 
 NS_IMPL_ISUPPORTS_INHERITED0(nsAbBSDirectory, nsAbDirProperty)
 
 nsresult nsAbBSDirectory::CreateDirectoriesFromFactory(const nsACString &aURI,
                                                        DIR_Server *aServer,
-                                                       PRBool aNotify)
+                                                       bool aNotify)
 {
   nsresult rv;
 
   // Get the directory factory service
   nsCOMPtr<nsIAbDirFactoryService> dirFactoryService = 
     do_GetService(NS_ABDIRFACTORYSERVICE_CONTRACTID,&rv);
   NS_ENSURE_SUCCESS (rv, rv);
 		
@@ -93,17 +93,17 @@ nsresult nsAbBSDirectory::CreateDirector
   rv = dirFactory->GetDirectories(NS_ConvertUTF8toUTF16(aServer->description),
                                   aURI,
                                   nsDependentCString(aServer->prefName),
                                   getter_AddRefs(newDirEnumerator));
   NS_ENSURE_SUCCESS (rv, rv);
   
   // Enumerate through the directories adding them
   // to the sub directories array
-  PRBool hasMore;
+  bool hasMore;
   nsCOMPtr<nsIAbManager> abManager = do_GetService(NS_ABMANAGER_CONTRACTID, &rv);
 
   while (NS_SUCCEEDED(newDirEnumerator->HasMoreElements(&hasMore)) && hasMore)
   {
     nsCOMPtr<nsISupports> newDirSupports;
     rv = newDirEnumerator->GetNext(getter_AddRefs(newDirSupports));
     if(NS_FAILED(rv))
       continue;
@@ -330,31 +330,31 @@ NS_IMETHODIMP nsAbBSDirectory::DeleteDir
       continue;
 
     rv = dirFactory->DeleteDirectory(d);
   }
 
   return rv;
 }
 
-NS_IMETHODIMP nsAbBSDirectory::HasDirectory(nsIAbDirectory *dir, PRBool *hasDir)
+NS_IMETHODIMP nsAbBSDirectory::HasDirectory(nsIAbDirectory *dir, bool *hasDir)
 {
   if (!hasDir)
     return NS_ERROR_NULL_POINTER;
 
   nsresult rv = EnsureInitialized();
   NS_ENSURE_SUCCESS(rv, rv);
 
   DIR_Server *dirServer = nsnull;
   mServers.Get(dir, &dirServer);
   return DIR_ContainsServer(dirServer, hasDir);
 }
 
 NS_IMETHODIMP nsAbBSDirectory::UseForAutocomplete(const nsACString &aIdentityKey,
-                                                  PRBool *aResult)
+                                                  bool *aResult)
 {
   // For the "root" directory (kAllDirectoryRoot) always return true so that
   // we can search sub directories that may or may not be local.
   NS_ENSURE_ARG_POINTER(aResult);
   *aResult = PR_TRUE;
   return NS_OK;
 }
 
--- a/mailnews/addrbook/src/nsAbBSDirectory.h
+++ b/mailnews/addrbook/src/nsAbBSDirectory.h
@@ -58,24 +58,24 @@ public:
   NS_IMETHOD CreateNewDirectory(const nsAString &aDirName,
                                 const nsACString &aURI,
                                 PRUint32 aType,
                                 const nsACString &aPrefName,
                                 nsACString &aResult);
   NS_IMETHOD CreateDirectoryByURI(const nsAString &aDisplayName,
                                   const nsACString &aURI);
   NS_IMETHOD DeleteDirectory(nsIAbDirectory *directory);
-  NS_IMETHOD HasDirectory(nsIAbDirectory *dir, PRBool *hasDir);
-  NS_IMETHOD UseForAutocomplete(const nsACString &aIdentityKey, PRBool *aResult);
+  NS_IMETHOD HasDirectory(nsIAbDirectory *dir, bool *hasDir);
+  NS_IMETHOD UseForAutocomplete(const nsACString &aIdentityKey, bool *aResult);
   NS_IMETHOD GetURI(nsACString &aURI);
 
 protected:
   nsresult EnsureInitialized();
 	nsresult CreateDirectoriesFromFactory(const nsACString &aURI,
-                                        DIR_Server* aServer, PRBool aNotify);
+                                        DIR_Server* aServer, bool aNotify);
 
 protected:
-	PRBool mInitialized;
+	bool mInitialized;
 	nsCOMArray<nsIAbDirectory> mSubDirectories;
 	nsDataHashtable<nsISupportsHashKey, DIR_Server*> mServers;
 };
 
 #endif
--- a/mailnews/addrbook/src/nsAbCardProperty.cpp
+++ b/mailnews/addrbook/src/nsAbCardProperty.cpp
@@ -177,23 +177,23 @@ NS_IMETHODIMP nsAbCardProperty::GetLocal
 NS_IMETHODIMP nsAbCardProperty::SetLocalId(const nsACString &aLocalId)
 {
   m_localId = aLocalId;
   return NS_OK;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
-NS_IMETHODIMP nsAbCardProperty::GetIsMailList(PRBool *aIsMailList)
+NS_IMETHODIMP nsAbCardProperty::GetIsMailList(bool *aIsMailList)
 {
     *aIsMailList = m_IsMailList;
     return NS_OK;
 }
 
-NS_IMETHODIMP nsAbCardProperty::SetIsMailList(PRBool aIsMailList)
+NS_IMETHODIMP nsAbCardProperty::SetIsMailList(bool aIsMailList)
 {
     m_IsMailList = aIsMailList;
     return NS_OK;
 }
 
 NS_IMETHODIMP nsAbCardProperty::GetMailListURI(char **aMailListURI)
 {
   if (aMailListURI)
@@ -290,17 +290,17 @@ NS_IMETHODIMP nsAbCardProperty::GetPrope
 
 NS_IMETHODIMP nsAbCardProperty::GetPropertyAsUint32(const char *name, PRUint32 *value) 
 {
   nsCOMPtr<nsIVariant> variant;
   return m_properties.Get(nsDependentCString(name), getter_AddRefs(variant)) ?
     variant->GetAsUint32(value) : NS_ERROR_NOT_AVAILABLE;
 }
 
-NS_IMETHODIMP nsAbCardProperty::GetPropertyAsBool(const char *name, PRBool *value) 
+NS_IMETHODIMP nsAbCardProperty::GetPropertyAsBool(const char *name, bool *value) 
 {
   nsCOMPtr<nsIVariant> variant;
   return m_properties.Get(nsDependentCString(name), getter_AddRefs(variant)) ?
     variant->GetAsBool(value) : NS_ERROR_NOT_AVAILABLE;
 }
 
 NS_IMETHODIMP nsAbCardProperty::SetProperty(const nsACString &name, nsIVariant *value)
 {
@@ -323,17 +323,17 @@ NS_IMETHODIMP nsAbCardProperty::SetPrope
 
 NS_IMETHODIMP nsAbCardProperty::SetPropertyAsUint32(const char *name, PRUint32 value) 
 {
   nsCOMPtr<nsIWritableVariant> variant = do_CreateInstance(NS_VARIANT_CONTRACTID);
   variant->SetAsUint32(value);
   return m_properties.Put(nsDependentCString(name), variant);
 }
 
-NS_IMETHODIMP nsAbCardProperty::SetPropertyAsBool(const char *name, PRBool value) 
+NS_IMETHODIMP nsAbCardProperty::SetPropertyAsBool(const char *name, bool value) 
 {
   nsCOMPtr<nsIWritableVariant> variant = do_CreateInstance(NS_VARIANT_CONTRACTID);
   variant->SetAsBool(value);
   return m_properties.Put(nsDependentCString(name), variant);
 }
 
 NS_IMETHODIMP nsAbCardProperty::DeleteProperty(const nsACString &name)
 {
@@ -401,17 +401,17 @@ NS_IMETHODIMP nsAbCardProperty::GetPrima
 }
 
 NS_IMETHODIMP nsAbCardProperty::SetPrimaryEmail(const nsAString &aString)
 {
   return SetPropertyAsAString(kPriEmailProperty, aString);
 }
 
 NS_IMETHODIMP nsAbCardProperty::HasEmailAddress(const nsACString &aEmailAddress,
-                                                PRBool *aResult)
+                                                bool *aResult)
 {
   NS_ENSURE_ARG_POINTER(aResult);
 
   *aResult = PR_FALSE;
 
   nsCString emailAddress;
   nsresult rv = GetPropertyAsAUTF8String(kPriEmailProperty, emailAddress);
   if (rv != NS_ERROR_NOT_AVAILABLE &&
@@ -434,17 +434,17 @@ NS_IMETHODIMP nsAbCardProperty::HasEmail
 NS_IMETHODIMP nsAbCardProperty::Copy(nsIAbCard* srcCard)
 {
   NS_ENSURE_ARG_POINTER(srcCard);
 
   nsCOMPtr<nsISimpleEnumerator> properties;
   nsresult rv = srcCard->GetProperties(getter_AddRefs(properties));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  PRBool hasMore;
+  bool hasMore;
   nsCOMPtr<nsISupports> result;
   while (NS_SUCCEEDED(rv = properties->HasMoreElements(&hasMore)) && hasMore)
   {
     rv = properties->GetNext(getter_AddRefs(result));
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsCOMPtr<nsIProperty> property = do_QueryInterface(result, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
@@ -453,28 +453,28 @@ NS_IMETHODIMP nsAbCardProperty::Copy(nsI
     property->GetName(name);
     nsCOMPtr<nsIVariant> value;
     property->GetValue(getter_AddRefs(value));
 
     SetProperty(NS_ConvertUTF16toUTF8(name), value);
   }
   NS_ENSURE_SUCCESS(rv, rv);
 
-  PRBool isMailList;
+  bool isMailList;
   srcCard->GetIsMailList(&isMailList);
   SetIsMailList(isMailList);
 
   nsCString mailListURI;
   srcCard->GetMailListURI(getter_Copies(mailListURI));
   SetMailListURI(mailListURI.get());
 
   return NS_OK;
 }
 
-NS_IMETHODIMP nsAbCardProperty::Equals(nsIAbCard *card, PRBool *result)
+NS_IMETHODIMP nsAbCardProperty::Equals(nsIAbCard *card, bool *result)
 {
   *result = (card == this);
   return NS_OK;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // The following methods are other views of a card
 ////////////////////////////////////////////////////////////////////////////////
@@ -493,28 +493,28 @@ NS_IMETHODIMP nsAbCardProperty::Translat
     return NS_OK;
   }
   else if (type.EqualsLiteral("vcard"))
     return ConvertToEscapedVCard(result);
 
   return NS_ERROR_ILLEGAL_VALUE;
 }
 //
-static VObject* myAddPropValue(VObject *o, const char *propName, const PRUnichar *propValue, PRBool *aCardHasData)
+static VObject* myAddPropValue(VObject *o, const char *propName, const PRUnichar *propValue, bool *aCardHasData)
 {
     if (aCardHasData)
         *aCardHasData = PR_TRUE;
     return addPropValue(o, propName, NS_ConvertUTF16toUTF8(propValue).get());
 }
 
 nsresult nsAbCardProperty::ConvertToEscapedVCard(nsACString &aResult)
 {
     nsString str;
     nsresult rv;
-    PRBool vCardHasData = PR_FALSE;
+    bool vCardHasData = false;
     VObject* vObj = newVObject(VCCardProp);
     VObject* t;
 
     // [comment from 4.x]
     // Big flame coming....so Vobject is not designed at all to work with  an array of
     // attribute values. It wants you to have all of the attributes easily available. You
     // cannot add one attribute at a time as you find them to the vobject. Why? Because
     // it creates a property for a particular type like phone number and then that property
@@ -889,17 +889,17 @@ nsresult nsAbCardProperty::AppendSection
                                          mozITXTToHTMLConv *aConv,
                                          nsString &aResult)
 {
   nsresult rv = NS_OK;
 
   aResult.AppendLiteral("<section>");
 
   nsString attrValue;
-  PRBool sectionIsEmpty = PR_TRUE;
+  bool sectionIsEmpty = true;
 
   PRInt16 i = 0;
   for (i=0;i<aCount;i++) {
     rv = GetPropertyAsAString(aArray[i].mColumn, attrValue);
     if (NS_SUCCEEDED(rv) && !attrValue.IsEmpty())
       sectionIsEmpty = PR_FALSE;
   }
 
@@ -1139,17 +1139,17 @@ NS_IMETHODIMP nsAbCardProperty::Generate
     PRInt32 index = aResult.FindChar('@');
     if (index != -1)
       aResult.SetLength(index);
   }
 
   return NS_OK;
 }
 
-NS_IMETHODIMP nsAbCardProperty::GeneratePhoneticName(PRBool aLastNameFirst,
+NS_IMETHODIMP nsAbCardProperty::GeneratePhoneticName(bool aLastNameFirst,
                                                      nsAString &aResult)
 {
   nsAutoString firstName, lastName;
   GetPropertyAsAString(kPhoneticFirstNameProperty, firstName);
   GetPropertyAsAString(kPhoneticLastNameProperty, lastName);
 
   if (aLastNameFirst)
   {
--- a/mailnews/addrbook/src/nsAbCardProperty.h
+++ b/mailnews/addrbook/src/nsAbCardProperty.h
@@ -66,17 +66,17 @@ public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIABCARD
   NS_DECL_NSIABITEM
 
   nsAbCardProperty();
   virtual ~nsAbCardProperty(void);
 
 protected:
-	PRBool   m_IsMailList;
+	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, PRInt16 aCount, const nsString& aHeading, nsIStringBundle *aBundle, mozITXTToHTMLConv *aConv, nsString &aResult);
--- a/mailnews/addrbook/src/nsAbDirProperty.cpp
+++ b/mailnews/addrbook/src/nsAbDirProperty.cpp
@@ -226,23 +226,23 @@ NS_IMETHODIMP nsAbDirProperty::GetDescri
 }
 
 NS_IMETHODIMP nsAbDirProperty::SetDescription(const nsAString &aDescription)
 {
   m_Description = aDescription;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsAbDirProperty::GetIsMailList(PRBool *aIsMailList)
+NS_IMETHODIMP nsAbDirProperty::GetIsMailList(bool *aIsMailList)
 {
 	*aIsMailList = m_IsMailList;
 	return NS_OK;
 }
 
-NS_IMETHODIMP nsAbDirProperty::SetIsMailList(PRBool aIsMailList)
+NS_IMETHODIMP nsAbDirProperty::SetIsMailList(bool aIsMailList)
 {
 	m_IsMailList = aIsMailList;
 	return NS_OK;
 }
 
 NS_IMETHODIMP nsAbDirProperty::GetAddressLists(nsIMutableArray * *aAddressLists)
 {
   if (!m_AddressList) 
@@ -276,17 +276,17 @@ NS_IMETHODIMP nsAbDirProperty::CopyMailL
   SetDescription(str);
 
   nsCOMPtr<nsIMutableArray> pAddressLists;
   srcList->GetAddressLists(getter_AddRefs(pAddressLists));
   SetAddressLists(pAddressLists);
   return NS_OK;
 }
 
-NS_IMETHODIMP nsAbDirProperty::GetIsQuery(PRBool *aResult)
+NS_IMETHODIMP nsAbDirProperty::GetIsQuery(bool *aResult)
 {
   NS_ENSURE_ARG_POINTER(aResult);
   // Mailing lists are not queries by default, individual directory types
   // will override this.
   *aResult = PR_FALSE;
   return NS_OK;
 }
 
@@ -317,21 +317,21 @@ NS_IMETHODIMP
 nsAbDirProperty::GetChildCards(nsISimpleEnumerator **childCards)
 { return NS_ERROR_NOT_IMPLEMENTED; }
 
 NS_IMETHODIMP
 nsAbDirProperty::DeleteDirectory(nsIAbDirectory *directory)
 { return NS_ERROR_NOT_IMPLEMENTED; }
 
 NS_IMETHODIMP
-nsAbDirProperty::HasCard(nsIAbCard *cards, PRBool *hasCard)
+nsAbDirProperty::HasCard(nsIAbCard *cards, bool *hasCard)
 { return NS_ERROR_NOT_IMPLEMENTED; }
 
 NS_IMETHODIMP
-nsAbDirProperty::HasDirectory(nsIAbDirectory *dir, PRBool *hasDir)
+nsAbDirProperty::HasDirectory(nsIAbDirectory *dir, bool *hasDir)
 { return NS_ERROR_NOT_IMPLEMENTED; }
 
 NS_IMETHODIMP
 nsAbDirProperty::CreateNewDirectory(const nsAString &aDirName,
                                     const nsACString &aURI,
                                     PRUint32 aType,
                                     const nsACString &aPrefName,
                                     nsACString &aResult)
@@ -352,70 +352,70 @@ NS_IMETHODIMP nsAbDirProperty::AddCard(n
 { return NS_ERROR_NOT_IMPLEMENTED; }
 
 NS_IMETHODIMP nsAbDirProperty::ModifyCard(nsIAbCard *aModifiedCard)
 { return NS_ERROR_NOT_IMPLEMENTED; }
 
 NS_IMETHODIMP nsAbDirProperty::DeleteCards(nsIArray *cards)
 { return NS_ERROR_NOT_IMPLEMENTED; }
 
-NS_IMETHODIMP nsAbDirProperty::DropCard(nsIAbCard *childCard, PRBool needToCopyCard)
+NS_IMETHODIMP nsAbDirProperty::DropCard(nsIAbCard *childCard, bool needToCopyCard)
 { return NS_ERROR_NOT_IMPLEMENTED; }
 
 NS_IMETHODIMP nsAbDirProperty::CardForEmailAddress(const nsACString &aEmailAddress,
                                                    nsIAbCard ** aAbCard)
 { return NS_ERROR_NOT_IMPLEMENTED; }
 
 NS_IMETHODIMP nsAbDirProperty::GetCardFromProperty(const char *aProperty,
                                                    const nsACString &aValue,
-                                                   PRBool caseSensitive,
+                                                   bool caseSensitive,
                                                    nsIAbCard **result)
 { return NS_ERROR_NOT_IMPLEMENTED; }
 
 NS_IMETHODIMP nsAbDirProperty::GetCardsFromProperty(const char *aProperty,
                                                     const nsACString &aValue,
-                                                    PRBool caseSensitive,
+                                                    bool caseSensitive,
                                                     nsISimpleEnumerator **result)
 { return NS_ERROR_NOT_IMPLEMENTED; }
 
 
-NS_IMETHODIMP nsAbDirProperty::GetSupportsMailingLists(PRBool *aSupportsMailingsLists)
+NS_IMETHODIMP nsAbDirProperty::GetSupportsMailingLists(bool *aSupportsMailingsLists)
 {
   NS_ENSURE_ARG_POINTER(aSupportsMailingsLists);
   // We don't currently support nested mailing lists, so only return true if
   // we're not a mailing list.
   *aSupportsMailingsLists = !m_IsMailList;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsAbDirProperty::GetReadOnly(PRBool *aReadOnly)
+NS_IMETHODIMP nsAbDirProperty::GetReadOnly(bool *aReadOnly)
 {
   NS_ENSURE_ARG_POINTER(aReadOnly);
   // Default is that we are writable. Any implementation that is read-only must
   // override this method.
   *aReadOnly = PR_FALSE;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsAbDirProperty::GetIsRemote(PRBool *aIsRemote)
+NS_IMETHODIMP nsAbDirProperty::GetIsRemote(bool *aIsRemote)
 {
   NS_ENSURE_ARG_POINTER(aIsRemote);
   *aIsRemote = PR_FALSE;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsAbDirProperty::GetIsSecure(PRBool *aIsSecure)
+NS_IMETHODIMP nsAbDirProperty::GetIsSecure(bool *aIsSecure)
 {
   NS_ENSURE_ARG_POINTER(aIsSecure);
   *aIsSecure = PR_FALSE;
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbDirProperty::UseForAutocomplete(const nsACString &aIdentityKey,
-                                                  PRBool *aResult)
+                                                  bool *aResult)
 {
   NS_ENSURE_ARG_POINTER(aResult);
 
   // Is local autocomplete enabled?
   nsresult rv;
   nsCOMPtr<nsIPrefBranch> prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID,
                                                    &rv));
   NS_ENSURE_SUCCESS(rv, rv);
@@ -467,18 +467,18 @@ NS_IMETHODIMP nsAbDirProperty::GetIntVal
 
   if (NS_FAILED(m_DirectoryPrefs->GetIntPref(aName, aResult)))
     *aResult = aDefaultValue;
 
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbDirProperty::GetBoolValue(const char *aName,
-                                           PRBool aDefaultValue,
-                                           PRBool *aResult)
+                                           bool aDefaultValue,
+                                           bool *aResult)
 {
   NS_ENSURE_ARG_POINTER(aResult);
 
   if (!m_DirectoryPrefs && NS_FAILED(InitDirectoryPrefs()))
     return NS_ERROR_NOT_INITIALIZED;
 
   if (NS_FAILED(m_DirectoryPrefs->GetBoolPref(aName, aResult)))
     *aResult = aDefaultValue;
@@ -543,17 +543,17 @@ NS_IMETHODIMP nsAbDirProperty::SetIntVal
 {
   if (!m_DirectoryPrefs && NS_FAILED(InitDirectoryPrefs()))
     return NS_ERROR_NOT_INITIALIZED;
 
   return m_DirectoryPrefs->SetIntPref(aName, aValue);
 }
 
 NS_IMETHODIMP nsAbDirProperty::SetBoolValue(const char *aName,
-                                           PRBool aValue)
+                                           bool aValue)
 {
   if (!m_DirectoryPrefs && NS_FAILED(InitDirectoryPrefs()))
     return NS_ERROR_NOT_INITIALIZED;
 
   return m_DirectoryPrefs->SetBoolPref(aName, aValue);
 }
 
 NS_IMETHODIMP nsAbDirProperty::SetStringValue(const char *aName,
--- a/mailnews/addrbook/src/nsAbDirProperty.h
+++ b/mailnews/addrbook/src/nsAbDirProperty.h
@@ -79,23 +79,23 @@ protected:
   nsresult InitDirectoryPrefs();
 
 	PRUint32 m_LastModifiedDate;
 
 	nsString m_ListDirName;
 	nsString m_ListName;
 	nsString m_ListNickName;
 	nsString m_Description;
-	PRBool   m_IsMailList;
+	bool     m_IsMailList;
 
   nsCString mURI;
   nsCString mQueryString;
   nsCString mURINoQuery;
-  PRBool mIsValidURI;
-  PRBool mIsQueryURI;
+  bool mIsValidURI;
+  bool mIsQueryURI;
 
 
   /*
    * Note that any derived implementations should ensure that this item
    * (m_DirPrefId) is correctly initialised correctly
    */
   nsCString m_DirPrefId;  // ie,"ldap_2.servers.pab"
 
--- a/mailnews/addrbook/src/nsAbDirectoryQuery.cpp
+++ b/mailnews/addrbook/src/nsAbDirectoryQuery.cpp
@@ -147,24 +147,24 @@ NS_IMETHODIMP nsAbDirectoryQueryArgument
 
 NS_IMETHODIMP nsAbDirectoryQueryArguments::SetExpression(nsISupports* aExpression)
 {
     mExpression = aExpression;
     return NS_OK;
 }
 
 /* attribute boolean querySubDirectories; */
-NS_IMETHODIMP nsAbDirectoryQueryArguments::GetQuerySubDirectories(PRBool* aQuerySubDirectories)
+NS_IMETHODIMP nsAbDirectoryQueryArguments::GetQuerySubDirectories(bool* aQuerySubDirectories)
 {
     NS_ENSURE_ARG_POINTER(aQuerySubDirectories);
     *aQuerySubDirectories = mQuerySubDirectories;
     return NS_OK;
 }
 
-NS_IMETHODIMP nsAbDirectoryQueryArguments::SetQuerySubDirectories(PRBool aQuerySubDirectories)
+NS_IMETHODIMP nsAbDirectoryQueryArguments::SetQuerySubDirectories(bool aQuerySubDirectories)
 {
     mQuerySubDirectories = aQuerySubDirectories;
     return NS_OK;
 }
 
 NS_IMETHODIMP nsAbDirectoryQueryArguments::GetTypeSpecificArg(nsISupports** aArg)
 {
     NS_ENSURE_ARG_POINTER(aArg);
@@ -253,17 +253,17 @@ NS_IMETHODIMP nsAbDirectoryQuery::DoQuer
 
   nsCOMPtr<nsISupports> supportsExpression;
   nsresult rv = arguments->GetExpression(getter_AddRefs(supportsExpression));
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIAbBooleanExpression> expression(do_QueryInterface(supportsExpression, &rv));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  PRBool doSubDirectories;
+  bool doSubDirectories;
   rv = arguments->GetQuerySubDirectories(&doSubDirectories);
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = query(aDirectory, expression, listener, doSubDirectories, &resultLimit);
 
   rv = NS_FAILED(rv) ? queryError(listener) : queryFinished(listener);
 
   *_retval = 0;
@@ -275,17 +275,17 @@ NS_IMETHODIMP nsAbDirectoryQuery::StopQu
 {
     return NS_OK;
 }
 
 
 nsresult nsAbDirectoryQuery::query(nsIAbDirectory* directory,
                                    nsIAbBooleanExpression* expression,
                                    nsIAbDirSearchListener* listener,
-                                   PRBool doSubDirectories,
+                                   bool doSubDirectories,
                                    PRInt32* resultLimit)
 {
   if (*resultLimit == 0)
     return NS_OK;
 
   nsresult rv = queryCards(directory, expression, listener, resultLimit);
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -297,26 +297,26 @@ nsresult nsAbDirectoryQuery::query(nsIAb
   }
 
   return rv;
 }
 
 nsresult nsAbDirectoryQuery::queryChildren(nsIAbDirectory* directory,
                                            nsIAbBooleanExpression* expression,
                                            nsIAbDirSearchListener* listener,
-                                           PRBool doSubDirectories,
+                                           bool doSubDirectories,
                                            PRInt32* resultLimit)
 {
     nsresult rv = NS_OK;
 
     nsCOMPtr<nsISimpleEnumerator> subDirectories;
     rv = directory->GetChildNodes(getter_AddRefs(subDirectories));
     NS_ENSURE_SUCCESS(rv, rv);
 
-    PRBool hasMore;
+    bool hasMore;
     while (NS_SUCCEEDED(rv = subDirectories->HasMoreElements(&hasMore)) && hasMore)
     {
         nsCOMPtr<nsISupports> item;
         rv = subDirectories->GetNext (getter_AddRefs (item));
         NS_ENSURE_SUCCESS(rv, rv);
 
         nsCOMPtr<nsIAbDirectory> subDirectory(do_QueryInterface(item, &rv));
         NS_ENSURE_SUCCESS(rv, rv);
@@ -343,17 +343,17 @@ nsresult nsAbDirectoryQuery::queryCards(
             NS_ENSURE_SUCCESS(rv, rv);
         else
             return NS_OK;
     }
 
     if (!cards)
         return NS_OK;
 
-    PRBool more;
+    bool more;
     while (NS_SUCCEEDED(cards->HasMoreElements(&more)) && more)
     {
         nsCOMPtr<nsISupports> item;
         rv = cards->GetNext(getter_AddRefs(item));
         NS_ENSURE_SUCCESS(rv, rv);
 
         nsCOMPtr<nsIAbCard> card(do_QueryInterface(item, &rv));
         NS_ENSURE_SUCCESS(rv, rv);
@@ -368,33 +368,33 @@ nsresult nsAbDirectoryQuery::queryCards(
     return NS_OK;
 }
 
 nsresult nsAbDirectoryQuery::matchCard(nsIAbCard* card,
                                        nsIAbBooleanExpression* expression,
                                        nsIAbDirSearchListener* listener,
                                        PRInt32* resultLimit)
 {
-    PRBool matchFound = PR_FALSE;
+    bool matchFound = false;
     nsresult rv = matchCardExpression(card, expression, &matchFound);
     NS_ENSURE_SUCCESS(rv, rv);
 
     if (matchFound)
     {
         (*resultLimit)--;
         rv = queryMatch(card, listener);
         NS_ENSURE_SUCCESS(rv, rv);
     }
 
     return rv;
 }
 
 nsresult nsAbDirectoryQuery::matchCardExpression(nsIAbCard* card,
                                                  nsIAbBooleanExpression* expression,
-                                                 PRBool* result)
+                                                 bool* result)
 {
     nsAbBooleanOperationType operation;
     nsresult rv = expression->GetOperation (&operation);
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsCOMPtr<nsIArray> childExpressions;
     rv = expression->GetExpressions (getter_AddRefs (childExpressions));
     NS_ENSURE_SUCCESS(rv, rv);
@@ -402,17 +402,17 @@ nsresult nsAbDirectoryQuery::matchCardEx
     PRUint32 count;
     rv = childExpressions->GetLength(&count);
     NS_ENSURE_SUCCESS(rv, rv);
 
     if (operation == nsIAbBooleanOperationTypes::NOT &&
         count > 1)
         return NS_ERROR_FAILURE;
 
-    PRBool value = *result = PR_FALSE;
+    bool value = *result = false;
     nsCOMPtr<nsIAbBooleanConditionString> childCondition;
     nsCOMPtr<nsIAbBooleanExpression> childExpression;
 
     for (PRUint32 i = 0; i < count; i++)
     {
         childCondition = do_QueryElementAt(childExpressions, i, &rv);
         if (NS_SUCCEEDED(rv))
         {
@@ -439,17 +439,17 @@ nsresult nsAbDirectoryQuery::matchCardEx
     }
     *result = value;
 
     return NS_OK;
 }
 
 nsresult nsAbDirectoryQuery::matchCardCondition(nsIAbCard* card,
                                                 nsIAbBooleanConditionString* condition,
-                                                PRBool* matchFound)
+                                                bool* matchFound)
 {
     nsAbBooleanConditionType conditionType;
     nsresult rv = condition->GetCondition (&conditionType);
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsCString name;
     rv = condition->GetName (getter_Copies (name));
     NS_ENSURE_SUCCESS(rv, rv);
@@ -461,17 +461,17 @@ nsresult nsAbDirectoryQuery::matchCardCo
     }
 
     nsString matchValue;
     rv = condition->GetValue (getter_Copies (matchValue));
     NS_ENSURE_SUCCESS(rv, rv);
 
     if (name.EqualsLiteral("IsMailList"))
     {
-      PRBool isMailList;
+      bool isMailList;
       rv = card->GetIsMailList(&isMailList);
       NS_ENSURE_SUCCESS(rv, rv);
 
       // Only equals is supported.
       if (conditionType != nsIAbBooleanConditionTypes::Is)
         return NS_ERROR_FAILURE;
 
       *matchFound = isMailList ? matchValue.EqualsLiteral("TRUE") :
--- a/mailnews/addrbook/src/nsAbDirectoryQuery.h
+++ b/mailnews/addrbook/src/nsAbDirectoryQuery.h
@@ -69,17 +69,17 @@ public:
     NS_DECL_NSIABDIRECTORYQUERYARGUMENTS
 
     nsAbDirectoryQueryArguments();
     virtual ~nsAbDirectoryQueryArguments();
 
 protected:
     nsCOMPtr<nsISupports> mExpression;
     nsCOMPtr<nsISupports> mTypeSpecificArg;
-    PRBool mQuerySubDirectories;
+    bool mQuerySubDirectories;
 };
 
 
 class nsAbDirectoryQueryPropertyValue : public nsIAbDirectoryQueryPropertyValue
 {
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSIABDIRECTORYQUERYPROPERTYVALUE
@@ -106,37 +106,37 @@ public:
 
     nsAbDirectoryQuery();
     virtual ~nsAbDirectoryQuery();
 
 protected:
     nsresult query(nsIAbDirectory* directory,
                    nsIAbBooleanExpression* expression,
                    nsIAbDirSearchListener* listener,
-                   PRBool doSubDirectories,
+                   bool doSubDirectories,
                    PRInt32* resultLimit);
     nsresult queryChildren(nsIAbDirectory* directory,
                            nsIAbBooleanExpression* expression,
                            nsIAbDirSearchListener* listener,
-                           PRBool doSubDirectories,
+                           bool doSubDirectories,
                            PRInt32* resultLimit);
     nsresult queryCards(nsIAbDirectory* directory,
                         nsIAbBooleanExpression* expression,
                         nsIAbDirSearchListener* listener,
                         PRInt32* resultLimit);
     nsresult matchCard(nsIAbCard* card,
                        nsIAbBooleanExpression* expression,
                        nsIAbDirSearchListener* listener,
                        PRInt32* resultLimit);
     nsresult matchCardExpression(nsIAbCard* card,
                                  nsIAbBooleanExpression* expression,
-                                 PRBool* result);
+                                 bool* result);
     nsresult matchCardCondition(nsIAbCard* card,
                                 nsIAbBooleanConditionString* condition,
-                                PRBool* matchFound);
+                                bool* matchFound);
 
     nsresult queryMatch (nsIAbCard* card,
         nsIAbDirSearchListener* listener);
     nsresult queryFinished(nsIAbDirSearchListener* listener);
     nsresult queryError(nsIAbDirSearchListener* listener);
 };
 
 #endif
--- a/mailnews/addrbook/src/nsAbDirectoryQueryProxy.h
+++ b/mailnews/addrbook/src/nsAbDirectoryQueryProxy.h
@@ -48,13 +48,13 @@ public:
     NS_DECL_ISUPPORTS
     NS_FORWARD_NSIABDIRECTORYQUERY(mDirectoryQuery->)
     NS_DECL_NSIABDIRECTORYQUERYPROXY
 
     nsAbDirectoryQueryProxy();
     virtual ~nsAbDirectoryQueryProxy();
 
 protected:
-    PRBool mInitiated;
+    bool mInitiated;
     nsCOMPtr<nsIAbDirectoryQuery> mDirectoryQuery;
 };
 
 #endif
--- a/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp
@@ -425,17 +425,17 @@ nsAbLDAPAutoCompFormatter::ProcessFormat
     //
     nsCOMPtr<nsIConsoleService> consoleSvc = 
         do_GetService("@mozilla.org/consoleservice;1", &rv);
     if (NS_FAILED(rv)) {
         NS_WARNING("nsAbLDAPAutoCompFormatter::ProcessFormat(): "
                    "couldn't get console service");
     }
 
-    PRBool attrRequired = PR_FALSE;     // is this attr required or optional?
+    bool attrRequired = false;     // is this attr required or optional?
     nsCAutoString attrName;             // current attr to get
 
     // parse until we hit the end of the string
     //
     while (iter != iterEnd) {
 
         switch (*iter) {            // process the next char
 
@@ -550,17 +550,17 @@ nsAbLDAPAutoCompFormatter::ProcessFormat
 
     return NS_OK;
 }
 
 nsresult 
 nsAbLDAPAutoCompFormatter::ParseAttrName(
     const PRUnichar **aIter,                     // iterators for mOutputString
     const PRUnichar *aIterEnd, 
-    PRBool aAttrRequired,                       // required?  or just optional?
+    bool aAttrRequired,                       // required?  or just optional?
     nsCOMPtr<nsIConsoleService> &aConsoleSvc,   // no need to reacquire this
     nsACString &aAttrName)                      // attribute token
 {
     // reset attrname, and move past the opening brace
     //
     ++(*aIter);
 
     // get the rest of the attribute name
@@ -604,17 +604,17 @@ nsAbLDAPAutoCompFormatter::ParseAttrName
 
     return NS_OK;
 }
 
 nsresult
 nsAbLDAPAutoCompFormatter::AppendFirstAttrValue(
     const nsACString &aAttrName, // attr to get
     nsILDAPMessage *aMessage, // msg to get values from
-    PRBool aAttrRequired, // is this a required value?
+    bool aAttrRequired, // is this a required value?
     nsACString &aValue)
 {
     // get the attribute values for the field which will be used 
     // to fill in nsIAutoCompleteItem::value
     //
     PRUint32 numVals;
     PRUnichar **values;
 
--- a/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.h
+++ b/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.h
@@ -62,19 +62,19 @@ class nsAbLDAPAutoCompFormatter : public
     nsresult ProcessFormat(const nsAString & aFormat,
                            nsILDAPMessage *aMessage, 
                            nsACString *aValue,
                            nsCStringArray *aAttrs);
 
     // process a single attribute while parsing format
     nsresult ParseAttrName(const PRUnichar **aIter,  
                            const PRUnichar *aIterEnd, 
-                           PRBool aAttrRequired,
+                           bool aAttrRequired,
                            nsCOMPtr<nsIConsoleService> & aConsoleSvc,
                            nsACString & aAttrName);
 
     // append the first value associated with aAttrName in aMessage to aValue
     nsresult AppendFirstAttrValue(const nsACString &aAttrName, 
                                   nsILDAPMessage *aMessage,
-                                  PRBool aAttrRequired,
+                                  bool aAttrRequired,
                                   nsACString &aValue);
 };
 
--- a/mailnews/addrbook/src/nsAbLDAPChangeLogData.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPChangeLogData.cpp
@@ -204,17 +204,17 @@ nsresult nsAbLDAPProcessChangeLogData::O
                 rv = mDirectory->GetReplicationFileName(fileName);
                 if (NS_FAILED(rv))
                   break;
 
                 rv = dbPath->AppendNative(fileName);
                 if (NS_FAILED(rv)) 
                     break;
 
-                PRBool fileExists;
+                bool fileExists;
                 rv = dbPath->Exists(&fileExists);
                 if (NS_FAILED(rv)) 
                     break;
 
                 PRInt64 fileSize;
                 rv = dbPath->GetFileSize(&fileSize);
                 if(NS_FAILED(rv)) 
                     break;
@@ -302,17 +302,17 @@ nsresult nsAbLDAPProcessChangeLogData::G
 
     nsString desc;
     rv = bundle->GetStringFromName(NS_LITERAL_STRING("AuthDlgDesc").get(), getter_Copies(desc));
     if (NS_FAILED (rv)) 
         return rv ;
 
     nsString username;
     nsString password;
-    PRBool btnResult = PR_FALSE;
+    bool btnResult = false;
 	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/nsAbLDAPChangeLogData.h
+++ b/mailnews/addrbook/src/nsAbLDAPChangeLogData.h
@@ -74,17 +74,17 @@ protected :
   nsCString mAuthUserID;   // user id of the user making the connection
 
   nsresult OnSearchAuthDNDone();
   nsresult OnSearchRootDSEDone();
   nsresult OnFindingChangesDone();
   nsresult OnReplicatingChangeDone();
 
   RootDSEChangeLogEntry mRootDSEEntry;
-  PRBool  mUseChangeLog;
+  bool    mUseChangeLog;
   PRInt32 mChangeLogEntriesCount;
 
   PRInt32 mEntriesAddedQueryCount;
   nsStringArray mEntriesToAdd;
 };
 
 
 #endif // nsAbLDAPChangeLogData_h__
--- a/mailnews/addrbook/src/nsAbLDAPDirectory.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPDirectory.cpp
@@ -141,17 +141,17 @@ NS_IMETHODIMP nsAbLDAPDirectory::GetChil
   return NS_NewEmptyEnumerator(aResult);
 }
 
 NS_IMETHODIMP nsAbLDAPDirectory::GetChildCards(nsISimpleEnumerator** result)
 {
     nsresult rv;
     
     // when offline, we need to get the child cards for the local, replicated mdb directory 
-    PRBool offline;
+    bool offline;
     nsCOMPtr <nsIIOService> ioService = do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
     NS_ENSURE_SUCCESS(rv,rv);
     rv = ioService->GetOffline(&offline);
     NS_ENSURE_SUCCESS(rv,rv);
     
     if (offline) {
       nsCString fileName;
       rv = GetReplicationFileName(fileName);
@@ -188,24 +188,24 @@ NS_IMETHODIMP nsAbLDAPDirectory::GetChil
 
       rv = NS_NewEmptyEnumerator(result);
     }
 
     NS_ENSURE_SUCCESS(rv,rv);
     return rv;
 }
 
-NS_IMETHODIMP nsAbLDAPDirectory::GetIsQuery(PRBool *aResult)
+NS_IMETHODIMP nsAbLDAPDirectory::GetIsQuery(bool *aResult)
 {
   NS_ENSURE_ARG_POINTER(aResult);
   *aResult = mIsQueryURI;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsAbLDAPDirectory::HasCard(nsIAbCard* card, PRBool* hasCard)
+NS_IMETHODIMP nsAbLDAPDirectory::HasCard(nsIAbCard* card, bool* hasCard)
 {
   nsresult rv = Initiate ();
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Enter lock
   MutexAutoLock lock (mLock);
 
   *hasCard = mCache.Get(card, nsnull);
@@ -275,17 +275,17 @@ NS_IMETHODIMP nsAbLDAPDirectory::SetLDAP
 
   rv = SetStringValue("uri", tempLDAPURL);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Now we need to send an update which will ensure our indicators and
   // listeners get updated correctly.
 
   // See if they both start with ldaps: or ldap:
-  PRBool newIsNotSecure = StringHead(tempLDAPURL, 5).Equals("ldap:");
+  bool newIsNotSecure = StringHead(tempLDAPURL, 5).Equals("ldap:");
 
   if (oldUrl.IsEmpty() ||
       StringHead(oldUrl, 5).Equals("ldap:") != newIsNotSecure)
   {
     // They don't so its time to send round an update.
     nsCOMPtr<nsIAbManager> abManager = do_GetService(NS_ABMANAGER_CONTRACTID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
 
@@ -417,83 +417,83 @@ NS_IMETHODIMP nsAbLDAPDirectory::OnSearc
 
   nsCOMPtr<nsIAbManager> abManager = do_GetService(NS_ABMANAGER_CONTRACTID, &rv);
   if(NS_SUCCEEDED(rv))
     abManager->NotifyDirectoryItemAdded(this, card);
 
   return NS_OK;
 }
 
-NS_IMETHODIMP nsAbLDAPDirectory::GetSupportsMailingLists(PRBool *aSupportsMailingsLists)
+NS_IMETHODIMP nsAbLDAPDirectory::GetSupportsMailingLists(bool *aSupportsMailingsLists)
 {
   NS_ENSURE_ARG_POINTER(aSupportsMailingsLists);
   *aSupportsMailingsLists = PR_FALSE;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsAbLDAPDirectory::GetReadOnly(PRBool *aReadOnly)
+NS_IMETHODIMP nsAbLDAPDirectory::GetReadOnly(bool *aReadOnly)
 {
   NS_ENSURE_ARG_POINTER(aReadOnly);
 
   *aReadOnly = PR_TRUE;
 
 #ifdef MOZ_EXPERIMENTAL_WRITEABLE_LDAP
-  PRBool readOnly;
+  bool readOnly;
   nsresult rv = GetBoolValue("readonly", PR_FALSE, &readOnly);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (readOnly)
     return NS_OK;
 
   // when online, we'll allow writing as well
-  PRBool offline;
+  bool offline;
   nsCOMPtr <nsIIOService> ioService =
     do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
   NS_ENSURE_SUCCESS(rv,rv);
 
   rv = ioService->GetOffline(&offline);
   NS_ENSURE_SUCCESS(rv,rv);
 
   if (!offline)
     *aReadOnly = PR_FALSE;
 #endif
 
   return NS_OK;
 }
 
-NS_IMETHODIMP nsAbLDAPDirectory::GetIsRemote(PRBool *aIsRemote)
+NS_IMETHODIMP nsAbLDAPDirectory::GetIsRemote(bool *aIsRemote)
 {
   NS_ENSURE_ARG_POINTER(aIsRemote);
   *aIsRemote = PR_TRUE;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsAbLDAPDirectory::GetIsSecure(PRBool *aIsSecure)
+NS_IMETHODIMP nsAbLDAPDirectory::GetIsSecure(bool *aIsSecure)
 {
   NS_ENSURE_ARG_POINTER(aIsSecure);
 
   nsCAutoString URI;
   nsresult rv = GetStringValue("uri", EmptyCString(), URI);
   NS_ENSURE_SUCCESS(rv, rv);
   
   // to determine if this is a secure directory, check if the uri is ldaps:// or not
   *aIsSecure = (strncmp(URI.get(), "ldaps:", 6) == 0);
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbLDAPDirectory::UseForAutocomplete(const nsACString &aIdentityKey,
-                                                    PRBool *aResult)
+                                                    bool *aResult)
 {
   NS_ENSURE_ARG_POINTER(aResult);
 
   // Set this to false by default to make the code easier below.
   *aResult = PR_FALSE;
 
   nsresult rv;
-  PRBool offline = PR_FALSE;
+  bool offline = false;
   nsCOMPtr <nsIIOService> ioService =
     do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = ioService->GetOffline(&offline);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // If we're online, then don't allow search during local autocomplete - must
@@ -501,17 +501,17 @@ NS_IMETHODIMP nsAbLDAPDirectory::UseForA
   if (!offline)
     return NS_OK;
 
   // Is the use directory pref set for autocompletion?
   nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID,
                                               &rv));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  PRBool useDirectory = PR_FALSE;
+  bool useDirectory = false;
   rv = prefs->GetBoolPref("ldap_2.autoComplete.useDirectory", &useDirectory);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // No need to search if not set up globally for LDAP autocompletion and we've
   // not been given an identity.
   if (!useDirectory && aIdentityKey.IsEmpty())
     return NS_OK;
 
@@ -525,17 +525,17 @@ NS_IMETHODIMP nsAbLDAPDirectory::UseForA
 
     // If we failed, just return, we can't do much about this.
     if (NS_SUCCEEDED(rv))
     {
       nsCOMPtr<nsIMsgIdentity> identity;
       rv = accountManager->GetIdentity(aIdentityKey, getter_AddRefs(identity));
       if (NS_SUCCEEDED(rv))
       {
-        PRBool overrideGlobalPref = PR_FALSE;
+        bool overrideGlobalPref = false;
         identity->GetOverrideGlobalPref(&overrideGlobalPref);
         if (overrideGlobalPref)
           identity->GetDirectoryServer(prefName);
       }
     }
 
     // If the preference name is still empty but useDirectory is false, then
     // the global one is not available, nor is the overriden one.
@@ -557,17 +557,17 @@ NS_IMETHODIMP nsAbLDAPDirectory::UseForA
   {
     // Yes it does, one last check - does the replication file exist?
     nsresult rv;
     nsCOMPtr<nsILocalFile> databaseFile;
     // If we can't get the file, then there is no database to use
     if (NS_FAILED(GetReplicationFile(getter_AddRefs(databaseFile))))
       return NS_OK;
 
-    PRBool exists;
+    bool exists;
     rv = databaseFile->Exists(&exists);
     NS_ENSURE_SUCCESS(rv, rv);
 
     *aResult = exists;
   }
   return NS_OK;
 }
 
--- a/mailnews/addrbook/src/nsAbLDAPDirectory.h
+++ b/mailnews/addrbook/src/nsAbLDAPDirectory.h
@@ -65,40 +65,40 @@ public:
 
   NS_IMETHOD Init(const char *aUri);
 
   // nsIAbDirectory methods
   NS_IMETHOD GetPropertiesChromeURI(nsACString &aResult);
   NS_IMETHOD GetURI(nsACString &aURI);
   NS_IMETHOD GetChildNodes(nsISimpleEnumerator* *result);
   NS_IMETHOD GetChildCards(nsISimpleEnumerator* *result);
-  NS_IMETHOD GetIsQuery(PRBool *aResult);
-  NS_IMETHOD HasCard(nsIAbCard *cards, PRBool *hasCard);
-  NS_IMETHOD GetSupportsMailingLists(PRBool *aSupportsMailingsLists);
-  NS_IMETHOD GetReadOnly(PRBool *aReadOnly);
-  NS_IMETHOD GetIsRemote(PRBool *aIsRemote);
-  NS_IMETHOD GetIsSecure(PRBool *aIsRemote);
-  NS_IMETHOD UseForAutocomplete(const nsACString &aIdentityKey, PRBool *aResult);
+  NS_IMETHOD GetIsQuery(bool *aResult);
+  NS_IMETHOD HasCard(nsIAbCard *cards, bool *hasCard);
+  NS_IMETHOD GetSupportsMailingLists(bool *aSupportsMailingsLists);
+  NS_IMETHOD GetReadOnly(bool *aReadOnly);
+  NS_IMETHOD GetIsRemote(bool *aIsRemote);
+  NS_IMETHOD GetIsSecure(bool *aIsRemote);
+  NS_IMETHOD UseForAutocomplete(const nsACString &aIdentityKey, bool *aResult);
   NS_IMETHOD AddCard(nsIAbCard *aChildCard, nsIAbCard **aAddedCard);
   NS_IMETHOD ModifyCard(nsIAbCard *aModifiedCard);
   NS_IMETHOD DeleteCards(nsIArray *aCards);
 
   // nsIAbDirectorySearch methods
   NS_DECL_NSIABDIRECTORYSEARCH
   NS_DECL_NSIABLDAPDIRECTORY
   NS_DECL_NSIABDIRSEARCHLISTENER
 
 protected:
   nsresult Initiate();
 
   nsresult SplitStringList(const nsACString& aString,
                            PRUint32 *aCount,
                            char ***aValues);
 
-  PRPackedBool mPerformingQuery;
+  bool mPerformingQuery;
   PRInt32 mContext;
   PRInt32 mMaxHits;
 
   nsInterfaceHashtable<nsISupportsHashKey, nsIAbCard> mCache;
 
   mozilla::Mutex mLock;
   nsCOMPtr<nsIAbDirectoryQuery> mDirectoryQuery;
   nsCOMPtr<nsIMutableArray> mSearchServerControls;
--- a/mailnews/addrbook/src/nsAbLDAPDirectoryModify.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPDirectoryModify.cpp
@@ -69,31 +69,31 @@ public:
                                 const PRInt32 timeOut = 0);
   virtual ~nsAbModifyLDAPMessageListener();
 
   // nsILDAPMessageListener
   NS_IMETHOD OnLDAPMessage(nsILDAPMessage *aMessage);
 
 protected:
   nsresult Cancel();
-  virtual void InitFailed(PRBool aCancelled = PR_FALSE);
+  virtual void InitFailed(bool aCancelled = false);
   virtual nsresult DoTask();
   nsresult DoMainTask();
   nsresult OnLDAPMessageModifyResult(nsILDAPMessage *aMessage);
   nsresult OnLDAPMessageRenameResult(nsILDAPMessage *aMessage);
 
   PRInt32 mType;
   nsCString mCardDN;
   nsCOMPtr<nsIArray> mModification;
   nsCString mNewRDN;
   nsCString mNewBaseDN;
 
-  PRBool mFinished;
-  PRBool mCanceled;
-  PRBool mFlagRename;
+  bool mFinished;
+  bool mCanceled;
+  bool mFlagRename;
 
   nsCOMPtr<nsILDAPOperation> mModifyOperation;
   nsCOMPtr<nsIMutableArray> mServerSearchControls;
   nsCOMPtr<nsIMutableArray> mClientSearchControls;
 };
 
 
 NS_IMPL_THREADSAFE_ISUPPORTS1(nsAbModifyLDAPMessageListener, nsILDAPMessageListener)
@@ -150,17 +150,17 @@ NS_IMETHODIMP nsAbModifyLDAPMessageListe
 {
   nsresult rv = Initiate();
   NS_ENSURE_SUCCESS(rv, rv);
 
   PRInt32 messageType;
   rv = aMessage->GetType(&messageType);
   NS_ENSURE_SUCCESS(rv, rv);
   
-  PRBool cancelOperation = PR_FALSE;
+  bool cancelOperation = false;
 
   // Enter lock
   {
     MutexAutoLock lock (mLock);
 
     if (mFinished)
       return NS_OK;
 
@@ -215,17 +215,17 @@ NS_IMETHODIMP nsAbModifyLDAPMessageListe
     // until the search is done, so we'll ignore results from a previous
     // search.
     mCanceled = mFinished = PR_FALSE;
   }
 
   return rv;
 }
 
-void nsAbModifyLDAPMessageListener::InitFailed(PRBool aCancelled)
+void nsAbModifyLDAPMessageListener::InitFailed(bool aCancelled)
 {
   // XXX Just cancel the operation for now
   // we'll need to review this when we've got the proper listeners in place.
   Cancel();
 }
 
 nsresult nsAbModifyLDAPMessageListener::DoTask()
 {
--- a/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp
@@ -90,27 +90,27 @@ public:
 protected:
   nsresult OnLDAPMessageSearchEntry(nsILDAPMessage *aMessage);
   nsresult OnLDAPMessageSearchResult(nsILDAPMessage *aMessage);
 
   friend class nsAbLDAPDirectoryQuery;
 
   nsresult Cancel();
   virtual nsresult DoTask();
-  virtual void InitFailed(PRBool aCancelled = PR_FALSE);
+  virtual void InitFailed(bool aCancelled = false);
 
   nsCOMPtr<nsILDAPURL> mSearchUrl;
   nsIAbDirectoryQueryResultListener *mResultListener;
   PRInt32 mContextID;
   nsCOMPtr<nsIAbDirectoryQueryArguments> mQueryArguments;
   PRInt32 mResultLimit;
 
-  PRBool mFinished;
-  PRBool mCanceled;
-  PRBool mWaitingForPrevQueryToFinish;
+  bool mFinished;
+  bool mCanceled;
+  bool mWaitingForPrevQueryToFinish;
 
   nsCOMPtr<nsIMutableArray> mServerSearchControls;
   nsCOMPtr<nsIMutableArray> mClientSearchControls;
 };
 
 
 NS_IMPL_THREADSAFE_ISUPPORTS1(nsAbQueryLDAPMessageListener, nsILDAPMessageListener)
 
@@ -165,17 +165,17 @@ NS_IMETHODIMP nsAbQueryLDAPMessageListen
 {
   nsresult rv = Initiate();
   NS_ENSURE_SUCCESS(rv, rv);
 
   PRInt32 messageType;
   rv = aMessage->GetType(&messageType);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  PRBool cancelOperation = PR_FALSE;
+  bool cancelOperation = false;
 
   // Enter lock
   {
     MutexAutoLock lock (mLock);
 
     if (mFinished)
       return NS_OK;
 
@@ -266,17 +266,17 @@ nsresult nsAbQueryLDAPMessageListener::D
 
   rv = mOperation->SetClientControls(mClientSearchControls);
   NS_ENSURE_SUCCESS(rv, rv);
 
   return mOperation->SearchExt(dn, scope, filter, attributes, mTimeOut,
                                mResultLimit);
 }
 
-void nsAbQueryLDAPMessageListener::InitFailed(PRBool aCancelled)
+void nsAbQueryLDAPMessageListener::InitFailed(bool aCancelled)
 {
   if (!mResultListener)
     return;
 
   // In the !aCancelled case we know there was an error, but we won't be
   // able to translate it, so just return an error code of zero.
   mResultListener->OnQueryResult(
       aCancelled ? nsIAbDirectoryQueryResultListener::queryResultStopped :
@@ -380,30 +380,30 @@ NS_IMETHODIMP nsAbLDAPDirectoryQuery::Do
   rv = directory->GetProtocolVersion(&protocolVersion);
   NS_ENSURE_SUCCESS(rv, rv);
   
   // To do:
   // Ensure query is stopped
   // If connection params have changed re-create connection
   // else reuse existing connection
   
-  PRBool redoConnection = PR_FALSE;
+  bool redoConnection = false;
   
   if (!mConnection || !mDirectoryUrl)
   {
     mDirectoryUrl = currentUrl;
     aDirectory->GetUuid(mDirectoryId);
     mCurrentLogin = login;
     mCurrentMechanism = saslMechanism;
     mCurrentProtocolVersion = protocolVersion;
     redoConnection = PR_TRUE;
   }
   else
   {
-    PRBool equal;
+    bool equal;
     rv = mDirectoryUrl->Equals(currentUrl, &equal);
       NS_ENSURE_SUCCESS(rv, rv);
   
     nsCString spec;
     mDirectoryUrl->GetSpec(spec);
     currentUrl->GetSpec(spec);
 
     if (!equal)
@@ -523,17 +523,17 @@ NS_IMETHODIMP nsAbLDAPDirectoryQuery::Do
 
   rv = url->SetFilter(searchFilter);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Now formulate the search string
   
   // Get the scope
   PRInt32 scope;
-  PRBool doSubDirectories;
+  bool doSubDirectories;
   rv = aArguments->GetQuerySubDirectories (&doSubDirectories);
   NS_ENSURE_SUCCESS(rv, rv);
   scope = doSubDirectories ? nsILDAPURL::SCOPE_SUBTREE :
                              nsILDAPURL::SCOPE_ONELEVEL;
 
   rv = url->SetScope(scope);
   NS_ENSURE_SUCCESS(rv, rv);
 
--- a/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.h
+++ b/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.h
@@ -67,12 +67,12 @@ private:
   nsCOMPtr<nsILDAPConnection> mConnection;
   nsCOMPtr<nsILDAPURL> mDirectoryUrl;
   nsCString mDirectoryId;
   nsCOMArray<nsIAbDirSearchListener> mListeners;
   nsCString mCurrentLogin;
   nsCString mCurrentMechanism;
   PRUint32 mCurrentProtocolVersion;
 
-  PRBool mInitialized;
+  bool mInitialized;
 };
 
 #endif // nsAbLDAPDirectoryQuery_h__
--- a/mailnews/addrbook/src/nsAbLDAPListenerBase.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPListenerBase.cpp
@@ -231,17 +231,17 @@ NS_IMETHODIMP nsAbLDAPListenerBase::OnLD
     if (NS_FAILED(rv))
     {
       NS_ERROR("nsAbLDAPMessageBase::OnLDAPInit():"
                " error getting directory url spec");
       InitFailed();
       return rv;
     }
 
-    PRBool status;
+    bool status;
     rv = authPrompter->PromptPassword(authPromptTitle.get(),
                                       authPromptText.get(),
                                       NS_ConvertUTF8toUTF16(spec).get(),
                                       nsIAuthPrompt::SAVE_PASSWORD_PERMANENTLY,
                                       getter_Copies(passwd),
                                       &status);
     if (NS_FAILED(rv))
     {
--- a/mailnews/addrbook/src/nsAbLDAPListenerBase.h
+++ b/mailnews/addrbook/src/nsAbLDAPListenerBase.h
@@ -63,26 +63,26 @@ public:
   NS_IMETHOD OnLDAPInit(nsILDAPConnection *aConn, nsresult aStatus);
 
 protected:
   nsresult OnLDAPMessageBind(nsILDAPMessage *aMessage);
 
   nsresult Initiate();
 
   // Called if an LDAP initialization fails.
-  virtual void InitFailed(PRBool aCancelled = PR_FALSE) = 0;
+  virtual void InitFailed(bool aCancelled = false) = 0;
 
   // Called to start off the required task after a bind.
   virtual nsresult DoTask() = 0;
 
   nsCOMPtr<nsILDAPURL> mDirectoryUrl;
   nsCOMPtr<nsILDAPOperation> mOperation;        // current ldap op
   nsILDAPConnection* mConnection;
   nsCString mLogin;
   nsCString mSaslMechanism;
   PRInt32 mTimeOut;
-  PRBool mBound;
-  PRBool mInitialized;
+  bool mBound;
+  bool mInitialized;
 
   mozilla::Mutex mLock;
 };
 
 #endif
--- a/mailnews/addrbook/src/nsAbLDAPReplicationData.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPReplicationData.cpp
@@ -241,17 +241,17 @@ nsresult nsAbLDAPProcessReplicationData:
 
   if (mListener && NS_SUCCEEDED(rv))
     mListener->OnStateChange(nsnull, nsnull,
                              nsIWebProgressListener::STATE_START, PR_TRUE);
 
   return mOperation->SearchExt(dn, scope, urlFilter, attributes, 0, 0);
 }
 
-void nsAbLDAPProcessReplicationData::InitFailed(PRBool aCancelled)
+void nsAbLDAPProcessReplicationData::InitFailed(bool aCancelled)
 {
   // Just call Done() which will ensure everything is tidied up nicely.
   Done(PR_FALSE);
 }
 
 nsresult nsAbLDAPProcessReplicationData::OnLDAPSearchEntry(nsILDAPMessage *aMessage)
 {
     NS_ENSURE_ARG_POINTER(aMessage);
@@ -376,17 +376,17 @@ nsresult nsAbLDAPProcessReplicationData:
             }
         }
         Done(PR_FALSE);
     }
 
     return NS_OK;
 }
 
-nsresult nsAbLDAPProcessReplicationData::OpenABForReplicatedDir(PRBool aCreate)
+nsresult nsAbLDAPProcessReplicationData::OpenABForReplicatedDir(bool aCreate)
 {
   if (!mInitialized)
     return NS_ERROR_NOT_INITIALIZED;
 
   nsresult rv = mDirectory->GetReplicationFile(getter_AddRefs(mReplicationFile));
   if (NS_FAILED(rv))
   {
      Done(PR_FALSE);
@@ -397,17 +397,17 @@ nsresult nsAbLDAPProcessReplicationData:
   rv = mReplicationFile->GetNativeLeafName(fileName);
   if (NS_FAILED(rv)) {
     Done(PR_FALSE);
     return rv;
   }
 
     // if the AB DB already exists backup existing one, 
     // in case if the user cancels or Abort put back the backed up file
-    PRBool fileExists;
+    bool fileExists;
     rv = mReplicationFile->Exists(&fileExists);
     if(NS_SUCCEEDED(rv) && fileExists) {
         // create the backup file object same as the Replication file object.
         // we create a backup file here since we need to cleanup the existing file
         // for create and then commit so instead of deleting existing cards we just
         // clone the existing one for a much better performance - for Download All.
         // And also important in case if replication fails we donot lose user's existing 
         // replicated data for both Download all and Changelog.
@@ -486,17 +486,17 @@ nsresult nsAbLDAPProcessReplicationData:
             mBackupReplicationFile->Remove(PR_FALSE);
         return rv;
     }
 
     mDBOpen = PR_TRUE;  // replication DB is now Open
     return rv;
 }
 
-void nsAbLDAPProcessReplicationData::Done(PRBool aSuccess)
+void nsAbLDAPProcessReplicationData::Done(bool aSuccess)
 {
    if (!mInitialized) 
        return;
 
    mState = kReplicationDone;
 
    if (mQuery)
      mQuery->Done(aSuccess);
--- a/mailnews/addrbook/src/nsAbLDAPReplicationData.h
+++ b/mailnews/addrbook/src/nsAbLDAPReplicationData.h
@@ -61,39 +61,39 @@ public:
   nsAbLDAPProcessReplicationData();
   virtual ~nsAbLDAPProcessReplicationData();
 
   // nsILDAPMessageListener
   NS_IMETHOD OnLDAPMessage(nsILDAPMessage *aMessage);
 
 protected:
   virtual nsresult DoTask();
-  virtual void InitFailed(PRBool aCancelled = PR_FALSE);
+  virtual void InitFailed(bool aCancelled = false);
 
   // pointer to the interfaces used by this object
   nsCOMPtr<nsIWebProgressListener> mListener;
   // pointer to the query to call back to once we've finished
   nsCOMPtr<nsIAbLDAPReplicationQuery> mQuery;
 
   nsCOMPtr<nsIAddrDatabase> mReplicationDB;
   nsCOMPtr <nsILocalFile> mReplicationFile;
   nsCOMPtr <nsILocalFile> mBackupReplicationFile;
 
   // state of processing, protocol used and count of results
   PRInt32         mState;
   PRInt32         mProtocol;
   PRInt32         mCount;
-  PRBool          mDBOpen;
-  PRBool          mInitialized;
+  bool            mDBOpen;
+  bool            mInitialized;
   
   nsCOMPtr<nsIAbLDAPDirectory> mDirectory;
   nsCOMPtr<nsIAbLDAPAttributeMap> mAttrMap; // maps ab properties to ldap attrs
   
   virtual nsresult OnLDAPSearchEntry(nsILDAPMessage *aMessage);
   virtual nsresult OnLDAPSearchResult(nsILDAPMessage *aMessage);
   
-  nsresult OpenABForReplicatedDir(PRBool bCreate);
+  nsresult OpenABForReplicatedDir(bool bCreate);
   nsresult DeleteCard(nsString & aDn);
-  void Done(PRBool aSuccess);
+  void Done(bool aSuccess);
 };
 
 
 #endif // nsAbLDAPReplicationData_h__
--- a/mailnews/addrbook/src/nsAbLDAPReplicationQuery.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPReplicationQuery.cpp
@@ -166,17 +166,17 @@ NS_IMETHODIMP nsAbLDAPReplicationQuery::
 NS_IMETHODIMP nsAbLDAPReplicationQuery::CancelQuery()
 {
     if (!mInitialized) 
         return NS_ERROR_NOT_INITIALIZED;
 
     return mDataProcessor->Abort();
 }
 
-NS_IMETHODIMP nsAbLDAPReplicationQuery::Done(PRBool aSuccess)
+NS_IMETHODIMP nsAbLDAPReplicationQuery::Done(bool aSuccess)
 {
    if (!mInitialized) 
        return NS_ERROR_NOT_INITIALIZED;
 
    nsresult rv = NS_OK;
    nsCOMPtr<nsIAbLDAPReplicationService> replicationService = 
                             do_GetService(NS_ABLDAP_REPLICATIONSERVICE_CONTRACTID, &rv);
    if (NS_SUCCEEDED(rv))
--- a/mailnews/addrbook/src/nsAbLDAPReplicationQuery.h
+++ b/mailnews/addrbook/src/nsAbLDAPReplicationQuery.h
@@ -63,13 +63,13 @@ protected :
   // pointer to interfaces used by this object
   nsCOMPtr<nsILDAPConnection> mConnection;
   nsCOMPtr<nsILDAPOperation> mOperation;
   nsCOMPtr<nsILDAPURL> mURL;
   nsCOMPtr<nsIAbLDAPDirectory> mDirectory;
 
   nsCOMPtr<nsIAbLDAPProcessReplicationData> mDataProcessor;
 
-  PRBool mInitialized;
+  bool mInitialized;
   nsCString mLogin;
 };
 
 #endif // nsAbLDAPReplicationQuery_h__
--- a/mailnews/addrbook/src/nsAbLDAPReplicationService.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPReplicationService.cpp
@@ -134,17 +134,17 @@ NS_IMETHODIMP nsAbLDAPReplicationService
 
   // If query has been cancelled successfully
   if (NS_SUCCEEDED(rv))
     Done(PR_FALSE);
 
   return rv;
 }
 
-NS_IMETHODIMP nsAbLDAPReplicationService::Done(PRBool aSuccess)
+NS_IMETHODIMP nsAbLDAPReplicationService::Done(bool aSuccess)
 {
   mReplicating = PR_FALSE;
   if (mQuery)
   {
     mQuery = nsnull;  // Release query obj
     mDirectory = nsnull; // Release directory
   }
 
--- a/mailnews/addrbook/src/nsAbLDAPReplicationService.h
+++ b/mailnews/addrbook/src/nsAbLDAPReplicationService.h
@@ -51,15 +51,15 @@ public:
 
   nsAbLDAPReplicationService();
   virtual ~nsAbLDAPReplicationService();
 
   PRInt32 DecideProtocol();
 
 protected:
   nsCOMPtr<nsIAbLDAPReplicationQuery> mQuery; 
-  PRBool         mReplicating;
+  bool           mReplicating;
   nsCOMPtr<nsIAbLDAPDirectory> mDirectory;
 
 };
 
 
 #endif /* nsAbLDAPReplicationService_h___ */
--- a/mailnews/addrbook/src/nsAbLDIFService.cpp
+++ b/mailnews/addrbook/src/nsAbLDIFService.cpp
@@ -88,17 +88,17 @@ static unsigned char b642nib[0x80] = {
     0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,
     0x17, 0x18, 0x19, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
     0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
     0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,
     0x31, 0x32, 0x33, 0xff, 0xff, 0xff, 0xff, 0xff
 };
 
-NS_IMETHODIMP nsAbLDIFService::ImportLDIFFile(nsIAddrDatabase *aDb, nsIFile *aSrc, PRBool aStoreLocAsHome, PRUint32 *aProgress)
+NS_IMETHODIMP nsAbLDIFService::ImportLDIFFile(nsIAddrDatabase *aDb, nsIFile *aSrc, bool aStoreLocAsHome, PRUint32 *aProgress)
 {
   NS_ENSURE_ARG_POINTER(aSrc);
   NS_ENSURE_ARG_POINTER(aDb);
 
   mStoreLocAsHome = aStoreLocAsHome;
 
   char buf[1024];
   char* pBuf = &buf[0];
@@ -366,17 +366,17 @@ nsresult nsAbLDIFService::GetLdifStringR
   if ((stopPos == len) && (mLFCount > 1) || (mCRCount > 2 && mLFCount) ||
       (!mLFCount && mCRCount > 1))
     return NS_OK;
 
   return NS_ERROR_FAILURE;
 }
 
 void nsAbLDIFService::AddLdifRowToDatabase(nsIAddrDatabase *aDatabase,
-                                           PRBool bIsList)
+                                           bool bIsList)
 {
   // If no data to process then reset CR/LF counters and return.
   if (mLdifLine.IsEmpty())
   {
     mLFCount = 0;
     mCRCount = 0;
     return;
   }
@@ -416,17 +416,17 @@ void nsAbLDIFService::AddLdifRowToDataba
     aDatabase->AddListDirNode(newRow);
         
   // Clear buffer for next record
   ClearLdifRecordBuffer();
 }
 
 void nsAbLDIFService::AddLdifColToDatabase(nsIAddrDatabase *aDatabase,
                                            nsIMdbRow* newRow, char* typeSlot,
-                                           char* valueSlot, PRBool bIsList)
+                                           char* valueSlot, bool bIsList)
 {
   nsCAutoString colType(typeSlot);
   nsCAutoString column(valueSlot);
 
   // 4.x exports attributes like "givenname", 
   // mozilla does "givenName" to be compliant with RFC 2798
   ToLowerCase(colType);
 
@@ -790,17 +790,17 @@ static const char *const sLDIFFields[] =
     "givenName",
     "mail",
     nsnull
 };
 #define kMaxLDIFLen        14
 
 // Count total number of legal ldif fields and records in the first 100 lines of the 
 // file and if the average legal ldif field is 3 or higher than it's a valid ldif file.
-NS_IMETHODIMP nsAbLDIFService::IsLDIFFile(nsIFile *pSrc, PRBool *_retval)
+NS_IMETHODIMP nsAbLDIFService::IsLDIFFile(nsIFile *pSrc, bool *_retval)
 {
   NS_ENSURE_ARG_POINTER(pSrc);
   NS_ENSURE_ARG_POINTER(_retval);
 
   *_retval = PR_FALSE;
 
   nsresult rv = NS_OK;
 
@@ -814,18 +814,18 @@ NS_IMETHODIMP nsAbLDIFService::IsLDIFFil
   PRInt32 lineLen = 0;
   PRInt32 lineCount = 0;
   PRInt32 ldifFields = 0;  // total number of legal ldif fields.
   char field[kMaxLDIFLen];
   PRInt32 fLen = 0;
   const char *pChar;
   PRInt32 recCount = 0;  // total number of records.
   PRInt32 i;
-  PRBool gotLDIF = PR_FALSE;
-  PRBool more = PR_TRUE;
+  bool gotLDIF = false;
+  bool more = true;
   nsCString line;
 
   while (more && NS_SUCCEEDED(rv) && (lineCount < 100))
   {
     rv = lineInputStream->ReadLine(line, &more);
 
     if (NS_SUCCEEDED(rv) && more)
     {
--- a/mailnews/addrbook/src/nsAbLDIFService.h
+++ b/mailnews/addrbook/src/nsAbLDIFService.h
@@ -50,21 +50,21 @@ public:
   NS_DECL_NSIABLDIFSERVICE
 
   nsAbLDIFService();
   virtual ~nsAbLDIFService();
 private:
   nsresult        str_parse_line(char *line, char **type, char **value, int *vlen) const;
   char *          str_getline(char **next) const;
   nsresult        GetLdifStringRecord(char* buf, PRInt32 len, PRInt32& stopPos);
-  void AddLdifRowToDatabase(nsIAddrDatabase *aDatabase, PRBool aIsList);
+  void AddLdifRowToDatabase(nsIAddrDatabase *aDatabase, bool aIsList);
   void AddLdifColToDatabase(nsIAddrDatabase *aDatabase, nsIMdbRow* newRow,
-                            char* typeSlot, char* valueSlot, PRBool bIsList);
+                            char* typeSlot, char* valueSlot, bool bIsList);
   void            ClearLdifRecordBuffer();
   void            SplitCRLFAddressField(nsCString &inputAddress, nsCString &outputLine1, nsCString &outputLine2) const;
 
-  PRBool          mStoreLocAsHome;
+  bool            mStoreLocAsHome;
   nsCString       mLdifLine;
   PRInt32         mLFCount;
   PRInt32         mCRCount;
 };
 
 #endif
--- a/mailnews/addrbook/src/nsAbMDBCard.cpp
+++ b/mailnews/addrbook/src/nsAbMDBCard.cpp
@@ -43,17 +43,17 @@ nsAbMDBCard::nsAbMDBCard(void)
 }
 
 nsAbMDBCard::~nsAbMDBCard(void)
 {
 }
 
 NS_IMPL_ISUPPORTS_INHERITED0(nsAbMDBCard, nsAbCardProperty)
 
-NS_IMETHODIMP nsAbMDBCard::Equals(nsIAbCard *card, PRBool *result)
+NS_IMETHODIMP nsAbMDBCard::Equals(nsIAbCard *card, bool *result)
 {
   if (this == card) {
     *result = PR_TRUE;
     return NS_OK;
   }
 
   // If we have the same directory, we will equal the other card merely given
   // the row IDs. If not, we are never equal. But we are dumb in that we don't
--- a/mailnews/addrbook/src/nsAbMDBCard.h
+++ b/mailnews/addrbook/src/nsAbMDBCard.h
@@ -45,12 +45,12 @@
 class nsAbMDBCard: public nsAbCardProperty
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
 
   nsAbMDBCard(void);
   virtual ~nsAbMDBCard(void);
 
-  NS_IMETHOD Equals(nsIAbCard *card, PRBool *result);
+  NS_IMETHOD Equals(nsIAbCard *card, bool *result);
 };
 
 #endif
--- a/mailnews/addrbook/src/nsAbMDBDirectory.cpp
+++ b/mailnews/addrbook/src/nsAbMDBDirectory.cpp
@@ -200,17 +200,17 @@ nsresult nsAbMDBDirectory::RemoveCardFro
       listDir->GetAddressLists(getter_AddRefs(pAddressLists));
       if (pAddressLists)
       {  
         PRUint32 total;
         rv = pAddressLists->GetLength(&total);
         for (j = total - 1; j >= 0; j--)
         {
           nsCOMPtr<nsIAbCard> cardInList(do_QueryElementAt(pAddressLists, j, &rv));
-          PRBool equals;
+          bool equals;
           rv = cardInList->Equals(card, &equals);  // should we checking email?
           if (NS_SUCCEEDED(rv) && equals)
             pAddressLists->RemoveElementAt(j);
         }
       }
     }
   }
   return NS_OK;
@@ -447,17 +447,17 @@ NS_IMETHODIMP nsAbMDBDirectory::GetChild
 
   if (NS_FAILED(rv) || !mDatabase)
     return rv;
 
   return m_IsMailList ? mDatabase->EnumerateListAddresses(this, result) :
                         mDatabase->EnumerateCards(this, result);
 }
 
-NS_IMETHODIMP nsAbMDBDirectory::GetIsQuery(PRBool *aResult)
+NS_IMETHODIMP nsAbMDBDirectory::GetIsQuery(bool *aResult)
 {
   NS_ENSURE_ARG_POINTER(aResult);
   *aResult = mIsQueryURI;
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbMDBDirectory::DeleteCards(nsIArray *aCards)
 {
@@ -531,17 +531,17 @@ NS_IMETHODIMP nsAbMDBDirectory::DeleteCa
               if (rowID == arrayRowID)
                 m_AddressList->RemoveElementAt(i);
             }
           }
         }
         else
         {
           mDatabase->DeleteCard(card, PR_TRUE, this);
-          PRBool bIsMailList = PR_FALSE;
+          bool bIsMailList = false;
           card->GetIsMailList(&bIsMailList);
           if (bIsMailList)
           {
             //to do, get mailing list dir side uri and notify nsIAbManager to remove it
             nsCAutoString listUri(mURI);
             listUri.AppendLiteral("/MailList");
             listUri.AppendInt(rowID);
             if (!listUri.IsEmpty())
@@ -574,17 +574,17 @@ NS_IMETHODIMP nsAbMDBDirectory::DeleteCa
         }
       }
     }
     mDatabase->Commit(nsAddrDBCommitType::kLargeCommit);
   }
   return rv;
 }
 
-NS_IMETHODIMP nsAbMDBDirectory::HasCard(nsIAbCard *cards, PRBool *hasCard)
+NS_IMETHODIMP nsAbMDBDirectory::HasCard(nsIAbCard *cards, bool *hasCard)
 {
   if(!hasCard)
     return NS_ERROR_NULL_POINTER;
 
   if (mIsQueryURI)
   {
     *hasCard = mSearchCache.Get(cards, nsnull);
     return NS_OK;
@@ -597,27 +597,27 @@ NS_IMETHODIMP nsAbMDBDirectory::HasCard(
   if(NS_SUCCEEDED(rv) && mDatabase)
   {
     if(NS_SUCCEEDED(rv))
       rv = mDatabase->ContainsCard(cards, hasCard);
   }
   return rv;
 }
 
-NS_IMETHODIMP nsAbMDBDirectory::HasDirectory(nsIAbDirectory *dir, PRBool *hasDir)
+NS_IMETHODIMP nsAbMDBDirectory::HasDirectory(nsIAbDirectory *dir, bool *hasDir)
 {
   if (!hasDir)
     return NS_ERROR_NULL_POINTER;
 
   nsresult rv;
 
   nsCOMPtr<nsIAbMDBDirectory> dbdir(do_QueryInterface(dir, &rv));
   NS_ENSURE_SUCCESS(rv, rv);
   
-  PRBool bIsMailingList  = PR_FALSE;
+  bool bIsMailingList  = false;
   dir->GetIsMailList(&bIsMailingList);
   if (bIsMailingList)
   {
     nsCOMPtr<nsIAddrDatabase> database;
     rv = GetDatabase(getter_AddRefs(database));
 
     if (NS_SUCCEEDED(rv))
       rv = database->ContainsMailList(dir, hasDir);
@@ -718,17 +718,17 @@ NS_IMETHODIMP nsAbMDBDirectory::ModifyCa
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
   rv = mDatabase->EditCard(aModifiedCard, PR_TRUE, this);
   NS_ENSURE_SUCCESS(rv, rv);
   return mDatabase->Commit(nsAddrDBCommitType::kLargeCommit);
 }
 
-NS_IMETHODIMP nsAbMDBDirectory::DropCard(nsIAbCard* aCard, PRBool needToCopyCard)
+NS_IMETHODIMP nsAbMDBDirectory::DropCard(nsIAbCard* aCard, bool needToCopyCard)
 {
   NS_ENSURE_ARG_POINTER(aCard);
 
   if (mIsQueryURI)
     return NS_ERROR_NOT_IMPLEMENTED;
 
   nsresult rv = NS_OK;
 
@@ -784,20 +784,20 @@ NS_IMETHODIMP nsAbMDBDirectory::EditMail
   NS_ENSURE_SUCCESS(rv, rv);
 
   mDatabase->EditMailList(this, listCard, PR_TRUE);
   mDatabase->Commit(nsAddrDBCommitType::kLargeCommit);
 
   return NS_OK;
 }
 
-static PRBool ContainsDirectory(nsIAbDirectory *parent, nsIAbDirectory *directory)
+static bool ContainsDirectory(nsIAbDirectory *parent, nsIAbDirectory *directory)
 {
   // If parent is a maillist, 'addressLists' contains AbCards.
-  PRBool bIsMailList = PR_FALSE;
+  bool bIsMailList = false;
   nsresult rv = parent->GetIsMailList(&bIsMailList);
   NS_ENSURE_SUCCESS(rv, PR_FALSE);
 
   if (bIsMailList)
     return PR_FALSE;
 
   nsCOMPtr<nsIMutableArray> pAddressLists;
   parent->GetAddressLists(getter_AddRefs(pAddressLists));
@@ -840,17 +840,17 @@ NS_IMETHODIMP nsAbMDBDirectory::OnCardEn
   //        => if <this> is <aParent>, or
   // - a card belonging to a directory which is parent of this is deleted
   //        => if aAbCode is AB_NotifyDeleted && <this> is child of <aParent>, or
   // - a card belonging to a directory which is child of this is added/modified
   //        => if aAbCode is !AB_NotifyDeleted && <this> is parent of <aParent>
 
   if (aParent != this)
   {
-    PRBool isChild = PR_FALSE;
+    bool isChild = false;
     if (aAbCode != AB_NotifyDeleted)
       isChild = ContainsDirectory(this, aParent);
     else
       isChild = ContainsDirectory(aParent, this);
 
     if (!isChild)
       return NS_OK;
   }
@@ -876,17 +876,17 @@ NS_IMETHODIMP nsAbMDBDirectory::OnCardEn
 
 NS_IMETHODIMP nsAbMDBDirectory::OnListEntryChange
 (PRUint32 abCode, nsIAbDirectory *list)
 {
   nsresult rv = NS_OK;
   
   if (abCode == AB_NotifyPropertyChanged && list)
   {
-    PRBool bIsMailList = PR_FALSE;
+    bool bIsMailList = false;
     rv = list->GetIsMailList(&bIsMailList);
     NS_ENSURE_SUCCESS(rv,rv);
     
     nsCOMPtr<nsIAbMDBDirectory> dblist(do_QueryInterface(list, &rv));
     NS_ENSURE_SUCCESS(rv,rv);
 
     if (bIsMailList) {
       nsString listName;
@@ -946,17 +946,17 @@ NS_IMETHODIMP nsAbMDBDirectory::StartSea
   nsCOMPtr<nsIAbDirectory> directory;
   rv = abManager->GetDirectory(mURINoQuery, getter_AddRefs(directory));
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Bug 280232 - something was causing continuous loops in searching. Add a
   // check here for the directory to search not being a query uri as well in
   // the hopes that will at least break us out of the continuous loop even if
   // we don't know how we got into it.
-  PRBool isQuery;
+  bool isQuery;
   rv = directory->GetIsQuery(&isQuery);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (isQuery)
   {
     NS_ERROR("Attempting to search a directory within a search");
     return NS_ERROR_FAILURE;
   }
@@ -1084,17 +1084,17 @@ NS_IMETHODIMP nsAbMDBDirectory::CardForE
     mDatabase->GetCardFromAttribute(this, k2ndEmailProperty, aEmailAddress,
                                     PR_TRUE, aAbCard);
 
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbMDBDirectory::GetCardFromProperty(const char *aProperty,
                                                     const nsACString &aValue,
-                                                    PRBool caseSensitive,
+                                                    bool caseSensitive,
                                                     nsIAbCard **result)
 {
   NS_ENSURE_ARG(aProperty);
   NS_ENSURE_ARG_POINTER(result);
 
   *result = nsnull;
 
   // If the value is empty, don't match.
@@ -1113,17 +1113,17 @@ NS_IMETHODIMP nsAbMDBDirectory::GetCardF
 
   // nsIAddrDatabase has aCaseInsensitive as its parameter
   return mDatabase->GetCardFromAttribute(this, aProperty, aValue,
                                          !caseSensitive, result);
 }
 
 NS_IMETHODIMP nsAbMDBDirectory::GetCardsFromProperty(const char *aProperty,
                                                      const nsACString &aValue,
-                                                     PRBool caseSensitive,
+                                                     bool caseSensitive,
                                                      nsISimpleEnumerator **result)
 {
   NS_ENSURE_ARG(aProperty);
   NS_ENSURE_ARG_POINTER(result);
 
   *result = nsnull;
 
   if (aValue.IsEmpty())
--- a/mailnews/addrbook/src/nsAbMDBDirectory.h
+++ b/mailnews/addrbook/src/nsAbMDBDirectory.h
@@ -82,34 +82,34 @@ public:
   NS_IMETHOD RemoveEmailAddressAt(PRUint32 aIndex);
   NS_IMETHOD AddDirectory(const char *uriName, nsIAbDirectory **childDir);
   NS_IMETHOD GetDatabaseFile(nsILocalFile **aResult);
   NS_IMETHOD GetDatabase(nsIAddrDatabase **aResult);
 
   // nsIAbDirectory methods:
   NS_IMETHOD GetChildNodes(nsISimpleEnumerator* *result);
   NS_IMETHOD GetChildCards(nsISimpleEnumerator* *result);
-  NS_IMETHOD GetIsQuery(PRBool *aResult);
+  NS_IMETHOD GetIsQuery(bool *aResult);
   NS_IMETHOD DeleteDirectory(nsIAbDirectory *directory);
   NS_IMETHOD DeleteCards(nsIArray *cards);
-  NS_IMETHOD HasCard(nsIAbCard *cards, PRBool *hasCard);
-  NS_IMETHOD HasDirectory(nsIAbDirectory *dir, PRBool *hasDir);
+  NS_IMETHOD HasCard(nsIAbCard *cards, bool *hasCard);
+  NS_IMETHOD HasDirectory(nsIAbDirectory *dir, bool *hasDir);
   NS_IMETHOD AddMailList(nsIAbDirectory *list, nsIAbDirectory **addedList);
   NS_IMETHOD AddCard(nsIAbCard *card, nsIAbCard **addedCard);
   NS_IMETHOD ModifyCard(nsIAbCard *aModifiedCard);
-  NS_IMETHOD DropCard(nsIAbCard *card, PRBool needToCopyCard);
+  NS_IMETHOD DropCard(nsIAbCard *card, bool needToCopyCard);
   NS_IMETHOD EditMailListToDatabase(nsIAbCard *listCard);
   NS_IMETHOD CardForEmailAddress(const nsACString &aEmailAddress,
                                  nsIAbCard ** aAbCard);
   NS_IMETHOD GetCardFromProperty(const char *aProperty,
                                  const nsACString &aValue,
-                                 PRBool caseSensitive, nsIAbCard **result);
+                                 bool caseSensitive, nsIAbCard **result);
   NS_IMETHOD GetCardsFromProperty(const char *aProperty,
                                   const nsACString &aValue,
-                                  PRBool caseSensitive,
+                                  bool caseSensitive,
                                   nsISimpleEnumerator **result);
 
   // nsIAbDirectorySearch methods
   NS_DECL_NSIABDIRECTORYSEARCH
 
   // nsIAbDirSearchListener methods
   NS_DECL_NSIABDIRSEARCHLISTENER
 
@@ -121,14 +121,14 @@ protected:
   nsresult RemoveCardFromAddressList(nsIAbCard* card);
 
   nsresult GetAbDatabase();
   nsCOMPtr<nsIAddrDatabase> mDatabase;  
 
   nsCOMArray<nsIAbDirectory> mSubDirectories;
 
   PRInt32 mContext;
-  PRBool mPerformingQuery;
+  bool mPerformingQuery;
 
   nsInterfaceHashtable<nsISupportsHashKey, nsIAbCard> mSearchCache;
 };
 
 #endif
--- a/mailnews/addrbook/src/nsAbManager.cpp
+++ b/mailnews/addrbook/src/nsAbManager.cpp
@@ -301,17 +301,17 @@ NS_IMETHODIMP nsAbManager::GetDirectory(
     // Init it with the URI
     const nsAFlatCString& flatURI = PromiseFlatCString(aURI);
 
     rv = directory->Init(flatURI.get());
     NS_ENSURE_SUCCESS(rv, rv);
 
     // Check if this directory was initiated with a search query.  If so,
     // we don't cache it.
-    PRBool isQuery = PR_FALSE;
+    bool isQuery = false;
     rv = directory->GetIsQuery(&isQuery);
     NS_ENSURE_SUCCESS(rv, rv);
 
     if (!isQuery)
       mAbStore.Put(aURI, directory);
   }
   NS_IF_ADDREF(*aResult = directory);
 
@@ -349,17 +349,17 @@ NS_IMETHODIMP nsAbManager::DeleteAddress
   // (so, the mailing lists) and remove their entries from
   // the look up table.
   nsCOMPtr<nsISimpleEnumerator> enumerator;
   rv = directory->GetChildNodes(getter_AddRefs(enumerator));
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsISupports> item;
   nsCOMPtr<nsIAbDirectory> childDirectory;
-  PRBool hasMore = PR_FALSE;
+  bool hasMore = false;
   while (NS_SUCCEEDED(enumerator->HasMoreElements(&hasMore)) && hasMore)
   {
     rv = enumerator->GetNext(getter_AddRefs(item));
     NS_ENSURE_SUCCESS(rv, rv);
 
     childDirectory = do_QueryInterface(item, &rv);
     if (NS_SUCCEEDED(rv))
     {
@@ -368,17 +368,17 @@ NS_IMETHODIMP nsAbManager::DeleteAddress
       NS_ENSURE_SUCCESS(rv, rv);
 
       mAbStore.Remove(childURI);
     }
   }
 
   mAbStore.Remove(aURI);
 
-  PRBool isMailList;
+  bool isMailList;
   rv = directory->GetIsMailList(&isMailList);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (!isMailList)
     // If we're not a mailing list, then our parent
     // must be the root address book directory.
     return rootDirectory->DeleteDirectory(directory);
 
@@ -469,17 +469,17 @@ NS_IMETHODIMP nsAbManager::GetUserProfil
   nsCAutoString pathBuf;
 
   rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(profileDir));
   NS_ENSURE_SUCCESS(rv, rv);
 
   return CallQueryInterface(profileDir, userDir);
 }
 
-NS_IMETHODIMP nsAbManager::MailListNameExists(const PRUnichar *name, PRBool *exist)
+NS_IMETHODIMP nsAbManager::MailListNameExists(const PRUnichar *name, bool *exist)
 {
   nsresult rv;
   NS_ENSURE_ARG_POINTER(exist);
 
   *exist = PR_FALSE;
 
   // now get the top-level book
   nsCOMPtr<nsIAbDirectory> topDirectory;
@@ -488,17 +488,17 @@ NS_IMETHODIMP nsAbManager::MailListNameE
   // now go through the address books
   nsCOMPtr<nsISimpleEnumerator> enumerator;
   rv = topDirectory->GetChildNodes(getter_AddRefs(enumerator));
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsISupports> item;
   nsCOMPtr<nsIAbMDBDirectory> directory;
 
-  PRBool hasMore;
+  bool hasMore;
   // XXX Make this not MDB specific.
   while (NS_SUCCEEDED(enumerator->HasMoreElements(&hasMore)) && hasMore)
   {
     rv = enumerator->GetNext(getter_AddRefs(item));
     NS_ENSURE_SUCCESS(rv, rv);
 
     directory = do_QueryInterface(item, &rv);
     if (NS_SUCCEEDED(rv))
@@ -581,17 +581,17 @@ NS_IMETHODIMP nsAbManager::ExportAddress
     return rv;
 
   nsCOMPtr<nsILocalFile> localFile;
   rv = filePicker->GetFile(getter_AddRefs(localFile));
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (dialogResult == nsIFilePicker::returnReplace) {
     // be extra safe and only delete when the file is really a file
-    PRBool isFile;
+    bool isFile;
     rv = localFile->IsFile(&isFile);
     if (NS_SUCCEEDED(rv) && isFile) {
       rv = localFile->Remove(PR_FALSE /* recursive delete */);
       NS_ENSURE_SUCCESS(rv, rv);
     }
   }
 
   // The type of export is determined by the drop-down in
@@ -710,24 +710,24 @@ nsAbManager::ExportDirectoryToDelimitedT
   rv = outputStream->Write(MSG_LINEBREAK, MSG_LINEBREAK_LEN, &writeCount);
   NS_ENSURE_SUCCESS(rv,rv);
   if (MSG_LINEBREAK_LEN != writeCount)
     return NS_ERROR_FAILURE;
 
   rv = aDirectory->GetChildCards(getter_AddRefs(cardsEnumerator));
   if (NS_SUCCEEDED(rv) && cardsEnumerator) {
     nsCOMPtr<nsISupports> item;
-    PRBool more;
+    bool more;
     while (NS_SUCCEEDED(cardsEnumerator->HasMoreElements(&more)) && more) {
       rv = cardsEnumerator->GetNext(getter_AddRefs(item));
       if (NS_SUCCEEDED(rv)) {
         nsCOMPtr <nsIAbCard> card = do_QueryInterface(item, &rv);
         NS_ENSURE_SUCCESS(rv,rv);
 
-        PRBool isMailList;
+        bool isMailList;
         rv = card->GetIsMailList(&isMailList);
         NS_ENSURE_SUCCESS(rv,rv);
 
 
         if (isMailList) {
           // .tab, .txt and .csv aren't able to export mailing lists
           // use LDIF for that.
         }
@@ -740,17 +740,17 @@ nsAbManager::ExportDirectoryToDelimitedT
               rv = card->GetPropertyAsAString(EXPORT_ATTRIBUTES_TABLE[i].abPropertyName, value);
               if (NS_FAILED(rv))
                 value.Truncate();
 
               // If a string contains at least one comma, tab or double quote then
               // we need to quote the entire string. Also if double quote is part
               // of the string we need to quote the double quote(s) as well.
               nsAutoString newValue(value);
-              PRBool needsQuotes = PR_FALSE;
+              bool needsQuotes = false;
               if(newValue.FindChar('"') != -1)
               {
                 needsQuotes = PR_TRUE;
                 
                 PRInt32 match = 0;
                 PRUint32 offset = 0;
                 nsString oldSubstr = NS_LITERAL_STRING("\"");
                 nsString newSubstr = NS_LITERAL_STRING("\"\""); 
@@ -859,24 +859,24 @@ nsAbManager::ExportDirectoryToLDIF(nsIAb
 
   PRUint32 i;
   PRUint32 writeCount;
   PRUint32 length;
 
   rv = aDirectory->GetChildCards(getter_AddRefs(cardsEnumerator));
   if (NS_SUCCEEDED(rv) && cardsEnumerator) {
     nsCOMPtr<nsISupports> item;
-    PRBool more;
+    bool more;
     while (NS_SUCCEEDED(cardsEnumerator->HasMoreElements(&more)) && more) {
       rv = cardsEnumerator->GetNext(getter_AddRefs(item));
       if (NS_SUCCEEDED(rv)) {
         nsCOMPtr <nsIAbCard> card = do_QueryInterface(item, &rv);
         NS_ENSURE_SUCCESS(rv,rv);
 
-        PRBool isMailList;
+        bool isMailList;
         rv = card->GetIsMailList(&isMailList);
         NS_ENSURE_SUCCESS(rv,rv);
 
         if (isMailList) {
           nsCString mailListCStr;
 
           rv = AppendLDIFForMailList(card, attrMap, mailListCStr);
           NS_ENSURE_SUCCESS(rv,rv);
@@ -1092,17 +1092,17 @@ nsresult nsAbManager::AppendBasicLDIFFor
     "objectclass: top" MSG_LINEBREAK \
     "objectclass: person" MSG_LINEBREAK \
     "objectclass: organizationalPerson" MSG_LINEBREAK \
     "objectclass: inetOrgPerson" MSG_LINEBREAK \
     "objectclass: " MOZ_AB_OBJECTCLASS MSG_LINEBREAK;
   return rv;
 }
 
-PRBool nsAbManager::IsSafeLDIFString(const PRUnichar *aStr)
+bool nsAbManager::IsSafeLDIFString(const PRUnichar *aStr)
 {
   // follow RFC 2849 to determine if something is safe "as is" for LDIF
   if (aStr[0] == PRUnichar(' ') ||
       aStr[0] == PRUnichar(':') ||
       aStr[0] == PRUnichar('<'))
     return PR_FALSE;
 
   PRUint32 i;
@@ -1263,17 +1263,17 @@ NS_IMETHODIMP nsAbManager::EscapedVCardT
     NS_IF_ADDREF(*aCard = cardFromVCard);
     return NS_OK;
 }
 
 NS_IMETHODIMP
 nsAbManager::Handle(nsICommandLine* aCmdLine)
 {
   nsresult rv;
-  PRBool found;
+  bool found;
 
   rv = aCmdLine->HandleFlag(NS_LITERAL_STRING("addressbook"), PR_FALSE, &found);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (!found)
     return NS_OK;
 
   nsCOMPtr<nsIWindowWatcher> wwatch (do_GetService(NS_WINDOWWATCHER_CONTRACTID));
--- a/mailnews/addrbook/src/nsAbManager.h
+++ b/mailnews/addrbook/src/nsAbManager.h
@@ -68,17 +68,17 @@ public:
 private:
   nsresult GetRootDirectory(nsIAbDirectory **aResult);
   nsresult ExportDirectoryToDelimitedText(nsIAbDirectory *aDirectory, const char *aDelim, PRUint32 aDelimLen, nsILocalFile *aLocalFile);
   nsresult ExportDirectoryToLDIF(nsIAbDirectory *aDirectory, nsILocalFile *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);
   nsresult AppendProperty(const char *aProperty, const PRUnichar *aValue, nsACString &aResult);
-  PRBool IsSafeLDIFString(const PRUnichar *aStr);
+  bool IsSafeLDIFString(const PRUnichar *aStr);
 
   struct abListener {
     nsCOMPtr<nsIAbListener> mListener;
     PRUint32 mNotifyFlags;
 
     abListener(nsIAbListener *aListener, PRUint32 aNotifyFlags)
       : mListener(aListener), mNotifyFlags(aNotifyFlags) {}
     abListener(const abListener &aListener)
--- a/mailnews/addrbook/src/nsAbOSXCard.h
+++ b/mailnews/addrbook/src/nsAbOSXCard.h
@@ -49,29 +49,29 @@
     { 0x81, 0x16, 0x23, 0xb7, 0x5a, 0xac, 0x94, 0x56 } }
 
 class nsIAbOSXCard : public nsISupports
 {
 public:
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_IABOSXCARD_IID)
 
   virtual nsresult Init(const char *aUri) = 0;
-  virtual nsresult Update(PRBool aNotify) = 0;
+  virtual nsresult Update(bool aNotify) = 0;
   virtual nsresult GetURI(nsACString &aURI) = 0;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIAbOSXCard, NS_IABOSXCARD_IID)
 
 class nsAbOSXCard : public nsAbCardProperty,
                     public nsIAbOSXCard
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
     
-  nsresult Update(PRBool aNotify);
+  nsresult Update(bool aNotify);
   nsresult GetURI(nsACString &aURI);
   nsresult Init(const char *aUri);
   // this is needed so nsAbOSXUtils.mm can get at nsAbCardProperty
   friend class nsAbOSXUtils;
 private:
   nsCString mURI;
 
 };
--- a/mailnews/addrbook/src/nsAbOSXCard.mm
+++ b/mailnews/addrbook/src/nsAbOSXCard.mm
@@ -69,17 +69,17 @@ GetPropertType(ABRecord *aCard, NSString
   else if ([aCard isKindOfClass:[ABGroup class]])
     propertyType = [ABGroup typeOfProperty:aProperty];
   return propertyType;
 }
 #endif
 
 static void
 SetStringProperty(nsAbOSXCard *aCard, const nsString &aValue,
-                  const char *aMemberName, PRBool aNotify,
+                  const char *aMemberName, bool aNotify,
                   nsIAbManager *aAbManager)
 {
   nsString oldValue;
   nsresult rv = aCard->GetPropertyAsAString(aMemberName, oldValue);
   if (NS_FAILED(rv))
     oldValue.Truncate();
 
   if (!aNotify) {
@@ -92,28 +92,28 @@ SetStringProperty(nsAbOSXCard *aCard, co
 
     aAbManager->NotifyItemPropertyChanged(supports, aMemberName,
                                           oldValue.get(), aValue.get());
   }
 }
 
 static void
 SetStringProperty(nsAbOSXCard *aCard, NSString *aValue, const char *aMemberName,
-                  PRBool aNotify, nsIAbManager *aAbManager)
+                  bool aNotify, nsIAbManager *aAbManager)
 {
   nsAutoString value;
   if (aValue)
     AppendToString(aValue, value);
 
   SetStringProperty(aCard, value, aMemberName, aNotify, aAbManager);
 }
 
 static void
 MapStringProperty(nsAbOSXCard *aCard, ABRecord *aOSXCard, NSString *aProperty,
-                  const char *aMemberName, PRBool aNotify,
+                  const char *aMemberName, bool aNotify,
                   nsIAbManager *aAbManager)
 {
   NS_ASSERTION(aProperty, "This is bad! You asked for an unresolved symbol.");
   NS_ASSERTION(GetPropertType(aOSXCard, aProperty) == kABStringProperty,
                "Wrong type!");
   
   SetStringProperty(aCard, [aOSXCard valueForProperty:aProperty], aMemberName,
                     aNotify, aAbManager);
@@ -126,36 +126,36 @@ GetMultiValue(ABRecord *aCard, NSString 
   NS_ASSERTION(GetPropertType(aCard, aProperty) & kABMultiValueMask,
                "Wrong type!");
   
   return [aCard valueForProperty:aProperty];
 }
 
 static void
 MapDate(nsAbOSXCard *aCard, NSDate *aDate, const char *aYearPropName,
-        const char *aMonthPropName, const char *aDayPropName, PRBool aNotify,
+        const char *aMonthPropName, const char *aDayPropName, bool aNotify,
         nsIAbManager *aAbManager)
 {
   // XXX Should we pass a format and timezone?
   NSCalendarDate *date = [aDate dateWithCalendarFormat:nil timeZone:nil];
   
   nsAutoString value;
   value.AppendInt(static_cast<PRInt32>([date yearOfCommonEra]));
   SetStringProperty(aCard, value, aYearPropName, aNotify, aAbManager);
   value.Truncate();
   value.AppendInt(static_cast<PRInt32>([date monthOfYear]));
   SetStringProperty(aCard, value, aMonthPropName, aNotify, aAbManager);
   value.Truncate();
   value.AppendInt(static_cast<PRInt32>([date dayOfMonth]));
   SetStringProperty(aCard, value, aDayPropName, aNotify, aAbManager);
 }
 
-static PRBool
+static bool
 MapMultiValue(nsAbOSXCard *aCard, ABRecord *aOSXCard,
-              const nsAbOSXPropertyMap &aMap, PRBool aNotify,
+              const nsAbOSXPropertyMap &aMap, bool aNotify,
               nsIAbManager *aAbManager)
 {
   ABMultiValue *value = GetMultiValue(aOSXCard, aMap.mOSXProperty);
   if (value) {
     unsigned int j;
     unsigned int count = [value count];
     for (j = 0; j < count; ++j) {
       if ([[value labelAtIndex:j] isEqualToString:aMap.mOSXLabel]) {
@@ -197,17 +197,17 @@ nsAbOSXCard::GetURI(nsACString &aURI)
   if (mURI.IsEmpty())
     return NS_ERROR_NOT_INITIALIZED;
 
   aURI = mURI;
   return NS_OK;
 }
 
 nsresult
-nsAbOSXCard::Update(PRBool aNotify)
+nsAbOSXCard::Update(bool aNotify)
 {
   ABAddressBook *addressBook = [ABAddressBook sharedAddressBook];
 
   const char *uid = &((mURI.get())[16]);
   ABRecord *card = [addressBook recordForUniqueId:[NSString stringWithUTF8String:uid]];
   NS_ENSURE_TRUE(card, NS_ERROR_FAILURE);
 
   nsCOMPtr<nsIAbManager> abManager;
@@ -224,17 +224,17 @@ nsAbOSXCard::Update(PRBool aNotify)
     MapStringProperty(this, card, kABGroupNameProperty, "DisplayName", aNotify,
                       abManager);
     MapStringProperty(this, card, kABGroupNameProperty, "LastName", aNotify,
                       abManager);
 
     return NS_OK;
   }
   
-  PRBool foundHome = PR_FALSE, foundWork = PR_FALSE;
+  bool foundHome = false, foundWork = false;
   
   PRUint32 i;
   for (i = 0; i < nsAbOSXUtils::kPropertyMapSize; ++i) {
     const nsAbOSXPropertyMap &propertyMap = nsAbOSXUtils::kPropertyMap[i];
     if (!propertyMap.mOSXProperty)
       continue;
     
     if (propertyMap.mOSXLabel) {
--- a/mailnews/addrbook/src/nsAbOSXDirectory.h
+++ b/mailnews/addrbook/src/nsAbOSXDirectory.h
@@ -94,30 +94,30 @@ public:
   
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIABDIRSEARCHLISTENER
     
   // nsIAbOSXDirectory method
   NS_IMETHOD Init(const char *aUri);
   
   // nsAbDirProperty methods
-  NS_IMETHOD GetReadOnly(PRBool *aReadOnly);
+  NS_IMETHOD GetReadOnly(bool *aReadOnly);
   NS_IMETHOD GetChildCards(nsISimpleEnumerator **aCards);
   NS_IMETHOD GetChildNodes(nsISimpleEnumerator **aNodes);
-  NS_IMETHOD GetIsQuery(PRBool *aResult);
-  NS_IMETHOD HasCard(nsIAbCard *aCard, PRBool *aHasCard);
-  NS_IMETHOD HasDirectory(nsIAbDirectory *aDirectory, PRBool *aHasDirectory);
+  NS_IMETHOD GetIsQuery(bool *aResult);
+  NS_IMETHOD HasCard(nsIAbCard *aCard, bool *aHasCard);
+  NS_IMETHOD HasDirectory(nsIAbDirectory *aDirectory, bool *aHasDirectory);
   NS_IMETHOD GetURI(nsACString &aURI);
   NS_IMETHOD GetCardFromProperty(const char *aProperty,
                                  const nsACString &aValue,
-                                 PRBool caseSensitive,
+                                 bool caseSensitive,
                                  nsIAbCard **aResult);
   NS_IMETHOD GetCardsFromProperty(const char *aProperty,
                                   const nsACString &aValue,
-                                  PRBool aCaseSensitive,
+                                  bool aCaseSensitive,
                                   nsISimpleEnumerator **aResult);
   NS_IMETHOD CardForEmailAddress(const nsACString &aEmailAddress,
                                  nsIAbCard **aResult);
 
   // nsIAbOSXDirectory
   nsresult AssertChildNodes();
   nsresult AssertDirectory(nsIAbManager *aManager,
                            nsIAbDirectory *aDirectory);
--- a/mailnews/addrbook/src/nsAbOSXDirectory.mm
+++ b/mailnews/addrbook/src/nsAbOSXDirectory.mm
@@ -264,18 +264,18 @@ Sync(NSString *aUid)
   if (!inserted && !updated && !deleted) {
     // XXX This is supposed to mean "everything was updated", but we get
     //     this whenever something has changed, so not sure what to do.
   }
 }
 @end
 
 static nsresult
-MapConditionString(nsIAbBooleanConditionString *aCondition, PRBool aNegate,
-                   PRBool &aCanHandle, ABSearchElement **aResult)
+MapConditionString(nsIAbBooleanConditionString *aCondition, bool aNegate,
+                   bool &aCanHandle, ABSearchElement **aResult)
 {
   aCanHandle = PR_FALSE;
   
   nsAbBooleanConditionType conditionType = 0;
   nsresult rv = aCondition->GetCondition(&conditionType);
   NS_ENSURE_SUCCESS(rv, rv);
   
   ABSearchComparison comparison;
@@ -389,17 +389,17 @@ MapConditionString(nsIAbBooleanCondition
   
   aCanHandle = PR_FALSE;
   
   return NS_OK;
 }
 
 static nsresult
 BuildSearchElements(nsIAbBooleanExpression *aExpression,
-                    PRBool &aCanHandle,
+                    bool &aCanHandle,
                     ABSearchElement **aResult)
 {
   aCanHandle = PR_TRUE;
   
   nsCOMPtr<nsIArray> expressions;
   nsresult rv = aExpression->GetExpressions(getter_AddRefs(expressions));
   NS_ENSURE_SUCCESS(rv, rv);
   
@@ -459,20 +459,20 @@ BuildSearchElements(nsIAbBooleanExpressi
       *aResult = [ABSearchElement searchElementForConjunction:conjunction children:array];
     }
     [array release];
   }
   
   return rv;
 }
 
-static PRBool
+static bool
 Search(nsIAbBooleanExpression *aExpression, NSArray **aResult)
 {
-  PRBool canHandle = PR_FALSE;
+  bool canHandle = false;
   ABSearchElement *searchElement;
   nsresult rv = BuildSearchElements(aExpression, canHandle, &searchElement);
   NS_ENSURE_SUCCESS(rv, PR_FALSE);
   
   if (canHandle)
     *aResult = [[ABAddressBook sharedAddressBook] recordsMatchingSearchElement:searchElement];
 
   return canHandle;
@@ -513,17 +513,17 @@ nsAbOSXDirectory::Init(const char *aUri)
                                              selector:@selector(ABChanged:)
                                                  name:kABDatabaseChangedExternallyNotification
                                                object:nil];
   }
   ++sObserverCount;
 
   NSArray *cards;
   nsCOMPtr<nsIMutableArray> cardList;
-  PRBool isRootOSXDirectory = PR_FALSE;
+  bool isRootOSXDirectory = false;
 
   if (!mIsQueryURI && mURINoQuery.Length() <= sizeof(NS_ABOSXDIRECTORY_URI_PREFIX))
     isRootOSXDirectory = PR_TRUE;
 
   if (mIsQueryURI || isRootOSXDirectory)
   {
     m_DirPrefId.AssignLiteral("ldap_2.servers.osx");
 
@@ -606,25 +606,25 @@ nsAbOSXDirectory::GetURI(nsACString &aUR
   if (mURI.IsEmpty())
     return NS_ERROR_NOT_INITIALIZED;
 
   aURI = mURI;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsAbOSXDirectory::GetReadOnly(PRBool *aReadOnly)
+nsAbOSXDirectory::GetReadOnly(bool *aReadOnly)
 {
   NS_ENSURE_ARG_POINTER(aReadOnly);
 
   *aReadOnly = PR_TRUE;
   return NS_OK;
 }
 
-static PRBool
+static bool
 CheckRedundantCards(nsIAbManager *aManager, nsIAbDirectory *aDirectory,
                     nsIAbCard *aCard, NSMutableArray *aCardList)
 {
   nsresult rv;
   nsCOMPtr<nsIAbOSXCard> osxCard = do_QueryInterface(aCard, &rv);
   NS_ENSURE_SUCCESS(rv, PR_FALSE);
 
   nsCAutoString uri;
@@ -941,17 +941,17 @@ nsAbOSXDirectory::GetChildCards(nsISimpl
   NSArray *cards;
   if (mIsQueryURI)
   {
     nsCOMPtr<nsIAbBooleanExpression> expression;
     rv = nsAbQueryStringToExpression::Convert(mQueryString.get(),
                                               getter_AddRefs(expression));
     NS_ENSURE_SUCCESS(rv, rv);
     
-    PRBool canHandle = !m_IsMailList && Search(expression, &cards);
+    bool canHandle = !m_IsMailList && Search(expression, &cards);
     if (!canHandle)
       return FallbackSearch(expression, aCards);
 
     if (!mCardList)
       mCardList = do_CreateInstance(NS_ARRAY_CONTRACTID, &rv);
     else
       mCardList->Clear();
     NS_ENSURE_SUCCESS(rv, rv);
@@ -988,17 +988,17 @@ nsAbOSXDirectory::GetChildCards(nsISimpl
   }
 
   // Not a search, so just return the appropriate list of items.
   return m_IsMailList ? NS_NewArrayEnumerator(aCards, m_AddressList) :
          NS_NewArrayEnumerator(aCards, mCardList);
 }
 
 NS_IMETHODIMP
-nsAbOSXDirectory::GetIsQuery(PRBool *aResult)
+nsAbOSXDirectory::GetIsQuery(bool *aResult)
 {
   NS_ENSURE_ARG_POINTER(aResult);
   *aResult = mIsQueryURI;
   return NS_OK;
 }
 
 /* Recursive method that searches for a child card by URI.  If it cannot find
  * it within this directory, it checks all subfolders.
@@ -1015,17 +1015,17 @@ nsAbOSXDirectory::GetCardByUri(const nsA
     return NS_OK;
   }
   // Search children
   nsCOMPtr<nsISimpleEnumerator> enumerator;
   nsresult rv = this->GetChildNodes(getter_AddRefs(enumerator));
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsISupports> item;
-  PRBool hasMore = PR_FALSE;
+  bool hasMore = false;
   while (NS_SUCCEEDED(enumerator->HasMoreElements(&hasMore)) && hasMore)
   {
     rv = enumerator->GetNext(getter_AddRefs(item));
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsCOMPtr<nsIAbOSXDirectory> childDirectory;
     childDirectory = do_QueryInterface(item, &rv);
     if (NS_SUCCEEDED(rv))
@@ -1039,17 +1039,17 @@ nsAbOSXDirectory::GetCardByUri(const nsA
     }
   }
   return NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
 nsAbOSXDirectory::GetCardFromProperty(const char *aProperty,
                                       const nsACString &aValue,
-                                      PRBool aCaseSensitive,
+                                      bool aCaseSensitive,
                                       nsIAbCard **aResult)
 {
   NS_ENSURE_ARG_POINTER(aResult);
 
   *aResult = nsnull;
 
   if (aValue.IsEmpty())
     return NS_OK;
@@ -1070,34 +1070,34 @@ nsAbOSXDirectory::GetCardFromProperty(co
   {
     card = do_QueryElementAt(list, i, &rv);
     if (NS_SUCCEEDED(rv))
     {
       rv = card->GetPropertyAsAUTF8String(aProperty, cardValue);
       if (NS_SUCCEEDED(rv))
       {
 #ifdef MOZILLA_INTERNAL_API
-        PRBool equal = aCaseSensitive ? cardValue.Equals(aValue) :
+        bool equal = aCaseSensitive ? cardValue.Equals(aValue) :
           cardValue.Equals(aValue, nsCaseInsensitiveCStringComparator());
 #else
-        PRBool equal = aCaseSensitive ? cardValue.Equals(aValue) :
+        bool equal = aCaseSensitive ? cardValue.Equals(aValue) :
           cardValue.Equals(aValue, CaseInsensitiveCompare);
 #endif
         if (equal)
           NS_IF_ADDREF(*aResult = card);
       }
     }
   }
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsAbOSXDirectory::GetCardsFromProperty(const char *aProperty,
                                        const nsACString &aValue,
-                                       PRBool aCaseSensitive,
+                                       bool aCaseSensitive,
                                        nsISimpleEnumerator **aResult)
 {
   NS_ENSURE_ARG_POINTER(aResult);
 
   *aResult = nsnull;
 
   if (aValue.IsEmpty())
     return NS_NewEmptyEnumerator(aResult);
@@ -1119,20 +1119,20 @@ nsAbOSXDirectory::GetCardsFromProperty(c
   {
     card = do_QueryElementAt(list, i, &rv);
     if (NS_SUCCEEDED(rv))
     {
       rv = card->GetPropertyAsAUTF8String(aProperty, cardValue);
       if (NS_SUCCEEDED(rv))
       {
 #ifdef MOZILLA_INTERNAL_API
-        PRBool equal = aCaseSensitive ? cardValue.Equals(aValue) :
+        bool equal = aCaseSensitive ? cardValue.Equals(aValue) :
           cardValue.Equals(aValue, nsCaseInsensitiveCStringComparator());
 #else
-        PRBool equal = aCaseSensitive ? cardValue.Equals(aValue) :
+        bool equal = aCaseSensitive ? cardValue.Equals(aValue) :
           cardValue.Equals(aValue, CaseInsensitiveCompare);
 #endif
         if (equal)
           resultArray.AppendObject(card);
       }
     }
   }
 
@@ -1161,28 +1161,28 @@ nsAbOSXDirectory::CardForEmailAddress(co
 
   nsCOMPtr<nsIAbCard> card;
 
   for (PRUint32 i = 0; i < length && !*aResult; ++i)
   {
     card = do_QueryElementAt(list, i, &rv);
     if (NS_SUCCEEDED(rv))
     {
-      PRBool hasEmailAddress = PR_FALSE;
+      bool hasEmailAddress = false;
 
       rv = card->HasEmailAddress(aEmailAddress, &hasEmailAddress);
       if (NS_SUCCEEDED(rv) && hasEmailAddress)
         NS_IF_ADDREF(*aResult = card);
     }
   }
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsAbOSXDirectory::HasCard(nsIAbCard *aCard, PRBool *aHasCard)
+nsAbOSXDirectory::HasCard(nsIAbCard *aCard, bool *aHasCard)
 {
   NS_ENSURE_ARG_POINTER(aCard);
   NS_ENSURE_ARG_POINTER(aHasCard);
 
   nsresult rv = NS_OK;
   PRUint32 index;
   if (m_IsMailList)
   {
@@ -1194,17 +1194,17 @@ nsAbOSXDirectory::HasCard(nsIAbCard *aCa
 
   *aHasCard = NS_SUCCEEDED(rv);
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsAbOSXDirectory::HasDirectory(nsIAbDirectory *aDirectory,
-                               PRBool *aHasDirectory)
+                               bool *aHasDirectory)
 {
   NS_ENSURE_ARG_POINTER(aDirectory);
   NS_ENSURE_ARG_POINTER(aHasDirectory);
   
   *aHasDirectory = PR_FALSE;
 
   PRUint32 pos;
   if (m_AddressList && NS_SUCCEEDED(m_AddressList->IndexOf(0, aDirectory, &pos)))
--- a/mailnews/addrbook/src/nsAbOutlookDirectory.cpp
+++ b/mailnews/addrbook/src/nsAbOutlookDirectory.cpp
@@ -215,17 +215,17 @@ NS_IMETHODIMP nsAbOutlookDirectory::GetC
       continue;
 
     if (!mCardList.Get(card, nsnull))
     {
       // We are dealing with a new element (probably directly
       // added from Outlook), we may need to sync m_AddressList
       mCardList.Put(card, card);
 
-      PRBool isMailList = PR_FALSE;
+      bool isMailList = false;
 
       rv = card->GetIsMailList(&isMailList);
       NS_ENSURE_SUCCESS(rv, rv);
       if (isMailList)
       {
         // We can have mailing lists only in folder,
         // we must add the directory to m_AddressList
         nsCString mailListUri;
@@ -243,33 +243,33 @@ NS_IMETHODIMP nsAbOutlookDirectory::GetC
         m_AddressList->AppendElement(card, PR_FALSE);
         NotifyItemAddition(card);
       }
     }
   }
   return rv;
 }
 
-NS_IMETHODIMP nsAbOutlookDirectory::GetIsQuery(PRBool *aResult)
+NS_IMETHODIMP nsAbOutlookDirectory::GetIsQuery(bool *aResult)
 {
   NS_ENSURE_ARG_POINTER(aResult);
   *aResult = mIsQueryURI;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsAbOutlookDirectory::HasCard(nsIAbCard *aCard, PRBool *aHasCard)
+NS_IMETHODIMP nsAbOutlookDirectory::HasCard(nsIAbCard *aCard, bool *aHasCard)
 {
   if (!aCard || !aHasCard)
     return NS_ERROR_NULL_POINTER;
 
   *aHasCard = mCardList.Get(aCard, nsnull);
   return NS_OK;
 }
 
-NS_IMETHODIMP nsAbOutlookDirectory::HasDirectory(nsIAbDirectory *aDirectory, PRBool *aHasDirectory)
+NS_IMETHODIMP nsAbOutlookDirectory::HasDirectory(nsIAbDirectory *aDirectory, bool *aHasDirectory)
 {
   NS_ENSURE_ARG_POINTER(aDirectory);
   NS_ENSURE_ARG_POINTER(aHasDirectory);
 
   *aHasDirectory = PR_FALSE;
 
   PRUint32 pos;
   if (m_AddressList && NS_SUCCEEDED(m_AddressList->IndexOf(0, aDirectory, &pos)))
@@ -389,17 +389,17 @@ NS_IMETHODIMP nsAbOutlookDirectory::Dele
 NS_IMETHODIMP nsAbOutlookDirectory::AddCard(nsIAbCard *aData, nsIAbCard **addedCard)
 {
     if (mIsQueryURI)
       return NS_ERROR_NOT_IMPLEMENTED;
 
     NS_ENSURE_ARG_POINTER(aData);
 
     nsresult retCode = NS_OK ;
-    PRBool hasCard = PR_FALSE ;
+    bool hasCard = false ;
     
     retCode = HasCard(aData, &hasCard) ;
     NS_ENSURE_SUCCESS(retCode, retCode) ;
     if (hasCard) {
         PRINTF(("Has card.\n")) ;
         NS_IF_ADDREF(*addedCard = aData);
         return NS_OK ; 
     }
@@ -415,34 +415,34 @@ NS_IMETHODIMP nsAbOutlookDirectory::AddC
     }
 
     if (m_IsMailList)
         m_AddressList->AppendElement(*addedCard, PR_FALSE);
     NotifyItemAddition(*addedCard) ;
     return retCode ;
 }
 
-NS_IMETHODIMP nsAbOutlookDirectory::DropCard(nsIAbCard *aData, PRBool needToCopyCard)
+NS_IMETHODIMP nsAbOutlookDirectory::DropCard(nsIAbCard *aData, bool needToCopyCard)
 {
     nsCOMPtr <nsIAbCard> addedCard;
     return AddCard(aData, getter_AddRefs(addedCard));
 }
 
 NS_IMETHODIMP nsAbOutlookDirectory::AddMailList(nsIAbDirectory *aMailList, nsIAbDirectory **addedList)
 {
   if (mIsQueryURI)
     return NS_ERROR_NOT_IMPLEMENTED;
   NS_ENSURE_ARG_POINTER(aMailList);
   NS_ENSURE_ARG_POINTER(addedList);
   if (m_IsMailList)
     return NS_OK;
   nsAbWinHelperGuard mapiAddBook (mAbWinType);
   nsCAutoString entryString;
   nsMapiEntry newEntry;
-  PRBool didCopy = PR_FALSE;
+  bool didCopy = false;
 
   if (!mapiAddBook->IsOK())
     return NS_ERROR_FAILURE;
   nsresult rv = ExtractDirectoryEntry(aMailList, entryString);
   if (NS_SUCCEEDED(rv) && !entryString.IsEmpty())
   {
       nsMapiEntry sourceEntry;
 
@@ -570,17 +570,17 @@ static ULONG findPropertyTag(const char 
             return OutlookTableStringToProp [i].mMapiProp ;
         }
     }
     return 0 ;
 }
 
 static nsresult BuildRestriction(nsIAbBooleanConditionString *aCondition, 
                                  SRestriction& aRestriction,
-                                 PRBool& aSkipItem)
+                                 bool& aSkipItem)
 {
     if (!aCondition) { return NS_ERROR_NULL_POINTER ; }
     aSkipItem = PR_FALSE ;
     nsAbBooleanConditionType conditionType = 0 ;
     nsresult retCode = NS_OK ;
     nsCString name;
     nsString value;
     ULONG propertyTag = 0 ;
@@ -729,17 +729,17 @@ static nsresult BuildRestriction(nsIAbBo
         return NS_OK ;
     }
     if (operationType == nsIAbBooleanOperationTypes::NOT && nbExpressions != 1) {
         PRINTF(("Error, unary operation NOT with multiple operands.\n")) ;
         return NS_OK ;
     }
     LPSRestriction restrictionArray = new SRestriction [nbExpressions] ;
     PRUint32 realNbExpressions = 0 ;
-    PRBool skipItem = PR_FALSE ;
+    bool skipItem = false ;
     PRUint32 i = 0 ;
 
     nsCOMPtr<nsIAbBooleanConditionString> condition;
     nsCOMPtr<nsIAbBooleanExpression> subExpression;
 
     for (i = 0; i < nbExpressions; ++i) {
       condition = do_QueryElementAt(expressions, i, &retCode);
 
@@ -1207,17 +1207,17 @@ nsresult nsAbOutlookDirectory::UpdateAdd
 nsresult nsAbOutlookDirectory::CreateCard(nsIAbCard *aData, nsIAbCard **aNewCard) 
 {
     if (!aData || !aNewCard) { return NS_ERROR_NULL_POINTER ; }
     *aNewCard = nsnull ;
     nsresult retCode = NS_OK ;
     nsAbWinHelperGuard mapiAddBook (mAbWinType) ;
     nsMapiEntry newEntry ;
     nsCAutoString entryString ;
-    PRBool didCopy = PR_FALSE ;
+    bool didCopy = false ;
 
     if (!mapiAddBook->IsOK()) { return NS_ERROR_FAILURE ; }
     // If we get an nsIAbCard that maps onto an Outlook card uri
     // we simply copy the contents of the Outlook card.
     retCode = ExtractCardEntry(aData, entryString) ;
     if (NS_SUCCEEDED(retCode) && !entryString.IsEmpty()) {
         nsMapiEntry sourceEntry ;
         
@@ -1439,17 +1439,17 @@ NS_IMETHODIMP nsAbOutlookDirectory::OnQu
 }
 
 NS_IMETHODIMP nsAbOutlookDirectory::OnQueryResult(PRInt32 aResult,
                                                   PRInt32 aErrorCode)
 {
   return OnSearchFinished(aResult, EmptyString());
 }