Bug 695256 - Switch from PRBool to bool and replace PR_TRUE/PR_FALSE with true/false in comm-central. r=bienvenu
authorMark Banner <bugzilla@standard8.plus.com>
Fri, 30 Dec 2011 12:07:39 +0000
changeset 10318 f9d611e3d0a562cedb52cdafb65dd4f8f5af3b23
parent 10317 6e4299ead2275bbea6787413a609d9a2b3cd3026
child 10319 29a4d87cee06a081b4716944d7fc7bf1e80549d0
push idunknown
push userunknown
push dateunknown
reviewersbienvenu
bugs695256
Bug 695256 - Switch from PRBool to bool and replace PR_TRUE/PR_FALSE with true/false in comm-central. r=bienvenu
calendar/base/src/calDateTime.cpp
calendar/base/src/calDuration.cpp
calendar/base/src/calICSService.cpp
calendar/base/src/calPeriod.cpp
calendar/base/src/calRecurrenceDate.cpp
calendar/base/src/calRecurrenceDateSet.cpp
calendar/base/src/calRecurrenceRule.cpp
calendar/base/src/calTimezone.cpp
db/mork/src/morkBuilder.cpp
db/mork/src/morkCell.cpp
db/mork/src/morkCellObject.cpp
db/mork/src/morkCursor.cpp
db/mork/src/morkFactory.cpp
db/mork/src/morkPortTableCursor.cpp
db/mork/src/morkRow.cpp
db/mork/src/morkRowCellCursor.cpp
db/mork/src/morkRowObject.cpp
db/mork/src/morkRowSpace.cpp
db/mork/src/morkStore.cpp
db/mork/src/morkTable.cpp
db/mork/src/morkTableRowCursor.cpp
ldap/xpcom/src/nsLDAPConnection.cpp
ldap/xpcom/src/nsLDAPControl.cpp
ldap/xpcom/src/nsLDAPMessage.cpp
ldap/xpcom/src/nsLDAPModification.cpp
ldap/xpcom/src/nsLDAPService.cpp
ldap/xpcom/src/nsLDAPSyncQuery.cpp
ldap/xpcom/src/nsLDAPURL.cpp
ldap/xpcom/src/nsLDAPUtils.h
mail/app/nsMailApp.cpp
mail/components/migration/src/nsEudoraProfileMigrator.cpp
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/nsProfileMigratorBase.cpp
mail/components/migration/src/nsSeamonkeyProfileMigrator.cpp
mail/components/search/nsMailWinSearchHelper.cpp
mail/components/shell/nsMailGNOMEIntegration.cpp
mail/components/shell/nsMailMacIntegration.cpp
mail/components/shell/nsMailWinIntegration.cpp
mailnews/addrbook/src/nsAbAddressCollector.cpp
mailnews/addrbook/src/nsAbBSDirectory.cpp
mailnews/addrbook/src/nsAbCardProperty.cpp
mailnews/addrbook/src/nsAbContentHandler.cpp
mailnews/addrbook/src/nsAbDirProperty.cpp
mailnews/addrbook/src/nsAbDirectoryQuery.cpp
mailnews/addrbook/src/nsAbDirectoryQueryProxy.cpp
mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp
mailnews/addrbook/src/nsAbLDAPCard.cpp
mailnews/addrbook/src/nsAbLDAPChangeLogData.cpp
mailnews/addrbook/src/nsAbLDAPChangeLogQuery.cpp
mailnews/addrbook/src/nsAbLDAPDirectory.cpp
mailnews/addrbook/src/nsAbLDAPDirectoryModify.cpp
mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp
mailnews/addrbook/src/nsAbLDAPListenerBase.cpp
mailnews/addrbook/src/nsAbLDAPReplicationData.cpp
mailnews/addrbook/src/nsAbLDAPReplicationQuery.cpp
mailnews/addrbook/src/nsAbLDAPReplicationService.cpp
mailnews/addrbook/src/nsAbLDIFService.cpp
mailnews/addrbook/src/nsAbMDBCard.cpp
mailnews/addrbook/src/nsAbMDBDirFactory.cpp
mailnews/addrbook/src/nsAbMDBDirProperty.cpp
mailnews/addrbook/src/nsAbMDBDirectory.cpp
mailnews/addrbook/src/nsAbManager.cpp
mailnews/addrbook/src/nsAbOSXCard.mm
mailnews/addrbook/src/nsAbOSXDirectory.mm
mailnews/addrbook/src/nsAbOutlookDirFactory.cpp
mailnews/addrbook/src/nsAbOutlookDirectory.cpp
mailnews/addrbook/src/nsAbQueryStringToExpression.cpp
mailnews/addrbook/src/nsAbView.cpp
mailnews/addrbook/src/nsAddbookProtocolHandler.cpp
mailnews/addrbook/src/nsAddrDatabase.cpp
mailnews/addrbook/src/nsDirPrefs.cpp
mailnews/addrbook/src/nsLDAPAutoCompleteSession.cpp
mailnews/addrbook/src/nsVCardObj.cpp
mailnews/base/search/public/nsMsgSearchBoolExpression.h
mailnews/base/search/src/nsMsgBodyHandler.cpp
mailnews/base/search/src/nsMsgFilter.cpp
mailnews/base/search/src/nsMsgFilterList.cpp
mailnews/base/search/src/nsMsgFilterService.cpp
mailnews/base/search/src/nsMsgImapSearch.cpp
mailnews/base/search/src/nsMsgLocalSearch.cpp
mailnews/base/search/src/nsMsgSearchAdapter.cpp
mailnews/base/search/src/nsMsgSearchNews.cpp
mailnews/base/search/src/nsMsgSearchSession.cpp
mailnews/base/search/src/nsMsgSearchTerm.cpp
mailnews/base/src/nsMailDirProvider.cpp
mailnews/base/src/nsMessenger.cpp
mailnews/base/src/nsMessengerBootstrap.cpp
mailnews/base/src/nsMessengerOSXIntegration.mm
mailnews/base/src/nsMessengerUnixIntegration.cpp
mailnews/base/src/nsMessengerWinIntegration.cpp
mailnews/base/src/nsMsgAccount.cpp
mailnews/base/src/nsMsgAccountManager.cpp
mailnews/base/src/nsMsgAccountManagerDS.cpp
mailnews/base/src/nsMsgBiffManager.cpp
mailnews/base/src/nsMsgContentPolicy.cpp
mailnews/base/src/nsMsgCopyService.cpp
mailnews/base/src/nsMsgDBView.cpp
mailnews/base/src/nsMsgDBView.h
mailnews/base/src/nsMsgFolderCache.cpp
mailnews/base/src/nsMsgFolderCompactor.cpp
mailnews/base/src/nsMsgFolderDataSource.cpp
mailnews/base/src/nsMsgFolderNotificationService.cpp
mailnews/base/src/nsMsgGroupThread.cpp
mailnews/base/src/nsMsgGroupView.cpp
mailnews/base/src/nsMsgMailSession.cpp
mailnews/base/src/nsMsgOfflineManager.cpp
mailnews/base/src/nsMsgPrintEngine.cpp
mailnews/base/src/nsMsgProgress.cpp
mailnews/base/src/nsMsgPurgeService.cpp
mailnews/base/src/nsMsgQuickSearchDBView.cpp
mailnews/base/src/nsMsgRDFDataSource.cpp
mailnews/base/src/nsMsgSearchDBView.cpp
mailnews/base/src/nsMsgServiceProvider.cpp
mailnews/base/src/nsMsgSpecialViews.cpp
mailnews/base/src/nsMsgTagService.cpp
mailnews/base/src/nsMsgThreadedDBView.cpp
mailnews/base/src/nsMsgWindow.cpp
mailnews/base/src/nsMsgXFViewThread.cpp
mailnews/base/src/nsMsgXFVirtualFolderDBView.cpp
mailnews/base/src/nsSpamSettings.cpp
mailnews/base/src/nsStatusBarBiffManager.cpp
mailnews/base/src/nsSubscribableServer.cpp
mailnews/base/src/nsSubscribeDataSource.cpp
mailnews/base/test/TestMailCookie.cpp
mailnews/base/test/TestMsgStripRE.cpp
mailnews/base/util/nsImapMoveCoalescer.cpp
mailnews/base/util/nsMsgCompressIStream.cpp
mailnews/base/util/nsMsgCompressOStream.cpp
mailnews/base/util/nsMsgDBFolder.cpp
mailnews/base/util/nsMsgFileStream.cpp
mailnews/base/util/nsMsgI18N.cpp
mailnews/base/util/nsMsgI18N.h
mailnews/base/util/nsMsgIdentity.cpp
mailnews/base/util/nsMsgIncomingServer.cpp
mailnews/base/util/nsMsgKeySet.cpp
mailnews/base/util/nsMsgLineBuffer.cpp
mailnews/base/util/nsMsgLineBuffer.h
mailnews/base/util/nsMsgMailNewsUrl.cpp
mailnews/base/util/nsMsgProtocol.cpp
mailnews/base/util/nsMsgReadStateTxn.cpp
mailnews/base/util/nsMsgTxn.cpp
mailnews/base/util/nsMsgUtils.cpp
mailnews/base/util/nsMsgUtils.h
mailnews/compose/src/nsMsgAppleDoubleEncode.cpp
mailnews/compose/src/nsMsgAppleEncode.cpp
mailnews/compose/src/nsMsgAttachment.cpp
mailnews/compose/src/nsMsgAttachmentHandler.cpp
mailnews/compose/src/nsMsgCompFields.cpp
mailnews/compose/src/nsMsgCompFields.h
mailnews/compose/src/nsMsgCompUtils.cpp
mailnews/compose/src/nsMsgCompose.cpp
mailnews/compose/src/nsMsgComposeParams.cpp
mailnews/compose/src/nsMsgComposeService.cpp
mailnews/compose/src/nsMsgCopy.cpp
mailnews/compose/src/nsMsgQuote.cpp
mailnews/compose/src/nsMsgSend.cpp
mailnews/compose/src/nsMsgSendLater.cpp
mailnews/compose/src/nsMsgSendPart.cpp
mailnews/compose/src/nsMsgSendReport.cpp
mailnews/compose/src/nsSmtpProtocol.cpp
mailnews/compose/src/nsSmtpServer.cpp
mailnews/compose/src/nsSmtpService.cpp
mailnews/compose/src/nsSmtpUrl.cpp
mailnews/compose/src/nsURLFetcher.cpp
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/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/mdn/src/nsMsgMdnGenerator.cpp
mailnews/extensions/smime/src/nsMsgComposeSecure.cpp
mailnews/extensions/smime/src/nsSMimeJSHelper.cpp
mailnews/imap/src/nsAutoSyncManager.cpp
mailnews/imap/src/nsAutoSyncState.cpp
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/nsIMAPNamespace.cpp
mailnews/imap/src/nsImapFlagAndUidState.cpp
mailnews/imap/src/nsImapIncomingServer.cpp
mailnews/imap/src/nsImapMailFolder.cpp
mailnews/imap/src/nsImapOfflineSync.cpp
mailnews/imap/src/nsImapProtocol.cpp
mailnews/imap/src/nsImapServerResponseParser.cpp
mailnews/imap/src/nsImapService.cpp
mailnews/imap/src/nsImapUndoTxn.cpp
mailnews/imap/src/nsImapUrl.cpp
mailnews/imap/src/nsImapUtils.cpp
mailnews/imap/test/TestImapFlagAndUidState.cpp
mailnews/import/applemail/src/nsAppleMailImport.cpp
mailnews/import/eudora/src/nsEudoraAddress.cpp
mailnews/import/eudora/src/nsEudoraCompose.cpp
mailnews/import/eudora/src/nsEudoraCompose.h
mailnews/import/eudora/src/nsEudoraEditor.cpp
mailnews/import/eudora/src/nsEudoraFilters.cpp
mailnews/import/eudora/src/nsEudoraImport.cpp
mailnews/import/eudora/src/nsEudoraMac.cpp
mailnews/import/eudora/src/nsEudoraMailbox.cpp
mailnews/import/eudora/src/nsEudoraSettings.cpp
mailnews/import/eudora/src/nsEudoraWin32.cpp
mailnews/import/oexpress/WabObject.cpp
mailnews/import/oexpress/nsOE5File.cpp
mailnews/import/oexpress/nsOEAddressIterator.cpp
mailnews/import/oexpress/nsOEImport.cpp
mailnews/import/oexpress/nsOEMailbox.cpp
mailnews/import/oexpress/nsOEScanBoxes.cpp
mailnews/import/oexpress/nsOESettings.cpp
mailnews/import/outlook/src/MapiApi.cpp
mailnews/import/outlook/src/MapiMessage.cpp
mailnews/import/outlook/src/nsOutlookCompose.cpp
mailnews/import/outlook/src/nsOutlookMail.cpp
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/nsImportABDescriptor.cpp
mailnews/import/src/nsImportAddressBooks.cpp
mailnews/import/src/nsImportEncodeScan.cpp
mailnews/import/src/nsImportFieldMap.cpp
mailnews/import/src/nsImportMailboxDescriptor.cpp
mailnews/import/src/nsImportMimeEncode.cpp
mailnews/import/src/nsImportScanFile.cpp
mailnews/import/src/nsImportScanFile.h
mailnews/import/src/nsImportService.cpp
mailnews/import/src/nsImportTranslator.cpp
mailnews/import/src/nsImportTranslator.h
mailnews/import/text/src/nsTextAddress.cpp
mailnews/import/text/src/nsTextImport.cpp
mailnews/import/vcard/src/nsVCardAddress.cpp
mailnews/import/vcard/src/nsVCardImport.cpp
mailnews/import/winlivemail/nsWMImport.cpp
mailnews/import/winlivemail/nsWMSettings.cpp
mailnews/local/src/nsLocalMailFolder.cpp
mailnews/local/src/nsLocalUndoTxn.cpp
mailnews/local/src/nsLocalUtils.cpp
mailnews/local/src/nsMailboxProtocol.cpp
mailnews/local/src/nsMailboxService.cpp
mailnews/local/src/nsMailboxUrl.cpp
mailnews/local/src/nsMovemailIncomingServer.cpp
mailnews/local/src/nsMovemailService.cpp
mailnews/local/src/nsMsgLocalStoreUtils.cpp
mailnews/local/src/nsNoIncomingServer.cpp
mailnews/local/src/nsNoneService.cpp
mailnews/local/src/nsParseMailbox.cpp
mailnews/local/src/nsParseMailbox.h
mailnews/local/src/nsPop3IncomingServer.cpp
mailnews/local/src/nsPop3Protocol.cpp
mailnews/local/src/nsPop3Protocol.h
mailnews/local/src/nsPop3Service.cpp
mailnews/local/src/nsPop3Sink.cpp
mailnews/local/src/nsRssIncomingServer.cpp
mailnews/local/src/nsRssService.cpp
mailnews/mapi/mapihook/src/msgMapiHook.cpp
mailnews/mapi/mapihook/src/msgMapiImp.cpp
mailnews/mapi/mapihook/src/msgMapiMain.cpp
mailnews/mapi/mapihook/src/msgMapiSupport.cpp
mailnews/mime/cthandlers/smimestub/nsSMIMEStub.cpp
mailnews/mime/cthandlers/vcard/mimevcrd.cpp
mailnews/mime/emitters/src/nsEmitterUtils.cpp
mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp
mailnews/mime/emitters/src/nsMimeHtmlEmitter.cpp
mailnews/mime/emitters/src/nsMimeXmlEmitter.cpp
mailnews/mime/src/comi18n.cpp
mailnews/mime/src/comi18n.h
mailnews/mime/src/mimecms.cpp
mailnews/mime/src/mimecont.cpp
mailnews/mime/src/mimecryp.cpp
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/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/mimemrel.cpp
mailnews/mime/src/mimemsg.cpp
mailnews/mime/src/mimemsig.cpp
mailnews/mime/src/mimemult.cpp
mailnews/mime/src/mimeobj.cpp
mailnews/mime/src/mimepbuf.cpp
mailnews/mime/src/mimesun.cpp
mailnews/mime/src/mimetenr.cpp
mailnews/mime/src/mimetext.cpp
mailnews/mime/src/mimethpl.cpp
mailnews/mime/src/mimethsa.cpp
mailnews/mime/src/mimethtm.cpp
mailnews/mime/src/mimetpfl.cpp
mailnews/mime/src/mimetpla.cpp
mailnews/mime/src/mimetric.cpp
mailnews/mime/src/mimeunty.cpp
mailnews/mime/src/modlmime.h
mailnews/mime/src/modmimee.h
mailnews/mime/src/nsMimeHeaders.cpp
mailnews/mime/src/nsMsgHeaderParser.cpp
mailnews/mime/src/nsSimpleMimeConverterStub.cpp
mailnews/mime/src/nsStreamConverter.cpp
mailnews/mime/test/TestMimeCrash.cpp
mailnews/news/src/nsNNTPArticleList.cpp
mailnews/news/src/nsNNTPNewsgroupList.cpp
mailnews/news/src/nsNNTPNewsgroupPost.cpp
mailnews/news/src/nsNNTPProtocol.cpp
mailnews/news/src/nsNewsDownloadDialogArgs.cpp
mailnews/news/src/nsNewsDownloader.cpp
mailnews/news/src/nsNewsFolder.cpp
mailnews/news/src/nsNntpIncomingServer.cpp
mailnews/news/src/nsNntpMockChannel.cpp
mailnews/news/src/nsNntpService.cpp
mailnews/news/src/nsNntpUrl.cpp
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/nsThunderbirdProfileMigrator.cpp
suite/profile/nsSuiteDirectoryProvider.cpp
suite/shell/src/nsGNOMEShellService.cpp
suite/shell/src/nsGNOMEShellService.h
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
@@ -59,39 +59,39 @@ extern "C" {
 #define CAL_ATTR_SET_PRE NS_ENSURE_FALSE(mImmutable, NS_ERROR_OBJECT_IS_IMMUTABLE)
 #define CAL_ATTR_SET_POST Normalize()
 #include "calAttributeHelpers.h"
 
 NS_IMPL_CLASSINFO(calDateTime, NULL, 0, CAL_DATETIME_CID)
 NS_IMPL_ISUPPORTS2_CI(calDateTime, calIDateTime, nsIXPCScriptable)
 
 calDateTime::calDateTime()
-    : mImmutable(PR_FALSE)
+    : mImmutable(false)
 {
     Reset();
 }
 
 calDateTime::calDateTime(icaltimetype const* atimeptr, calITimezone *tz)
-    : mImmutable(PR_FALSE)
+    : mImmutable(false)
 {
     FromIcalTime(atimeptr, tz);
 }
 
 NS_IMETHODIMP
 calDateTime::GetIsMutable(bool *aResult)
 {
     NS_ENSURE_ARG_POINTER(aResult);
     *aResult = !mImmutable;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calDateTime::MakeImmutable()
 {
-    mImmutable = PR_TRUE;
+    mImmutable = true;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calDateTime::Clone(calIDateTime **aResult)
 {
     NS_ENSURE_ARG_POINTER(aResult);
     icaltimetype itt;
@@ -114,17 +114,17 @@ calDateTime::ResetTo(PRInt16 year,
     NS_ENSURE_FALSE(mImmutable, NS_ERROR_OBJECT_IS_IMMUTABLE);
     NS_ENSURE_ARG_POINTER(tz);
     mYear = year;
     mMonth = month;
     mDay = day;
     mHour = hour;
     mMinute = minute;
     mSecond = second;
-    mIsDate = PR_FALSE;
+    mIsDate = false;
     mTimezone = tz;
     Normalize();
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calDateTime::Reset()
 {
@@ -132,20 +132,20 @@ calDateTime::Reset()
     mYear = 1970;
     mMonth = 0;
     mDay = 1;
     mHour = 0;
     mMinute = 0;
     mSecond = 0;
     mWeekday = 4;
     mYearday = 1;
-    mIsDate = PR_FALSE;
+    mIsDate = false;
     mTimezone = nsnull;
     mNativeTime = 0;
-    mIsValid = PR_TRUE;
+    mIsValid = true;
     return NS_OK;
 }
 
 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)
@@ -187,17 +187,17 @@ calDateTime::GetTimezoneOffset(PRInt32 *
     *aResult = icaltimezone_get_utc_offset(const_cast<icaltimezone *>(icalt.zone), &icalt, &dst);
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calDateTime::SetNativeTime(PRTime aNativeTime)
 {
     icaltimetype icalt;
-    PRTimeToIcaltime(aNativeTime, PR_FALSE, icaltimezone_get_utc_timezone(), &icalt);
+    PRTimeToIcaltime(aNativeTime, false, icaltimezone_get_utc_timezone(), &icalt);
     FromIcalTime(&icalt, cal::UTC());
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calDateTime::AddDuration(calIDuration *aDuration)
 {
     NS_ENSURE_FALSE(mImmutable, NS_ERROR_OBJECT_IS_IMMUTABLE);
@@ -255,17 +255,17 @@ calDateTime::ToString(nsACString & aResu
 }
 
 NS_IMETHODIMP
 calDateTime::SetTimeInTimezone(PRTime aTime, calITimezone * aTimezone)
 {
     NS_ENSURE_FALSE(mImmutable, NS_ERROR_OBJECT_IS_IMMUTABLE);
     NS_ENSURE_ARG_POINTER(aTimezone);
     icaltimetype icalt;
-    PRTimeToIcaltime(aTime, PR_FALSE, cal::getIcalTimezone(aTimezone), &icalt);
+    PRTimeToIcaltime(aTime, false, cal::getIcalTimezone(aTimezone), &icalt);
     FromIcalTime(&icalt, aTimezone);
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calDateTime::GetInTimezone(calITimezone * aTimezone, calIDateTime ** aResult)
 {
     NS_ENSURE_ARG_POINTER(aTimezone);
@@ -483,19 +483,19 @@ calDateTime::ToIcalTime(struct icaltimet
 //         icaltimezone_get_utc_offset(tz, icalt, &icalt->is_daylight);
 //     }
 }
 
 void calDateTime::FromIcalTime(icaltimetype const* icalt, calITimezone * tz)
 {
     icaltimetype t = *icalt;
     mIsValid = (icaltime_is_null_time(t) ||
-                icaltime_is_valid_time(t) ? PR_TRUE : PR_FALSE);
+                icaltime_is_valid_time(t) ? true : false);
 
-    mIsDate = t.is_date ? PR_TRUE : PR_FALSE;
+    mIsDate = t.is_date ? true : false;
     if (mIsDate) {
         t.hour = 0;
         t.minute = 0;
         t.second = 0;
     }
 
     if (mIsValid) {
         t = icaltime_normalize(t);
@@ -679,22 +679,22 @@ calDateTime::GetProperty(nsIXPConnectWra
             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;
+            *_retval = true;
             return NS_SUCCESS_I_DID_SOMETHING;
         }
     }
 
-    *_retval = PR_TRUE;
+    *_retval = true;
     return NS_OK;
 }
 
 
 /* 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, bool *_retval)
@@ -707,37 +707,37 @@ calDateTime::SetProperty(nsIXPConnectWra
         const jschar *str = JS_GetStringCharsAndLength(cx, idString, &length);
 
         nsDependentString const val(reinterpret_cast<PRUnichar const*>(str), length);
 
         if (val.EqualsLiteral("jsDate") && vp) {
             JSObject *dobj;
             if (!JSVAL_IS_OBJECT(*vp) ||
                 !js_DateIsValid(cx, (dobj = JSVAL_TO_OBJECT(*vp)))) {
-                mIsValid = PR_FALSE;
+                mIsValid = false;
             } else {
                 jsdouble utcMsec = js_DateGetMsecSinceEpoch(cx, dobj);
                 PRTime utcTime, thousands;
                 LL_F2L(utcTime, utcMsec);
                 LL_I2L(thousands, 1000);
                 LL_MUL(utcTime, utcTime, thousands);
 
                 nsresult rv = SetNativeTime(utcTime);
                 if (NS_SUCCEEDED(rv)) {
-                    mIsValid = PR_TRUE;
+                    mIsValid = true;
                 } else {
-                    mIsValid = PR_FALSE;
+                    mIsValid = false;
                 }
             }
 
-            *_retval = PR_TRUE;
+            *_retval = true;
             return NS_SUCCESS_I_DID_SOMETHING;
         }
     }
-    *_retval = PR_TRUE;
+    *_retval = true;
     return NS_OK;
 }
 
 /* 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, bool *_retval)
@@ -757,11 +757,11 @@ calDateTime::NewResolve(nsIXPConnectWrap
                                            length,
                                            JSVAL_VOID,
                                            nsnull, nsnull, 0);
             *objp = obj;
             return *_retval ? NS_OK : NS_ERROR_FAILURE;
         }
     }
 
-    *_retval = PR_TRUE;
+    *_retval = true;
     return NS_OK;
 }
--- a/calendar/base/src/calDuration.cpp
+++ b/calendar/base/src/calDuration.cpp
@@ -51,53 +51,53 @@
 #define SECONDS_PER_DAY     86400
 #define SECONDS_PER_HOUR     3600
 #define SECONDS_PER_MINUTE     60
 
 NS_IMPL_CLASSINFO(calDuration, NULL, 0, CAL_DURATION_CID)
 NS_IMPL_ISUPPORTS1_CI(calDuration, calIDuration)
 
 calDuration::calDuration()
-    : mImmutable(PR_FALSE)
+    : mImmutable(false)
 {
     Reset();
 }
 
 calDuration::calDuration(const calDuration& cdt)
 {
     mDuration.is_neg = cdt.mDuration.is_neg;
     mDuration.weeks = cdt.mDuration.weeks;
     mDuration.days = cdt.mDuration.days;
     mDuration.hours = cdt.mDuration.hours;
     mDuration.minutes = cdt.mDuration.minutes;
     mDuration.seconds = cdt.mDuration.seconds;
 
     // copies are always mutable
-    mImmutable = PR_FALSE;
+    mImmutable = false;
 }
 
 calDuration::calDuration(const struct icaldurationtype * const aDurationPtr)
-    : mImmutable(PR_FALSE)
+    : mImmutable(false)
 {
     FromIcalDuration(aDurationPtr);
 }
 
 NS_IMETHODIMP
 calDuration::GetIsMutable(bool *aResult)
 {
     NS_ENSURE_ARG_POINTER(aResult);
 
     *aResult = !mImmutable;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calDuration::MakeImmutable()
 {
-    mImmutable = PR_TRUE;
+    mImmutable = true;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calDuration::Clone(calIDuration **aResult)
 {
     calDuration *cdt = new calDuration(*this);
     if (!cdt)
--- a/calendar/base/src/calICSService.cpp
+++ b/calendar/base/src/calICSService.cpp
@@ -116,17 +116,17 @@ calIcalProperty::GetValue(nsACString &st
         icalstr = icalproperty_get_value_as_string(mProperty);
     }
 
     if (!icalstr) {
         if (icalerrno == ICAL_BADARG_ERROR) {
             str.Truncate();
             // Set string to null, because we don't have a value
             // (which is something different then an empty value)
-            str.SetIsVoid(PR_TRUE);
+            str.SetIsVoid(true);
             return NS_OK;
         }
 
 #ifdef DEBUG
         fprintf(stderr, "Error getting string value: %d (%s)\n",
                 icalerrno, icalerror_strerror(icalerrno));
 #endif
         return NS_ERROR_FAILURE;
@@ -162,17 +162,17 @@ NS_IMETHODIMP
 calIcalProperty::GetValueAsIcalString(nsACString &str)
 {
     const char *icalstr = icalproperty_get_value_as_string(mProperty);
     if (!icalstr) {
         if (icalerrno == ICAL_BADARG_ERROR) {
             str.Truncate();
             // Set string to null, because we don't have a value
             // (which is something different then an empty value)
-            str.SetIsVoid(PR_TRUE);
+            str.SetIsVoid(true);
             return NS_OK;
         }
 
 #ifdef DEBUG
         fprintf(stderr, "Error getting string value: %d (%s)\n",
                 icalerrno, icalerror_strerror(icalerrno));
 #endif
         return NS_ERROR_FAILURE;
@@ -242,17 +242,17 @@ calIcalProperty::GetParameter(const nsAC
             icalstr = icalparameter_get_iana_value(icalparam);
     } else {
         icalstr = icalproperty_get_parameter_as_string(mProperty,
                                                        PromiseFlatCString(param).get());
     }
 
     if (!icalstr) {
         value.Truncate();
-        value.SetIsVoid(PR_TRUE);
+        value.SetIsVoid(true);
     } else {
         value.Assign(icalstr);
     }
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calIcalProperty::SetParameter(const nsACString &param, const nsACString &value)
@@ -324,17 +324,17 @@ FillParameterName(icalparameter *icalpar
         else if (paramkind != ICAL_NO_PARAMETER)
             propname = icalparameter_kind_to_string(paramkind);
     }
 
     if (propname) {
         name.Assign(propname);
     } else {
         name.Truncate();
-        name.SetIsVoid(PR_TRUE);
+        name.SetIsVoid(true);
     }
 
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calIcalProperty::GetFirstParameterName(nsACString &name)
 {
@@ -585,17 +585,17 @@ NS_IMETHODIMP                           
 calIcalComponent::Get##Attrname(nsACString &str)                        \
 {                                                                       \
     PRInt32 val;                                                        \
     nsresult rv = GetIntProperty(ICAL_##ICALNAME##_PROPERTY, &val);     \
     if (NS_FAILED(rv))                                                  \
         return rv;                                                      \
     if (val == -1) {                                                    \
         str.Truncate();                                                 \
-        str.SetIsVoid(PR_TRUE);                                         \
+        str.SetIsVoid(true);                                         \
     } else {                                                            \
         str.Assign(icalproperty_##lcname##_to_string((icalproperty_##lcname)val)); \
     }                                                                   \
     return NS_OK;                                                       \
 }                                                                       \
                                                                         \
 NS_IMETHODIMP                                                           \
 calIcalComponent::Set##Attrname(const nsACString &str)                  \
@@ -681,17 +681,17 @@ calIcalComponent::Set##Attrname(PRInt32 
     return SetProperty(ICAL_##ICALNAME##_PROPERTY, prop);       \
 }
 
 nsresult calIcalComponent::GetStringProperty(icalproperty_kind kind, nsACString &str)
 {
     icalproperty *prop = icalcomponent_get_first_property(mComponent, kind);
     if (!prop) {
         str.Truncate();
-        str.SetIsVoid(PR_TRUE);
+        str.SetIsVoid(true);
     } else {
         str.Assign(icalvalue_get_string(icalproperty_get_value(prop)));
     }
     return NS_OK;
 }
 
 nsresult calIcalComponent::SetStringProperty(icalproperty_kind kind,
                                              const nsACString &str)
@@ -1083,17 +1083,17 @@ calIcalComponent::AddSubcomponent(calIIc
     NS_ENSURE_SUCCESS(rv, rv);
 
     calIcalComponent * const vcal = getParentVCalendarOrThis();
     bool failed = false;
     for (PRUint32 i = 0; i < tzCount; i++) {
         if (!failed) {
             rv = vcal->AddTimezoneReference(timezones[i]);
             if (NS_FAILED(rv))
-                failed = PR_TRUE;
+                failed = true;
         }
 
         NS_RELEASE(timezones[i]);
     }
 
     nsMemory::Free(timezones);
 
     if (failed)
--- a/calendar/base/src/calPeriod.cpp
+++ b/calendar/base/src/calPeriod.cpp
@@ -42,48 +42,48 @@
 #include "nsIClassInfoImpl.h"
 
 #include "calUtils.h"
 
 NS_IMPL_CLASSINFO(calPeriod, NULL, 0, CAL_PERIOD_CID)
 NS_IMPL_ISUPPORTS1_CI(calPeriod, calIPeriod)
 
 calPeriod::calPeriod()
-    : mImmutable(PR_FALSE)
+    : mImmutable(false)
 {
 }
 
 calPeriod::calPeriod(const calPeriod& cpt)
-    : mImmutable(PR_FALSE)
+    : mImmutable(false)
 {
     if (cpt.mStart)
         cpt.mStart->Clone(getter_AddRefs(mStart));
     if (cpt.mEnd)
         cpt.mEnd->Clone(getter_AddRefs(mEnd));
 }
 
 calPeriod::calPeriod(struct icalperiodtype const* aPeriodPtr)
-    : mImmutable(PR_FALSE)
+    : mImmutable(false)
 {
     FromIcalPeriod(aPeriodPtr);
 }
 
 NS_IMETHODIMP
 calPeriod::GetIsMutable(bool *aResult)
 {
     NS_ENSURE_ARG_POINTER(aResult);
 
     *aResult = !mImmutable;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calPeriod::MakeImmutable()
 {
-    mImmutable = PR_TRUE;
+    mImmutable = true;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calPeriod::Clone(calIPeriod **aResult)
 {
     NS_ENSURE_ARG_POINTER(aResult);
     calPeriod *cpt = new calPeriod(*this);
--- a/calendar/base/src/calRecurrenceDate.cpp
+++ b/calendar/base/src/calRecurrenceDate.cpp
@@ -55,18 +55,18 @@
 extern "C" {
     #include "ical.h"
 }
 
 NS_IMPL_CLASSINFO(calRecurrenceDate, NULL, 0, CAL_RECURRENCEDATE_CID)
 NS_IMPL_ISUPPORTS2_CI(calRecurrenceDate, calIRecurrenceItem, calIRecurrenceDate)
 
 calRecurrenceDate::calRecurrenceDate()
-    : mImmutable(PR_FALSE),
-      mIsNegative(PR_FALSE)
+    : mImmutable(false),
+      mIsNegative(false)
 {
 }
 
 NS_IMETHODIMP
 calRecurrenceDate::GetIsMutable(bool *aResult)
 {
     NS_ENSURE_ARG_POINTER(aResult);
 
@@ -75,17 +75,17 @@ calRecurrenceDate::GetIsMutable(bool *aR
 }
 
 NS_IMETHODIMP
 calRecurrenceDate::MakeImmutable()
 {
     if (mImmutable)
         return NS_ERROR_FAILURE; // XXX another error code
 
-    mImmutable = PR_TRUE;
+    mImmutable = true;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calRecurrenceDate::Clone(calIRecurrenceItem **_retval)
 {
     calRecurrenceDate *crd = new calRecurrenceDate;
     if (!crd)
@@ -121,17 +121,17 @@ calRecurrenceDate::SetIsNegative(bool aI
     return NS_OK;
 }
 
 /* readonly attribute boolean isFinite; */
 NS_IMETHODIMP
 calRecurrenceDate::GetIsFinite(bool *_retval)
 {
     NS_ENSURE_ARG_POINTER(_retval);
-    *_retval = PR_TRUE;
+    *_retval = true;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calRecurrenceDate::GetDate(calIDateTime **aDate)
 {
     NS_ENSURE_ARG_POINTER(aDate);
 
@@ -221,24 +221,24 @@ calRecurrenceDate::SetIcalProperty(calII
 {
     NS_ENSURE_ARG_POINTER(aProp);
 
     nsCAutoString name;
     nsresult rc = aProp->GetPropertyName(name);
     if (NS_FAILED(rc))
         return rc;
     if (name.EqualsLiteral("RDATE")) {
-        mIsNegative = PR_FALSE;
+        mIsNegative = false;
         icalvalue * const value = icalproperty_get_value(aProp->GetIcalProperty());
         if (icalvalue_isa(value) == ICAL_PERIOD_VALUE) {
             icalperiodtype const period = icalvalue_get_period(value);
             // take only period's start date and skip end date, but continue parsing;
             // open bug 489747:
             mDate = new calDateTime(&period.start, nsnull /* detect timezone */);
             return NS_OK;
         }
     } else if (name.EqualsLiteral("EXDATE"))
-        mIsNegative = PR_TRUE;
+        mIsNegative = true;
     else
         return NS_ERROR_INVALID_ARG;
 
     return aProp->GetValueAsDatetime(getter_AddRefs(mDate));
 }
--- a/calendar/base/src/calRecurrenceDateSet.cpp
+++ b/calendar/base/src/calRecurrenceDateSet.cpp
@@ -50,19 +50,19 @@
 extern "C" {
     #include "ical.h"
 }
 
 NS_IMPL_CLASSINFO(calRecurrenceDateSet, NULL, 0, CAL_RECURRENCEDATESET_CID)
 NS_IMPL_ISUPPORTS2_CI(calRecurrenceDateSet, calIRecurrenceItem, calIRecurrenceDateSet)
 
 calRecurrenceDateSet::calRecurrenceDateSet()
-    : mImmutable(PR_FALSE),
-      mIsNegative(PR_FALSE),
-      mSorted(PR_FALSE)
+    : mImmutable(false),
+      mIsNegative(false),
+      mSorted(false)
 {
 }
 
 NS_IMETHODIMP
 calRecurrenceDateSet::GetIsMutable(bool *aResult)
 {
     NS_ENSURE_ARG_POINTER(aResult);
 
@@ -71,17 +71,17 @@ calRecurrenceDateSet::GetIsMutable(bool 
 }
 
 NS_IMETHODIMP
 calRecurrenceDateSet::MakeImmutable()
 {
     if (mImmutable)
         return NS_ERROR_FAILURE; // XXX another error code
 
-    mImmutable = PR_TRUE;
+    mImmutable = true;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calRecurrenceDateSet::Clone(calIRecurrenceItem **_retval)
 {
     nsresult rv;
 
@@ -125,17 +125,17 @@ calRecurrenceDateSet::SetIsNegative(bool
     return NS_OK;
 }
 
 /* readonly attribute boolean isFinite; */
 NS_IMETHODIMP
 calRecurrenceDateSet::GetIsFinite(bool *_retval)
 {
     NS_ENSURE_ARG_POINTER(_retval);
-    *_retval = PR_TRUE;
+    *_retval = true;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calRecurrenceDateSet::GetDates(PRUint32 *aCount, calIDateTime ***aDates)
 {
     if (mDates.Count() == 0) {
         *aDates = nsnull;
@@ -164,29 +164,29 @@ calRecurrenceDateSet::SetDates(PRUint32 
 {
     NS_ENSURE_ARG_POINTER(aDates);
 
     mDates.Clear();
     for (PRUint32 i = 0; i < aCount; i++) {
         mDates.AppendObject(aDates[i]);
     }
 
-    mSorted = PR_FALSE;
+    mSorted = false;
 
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calRecurrenceDateSet::AddDate(calIDateTime *aDate)
 {
     NS_ENSURE_ARG_POINTER(aDate);
 
     mDates.AppendObject(aDate);
 
-    mSorted = PR_FALSE;
+    mSorted = false;
 
     return NS_OK;
 }
 
 static int
 calDateTimeComparator (calIDateTime *aElement1,
                        calIDateTime *aElement2,
                        void *aData)
@@ -196,17 +196,17 @@ calDateTimeComparator (calIDateTime *aEl
     return result;
 }
 
 void
 calRecurrenceDateSet::EnsureSorted()
 {
     if (!mSorted) {
         mDates.Sort(calDateTimeComparator, nsnull);
-        mSorted = PR_TRUE;
+        mSorted = true;
     }
 }
 
 NS_IMETHODIMP
 calRecurrenceDateSet::GetNextOccurrence(calIDateTime *aStartTime,
                                         calIDateTime *aOccurrenceTime,
                                         calIDateTime **_retval)
 {
--- a/calendar/base/src/calRecurrenceRule.cpp
+++ b/calendar/base/src/calRecurrenceRule.cpp
@@ -50,35 +50,35 @@
 #include "nsIClassInfoImpl.h"
 
 #include <climits>
 
 NS_IMPL_CLASSINFO(calRecurrenceRule, NULL, 0, CAL_RECURRENCERULE_CID)
 NS_IMPL_ISUPPORTS2_CI(calRecurrenceRule, calIRecurrenceItem, calIRecurrenceRule)
 
 calRecurrenceRule::calRecurrenceRule()
-    : mImmutable(PR_FALSE),
-      mIsNegative(PR_FALSE),
-      mIsByCount(PR_FALSE)
+    : mImmutable(false),
+      mIsNegative(false),
+      mIsByCount(false)
 {
     icalrecurrencetype_clear(&mIcalRecur);
 }
 
 NS_IMETHODIMP
 calRecurrenceRule::GetIsMutable(bool *aResult)
 {
     NS_ENSURE_ARG_POINTER(aResult);
     *aResult = !mImmutable;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calRecurrenceRule::MakeImmutable()
 {
-    mImmutable = PR_TRUE;
+    mImmutable = true;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calRecurrenceRule::Clone(calIRecurrenceItem **aResult)
 {
     calRecurrenceRule * const crc = new calRecurrenceRule();
     CAL_ENSURE_MEMORY(crc);
@@ -113,19 +113,19 @@ calRecurrenceRule::SetIsNegative(bool aI
 NS_IMETHODIMP
 calRecurrenceRule::GetIsFinite(bool *_retval)
 {
     NS_ENSURE_ARG_POINTER(_retval);
 
     if ((mIsByCount && mIcalRecur.count == 0) ||
         (!mIsByCount && icaltime_is_null_time(mIcalRecur.until)))
     {
-        *_retval = PR_FALSE;
+        *_retval = false;
     } else {
-        *_retval = PR_TRUE;
+        *_retval = true;
     }
     return NS_OK;
 }
 
 /* attribute long type; */
 NS_IMETHODIMP
 calRecurrenceRule::GetType(nsACString &aType)
 {
@@ -197,17 +197,17 @@ calRecurrenceRule::SetCount(PRInt32 aRec
             return NS_ERROR_ILLEGAL_VALUE;
         mIcalRecur.count = static_cast<int>(aRecurCount);
     } else {
         mIcalRecur.count = 0;
     }
 
     mIcalRecur.until = icaltime_null_time();
 
-    mIsByCount = PR_TRUE;
+    mIsByCount = true;
 
     return NS_OK;
 }
 
 /* attribute calIDateTime untilDate; */
 NS_IMETHODIMP
 calRecurrenceRule::GetUntilDate(calIDateTime * *aRecurEnd)
 {
@@ -245,17 +245,17 @@ calRecurrenceRule::SetUntilDate(calIDate
 
         mIcalRecur.until = itt;
     } else {
         mIcalRecur.until = icaltime_null_time();
     }
 
     mIcalRecur.count = 0;
 
-    mIsByCount = PR_FALSE;
+    mIsByCount = false;
 
     return NS_OK;
 }
 
 /* readonly attribute boolean isByCount; */
 NS_IMETHODIMP
 calRecurrenceRule::GetIsByCount (bool *aIsByCount)
 {
@@ -549,19 +549,19 @@ calRecurrenceRule::SetIcalProperty(calII
 
     if (mImmutable)
         return NS_ERROR_OBJECT_IS_IMMUTABLE;
 
     nsCAutoString propname;
     nsresult rv = aProp->GetPropertyName(propname);
     NS_ENSURE_SUCCESS(rv, rv);
     if (propname.EqualsLiteral("RRULE"))
-        mIsNegative = PR_FALSE;
+        mIsNegative = false;
     else if (propname.EqualsLiteral("EXRULE"))
-        mIsNegative = PR_TRUE;
+        mIsNegative = true;
     else
         return NS_ERROR_INVALID_ARG;
 
     icalproperty *prop;
     struct icalrecurrencetype icalrecur;
 
     prop = aProp->GetIcalProperty();
 
@@ -573,16 +573,16 @@ calRecurrenceRule::SetIcalProperty(calII
     // event that start at different times (e.g. every day starting on
     // jan 1 for 2 weeks, every other day starting on feb 1 for 2
     // weeks).  Neither the server nor the UI supports this now,
     // but we really ought to!
     //struct icaltimetype icaldtstart;
     //icaldtstrat = icalproperty_get_dtstart(prop);
 
     if (icalrecur.count != 0)
-        mIsByCount = PR_TRUE;
+        mIsByCount = true;
     else
-        mIsByCount = PR_FALSE;
+        mIsByCount = false;
 
     mIcalRecur = icalrecur;
 
     return NS_OK;
 }
--- a/calendar/base/src/calTimezone.cpp
+++ b/calendar/base/src/calTimezone.cpp
@@ -41,42 +41,42 @@
 NS_IMPL_ISUPPORTS1(calTimezone, calITimezone)
 
 CAL_ISUPPORTS_ATTR_GETTER(calTimezone, calIIcalComponent, IcalComponent)
 CAL_STRINGTYPE_ATTR_GETTER(calTimezone, nsACString, Tzid)
 
 NS_IMETHODIMP
 calTimezone::GetIsFloating(bool * _retval) {
     NS_ENSURE_ARG_POINTER(_retval);
-    *_retval = PR_FALSE;
+    *_retval = false;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calTimezone::GetIsUTC(bool * _retval) {
     NS_ENSURE_ARG_POINTER(_retval);
-    *_retval = PR_FALSE;
+    *_retval = false;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calTimezone::GetDisplayName(nsAString & _retval) {
     _retval = NS_ConvertUTF8toUTF16(mTzid);
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calTimezone::GetLatitude(nsACString & _retval) {
-    _retval.SetIsVoid(PR_TRUE);
+    _retval.SetIsVoid(true);
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calTimezone::GetLongitude(nsACString & _retval) {
-    _retval.SetIsVoid(PR_TRUE);
+    _retval.SetIsVoid(true);
     return NS_OK;
 }
 
 NS_IMETHODIMP
 calTimezone::GetProvider(calITimezoneProvider ** _retval) {
     NS_ENSURE_ARG_POINTER(_retval);
     *_retval = nsnull;
     return NS_OK;
--- a/db/mork/src/morkBuilder.cpp
+++ b/db/mork/src/morkBuilder.cpp
@@ -847,17 +847,17 @@ morkBuilder::OnValue(morkEnv* ev, const 
   if ( cell )
   {
     mdbYarn yarn;
     yarn.mYarn_Buf = inBuf.mBuf_Body;
     yarn.mYarn_Fill = yarn.mYarn_Size = inBuf.mBuf_Fill;
     yarn.mYarn_More = 0;
     yarn.mYarn_Form = mBuilder_CellForm;
     yarn.mYarn_Grow = 0;
-    morkAtom* atom = store->YarnToAtom(ev, &yarn, PR_TRUE /* create */);
+    morkAtom* atom = store->YarnToAtom(ev, &yarn, true /* create */);
     cell->SetAtom(ev, atom, store->StorePool());
   }
   else if ( mParser_InMeta )
   {
     mork_token* metaSlot = mBuilder_MetaTokenSlot;
     if ( metaSlot )
     {
       if ( metaSlot == &mBuilder_TableStatus ) // table status?
--- a/db/mork/src/morkCell.cpp
+++ b/db/mork/src/morkCell.cpp
@@ -63,17 +63,17 @@
 #include "morkCell.h"
 #endif
 
 //3456789_123456789_123456789_123456789_123456789_123456789_123456789_123456789
 
 void
 morkCell::SetYarn(morkEnv* ev, const mdbYarn* inYarn, morkStore* ioStore)
 {
-  morkAtom* atom = ioStore->YarnToAtom(ev, inYarn, PR_TRUE /* create */);
+  morkAtom* atom = ioStore->YarnToAtom(ev, inYarn, true /* create */);
   if ( atom )
     this->SetAtom(ev, atom, ioStore->StorePool()); // refcounts atom
 }
 
 void
 morkCell::GetYarn(morkEnv* ev, mdbYarn* outYarn) const
 {
   MORK_USED_1(ev);
--- a/db/mork/src/morkCellObject.cpp
+++ b/db/mork/src/morkCellObject.cpp
@@ -300,37 +300,37 @@ morkCellObject::CanUseCell(nsIMdbEnv* me
   
   return outEnv;
 }
 
 // { ----- begin attribute methods -----
 NS_IMETHODIMP morkCellObject::SetBlob(nsIMdbEnv* /* mev */,
   nsIMdbBlob* /* ioBlob */)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 } // reads inBlob slots
 
 // when inBlob is in the same suite, this might be fastest cell-to-cell
 
 NS_IMETHODIMP morkCellObject::ClearBlob( // make empty (so content has zero length)
   nsIMdbEnv*  /* mev */)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
   // remember row->MaybeDirtySpaceStoreAndRow();
 }
 // clearing a yarn is like SetYarn() with empty yarn instance content
 
 NS_IMETHODIMP morkCellObject::GetBlobFill(nsIMdbEnv* mev,
   mdb_fill* outFill)
 // Same value that would be put into mYarn_Fill, if one called GetYarn()
 // with a yarn instance that had mYarn_Buf==nil and mYarn_Size==0.
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }  // size of blob 
 
 NS_IMETHODIMP morkCellObject::SetYarn(nsIMdbEnv* mev, 
   const mdbYarn* inYarn)
 {
   mdb_err outErr = 0;
   morkCell* cell = 0;
@@ -398,17 +398,17 @@ NS_IMETHODIMP morkCellObject::AliasYarn(
 
 // } ===== end nsIMdbBlob methods =====
 
 // { ===== begin nsIMdbCell methods =====
 
 // { ----- begin attribute methods -----
 NS_IMETHODIMP morkCellObject::SetColumn(nsIMdbEnv* mev, mdb_column inColumn)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
   // remember row->MaybeDirtySpaceStoreAndRow();
 } 
 
 NS_IMETHODIMP morkCellObject::GetColumn(nsIMdbEnv* mev, mdb_column* outColumn)
 {
   mdb_err outErr = 0;
   mdb_column col = 0;
@@ -429,17 +429,17 @@ NS_IMETHODIMP morkCellObject::GetCellInf
   nsIMdbEnv* mev, 
   mdb_column* outColumn,           // the column in the containing row
   mdb_fill*   outBlobFill,         // the size of text content in bytes
   mdbOid*     outChildOid,         // oid of possible row or table child
   mdb_bool*   outIsRowChild)  // nonzero if child, and a row child
 // Checking all cell metainfo is a good way to avoid forcing a large cell
 // in to memory when you don't actually want to use the content.
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 
 NS_IMETHODIMP morkCellObject::GetRow(nsIMdbEnv* mev, // parent row for this cell
   nsIMdbRow** acqRow)
 {
   mdb_err outErr = 0;
@@ -516,52 +516,52 @@ NS_IMETHODIMP morkCellObject::HasAnyChil
   return outErr;
 }
 
 NS_IMETHODIMP morkCellObject::GetAnyChild( // access table of specific attribute
   nsIMdbEnv* mev, // context
   nsIMdbRow** acqRow, // child row (or null)
   nsIMdbTable** acqTable) // child table (or null)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 
 NS_IMETHODIMP morkCellObject::SetChildRow( // access table of specific attribute
   nsIMdbEnv* mev, // context
   nsIMdbRow* ioRow)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 } // inRow must be bound inside this same db port
 
 NS_IMETHODIMP morkCellObject::GetChildRow( // access row of specific attribute
   nsIMdbEnv* mev, // context
   nsIMdbRow** acqRow) // acquire child row (or nil if no child)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 
 NS_IMETHODIMP morkCellObject::SetChildTable( // access table of specific attribute
   nsIMdbEnv* mev, // context
   nsIMdbTable* inTable) // table must be bound inside this same db port
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
   // remember row->MaybeDirtySpaceStoreAndRow();
 }
 
 NS_IMETHODIMP morkCellObject::GetChildTable( // access table of specific attribute
   nsIMdbEnv* mev, // context
   nsIMdbTable** acqTable) // acquire child tabdle (or nil if no chil)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 // } ----- end children methods -----
 
 // } ===== end nsIMdbCell methods =====
 
 
 //3456789_123456789_123456789_123456789_123456789_123456789_123456789_123456789
--- a/db/mork/src/morkCursor.cpp
+++ b/db/mork/src/morkCursor.cpp
@@ -170,49 +170,49 @@ morkCursor::IsFrozenMdbObject(nsIMdbEnv*
   return NS_OK;
 }
 // } ===== end morkNode methods =====
 // ````` ````` ````` ````` ````` 
 
 NS_IMETHODIMP
 morkCursor::GetCount(nsIMdbEnv* mev, mdb_count* outCount)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkCursor::GetSeed(nsIMdbEnv* mev, mdb_seed* outSeed)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkCursor::SetPos(nsIMdbEnv* mev, mdb_pos inPos)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkCursor::GetPos(nsIMdbEnv* mev, mdb_pos* outPos)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkCursor::SetDoFailOnSeedOutOfSync(nsIMdbEnv* mev, mdb_bool inFail)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkCursor::GetDoFailOnSeedOutOfSync(nsIMdbEnv* mev, mdb_bool* outFail)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 
 //3456789_123456789_123456789_123456789_123456789_123456789_123456789_123456789
--- a/db/mork/src/morkFactory.cpp
+++ b/db/mork/src/morkFactory.cpp
@@ -320,27 +320,27 @@ morkFactory::MakeHeap(nsIMdbEnv* mev, ns
   return outErr;
 }
 // } ----- end heap methods -----
 
 // { ----- begin compare methods -----
 NS_IMETHODIMP
 morkFactory::MakeCompare(nsIMdbEnv* mev, nsIMdbCompare** acqCompare)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 // } ----- end compare methods -----
 
 // { ----- begin row methods -----
 NS_IMETHODIMP
 morkFactory::MakeRow(nsIMdbEnv* mev, nsIMdbHeap* ioHeap,
   nsIMdbRow** acqRow)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 // ioHeap can be nil, causing the heap associated with ev to be used
 // } ----- end row methods -----
 
 // { ----- begin port methods -----
 NS_IMETHODIMP
 morkFactory::CanOpenFilePort(
@@ -380,17 +380,17 @@ NS_IMETHODIMP
 morkFactory::OpenFilePort(
   nsIMdbEnv* mev, // context
   nsIMdbHeap* ioHeap, // can be nil to cause ev's heap attribute to be used
   // const char* inFilePath, // the file to open for readonly import
   nsIMdbFile* ioFile, // db abstract file interface
   const mdbOpenPolicy* inOpenPolicy, // runtime policies for using db
   nsIMdbThumb** acqThumb)
 {
-  NS_ASSERTION(PR_FALSE, "this doesn't look implemented");
+  NS_ASSERTION(false, "this doesn't look implemented");
   MORK_USED_1(ioHeap);
   mdb_err outErr = 0;
   nsIMdbThumb* outThumb = 0;
   morkEnv* ev = morkEnv::FromMdbEnv(mev);
    if ( ev )
   {
     if ( ioFile && inOpenPolicy && acqThumb )
     {
--- a/db/mork/src/morkPortTableCursor.cpp
+++ b/db/mork/src/morkPortTableCursor.cpp
@@ -346,17 +346,17 @@ morkPortTableCursor::NextTable(morkEnv* 
 // { ----- begin table iteration methods -----
 
 // { ===== begin nsIMdbPortTableCursor methods =====
 
 // { ----- begin attribute methods -----
 NS_IMETHODIMP
 morkPortTableCursor::SetPort(nsIMdbEnv* mev, nsIMdbPort* ioPort)
 {
-  NS_ASSERTION(PR_FALSE,"not implemented");
+  NS_ASSERTION(false,"not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkPortTableCursor::GetPort(nsIMdbEnv* mev, nsIMdbPort** acqPort)
 {
   mdb_err outErr = 0;
   nsIMdbPort* outPort = 0;
--- a/db/mork/src/morkRow.cpp
+++ b/db/mork/src/morkRow.cpp
@@ -885,17 +885,17 @@ void morkRow::AddColumn(morkEnv* ev, mdb
     morkCell* oldCell = cell; // need to know later whether new
     if ( !cell ) // column does not yet exist?
       cell = this->NewCell(ev, inColumn, &pos, ioStore);
     
     if ( cell )
     {
       morkAtom* oldAtom = cell->mCell_Atom;
 
-      morkAtom* atom = ioStore->YarnToAtom(ev, inYarn, PR_TRUE /* create */);
+      morkAtom* atom = ioStore->YarnToAtom(ev, inYarn, true /* create */);
       if ( atom && atom != oldAtom )
       {
         morkRowSpace* rowSpace = mRow_Space;
         morkAtomRowMap* map = ( rowSpace->mRowSpace_IndexCount )?
           rowSpace->FindMap(ev, inColumn) : (morkAtomRowMap*) 0;
         
         if ( map ) // inColumn is indexed by row space?
         {
--- a/db/mork/src/morkRowCellCursor.cpp
+++ b/db/mork/src/morkRowCellCursor.cpp
@@ -259,17 +259,17 @@ morkRowCellCursor::MakeCell( // get cell
 // { ----- begin cell seeking methods -----
 NS_IMETHODIMP
 morkRowCellCursor::SeekCell( // same as SetRow() followed by MakeCell()
   nsIMdbEnv* mev, // context
   mdb_pos inPos, // position of cell in row sequence
   mdb_column* outColumn, // column for this particular cell
   nsIMdbCell** acqCell)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 // } ----- end cell seeking methods -----
 
 // { ----- begin cell iteration methods -----
 NS_IMETHODIMP
 morkRowCellCursor::NextCell( // get next cell in the row
   nsIMdbEnv* mev, // context
@@ -311,16 +311,16 @@ morkRowCellCursor::PickNextCell( // get 
   nsIMdbCell* ioCell, // changes to the next cell in the iteration
   const mdbColumnSet* inFilterSet, // col set of actual caller interest
   mdb_column* outColumn, // column for this particular cell
   mdb_pos* outPos)
 // Note that inFilterSet should not have too many (many more than 10?)
 // cols, since this might imply a potential excessive consumption of time
 // over many cursor calls when looking for column and filter intersection.
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 // } ----- end cell iteration methods -----
 
 // } ===== end nsIMdbRowCellCursor methods =====
 
--- a/db/mork/src/morkRowObject.cpp
+++ b/db/mork/src/morkRowObject.cpp
@@ -197,28 +197,28 @@ morkRowObject::GetOid(nsIMdbEnv* mev,
   morkEnv* ev = morkEnv::FromMdbEnv(mev);
   return (ev) ? ev->AsErr() : NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
 morkRowObject::BecomeContent(nsIMdbEnv* mev,
   const mdbOid* inOid)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
   // remember row->MaybeDirtySpaceStoreAndRow();
 }
 // } ----- end ID methods -----
 
 // { ----- begin activity dropping methods -----
 NS_IMETHODIMP
 morkRowObject::DropActivity( // tell collection usage no longer expected
   nsIMdbEnv* mev)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 // } ----- end activity dropping methods -----
 
 // } ===== end nsIMdbCollection methods =====
 
 // { ===== begin nsIMdbRow methods =====
 
--- a/db/mork/src/morkRowSpace.cpp
+++ b/db/mork/src/morkRowSpace.cpp
@@ -551,18 +551,18 @@ morkRowSpace::FindMap(morkEnv* ev, mork_
 }
 
 morkRow*
 morkRowSpace::FindRow(morkEnv* ev, mork_column inCol, const mdbYarn* inYarn)
 {
   morkRow* outRow = 0;
 
   // if yarn hasn't been atomized, there can't be a corresponding row,
-  // so pass in PR_FALSE to not create the row - should help history bloat
-  morkAtom* atom = mSpace_Store->YarnToAtom(ev, inYarn, PR_FALSE);
+  // so pass in false to not create the row - should help history bloat
+  morkAtom* atom = mSpace_Store->YarnToAtom(ev, inYarn, false);
   if ( atom ) // have or created an atom corresponding to input yarn?
   {
     mork_aid atomAid = atom->GetBookAtomAid();
     if ( atomAid ) // atom has an identity for use in hash table?
     {
       morkAtomRowMap* map = this->ForceMap(ev, inCol);
       if ( map ) // able to find or create index for col?
       {
--- a/db/mork/src/morkStore.cpp
+++ b/db/mork/src/morkStore.cpp
@@ -694,17 +694,17 @@ morkAtom*
 morkStore::CopyAtom(morkEnv* ev, const morkAtom* inAtom)
 // copy inAtom (from some other store) over to this store
 {
   morkAtom* outAtom = 0;
   if ( inAtom )
   {
     mdbYarn yarn;
     if ( inAtom->AliasYarn(&yarn) )
-      outAtom = this->YarnToAtom(ev, &yarn, PR_TRUE /* create */);
+      outAtom = this->YarnToAtom(ev, &yarn, true /* create */);
   }
   return outAtom;
 }
  
 morkAtom*
 morkStore::YarnToAtom(morkEnv* ev, const mdbYarn* inYarn, bool createIfMissing /* = true */)
 {
   morkAtom* outAtom = 0;
@@ -2060,37 +2060,37 @@ morkStore::NewTableWithOid( // make one 
 
 // { ----- begin row scope methods -----
 NS_IMETHODIMP
 morkStore::RowScopeHasAssignedIds(nsIMdbEnv* mev,
   mdb_scope inRowScope,   // row scope for row ids
   mdb_bool* outCallerAssigned, // nonzero if caller assigned specified
   mdb_bool* outStoreAssigned) // nonzero if store db assigned specified
 {
-  NS_ASSERTION(PR_FALSE, " not implemented");
+  NS_ASSERTION(false, " not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkStore::SetCallerAssignedIds(nsIMdbEnv* mev,
   mdb_scope inRowScope,   // row scope for row ids
   mdb_bool* outCallerAssigned, // nonzero if caller assigned specified
   mdb_bool* outStoreAssigned) // nonzero if store db assigned specified
 {
-  NS_ASSERTION(PR_FALSE, " not implemented");
+  NS_ASSERTION(false, " not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkStore::SetStoreAssignedIds(nsIMdbEnv* mev,
   mdb_scope inRowScope,   // row scope for row ids
   mdb_bool* outCallerAssigned, // nonzero if caller assigned specified
   mdb_bool* outStoreAssigned) // nonzero if store db assigned specified
 {
-  NS_ASSERTION(PR_FALSE, " not implemented");
+  NS_ASSERTION(false, " not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 // } ----- end row scope methods -----
 
 // { ----- begin row methods -----
 NS_IMETHODIMP
 morkStore::NewRowWithOid(nsIMdbEnv* mev, // new row w/ caller assigned oid
   const mdbOid* inOid,   // caller assigned oid
@@ -2141,29 +2141,29 @@ NS_IMETHODIMP
 morkStore::ImportContent( // import content from port
   nsIMdbEnv* mev, // context
   mdb_scope inRowScope, // scope for rows (or zero for all?)
   nsIMdbPort* ioPort, // the port with content to add to store
   nsIMdbThumb** acqThumb) // acquire thumb for incremental import
 // Call nsIMdbThumb::DoMore() until done, or until the thumb is broken, and
 // then the import will be finished.
 {
-  NS_ASSERTION(PR_FALSE, " not implemented");
+  NS_ASSERTION(false, " not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkStore::ImportFile( // import content from port
   nsIMdbEnv* mev, // context
   nsIMdbFile* ioFile, // the file with content to add to store
   nsIMdbThumb** acqThumb) // acquire thumb for incremental import
 // Call nsIMdbThumb::DoMore() until done, or until the thumb is broken, and
 // then the import will be finished.
 {
-  NS_ASSERTION(PR_FALSE, " not implemented");
+  NS_ASSERTION(false, " not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 // } ----- end inport/export methods -----
 
 // { ----- begin hinting methods -----
 NS_IMETHODIMP
 morkStore::ShareAtomColumnsHint( // advise re shared col content atomizing
   nsIMdbEnv* mev, // context
--- a/db/mork/src/morkTable.cpp
+++ b/db/mork/src/morkTable.cpp
@@ -259,29 +259,29 @@ morkTable::GetOid(nsIMdbEnv* mev,
   GetTableOid(ev, outOid);
   return NS_OK;
 }
 
 NS_IMETHODIMP
 morkTable::BecomeContent(nsIMdbEnv* mev,
   const mdbOid* inOid) // exchange content
 {
-  NS_ASSERTION(PR_FALSE, "not implemented"); 
+  NS_ASSERTION(false, "not implemented"); 
   return NS_ERROR_NOT_IMPLEMENTED;
   // remember table->MaybeDirtySpaceStoreAndTable();
 }
 
 // } ----- end ID methods -----
 
 // { ----- begin activity dropping methods -----
 NS_IMETHODIMP
 morkTable::DropActivity( // tell collection usage no longer expected
   nsIMdbEnv* mev)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented"); 
+  NS_ASSERTION(false, "not implemented"); 
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 // } ----- end activity dropping methods -----
 
 // } ===== end nsIMdbCollection methods =====
 
 // { ===== begin nsIMdbTable methods =====
@@ -564,17 +564,17 @@ morkTable::RowToPos( // test for the tab
 // } ----- end row position methods -----
 
 // { ----- begin oid set methods -----
 NS_IMETHODIMP
 morkTable::AddOid( // make sure the row with inOid is a table member 
   nsIMdbEnv* mev, // context
   const mdbOid* inOid) // row to ensure membership in table
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkTable::HasOid( // test for the table position of a row member
   nsIMdbEnv* mev, // context
   const mdbOid* inOid, // row to find in table
   mdb_bool* outHasOid) // whether inOid is a member row
@@ -718,17 +718,17 @@ morkTable::CutAllRows( // remove all row
 
 // { ----- begin searching methods -----
 NS_IMETHODIMP
 morkTable::FindRowMatches( // search variable number of sorted cols
   nsIMdbEnv* mev, // context
   const mdbYarn* inPrefix, // content to find as prefix in row's column cell
   nsIMdbTableRowCursor** acqCursor) // set of matching rows
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
   
 NS_IMETHODIMP
 morkTable::GetSearchColumns( // query columns used by FindRowMatches()
   nsIMdbEnv* mev, // context
   mdb_count* outCount, // context
   mdbColumnSet* outColSet) // caller supplied space to put columns
@@ -740,37 +740,37 @@ morkTable::GetSearchColumns( // query co
   // the outCount parameter; if this number exceeds mColumnSet_Count,
   // then a caller needs a bigger array to read the entire column set.
   // The minimum of mColumnSet_Count and outCount is the number slots
   // in mColumnSet_Columns that were actually written by this method.
   //
   // Callers are expected to change this set of columns by calls to
   // nsIMdbTable::SearchColumnsHint() or SetSearchSorting(), or both.
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 // } ----- end searching methods -----
 
 // { ----- begin hinting methods -----
 NS_IMETHODIMP
 morkTable::SearchColumnsHint( // advise re future expected search cols  
   nsIMdbEnv* mev, // context
   const mdbColumnSet* inColumnSet) // columns likely to be searched
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
   
 NS_IMETHODIMP
 morkTable::SortColumnsHint( // advise re future expected sort columns  
   nsIMdbEnv* mev, // context
   const mdbColumnSet* inColumnSet) // columns for likely sort requests
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkTable::StartBatchChangeHint( // advise before many adds and cuts  
   nsIMdbEnv* mev, // context
   const void* inLabel) // intend unique address to match end call
   // If batch starts nest by virtue of nesting calls in the stack, then
@@ -805,27 +805,27 @@ morkTable::EndBatchChangeHint( // advise
 // sort following the primary column sort, when table rows are sorted.
 
 NS_IMETHODIMP
 morkTable::CanSortColumn( // query which column is currently used for sorting
   nsIMdbEnv* mev, // context
   mdb_column inColumn, // column to query sorting potential
   mdb_bool* outCanSort) // whether the column can be sorted
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkTable::GetSorting( // view same table in particular sorting
   nsIMdbEnv* mev, // context
   mdb_column inColumn, // requested new column for sorting table
   nsIMdbSorting** acqSorting) // acquire sorting for column
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkTable::SetSearchSorting( // use this sorting in FindRowMatches()
   nsIMdbEnv* mev, // context
   mdb_column inColumn, // often same as nsIMdbSorting::GetSortColumn()
   nsIMdbSorting* ioSorting) // requested sorting for some column
@@ -847,17 +847,17 @@ morkTable::SetSearchSorting( // use this
   // column inColumn no longer be used at all by FindRowMatches().
   // But when ioSorting is non-nil, then inColumn should match the
   // column actually sorted by ioSorting; when these do not agree,
   // implementations are instructed to give precedence to the column
   // specified by ioSorting (so this means callers might just pass
   // zero for inColumn when ioSorting is also provided, since then
   // inColumn is both redundant and ignored).
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 // } ----- end sorting methods -----
 
 // { ----- begin moving methods -----
 // moving a row does nothing unless a table is currently unsorted
 
@@ -918,67 +918,67 @@ morkTable::MoveRow( // change position o
 NS_IMETHODIMP
 morkTable::AddIndex( // create a sorting index for column if possible
   nsIMdbEnv* mev, // context
   mdb_column inColumn, // the column to sort by index
   nsIMdbThumb** acqThumb) // acquire thumb for incremental index building
 // Call nsIMdbThumb::DoMore() until done, or until the thumb is broken, and
 // then the index addition will be finished.
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkTable::CutIndex( // stop supporting a specific column index
   nsIMdbEnv* mev, // context
   mdb_column inColumn, // the column with index to be removed
   nsIMdbThumb** acqThumb) // acquire thumb for incremental index destroy
 // Call nsIMdbThumb::DoMore() until done, or until the thumb is broken, and
 // then the index removal will be finished.
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkTable::HasIndex( // query for current presence of a column index
   nsIMdbEnv* mev, // context
   mdb_column inColumn, // the column to investigate
   mdb_bool* outHasIndex) // whether column has index for this column
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkTable::EnableIndexOnSort( // create an index for col on first sort
   nsIMdbEnv* mev, // context
   mdb_column inColumn) // the column to index if ever sorted
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkTable::QueryIndexOnSort( // check whether index on sort is enabled
   nsIMdbEnv* mev, // context
   mdb_column inColumn, // the column to investigate
   mdb_bool* outIndexOnSort) // whether column has index-on-sort enabled
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 morkTable::DisableIndexOnSort( // prevent future index creation on sort
   nsIMdbEnv* mev, // context
   mdb_column inColumn) // the column to index if ever sorted
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 // } ----- end index methods -----
 
 // } ===== end nsIMdbTable methods =====
 
 // we override these so that we'll use the xpcom add and release ref.
 mork_refs
--- a/db/mork/src/morkTableRowCursor.cpp
+++ b/db/mork/src/morkTableRowCursor.cpp
@@ -155,17 +155,17 @@ morkTableRowCursor::GetCount(nsIMdbEnv* 
   if ( outCount )
     *outCount = count;
   return outErr;
 }
 
 /*virtual*/ mdb_err
 morkTableRowCursor::GetSeed(nsIMdbEnv* mev, mdb_seed* outSeed)
 {
-  NS_ASSERTION(PR_FALSE, "not implemented");
+  NS_ASSERTION(false, "not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 /*virtual*/ mdb_err
 morkTableRowCursor::SetPos(nsIMdbEnv* mev, mdb_pos inPos)
 {
   mCursor_Pos = inPos;
   return NS_OK;
--- a/ldap/xpcom/src/nsLDAPConnection.cpp
+++ b/ldap/xpcom/src/nsLDAPConnection.cpp
@@ -66,17 +66,17 @@
 
 const char kConsoleServiceContractId[] = "@mozilla.org/consoleservice;1";
 const char kDNSServiceContractId[] = "@mozilla.org/network/dns-service;1";
 
 // constructor
 //
 nsLDAPConnection::nsLDAPConnection()
     : mConnectionHandle(0),
-      mSSL(PR_FALSE),
+      mSSL(false),
       mVersion(nsILDAPConnection::VERSION3),
       mDNSRequest(0)
 {
 }
 
 // destructor
 //
 nsLDAPConnection::~nsLDAPConnection()
@@ -113,17 +113,17 @@ nsLDAPConnection::Init(nsILDAPURL *aUrl,
   NS_ENSURE_ARG_POINTER(aUrl);
   NS_ENSURE_ARG_POINTER(aMessageListener);
 
   nsresult rv;
   nsCOMPtr<nsIObserverService> obsServ =
         do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
   // We have to abort all LDAP pending operation before shutdown.
-  obsServ->AddObserver(this, "profile-change-net-teardown", PR_TRUE);
+  obsServ->AddObserver(this, "profile-change-net-teardown", true);
 
   // Save various items that we'll use later
   mBindName.Assign(aBindName);
   mClosure = aClosure;
   mInitListener = aMessageListener;
 
   // Make sure we haven't called Init earlier, i.e. there's a DNS
   // request pending.
@@ -701,17 +701,17 @@ NS_IMETHODIMP nsLDAPConnectionRunnable::
       return thread->Dispatch(this, nsIEventTarget::DISPATCH_NORMAL);
     case -1:
       NS_ERROR("We don't know what went wrong with the ldap operation");
       return NS_ERROR_FAILURE;
 
     case LDAP_RES_SEARCH_ENTRY:
     case LDAP_RES_SEARCH_REFERENCE:
       // XXX what should we do with LDAP_RES_SEARCH_EXTENDED
-      operationFinished = PR_FALSE;
+      operationFinished = false;
     default:
     {
       msg = new nsLDAPMessage;
       if (!msg)
         return NS_ERROR_NULL_POINTER;
 
       // initialize the message, using a protected method not available
       // through nsILDAPMessage (which is why we need the raw pointer)
--- a/ldap/xpcom/src/nsLDAPControl.cpp
+++ b/ldap/xpcom/src/nsLDAPControl.cpp
@@ -40,17 +40,17 @@
 #include "nsLDAPControl.h"
 #include "prmem.h"
 #include "plstr.h"
 #include "nsLDAPBERValue.h"
 
 NS_IMPL_ISUPPORTS1(nsLDAPControl, nsILDAPControl)
 
 nsLDAPControl::nsLDAPControl()
-  : mIsCritical(PR_FALSE)
+  : mIsCritical(false)
 {
 }
 
 nsLDAPControl::~nsLDAPControl()
 {
 }
 
 /* attribute ACString oid; */
--- a/ldap/xpcom/src/nsLDAPMessage.cpp
+++ b/ldap/xpcom/src/nsLDAPMessage.cpp
@@ -317,24 +317,24 @@ nsLDAPMessage::IterateAttrErrHandler(PRI
 }
 
 
 // wrapper for ldap_first_attribute 
 //
 NS_IMETHODIMP
 nsLDAPMessage::GetAttributes(PRUint32 *aAttrCount, char** *aAttributes)
 {
-    return IterateAttributes(aAttrCount, aAttributes, PR_TRUE);
+    return IterateAttributes(aAttrCount, aAttributes, true);
 }
 
-// if getP is PR_TRUE, we get the attributes by recursing once
+// if getP is 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
+// if getP is false, just fill in *attrCount and return
 // 
 nsresult
 nsLDAPMessage::IterateAttributes(PRUint32 *aAttrCount, char** *aAttributes, 
                  bool getP)
 {
     BerElement *position;
     nsresult rv;
 
@@ -344,17 +344,17 @@ nsLDAPMessage::IterateAttributes(PRUint3
 
     // if we've been called from GetAttributes, recurse once in order to
     // count the elements in this message.
     //
     if (getP) {
         *aAttributes = 0;
         *aAttrCount = 0;
 
-        rv = IterateAttributes(aAttrCount, aAttributes, PR_FALSE);
+        rv = IterateAttributes(aAttrCount, aAttributes, false);
         if (NS_FAILED(rv))
             return rv;
 
         // create an array of the appropriate size
         //
         *aAttributes = static_cast<char **>(nsMemory::Alloc(*aAttrCount *
                                                       sizeof(char *)));
         if (!*aAttributes) {
--- a/ldap/xpcom/src/nsLDAPModification.cpp
+++ b/ldap/xpcom/src/nsLDAPModification.cpp
@@ -135,17 +135,17 @@ nsLDAPModification::SetValues(nsIArray* 
 
   nsCOMPtr<nsISupports> value;
 
   while (hasMoreElements)
   {
     rv = enumerator->GetNext(getter_AddRefs(value));
     NS_ENSURE_SUCCESS(rv, rv);
 
-    rv = mValues->AppendElement(value, PR_FALSE);
+    rv = mValues->AppendElement(value, false);
     NS_ENSURE_SUCCESS(rv, rv);
 
     rv = enumerator->HasMoreElements(&hasMoreElements);
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
   return NS_OK;
 }
@@ -183,10 +183,10 @@ nsLDAPModification::SetUpModificationOne
 
   if (!mValues)
     mValues = do_CreateInstance(NS_ARRAY_CONTRACTID, &rv);
   else
     rv = mValues->Clear();
 
   NS_ENSURE_SUCCESS(rv, rv);
   
-  return mValues->AppendElement(aValue, PR_FALSE);
+  return mValues->AppendElement(aValue, false);
 }
--- a/ldap/xpcom/src/nsLDAPService.cpp
+++ b/ldap/xpcom/src/nsLDAPService.cpp
@@ -60,28 +60,28 @@ static NS_DEFINE_CID(kLDAPOperationCID, 
 // First we provide all the methods for the "local" class
 // nsLDAPServiceEntry.
 //
 
 // constructor
 //
 nsLDAPServiceEntry::nsLDAPServiceEntry()
     : mLeases(0),
-      mDelete(PR_FALSE),
-      mRebinding(PR_FALSE)
+      mDelete(false),
+      mRebinding(false)
 
 {
     mTimestamp = LL_Zero();
 }
 
 // Init function
 //
 bool nsLDAPServiceEntry::Init()
 {
-    return PR_TRUE;
+    return 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()
 {
     return mTimestamp;
@@ -97,21 +97,21 @@ void nsLDAPServiceEntry::SetTimestamp()
 //
 void nsLDAPServiceEntry::IncrementLeases()
 {
     mLeases++;
 }
 bool nsLDAPServiceEntry::DecrementLeases()
 {
     if (!mLeases) {
-        return PR_FALSE;
+        return false;
     }
     mLeases--;
 
-    return PR_TRUE;
+    return true;
 }
 PRUint32 nsLDAPServiceEntry::GetLeases()
 {
     return mLeases;
 }
 
 // Get/Set the nsLDAPServer object for this entry.
 //
@@ -120,21 +120,21 @@ already_AddRefed<nsILDAPServer> nsLDAPSe
     nsILDAPServer *server;
 
     NS_IF_ADDREF(server = mServer);
     return server;
 }
 bool nsLDAPServiceEntry::SetServer(nsILDAPServer *aServer)
 {
     if (!aServer) {
-        return PR_FALSE;
+        return false;
     }
     mServer = aServer;
 
-    return PR_TRUE;
+    return true;
 }
 
 // Get/Set/Clear the nsLDAPConnection object for this entry.
 //
 already_AddRefed<nsILDAPConnection> nsLDAPServiceEntry::GetConnection()
 {
     nsILDAPConnection *conn;
 
@@ -200,19 +200,19 @@ void nsLDAPServiceEntry::SetRebinding(bo
     mRebinding = aState;
 }
 
 // Mark a service entry for deletion, this is "dead" code right now,
 // see bug #75966.
 //
 bool nsLDAPServiceEntry::DeleteEntry()
 {
-    mDelete = PR_TRUE;
+    mDelete = true;
 
-    return PR_TRUE;
+    return true;
 }
 // This is the end of the nsLDAPServiceEntry class
 
 
 // Here begins the implementation for nsLDAPService
 // 
 NS_IMPL_THREADSAFE_ISUPPORTS2(nsLDAPService,
                               nsILDAPService,
@@ -506,30 +506,30 @@ NS_IMETHODIMP nsLDAPService::ReconnectCo
         // we be marked as finished either if there's an error condition,
         // or if the OnLDAPMessage() method gets called (i.e. bind() done).
         //
         entry->SetMessage(0);
         entry->SetConnection(0);
 
         // Get a new connection
         //
-        entry->SetRebinding(PR_TRUE);
+        entry->SetRebinding(true);
     }
 
     rv = EstablishConnection(entry, aListener);
     if (NS_FAILED(rv)) {
         return rv;
     }
 
     {
         MutexAutoLock lock(mLock);
         
         if (!entry->PushListener(static_cast<nsILDAPMessageListener *>
                                             (aListener))) {
-            entry->SetRebinding(PR_FALSE);
+            entry->SetRebinding(false);
             return NS_ERROR_FAILURE;
         }
     }
 
     return NS_OK;
 }
 
 /**
@@ -593,17 +593,17 @@ nsLDAPService::OnLDAPMessage(nsILDAPMess
 
             message = entry->GetMessage();
             if (message) {
                 // We already have a message, lets keep that one.
                 //
                 return NS_ERROR_FAILURE;
             }
 
-            entry->SetRebinding(PR_FALSE);
+            entry->SetRebinding(false);
             entry->SetMessage(aMessage);
 
             // Now process all the pending callbacks/listeners. We
             // have to make sure to unlock before calling a listener,
             // since it's likely to call back into us again.
             //
             while (listener = entry->PopListener()) {
                 MutexAutoUnlock unlock(mLock);
--- a/ldap/xpcom/src/nsLDAPSyncQuery.cpp
+++ b/ldap/xpcom/src/nsLDAPSyncQuery.cpp
@@ -48,17 +48,17 @@
 
 // nsISupports Implementation
 
 NS_IMPL_THREADSAFE_ISUPPORTS2(nsLDAPSyncQuery, nsILDAPSyncQuery, nsILDAPMessageListener)
 
 // Constructor
 //
 nsLDAPSyncQuery::nsLDAPSyncQuery() :
-    mFinished(PR_FALSE), // This is a control variable for event loop
+    mFinished(false), // This is a control variable for event loop
     mProtocolVersion(nsILDAPConnection::VERSION3)
 {
 }
 
 // Destructor
 //
 nsLDAPSyncQuery::~nsLDAPSyncQuery()
 {
@@ -355,17 +355,17 @@ nsresult nsLDAPSyncQuery::InitConnection
 }
 
 void
 nsLDAPSyncQuery::FinishLDAPQuery()
 {
     // We are done with the LDAP operation. 
     // Release the Control variable for the eventloop
     //
-    mFinished = PR_TRUE;
+    mFinished = true;
     
     // Release member variables
     //
     mConnection = 0;
     mOperation = 0;
     mServerURL = 0;
  
 }
--- a/ldap/xpcom/src/nsLDAPURL.cpp
+++ b/ldap/xpcom/src/nsLDAPURL.cpp
@@ -372,17 +372,17 @@ NS_IMETHODIMP nsLDAPURL::GetOriginCharse
 
   return mBaseURL->GetOriginCharset(result);
 }
 
 // boolean equals (in nsIURI other)
 // (based on nsSimpleURI::Equals)
 NS_IMETHODIMP nsLDAPURL::Equals(nsIURI *other, bool *_retval)
 {
-  *_retval = PR_FALSE;
+  *_retval = false;
   if (other)
   {
     nsresult rv;
     nsCOMPtr<nsILDAPURL> otherURL(do_QueryInterface(other, &rv));
     if (NS_SUCCEEDED(rv))
     {
       nsCAutoString thisSpec, otherSpec;
       PRUint32 otherOptions;
@@ -392,17 +392,17 @@ NS_IMETHODIMP nsLDAPURL::Equals(nsIURI *
 
       rv = otherURL->GetSpec(otherSpec);
       NS_ENSURE_SUCCESS(rv, rv);
 
       rv = otherURL->GetOptions(&otherOptions);
       NS_ENSURE_SUCCESS(rv, rv);
 
       if (thisSpec == otherSpec && mOptions == otherOptions)
-        *_retval = PR_TRUE;
+        *_retval = true;
     }
   }
   return NS_OK;
 }
 
 // boolean schemeIs(in const char * scheme);
 //
 NS_IMETHODIMP nsLDAPURL::SchemeIs(const char *aScheme, bool *aEquals)
--- a/ldap/xpcom/src/nsLDAPUtils.h
+++ b/ldap/xpcom/src/nsLDAPUtils.h
@@ -118,59 +118,59 @@ bool IsUTF8(const nsACString& aString)
     if (0 == state) {
 
       c = *ptr++;
 
       if ((c & 0x80) == 0x00)
         continue;
 
       if ( c <= 0xC1 ) // [80-BF] where not expected, [C0-C1] for overlong.
-        return PR_FALSE;
+        return false;
       else if ((c & 0xE0) == 0xC0)
         state = 1;
       else if ((c & 0xF0) == 0xE0) {
         state = 2;
         if ( c == 0xE0 ) { // to exclude E0[80-9F][80-BF]
-          overlong = PR_TRUE;
+          overlong = true;
           olupper = 0x9F;
         } else if ( c == 0xED ) { // ED[A0-BF][80-BF] : surrogate codepoint
-          surrogate = PR_TRUE;
+          surrogate = true;
           slower = 0xA0;
         } else if ( c == 0xEF ) // EF BF [BE-BF] : non-character
-          nonchar = PR_TRUE;
+          nonchar = true;
       } else if ( c <= 0xF4 ) { // XXX replace /w UTF8traits::is4byte when it's updated to exclude [F5-F7].(bug 199090)
         state = 3;
-        nonchar = PR_TRUE;
+        nonchar = true;
         if ( c == 0xF0 ) { // to exclude F0[80-8F][80-BF]{2}
-          overlong = PR_TRUE;
+          overlong = true;
           olupper = 0x8F;
         }
         else if ( c == 0xF4 ) { // to exclude F4[90-BF][80-BF]
           // actually not surrogates but codepoints beyond 0x10FFFF
-          surrogate = PR_TRUE;
+          surrogate = true;
           slower = 0x90;
         }
       } else
-        return PR_FALSE; // Not UTF-8 string
+        return false; // Not UTF-8 string
     }
 
     while (ptr < done_reading && state) {
       c = *ptr++;
       --state;
 
       // non-character : EF BF [BE-BF] or F[0-7] [89AB]F BF [BE-BF]
       if ( nonchar &&  ( !state &&  c < 0xBE ||
            state == 1 && c != 0xBF  ||
            state == 2 && 0x0F != (0x0F & c) ))
-        nonchar = PR_FALSE;
+        nonchar = false;
 
       if ((c & 0xC0) != 0x80 || overlong && c <= olupper ||
            surrogate && slower <= c || nonchar && !state )
-        return PR_FALSE; // Not UTF-8 string
-      overlong = surrogate = PR_FALSE;
+        return false; // Not UTF-8 string
+      overlong = surrogate = false;
     }
   }
   return !state; // state != 0 at the end indicates an invalid UTF-8 seq.
 }
 
 #define kNotFound -1
 
 #define nsCaseInsensitiveCStringComparator() \
--- a/mail/app/nsMailApp.cpp
+++ b/mail/app/nsMailApp.cpp
@@ -116,20 +116,20 @@ static const nsDynamicFunctionLoad kXULF
 };
 
 static int do_main(const char *exePath, int argc, char* argv[])
 {
   nsCOMPtr<nsILocalFile> appini;
 #ifdef XP_WIN
   // exePath comes from mozilla::BinaryPath::Get, which returns a UTF-8
   // encoded path, so it is safe to convert it
-  nsresult rv = NS_NewLocalFile(NS_ConvertUTF8toUTF16(exePath), PR_FALSE,
+  nsresult rv = NS_NewLocalFile(NS_ConvertUTF8toUTF16(exePath), false,
                                 getter_AddRefs(appini));
 #else
-  nsresult rv = NS_NewNativeLocalFile(nsDependentCString(exePath), PR_FALSE,
+  nsresult rv = NS_NewNativeLocalFile(nsDependentCString(exePath), false,
                                       getter_AddRefs(appini));
 #endif
   if (NS_FAILED(rv)) {
     return 255;
   }
 
   appini->SetNativeLeafName(NS_LITERAL_CSTRING("application.ini"));
 
--- a/mail/components/migration/src/nsEudoraProfileMigrator.cpp
+++ b/mail/components/migration/src/nsEudoraProfileMigrator.cpp
@@ -51,17 +51,17 @@
 #include "nsIFile.h"
 
 
 NS_IMPL_ISUPPORTS2(nsEudoraProfileMigrator, nsIMailProfileMigrator, nsITimerCallback)
 
 
 nsEudoraProfileMigrator::nsEudoraProfileMigrator()
 {
-  mProcessingMailFolders = PR_FALSE;
+  mProcessingMailFolders = false;
   // get the import service
   mImportModule = do_CreateInstance("@mozilla.org/import/import-eudora;1");
 }
 
 nsEudoraProfileMigrator::~nsEudoraProfileMigrator()
 {
 }
 
@@ -135,17 +135,17 @@ nsEudoraProfileMigrator::GetMigrateData(
   *aResult = nsIMailProfileMigrator::ACCOUNT_SETTINGS | nsIMailProfileMigrator::ADDRESSBOOK_DATA |
              nsIMailProfileMigrator::MAILDATA | nsIMailProfileMigrator::FILTERS;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsEudoraProfileMigrator::GetSourceExists(bool* aResult)
 {
-  *aResult = PR_FALSE;
+  *aResult = false;
 
   nsCOMPtr<nsIImportSettings> importSettings;
   mImportModule->GetImportInterface(NS_IMPORT_SETTINGS_STR, getter_AddRefs(importSettings));
 
   if (importSettings)
   {
     nsString description;
     nsCOMPtr<nsIFile> location;
@@ -153,17 +153,17 @@ nsEudoraProfileMigrator::GetSourceExists
   }
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsEudoraProfileMigrator::GetSourceHasMultipleProfiles(bool* aResult)
 {
-  *aResult = PR_FALSE;
+  *aResult = false;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsEudoraProfileMigrator::GetSourceProfiles(nsIArray** aResult)
 {
   *aResult = nsnull;
   return NS_OK;
--- a/mail/components/migration/src/nsNetscapeProfileMigratorBase.cpp
+++ b/mail/components/migration/src/nsNetscapeProfileMigratorBase.cpp
@@ -98,17 +98,17 @@ nsNetscapeProfileMigratorBase::GetProfil
   rv = parser.Init(profileIni);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCAutoString buffer, filePath;
   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) {
+  for (unsigned int c = 0; true; ++c) {
     nsCAutoString profileID("Profile");
     profileID.AppendInt(c);
 
     if (NS_FAILED(parser.GetString(profileID.get(), "IsRelative", buffer)))
       break;
 
     isRelative = buffer.EqualsLiteral("1");
 
@@ -120,44 +120,44 @@ nsNetscapeProfileMigratorBase::GetProfil
 
     rv = parser.GetString(profileID.get(), "Name", buffer);
     if (NS_FAILED(rv)) {
       NS_ERROR("Malformed profiles.ini: Name= not found");
       continue;
     }
 
     nsCOMPtr<nsILocalFile> rootDir;
-    rv = NS_NewNativeLocalFile(EmptyCString(), PR_TRUE, getter_AddRefs(rootDir));
+    rv = NS_NewNativeLocalFile(EmptyCString(), true, getter_AddRefs(rootDir));
     NS_ENSURE_SUCCESS(rv, rv);
 
     rv = isRelative ? rootDir->SetRelativeDescriptor(aDataDir, filePath) :
                       rootDir->SetPersistentDescriptor(filePath);
     if (NS_FAILED(rv))
       continue;
 
     bool exists = false;
     rootDir->Exists(&exists);
 
     if (exists) {
-      aProfileLocations->AppendElement(rootDir, PR_FALSE);
+      aProfileLocations->AppendElement(rootDir, false);
 
       nsCOMPtr<nsISupportsString> profileNameString(
         do_CreateInstance("@mozilla.org/supports-string;1"));
 
       profileNameString->SetData(NS_ConvertUTF8toUTF16(buffer));
-      aProfileNames->AppendElement(profileNameString, PR_FALSE);
+      aProfileNames->AppendElement(profileNameString, false);
     }
   }
   return NS_OK;
 }
 
 #define GETPREF(xform, method, value) \
   nsresult rv = aBranch->method(xform->sourcePrefName, value); \
   if (NS_SUCCEEDED(rv)) \
-    xform->prefHasValue = PR_TRUE; \
+    xform->prefHasValue = true; \
   return rv;
 
 #define SETPREF(xform, method, value) \
   if (xform->prefHasValue) { \
     return aBranch->method(xform->targetPrefName ? xform->targetPrefName : xform->sourcePrefName, value); \
   } \
   return NS_OK;
 
@@ -222,17 +222,17 @@ nsNetscapeProfileMigratorBase::CopyFile(
     return NS_OK;
 
   nsCOMPtr<nsIFile> targetFile;
   mTargetProfile->Clone(getter_AddRefs(targetFile));
 
   targetFile->Append(aTargetFileName);
   targetFile->Exists(&exists);
   if (exists)
-    targetFile->Remove(PR_FALSE);
+    targetFile->Remove(false);
 
   return sourceFile->CopyTo(mTargetProfile, aTargetFileName);
 }
 
 nsresult
 nsNetscapeProfileMigratorBase::GetSignonFileName(bool aReplace, char** aFileName)
 {
   nsresult rv;
@@ -442,29 +442,29 @@ nsNetscapeProfileMigratorBase::GetSource
   GetSourceProfiles(getter_AddRefs(profiles));
 
   if (profiles) {
     PRUint32 count;
     profiles->GetLength(&count);
     *aResult = count > 1;
   }
   else
-    *aResult = PR_FALSE;
+    *aResult = false;
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsNetscapeProfileMigratorBase::GetSourceExists(bool* aResult)
 {
   nsCOMPtr<nsIArray> profiles;
   GetSourceProfiles(getter_AddRefs(profiles));
 
   if (profiles) {
     PRUint32 count;
     profiles->GetLength(&count);
     *aResult = count > 0;
   }
   else
-    *aResult = PR_FALSE;
+    *aResult = false;
 
   return NS_OK;
 }
--- a/mail/components/migration/src/nsNetscapeProfileMigratorBase.h
+++ b/mail/components/migration/src/nsNetscapeProfileMigratorBase.h
@@ -54,20 +54,20 @@ struct fileTransactionEntry {
   nsCOMPtr<nsIFile> srcFile;  // the src path including leaf name
   nsCOMPtr<nsIFile> destFile; // the destination path
   nsString newName; // only valid if the file should be renamed after getting copied
 };
 
 #define F(a) nsNetscapeProfileMigratorBase::a
 
 #define MAKEPREFTRANSFORM(pref, newpref, getmethod, setmethod) \
-  { pref, newpref, F(Get##getmethod), F(Set##setmethod), PR_FALSE, { -1 } }
+  { pref, newpref, F(Get##getmethod), F(Set##setmethod), false, { -1 } }
 
 #define MAKESAMETYPEPREFTRANSFORM(pref, method) \
-  { pref, 0, F(Get##method), F(Set##method), PR_FALSE, { -1 } }
+  { pref, 0, F(Get##method), F(Set##method), false, { -1 } }
 
 class nsNetscapeProfileMigratorBase : public nsIMailProfileMigrator,
                                       public nsITimerCallback
                                       
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSITIMERCALLBACK
--- a/mail/components/migration/src/nsOEProfileMigrator.cpp
+++ b/mail/components/migration/src/nsOEProfileMigrator.cpp
@@ -46,17 +46,17 @@
 #include "nsIFile.h"
 
 
 NS_IMPL_ISUPPORTS2(nsOEProfileMigrator, nsIMailProfileMigrator, nsITimerCallback)
 
 
 nsOEProfileMigrator::nsOEProfileMigrator()
 {
-  mProcessingMailFolders = PR_FALSE;
+  mProcessingMailFolders = false;
   // get the import service
   mImportModule = do_CreateInstance("@mozilla.org/import/import-oe;1");
 }
 
 nsOEProfileMigrator::~nsOEProfileMigrator()
 {
 
 }
@@ -131,17 +131,17 @@ nsOEProfileMigrator::GetMigrateData(cons
   *aResult = nsIMailProfileMigrator::ACCOUNT_SETTINGS | nsIMailProfileMigrator::ADDRESSBOOK_DATA |
              nsIMailProfileMigrator::MAILDATA;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsOEProfileMigrator::GetSourceExists(bool* aResult)
 {
-  *aResult = PR_FALSE;
+  *aResult = false;
 
   nsCOMPtr<nsIImportSettings> importSettings;
   mImportModule->GetImportInterface(NS_IMPORT_SETTINGS_STR, getter_AddRefs(importSettings));
 
   if (importSettings)
   {
     nsString description;
     nsCOMPtr<nsIFile> location;
@@ -149,17 +149,17 @@ nsOEProfileMigrator::GetSourceExists(boo
   }
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsOEProfileMigrator::GetSourceHasMultipleProfiles(bool* aResult)
 {
-  *aResult = PR_FALSE;
+  *aResult = false;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsOEProfileMigrator::GetSourceProfiles(nsIArray** aResult)
 {
   *aResult = nsnull;
   return NS_OK;
--- a/mail/components/migration/src/nsOutlookProfileMigrator.cpp
+++ b/mail/components/migration/src/nsOutlookProfileMigrator.cpp
@@ -42,17 +42,17 @@
 #include "nsIImportSettings.h"
 #include "nsIFile.h"
 
 NS_IMPL_ISUPPORTS2(nsOutlookProfileMigrator, nsIMailProfileMigrator, nsITimerCallback)
 
 
 nsOutlookProfileMigrator::nsOutlookProfileMigrator()
 {
-  mProcessingMailFolders = PR_FALSE;
+  mProcessingMailFolders = false;
   // get the import service
   mImportModule = do_CreateInstance("@mozilla.org/import/import-outlook;1");
 }
 
 nsOutlookProfileMigrator::~nsOutlookProfileMigrator()
 {
 }
 
@@ -125,17 +125,17 @@ nsOutlookProfileMigrator::GetMigrateData
   *aResult = nsIMailProfileMigrator::ACCOUNT_SETTINGS | nsIMailProfileMigrator::ADDRESSBOOK_DATA |
              nsIMailProfileMigrator::MAILDATA;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsOutlookProfileMigrator::GetSourceExists(bool* aResult)
 {
-  *aResult = PR_FALSE;
+  *aResult = false;
 
   nsCOMPtr<nsIImportSettings> importSettings;
   mImportModule->GetImportInterface(NS_IMPORT_SETTINGS_STR, getter_AddRefs(importSettings));
 
   if (importSettings)
   {
     nsString description;
     nsCOMPtr<nsIFile> location;
@@ -143,17 +143,17 @@ nsOutlookProfileMigrator::GetSourceExist
   }
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsOutlookProfileMigrator::GetSourceHasMultipleProfiles(bool* aResult)
 {
-  *aResult = PR_FALSE;
+  *aResult = false;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsOutlookProfileMigrator::GetSourceProfiles(nsIArray** aResult)
 {
   *aResult = nsnull;
   return NS_OK;
--- a/mail/components/migration/src/nsProfileMigrator.cpp
+++ b/mail/components/migration/src/nsProfileMigrator.cpp
@@ -77,19 +77,19 @@ nsProfileMigrator::Migrate(nsIProfileSta
   cstr->SetData(key);
 
   // By opening the Migration FE with a supplied mailMigrator, it will automatically
   // migrate from it.
   nsCOMPtr<nsIWindowWatcher> ww (do_GetService(NS_WINDOWWATCHER_CONTRACTID));
   nsCOMPtr<nsIMutableArray> params (do_CreateInstance(NS_ARRAY_CONTRACTID));
   if (!ww || !params) return NS_ERROR_FAILURE;
 
-  params->AppendElement(cstr, PR_FALSE);
-  params->AppendElement(mailMigrator, PR_FALSE);
-  params->AppendElement(aStartup, PR_FALSE);
+  params->AppendElement(cstr, false);
+  params->AppendElement(mailMigrator, false);
+  params->AppendElement(aStartup, false);
 
   nsCOMPtr<nsIDOMWindow> migrateWizard;
   return ww->OpenWindow(nsnull,
                         MIGRATION_WIZARD_FE_URL,
                         "_blank",
                         MIGRATION_WIZARD_FE_FEATURES,
                         params,
                         getter_AddRefs(migrateWizard));
--- a/mail/components/migration/src/nsProfileMigratorBase.cpp
+++ b/mail/components/migration/src/nsProfileMigratorBase.cpp
@@ -44,17 +44,17 @@
 #include "nsIImportSettings.h"
 #include "nsIImportFilters.h"
 
 #define kPersonalAddressbookUri "moz-abmdbdirectory://abook.mab"
 
 nsProfileMigratorBase::nsProfileMigratorBase()
 {
   mObserverService = do_GetService("@mozilla.org/observer-service;1");
-  mProcessingMailFolders = PR_FALSE;
+  mProcessingMailFolders = false;
 }
 
 nsProfileMigratorBase::~nsProfileMigratorBase()
 {
   if (mFileIOTimer)
     mFileIOTimer->Cancel();
 }
 
@@ -133,25 +133,25 @@ nsresult nsProfileMigratorBase::ImportMa
   rv = aImportModule->GetImportInterface(NS_IMPORT_MAIL_STR, getter_AddRefs(mGenericImporter));
   NS_ENSURE_SUCCESS(rv, rv);
 
   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);
+  migrating->SetData(true);
   mGenericImporter->SetData("migration", migrating);
 
   bool importResult;
   bool wantsProgress;
   mGenericImporter->WantsProgress(&wantsProgress);
   rv = mGenericImporter->BeginImport(nsnull, nsnull, &importResult);
 
-  mProcessingMailFolders = PR_TRUE;
+  mProcessingMailFolders = true;
 
   if (wantsProgress)
     ContinueImport();
   else
     FinishCopyingMailFolders();
 
   return rv;
 }
--- a/mail/components/migration/src/nsSeamonkeyProfileMigrator.cpp
+++ b/mail/components/migration/src/nsSeamonkeyProfileMigrator.cpp
@@ -152,20 +152,20 @@ nsSeamonkeyProfileMigrator::GetMigrateDa
   if (!mSourceProfile) {
     GetSourceProfile(aProfile);
     if (!mSourceProfile)
       return NS_ERROR_FILE_NOT_FOUND;
   }
 
   MigrationData data[] = { { ToNewUnicode(FILE_NAME_PREFS),
                              nsIMailProfileMigrator::SETTINGS,
-                             PR_TRUE },
+                             true },
                            { ToNewUnicode(FILE_NAME_JUNKTRAINING),
                              nsIMailProfileMigrator::JUNKTRAINING,
-                             PR_TRUE },
+                             true },
                           };
 
   // Frees file name strings allocated above.
   GetMigrateDataFromArray(data, sizeof(data)/sizeof(MigrationData),
                           aReplace, mSourceProfile, aResult);
 
   // Now locate passwords
   nsCString signonsFileName;
--- a/mail/components/search/nsMailWinSearchHelper.cpp
+++ b/mail/components/search/nsMailWinSearchHelper.cpp
@@ -77,17 +77,17 @@ nsMailWinSearchHelper::~nsMailWinSearchH
   CoUninitialize();
 }
 
 NS_IMPL_ISUPPORTS1(nsMailWinSearchHelper, nsIMailWinSearchHelper)
 
 
 NS_IMETHODIMP nsMailWinSearchHelper::GetFoldersInCrawlScope(bool* aResult)
 {
-  *aResult = PR_FALSE;
+  *aResult = false;
   NS_ENSURE_ARG_POINTER(mProfD);
 
   // If the service isn't present or running, we shouldn't proceed.
   bool serviceRunning;
   nsresult rv = GetServiceRunning(&serviceRunning);
   if (!serviceRunning || NS_FAILED(rv))
     return rv;
 
@@ -130,23 +130,23 @@ NS_IMETHODIMP nsMailWinSearchHelper::Get
     BOOL included;
     if (FAILED(crawlScopeManager->IncludedInCrawlScope(subdirURL.get(), &included)))
       return NS_ERROR_FAILURE;
 
     // If even one of the folders isn't there, we return false
     if (!included)
       return NS_OK;
   }
-  *aResult = PR_TRUE;
+  *aResult = true;
   return NS_OK;
 }
 
 NS_IMETHODIMP nsMailWinSearchHelper::GetServiceRunning(bool* aResult)
 {
-  *aResult = PR_FALSE;
+  *aResult = 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);
   if (!hService)
     // The service isn't present. Never mind.
@@ -215,17 +215,17 @@ NS_IMETHODIMP nsMailWinSearchHelper::Set
     }
   }
   return rv;
 }
 
 NS_IMETHODIMP nsMailWinSearchHelper::GetIsFileAssociationSet(bool *aResult)
 {
   NS_ENSURE_ARG_POINTER(aResult);
-  *aResult = PR_FALSE;
+  *aResult = false;
 
   // We'll use the Vista method here
   nsRefPtr<IApplicationAssociationRegistration> pAAR;
   HRESULT hr = CoCreateInstance(CLSID_ApplicationAssociationRegistration,
                                 NULL,
                                 CLSCTX_INPROC,
                                 IID_IApplicationAssociationRegistration,
                                 getter_AddRefs(pAAR));
--- a/mail/components/shell/nsMailGNOMEIntegration.cpp
+++ b/mail/components/shell/nsMailGNOMEIntegration.cpp
@@ -67,18 +67,18 @@ static const char* const sNewsProtocols[
   "nntp"
 };
 
 static const char* const sFeedProtocols[] = {
   "feed"
 };
 
 nsMailGNOMEIntegration::nsMailGNOMEIntegration(): 
-                          mCheckedThisSession(PR_FALSE),
-                          mAppIsInPath(PR_FALSE)
+                          mCheckedThisSession(false),
+                          mAppIsInPath(false)
 {}
 
 nsresult
 nsMailGNOMEIntegration::Init()
 {
   nsresult rv;
 
   // GConf _must_ be available, or we do not allow CreateInstance to succeed.
@@ -112,54 +112,54 @@ NS_IMPL_ISUPPORTS1(nsMailGNOMEIntegratio
 
 bool
 nsMailGNOMEIntegration::GetAppPathFromLauncher()
 {
   gchar *tmp;
 
   const char *launcher = PR_GetEnv("MOZ_APP_LAUNCHER");
   if (!launcher)
-    return PR_FALSE;
+    return false;
 
   if (g_path_is_absolute(launcher)) {
     mAppPath = launcher;
     tmp = g_path_get_basename(launcher);
     gchar *fullpath = g_find_program_in_path(tmp);
     if (fullpath && mAppPath.Equals(fullpath)) {
-      mAppIsInPath = PR_TRUE;
+      mAppIsInPath = true;
     }
     g_free(fullpath);
   } else {
     tmp = g_find_program_in_path(launcher);
     if (!tmp)
-      return PR_FALSE;
+      return false;
     mAppPath = tmp;
-    mAppIsInPath = PR_TRUE;
+    mAppIsInPath = true;
   }
 
   g_free(tmp);
-  return PR_TRUE;
+  return true;
 }
 
 NS_IMETHODIMP
 nsMailGNOMEIntegration::IsDefaultClient(bool aStartupCheck, PRUint16 aApps, bool * aIsDefaultClient)
 {
-  *aIsDefaultClient = PR_TRUE;
+  *aIsDefaultClient = 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));
   
   // 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;
+    mCheckedThisSession = true;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsMailGNOMEIntegration::SetDefaultClient(bool aForAllUsers, PRUint16 aApps)
 {
   nsresult rv = NS_OK;
   if (aApps & nsIShellService::MAIL)
@@ -172,17 +172,17 @@ nsMailGNOMEIntegration::SetDefaultClient
   return rv;	
 }
 
 NS_IMETHODIMP
 nsMailGNOMEIntegration::GetShouldCheckDefaultClient(bool* aResult)
 {
   if (mCheckedThisSession) 
   {
-    *aResult = PR_FALSE;
+    *aResult = false;
     return NS_OK;
   }
 
   nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
   return prefs->GetBoolPref("mail.shell.checkDefaultClient", aResult);
 }
 
 NS_IMETHODIMP
@@ -195,27 +195,27 @@ nsMailGNOMEIntegration::SetShouldCheckDe
 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;
+      return false;
     }
 
     commandPath = g_find_program_in_path(nativePath);
     g_free(nativePath);
   } else {
     commandPath = g_find_program_in_path(aKeyValue);
   }
 
   if (!commandPath)
-    return PR_FALSE;
+    return false;
 
   bool matches = mAppPath.Equals(commandPath);
   g_free(commandPath);
   return matches;
 }
 
 bool
 nsMailGNOMEIntegration::CheckHandlerMatchesAppName(const nsACString &handler) const
@@ -223,17 +223,17 @@ nsMailGNOMEIntegration::CheckHandlerMatc
   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 false;
   }
 
   return KeyMatchesAppName(command.get());
 }
 
 bool
 nsMailGNOMEIntegration::checkDefault(const char* const *aProtocols, unsigned int aLength)
 {
@@ -245,36 +245,36 @@ nsMailGNOMEIntegration::checkDefault(con
   nsresult rv;
 
   for (unsigned int i = 0; i < aLength; ++i) {
     if (gconf) {
       handler.Truncate();
       rv = gconf->GetAppForProtocol(nsDependentCString(aProtocols[i]),
                                     &enabled, handler);
       if (NS_SUCCEEDED(rv) && (!CheckHandlerMatchesAppName(handler) || !enabled)) {
-        return PR_FALSE;
+        return false;
       }
     }
 
     if (giovfs) {
       handler.Truncate();
       nsCOMPtr<nsIGIOMimeApp> app;
       rv = giovfs->GetAppForURIScheme(nsDependentCString(aProtocols[i]),
                                       getter_AddRefs(app));
       if (NS_FAILED(rv) || !app) {
-        return PR_FALSE;
+        return false;
       }
       rv = app->GetCommand(handler);
       if (NS_SUCCEEDED(rv) && !CheckHandlerMatchesAppName(handler)) {
-        return PR_FALSE;
+        return false;
       }
     }
   }
 
-  return PR_TRUE;
+  return true;
 }
 
 nsresult
 nsMailGNOMEIntegration::MakeDefault(const char* const *aProtocols,
                                     unsigned int aLength)
 {
   nsCAutoString appKeyValue;
   nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
--- a/mail/components/shell/nsMailMacIntegration.cpp
+++ b/mail/components/shell/nsMailMacIntegration.cpp
@@ -56,36 +56,36 @@ extern "C" {
                                                  CFURLRef *appURL);
   extern OSStatus _LSSetDefaultSchemeHandlerURL(CFStringRef scheme,
                                                 CFURLRef appURL);
   extern OSStatus _LSSaveAndRefresh(void);
 }
 
 NS_IMPL_ISUPPORTS1(nsMailMacIntegration, nsIShellService)
 
-nsMailMacIntegration::nsMailMacIntegration(): mCheckedThisSession(PR_FALSE)
+nsMailMacIntegration::nsMailMacIntegration(): mCheckedThisSession(false)
 {}
 
 NS_IMETHODIMP
 nsMailMacIntegration::IsDefaultClient(bool aStartupCheck, PRUint16 aApps, bool * aIsDefaultClient)
 {
-  *aIsDefaultClient = PR_TRUE;
+  *aIsDefaultClient = 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"));
   
   // 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;
+    mCheckedThisSession = true;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsMailMacIntegration::SetDefaultClient(bool aForAllUsers, PRUint16 aApps)
 {
   nsresult rv = NS_OK;
   if (aApps & nsIShellService::MAIL)
@@ -98,17 +98,17 @@ nsMailMacIntegration::SetDefaultClient(b
   return rv;	
 }
 
 NS_IMETHODIMP
 nsMailMacIntegration::GetShouldCheckDefaultClient(bool* aResult)
 {
   if (mCheckedThisSession) 
   {
-    *aResult = PR_FALSE;
+    *aResult = false;
     return NS_OK;
   }
 
   nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
   return prefs->GetBoolPref("mail.shell.checkDefaultClient", aResult);
 }
 
 NS_IMETHODIMP
@@ -156,28 +156,28 @@ nsMailMacIntegration::isDefaultHandlerFo
         // and compare it to our bundle identifier
         isDefault = ::CFStringCompare(tbirdID, defaultHandlerID, 0)
                        == kCFCompareEqualTo;
         ::CFRelease(defaultHandlerID);
       }
       else {
         // If the bundle doesn't have an identifier in its info property list,
         // it's not our bundle.
-        isDefault = PR_FALSE;
+        isDefault = false;
       }
 
       ::CFRelease(defaultHandlerBundle);
     }
 
     ::CFRelease(defaultHandlerURL);
   }
   else {
     // If |_LSCopyDefaultSchemeHandlerURL| failed, there's no default
     // handler for the given protocol
-    isDefault = PR_FALSE;
+    isDefault = false;
   }
 
   ::CFRelease(tbirdID);
   return isDefault;
 }
 
 nsresult
 nsMailMacIntegration::setAsDefaultHandlerForProtocol(CFStringRef aScheme)
--- a/mail/components/shell/nsMailWinIntegration.cpp
+++ b/mail/components/shell/nsMailWinIntegration.cpp
@@ -277,30 +277,30 @@ nsresult nsWindowsShellService::Init()
     return NS_ERROR_FAILURE;
 
   mAppLongPath = appPath;
 
   return NS_OK;
 }
 
 nsWindowsShellService::nsWindowsShellService()
-:mCheckedThisSession(PR_FALSE)
+:mCheckedThisSession(false)
 {
 }
 
 NS_IMETHODIMP
 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;
+    mCheckedThisSession = true;
 
-  *aIsDefaultClient = PR_TRUE;
+  *aIsDefaultClient = true;
 
   // for each type,
   if (aApps & nsIShellService::MAIL)
   {
     *aIsDefaultClient &= TestForDefault(gMailSettings, sizeof(gMailSettings)/sizeof(SETTING));
     // Only check if this app is default on Vista if the previous checks
     // indicate that this app is the default.
     if (*aIsDefaultClient)
@@ -309,20 +309,20 @@ nsWindowsShellService::IsDefaultClient(b
   if (aApps & nsIShellService::NEWS)
   {
     *aIsDefaultClient &= TestForDefault(gNewsSettings, sizeof(gNewsSettings)/sizeof(SETTING));
     // Only check if this app is default on Vista if the previous checks
     // indicate that this app is the default.
     if (*aIsDefaultClient)
       IsDefaultClientVista(nsIShellService::NEWS, aIsDefaultClient);
   }
-  // RSS / feed protocol shell integration is not working so return PR_TRUE
+  // RSS / feed protocol shell integration is not working so return true
   // until it is fixed (bug 445823).
   if (aApps & nsIShellService::RSS)
-    *aIsDefaultClient &= PR_TRUE;
+    *aIsDefaultClient &= true;
 //    *aIsDefaultClient &= TestForDefault(gFeedSettings, sizeof(gFeedSettings)/sizeof(SETTING));
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsWindowsShellService::SetDefaultClient(bool aForAllUsers, PRUint16 aApps)
 {
@@ -348,17 +348,17 @@ nsWindowsShellService::SetDefaultClient(
   return LaunchHelper(appHelperPath, params);
 }
 
 NS_IMETHODIMP
 nsWindowsShellService::GetShouldCheckDefaultClient(bool* aResult)
 {
   if (mCheckedThisSession)
   {
-    *aResult = PR_FALSE;
+    *aResult = false;
     return NS_OK;
   }
 
   nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
   return prefs->GetBoolPref("mail.shell.checkDefaultClient", aResult);
 }
 
 NS_IMETHODIMP
@@ -387,30 +387,30 @@ nsWindowsShellService::TestForDefault(SE
     }
 
     ::ZeroMemory(currValue, sizeof(currValue));
     HKEY theKey;
     nsresult rv = OpenKeyForReading(HKEY_CLASSES_ROOT, key, &theKey);
     if (NS_FAILED(rv))
     {
       // Key doesn't exist
-      isDefault = PR_FALSE;
+      isDefault = false;
       break;
     }
 
     DWORD len = sizeof currValue;
     DWORD result = ::RegQueryValueExW(theKey, PromiseFlatString(value).get(),
                                       NULL, NULL, (LPBYTE)currValue, &len);
     // Close the key we opened.
     ::RegCloseKey(theKey);
     if (REG_FAILED(result) ||
         !dataLongPath.Equals(currValue, nsCaseInsensitiveStringComparator()))
     {
       // Key wasn't set, or was set to something else (something else became the default client)
-      isDefault = PR_FALSE;
+      isDefault = false;
       break;
     }
   }  // for each registry key we want to look at
 
   return isDefault;
 }
 
 bool
@@ -432,13 +432,13 @@ nsWindowsShellService::IsDefaultClientVi
     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();
-    return PR_TRUE;
+    return true;
   }
 #endif
-  return PR_FALSE;
+  return false;
 }
--- a/mailnews/addrbook/src/nsAbAddressCollector.cpp
+++ b/mailnews/addrbook/src/nsAbAddressCollector.cpp
@@ -95,17 +95,17 @@ nsAbAddressCollector::GetCardFromPropert
     NS_ENSURE_SUCCESS(rv, nsnull);
 
     directory = do_QueryInterface(supports, &rv);
     if (NS_FAILED(rv))
       continue;
 
     // Some implementations may return NS_ERROR_NOT_IMPLEMENTED here,
     // so just catch the value and continue.
-    if (NS_FAILED(directory->GetCardFromProperty(aName, aValue, PR_TRUE,
+    if (NS_FAILED(directory->GetCardFromProperty(aName, aValue, true,
                                                  &result)))
       continue;
 
     if (result)
     {
       if (aDirectory)
         directory.swap(*aDirectory);
       return result;
@@ -143,31 +143,31 @@ nsAbAddressCollector::CollectAddress(con
   char *curAddressPtr = addresses;
 
   for (PRUint32 i = 0; i < numAddresses; i++)
   {
     nsDependentCString curAddress(curAddressPtr);
     curAddressPtr += curAddress.Length() + 1;
 
     nsCString unquotedName;
-    rv = pHeader->UnquotePhraseOrAddr(curNamePtr, PR_FALSE,
+    rv = pHeader->UnquotePhraseOrAddr(curNamePtr, false,
                                       getter_Copies(unquotedName));
     curNamePtr += strlen(curNamePtr) + 1;
     NS_ASSERTION(NS_SUCCEEDED(rv), "failed to unquote name");
     if (NS_FAILED(rv))
       continue;
 
     // Don't allow collection of addresses with no email address, it makes
     // no sense. Whilst we should never get here in most normal cases, we
     // should still be careful.
     if (curAddress.IsEmpty())
       continue;
 
     CollectSingleAddress(curAddress, unquotedName, aCreateCard, aSendFormat,
-                         PR_FALSE);
+                         false);
   }
 
   PR_FREEIF(addresses);
   PR_FREEIF(names);
   return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -192,17 +192,17 @@ nsAbAddressCollector::CollectSingleAddre
                                getter_AddRefs(originDirectory));
     // We've not found a card, but is this address actually in the additional
     // email column?
     if (!card)
     {
       card = GetCardFromProperty(k2ndEmailProperty, aEmail,
                                  getter_AddRefs(originDirectory));
       if (card)
-        emailAddressIn2ndEmailColumn = PR_TRUE;
+        emailAddressIn2ndEmailColumn = true;
     }
   }
 
   if (!card && (aCreateCard || aSkipCheckExisting))
   {
     card = do_CreateInstance(NS_ABCARDPROPERTY_CONTRACTID, &rv);
     if (NS_SUCCEEDED(rv) && card)
     {
@@ -246,17 +246,17 @@ nsAbAddressCollector::CollectSingleAddre
       rv = card->GetPropertyAsUint32(kPreferMailFormatProperty,
                                      &currentFormat);
       NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get preferred mail format");
 
       // we only want to update the AB if the current format is unknown
       if (currentFormat == nsIAbPreferMailFormat::unknown &&
           NS_SUCCEEDED(card->SetPropertyAsUint32(kPreferMailFormatProperty,
                                                  aSendFormat)))
-        modifiedCard = PR_TRUE;
+        modifiedCard = true;
     }
 
     if (modifiedCard)
       originDirectory->ModifyCard(card);
   }
 
   return NS_OK;
 }
@@ -291,28 +291,28 @@ bool
 nsAbAddressCollector::SetNamesForCard(nsIAbCard *aSenderCard,
                                       const nsACString &aFullName)
 {
   nsCString firstName;
   nsCString lastName;
   bool modifiedCard = false;
 
   if (NS_SUCCEEDED(aSenderCard->SetDisplayName(NS_ConvertUTF8toUTF16(aFullName))))
-    modifiedCard = PR_TRUE;
+    modifiedCard = true;
 
   // Now split up the full name.
   SplitFullName(nsCString(aFullName), firstName, lastName);
 
   if (!firstName.IsEmpty() &&
       NS_SUCCEEDED(aSenderCard->SetFirstName(NS_ConvertUTF8toUTF16(firstName))))
-    modifiedCard = PR_TRUE;
+    modifiedCard = true;
 
   if (!lastName.IsEmpty() &&
       NS_SUCCEEDED(aSenderCard->SetLastName(NS_ConvertUTF8toUTF16(lastName))))
-    modifiedCard = PR_TRUE;
+    modifiedCard = true;
 
   if (modifiedCard)
     aSenderCard->SetPropertyAsBool("PreferDisplayName", false);
 
   return modifiedCard;
 }
 
 // Splits the first and last name based on the space between them.
@@ -347,17 +347,17 @@ nsAbAddressCollector::Observe(nsISupport
 nsresult
 nsAbAddressCollector::Init(void)
 {
   nsresult rv;
   nsCOMPtr<nsIPrefBranch2> prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID,
                                                     &rv));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = prefBranch->AddObserver(PREF_MAIL_COLLECT_ADDRESSBOOK, this, PR_FALSE);
+  rv = prefBranch->AddObserver(PREF_MAIL_COLLECT_ADDRESSBOOK, this, false);
   NS_ENSURE_SUCCESS(rv, rv);
 
   SetUpAbFromPrefs(prefBranch);
   return NS_OK;
 }
 
 // Performs the necessary changes to set up the collector for the specified
 // collected address book.
--- a/mailnews/addrbook/src/nsAbBSDirectory.cpp
+++ b/mailnews/addrbook/src/nsAbBSDirectory.cpp
@@ -50,17 +50,17 @@
 #include "nsServiceManagerUtils.h"
 #include "nsAbDirFactoryService.h"
 #include "nsAbMDBDirFactory.h"
 #include "nsArrayEnumerator.h"
 
 #include "nsCRTGlue.h"
 
 nsAbBSDirectory::nsAbBSDirectory()
-: mInitialized(PR_FALSE)
+: mInitialized(false)
 {
   mServers.Init(13);
 }
 
 nsAbBSDirectory::~nsAbBSDirectory()
 {
 }
 
@@ -179,26 +179,26 @@ nsresult nsAbBSDirectory::EnsureInitiali
      * Check that we are not converting from a
      * a 4.x address book file e.g. pab.na2
      * check if the URI ends with ".na2"
      */
     if (StringEndsWith(URI, NS_LITERAL_CSTRING(kABFileName_PreviousSuffix))) 
       URI.Replace(kMDBDirectoryRootLen, URI.Length() - kMDBDirectoryRootLen, server->fileName);
       
     // Create the directories
-    rv = CreateDirectoriesFromFactory(URI, server, PR_FALSE /* notify */);
+    rv = CreateDirectoriesFromFactory(URI, server, false /* notify */);
 
     // If we failed, this could be because something has set a pref for us
     // which is now broke (e.g. no factory present). So just ignore this one
     // and move on.
     if (NS_FAILED(rv))
       NS_WARNING("CreateDirectoriesFromFactory failed - Invalid factory?");
   }
     
-  mInitialized = PR_TRUE;
+  mInitialized = true;
   // sort directories by position...
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbBSDirectory::CreateNewDirectory(const nsAString &aDirName,
                                                   const nsACString &aURI,
                                                   PRUint32 aType,
                                                   const nsACString &aPrefName,
@@ -233,17 +233,17 @@ NS_IMETHODIMP nsAbBSDirectory::CreateNew
   if (aType == PABDirectory) {
     // Add the URI property
     URI.AssignLiteral(kMDBDirectoryRoot);
     URI.Append(nsDependentCString(server->fileName));
   }
 
   aResult.Assign(server->prefName);
 
-  rv = CreateDirectoriesFromFactory(URI, server, PR_TRUE /* notify */);
+  rv = CreateDirectoriesFromFactory(URI, server, true /* notify */);
   NS_ENSURE_SUCCESS(rv,rv);
   return rv;
 }
 
 NS_IMETHODIMP nsAbBSDirectory::CreateDirectoryByURI(const nsAString &aDisplayName,
                                                     const nsACString &aURI)
 {
   nsresult rv = EnsureInitialized();
@@ -253,17 +253,17 @@ NS_IMETHODIMP nsAbBSDirectory::CreateDir
   if (StringBeginsWith(aURI, NS_LITERAL_CSTRING(kMDBDirectoryRoot)))
     fileName = Substring(aURI, kMDBDirectoryRootLen);
 
   DIR_Server * server = nsnull;
   rv = DIR_AddNewAddressBook(aDisplayName, fileName, aURI,
                              PABDirectory, EmptyCString(), &server);
   NS_ENSURE_SUCCESS(rv,rv);
 
-  rv = CreateDirectoriesFromFactory(aURI, server, PR_TRUE /* notify */);
+  rv = CreateDirectoriesFromFactory(aURI, server, true /* notify */);
   NS_ENSURE_SUCCESS(rv,rv);
 	return rv;
 }
 
 struct GetDirectories
 {
   GetDirectories(DIR_Server* aServer) : mServer(aServer) { }
 
@@ -349,17 +349,17 @@ NS_IMETHODIMP nsAbBSDirectory::HasDirect
 }
 
 NS_IMETHODIMP nsAbBSDirectory::UseForAutocomplete(const nsACString &aIdentityKey,
                                                   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;
+  *aResult = true;
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbBSDirectory::GetURI(nsACString &aURI)
 {
   if (mURI.IsEmpty())
     return NS_ERROR_NOT_INITIALIZED;
 
--- a/mailnews/addrbook/src/nsAbCardProperty.cpp
+++ b/mailnews/addrbook/src/nsAbCardProperty.cpp
@@ -117,26 +117,26 @@ static const AppendItem CUSTOM_ATTRS_ARR
   {kCustom1Property, "propertyCustom1", eAppendLabel},
   {kCustom2Property, "propertyCustom2", eAppendLabel},
   {kCustom3Property, "propertyCustom3", eAppendLabel},
   {kCustom4Property, "propertyCustom4", eAppendLabel},
   {kNotesProperty, "", eAppendLine}
 };
 
 nsAbCardProperty::nsAbCardProperty()
-  : m_IsMailList(PR_FALSE)
+  : m_IsMailList(false)
 {
   m_properties.Init();
 
   // Initialize some default properties
   SetPropertyAsUint32(kPreferMailFormatProperty, nsIAbPreferMailFormat::unknown);
   SetPropertyAsUint32(kPopularityIndexProperty, 0);
   // Uninitialized...
   SetPropertyAsUint32(kLastModifiedDateProperty, 0);
-  SetPropertyAsBool(kAllowRemoteContentProperty, PR_FALSE);
+  SetPropertyAsBool(kAllowRemoteContentProperty, false);
 }
 
 nsAbCardProperty::~nsAbCardProperty(void)
 {
 }
 
 NS_IMPL_ISUPPORTS2(nsAbCardProperty, nsIAbCard, nsIAbItem)
 
@@ -405,31 +405,31 @@ NS_IMETHODIMP nsAbCardProperty::SetPrima
   return SetPropertyAsAString(kPriEmailProperty, aString);
 }
 
 NS_IMETHODIMP nsAbCardProperty::HasEmailAddress(const nsACString &aEmailAddress,
                                                 bool *aResult)
 {
   NS_ENSURE_ARG_POINTER(aResult);
 
-  *aResult = PR_FALSE;
+  *aResult = false;
 
   nsCString emailAddress;
   nsresult rv = GetPropertyAsAUTF8String(kPriEmailProperty, emailAddress);
   if (rv != NS_ERROR_NOT_AVAILABLE &&
       emailAddress.Equals(aEmailAddress, nsCaseInsensitiveCStringComparator()))
   {
-    *aResult = PR_TRUE;
+    *aResult = true;
     return NS_OK;
   }
 
   rv = GetPropertyAsAUTF8String(k2ndEmailProperty, emailAddress);
   if (rv != NS_ERROR_NOT_AVAILABLE &&
       emailAddress.Equals(aEmailAddress, nsCaseInsensitiveCStringComparator()))
-    *aResult = PR_TRUE;
+    *aResult = true;
 
   return NS_OK;
 }
 
 // This function may be overridden by derived classes for
 // nsAb*Card specific implementations.
 NS_IMETHODIMP nsAbCardProperty::Copy(nsIAbCard* srcCard)
 {
@@ -496,17 +496,17 @@ NS_IMETHODIMP nsAbCardProperty::Translat
     return ConvertToEscapedVCard(result);
 
   return NS_ERROR_ILLEGAL_VALUE;
 }
 //
 static VObject* myAddPropValue(VObject *o, const char *propName, const PRUnichar *propValue, bool *aCardHasData)
 {
     if (aCardHasData)
-        *aCardHasData = PR_TRUE;
+        *aCardHasData = true;
     return addPropValue(o, propName, NS_ConvertUTF16toUTF8(propValue).get());
 }
 
 nsresult nsAbCardProperty::ConvertToEscapedVCard(nsACString &aResult)
 {
     nsString str;
     nsresult rv;
     bool vCardHasData = false;
@@ -895,17 +895,17 @@ nsresult nsAbCardProperty::AppendSection
 
   nsString attrValue;
   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;
+      sectionIsEmpty = false;
   }
 
   if (!sectionIsEmpty && !aHeading.IsEmpty()) {
     nsString heading;
     rv = aBundle->GetStringFromName(aHeading.get(), getter_Copies(heading));
     NS_ENSURE_SUCCESS(rv, rv);
 
     aResult.AppendLiteral("<sectiontitle>");
--- a/mailnews/addrbook/src/nsAbContentHandler.cpp
+++ b/mailnews/addrbook/src/nsAbContentHandler.cpp
@@ -175,17 +175,17 @@ nsAbContentHandler::OnStreamComplete(nsI
   nsCOMPtr<nsIMsgVCardService> vCardService = do_GetService(NS_MSGVCARDSERVICE_CONTRACTID);
   if (vCardService)
   {
     nsAutoPtr<VObject> vObj(vCardService->Parse_MIME((const char *)data, datalen));
     if (vObj)
     {
       PRInt32 len = 0;
       nsCString vCard;
-      vCard.Adopt(vCardService->WriteMemoryVObjects(0, &len, vObj, PR_FALSE));
+      vCard.Adopt(vCardService->WriteMemoryVObjects(0, &len, vObj, false));
 
       nsCOMPtr<nsIAbManager> ab =
         do_GetService(NS_ABMANAGER_CONTRACTID, &rv);
       NS_ENSURE_SUCCESS(rv, rv);
 
       nsCOMPtr <nsIAbCard> cardFromVCard;
       rv = ab->EscapedVCardToAbCard(vCard.get(),
                                     getter_AddRefs(cardFromVCard));
--- a/mailnews/addrbook/src/nsAbDirProperty.cpp
+++ b/mailnews/addrbook/src/nsAbDirProperty.cpp
@@ -48,20 +48,20 @@
 #include "prmem.h"
 #include "nsIAbManager.h"
 
 // From nsDirPrefs
 #define kDefaultPosition 1
 
 nsAbDirProperty::nsAbDirProperty(void)
   : m_LastModifiedDate(0),
-    mIsValidURI(PR_FALSE),
-    mIsQueryURI(PR_FALSE)
+    mIsValidURI(false),
+    mIsQueryURI(false)
 {
-	m_IsMailList = PR_FALSE;
+	m_IsMailList = false;
 }
 
 nsAbDirProperty::~nsAbDirProperty(void)
 {
 #if 0
   // this code causes a regression #138647
   // don't turn it on until you figure it out
   if (m_AddressList) {
@@ -260,17 +260,17 @@ NS_IMETHODIMP nsAbDirProperty::GetAddres
 NS_IMETHODIMP nsAbDirProperty::SetAddressLists(nsIMutableArray * aAddressLists)
 {
   m_AddressList = aAddressLists;
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbDirProperty::CopyMailList(nsIAbDirectory* srcList)
 {
-  SetIsMailList(PR_TRUE);
+  SetIsMailList(true);
 
   nsString str;
   srcList->GetDirName(str);
   SetDirName(str);
   srcList->GetListNickName(str);
   SetListNickName(str);
   srcList->GetDescription(str);
   SetDescription(str);
@@ -281,33 +281,33 @@ NS_IMETHODIMP nsAbDirProperty::CopyMailL
   return NS_OK;
 }
 
 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;
+  *aResult = false;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsAbDirProperty::Init(const char *aURI)
 {
   mURINoQuery = aURI;
   mURI = aURI;
-  mIsValidURI = PR_TRUE;
+  mIsValidURI = true;
 
   PRInt32 searchCharLocation = mURINoQuery.FindChar('?');
   if (searchCharLocation >= 0)
   {
     mQueryString = Substring(mURINoQuery, searchCharLocation + 1);
     mURINoQuery.SetLength(searchCharLocation);
-    mIsQueryURI = PR_TRUE;
+    mIsQueryURI = true;
   }
 
   return NS_OK;
 }
 
 // nsIAbDirectory NOT IMPLEMENTED methods
 NS_IMETHODIMP
 nsAbDirProperty::GetChildNodes(nsISimpleEnumerator **childList)
@@ -386,31 +386,31 @@ NS_IMETHODIMP nsAbDirProperty::GetSuppor
   return NS_OK;
 }
 
 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;
+  *aReadOnly = false;
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbDirProperty::GetIsRemote(bool *aIsRemote)
 {
   NS_ENSURE_ARG_POINTER(aIsRemote);
-  *aIsRemote = PR_FALSE;
+  *aIsRemote = false;
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbDirProperty::GetIsSecure(bool *aIsSecure)
 {
   NS_ENSURE_ARG_POINTER(aIsSecure);
-  *aIsSecure = PR_FALSE;
+  *aIsSecure = false;
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbDirProperty::UseForAutocomplete(const nsACString &aIdentityKey,
                                                   bool *aResult)
 {
   NS_ENSURE_ARG_POINTER(aResult);
 
--- a/mailnews/addrbook/src/nsAbDirectoryQuery.cpp
+++ b/mailnews/addrbook/src/nsAbDirectoryQuery.cpp
@@ -122,17 +122,17 @@ NS_IMETHODIMP nsAbDirectoryQuerySimpleBo
   mExpressions = aExpressions;
 
   return NS_OK;
 }
 
 NS_IMPL_THREADSAFE_ISUPPORTS1(nsAbDirectoryQueryArguments, nsIAbDirectoryQueryArguments)
 
 nsAbDirectoryQueryArguments::nsAbDirectoryQueryArguments() :
-    mQuerySubDirectories(PR_TRUE)
+    mQuerySubDirectories(true)
 {
 }
 
 nsAbDirectoryQueryArguments::~nsAbDirectoryQueryArguments()
 {
 }
 
 /* attribute nsISupports matchItems; */
@@ -480,29 +480,29 @@ nsresult nsAbDirectoryQuery::matchCardCo
     }
 
     nsString value;
     (void)card->GetPropertyAsAString(name.get(), value);
 
     if (value.IsEmpty())
     {
       *matchFound = (conditionType == nsIAbBooleanConditionTypes::DoesNotExist) ?
-          PR_TRUE : PR_FALSE;
+          true : false;
       return NS_OK;
     }
 
     /* TODO
      * What about allowing choice between case insensitive
      * and case sensitive comparisons?
      *
      */
     switch (conditionType)
     {
         case nsIAbBooleanConditionTypes::Exists:
-            *matchFound = PR_TRUE;
+            *matchFound = true;
             break;
         case nsIAbBooleanConditionTypes::Contains:
             *matchFound = CaseInsensitiveFindInReadable(matchValue, value);
             break;
         case nsIAbBooleanConditionTypes::DoesNotContain:
             *matchFound = !CaseInsensitiveFindInReadable(matchValue, value);
             break;
         case nsIAbBooleanConditionTypes::Is:
@@ -520,20 +520,20 @@ nsresult nsAbDirectoryQuery::matchCardCo
         case nsIAbBooleanConditionTypes::GreaterThan:
             *matchFound = Compare(value, matchValue, nsCaseInsensitiveStringComparator()) > 0;
             break;
         case nsIAbBooleanConditionTypes::EndsWith:
             *matchFound = StringEndsWith(value, matchValue, nsCaseInsensitiveStringComparator());
             break;
         case nsIAbBooleanConditionTypes::SoundsLike:
         case nsIAbBooleanConditionTypes::RegExp:
-            *matchFound = PR_FALSE;
+            *matchFound = false;
             break;
         default:
-            *matchFound = PR_FALSE;
+            *matchFound = false;
     }
 
     return rv;
 }
 
 nsresult nsAbDirectoryQuery::queryMatch(nsIAbCard* card,
     nsIAbDirSearchListener* listener)
 {
--- a/mailnews/addrbook/src/nsAbDirectoryQueryProxy.cpp
+++ b/mailnews/addrbook/src/nsAbDirectoryQueryProxy.cpp
@@ -37,30 +37,30 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsAbDirectoryQuery.h"
 #include "nsAbDirectoryQueryProxy.h"
 
 NS_IMPL_ISUPPORTS2(nsAbDirectoryQueryProxy, nsIAbDirectoryQueryProxy, nsIAbDirectoryQuery)
 
 nsAbDirectoryQueryProxy::nsAbDirectoryQueryProxy() :
-    mInitiated (PR_FALSE)
+    mInitiated (false)
 {
 }
 
 nsAbDirectoryQueryProxy::~nsAbDirectoryQueryProxy()
 {
 }
 
 /* void initiate (in nsIAbDirectory directory); */
 NS_IMETHODIMP nsAbDirectoryQueryProxy::Initiate()
 {
     if (mInitiated)
         return NS_OK;
 
     mDirectoryQuery = new nsAbDirectoryQuery();
 
-    mInitiated = PR_TRUE;
+    mInitiated = true;
 
     return NS_OK;
 }
 
 
--- a/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp
@@ -418,17 +418,17 @@ nsAbLDAPAutoCompFormatter::ProcessFormat
     // parse until we hit the end of the string
     //
     while (iter != iterEnd) {
 
         switch (*iter) {            // process the next char
 
         case PRUnichar('{'):
 
-            attrRequired = PR_TRUE;  // this attribute is required
+            attrRequired = true;  // this attribute is required
 
             /*FALLTHROUGH*/
 
         case PRUnichar('['):
 
             rv = ParseAttrName(&iter, iterEnd, attrRequired,
                                consoleSvc, attrName);
 
@@ -462,17 +462,17 @@ nsAbLDAPAutoCompFormatter::ProcessFormat
                     // something unrecoverable happened; stop parsing and 
                     // propagate the error up the stack
                     //
                     return rv;
                 }
             }
 
             attrName.Truncate();     // clear out for next pass
-            attrRequired = PR_FALSE; // reset to the default for the next pass
+            attrRequired = false; // reset to the default for the next pass
 
             break;
 
         case PRUnichar('\\'):
 
             // advance the iterator and be sure we haven't run off the end
             //
             ++iter;
--- a/mailnews/addrbook/src/nsAbLDAPCard.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPCard.cpp
@@ -128,24 +128,24 @@ NS_IMETHODIMP nsAbLDAPCard::GetLDAPMessa
   {
     nsCOMPtr<nsILDAPBERValue> value =
       do_CreateInstance("@mozilla.org/network/ldap-ber-value;1", &rv);
     NS_ENSURE_SUCCESS(rv, rv);
 
     rv = value->SetFromUTF8(m_objectClass.ElementAt(i));
     NS_ENSURE_SUCCESS(rv, rv);
 
-    rv = values->AppendElement(value, PR_FALSE);
+    rv = values->AppendElement(value, false);
     NS_ENSURE_SUCCESS(rv, rv);
   }
   
   rv = mod->SetUpModification(aType, NS_LITERAL_CSTRING("objectClass"), values);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  modArray->AppendElement(mod, PR_FALSE);
+  modArray->AppendElement(mod, false);
 
   // Add card properties
   CharPtrArrayGuard props;
   rv = aAttributeMap->GetAllCardProperties(props.GetSizeAddr(),
     props.GetArrayAddr());
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCAutoString attr;
@@ -194,17 +194,17 @@ NS_IMETHODIMP nsAbLDAPCard::GetLDAPMessa
       rv = value->SetFromUTF8(propvalue);
       NS_ENSURE_SUCCESS(rv, rv);
  
       rv = mod->SetUpModificationOneValue(aType, attr, value);
       NS_ENSURE_SUCCESS(rv, rv);
     
       printf("LDAP : setting attribute %s (%s) to '%s'\n", attr.get(),
         props[i], propvalue.get());
-      modArray->AppendElement(mod, PR_FALSE);
+      modArray->AppendElement(mod, false);
       if (index != nsTArray<nsCString>::NoIndex)
         m_attributes.AppendElement(attr);
 
     }
     else if (aType == nsILDAPModification::MOD_REPLACE &&
              index != nsTArray<nsCString>::NoIndex)
     {
       // If the new value is empty, we are performing an update
@@ -212,17 +212,17 @@ NS_IMETHODIMP nsAbLDAPCard::GetLDAPMessa
       nsCOMPtr<nsIMutableArray> novalues =
         do_CreateInstance(NS_ARRAY_CONTRACTID, &rv);
       NS_ENSURE_SUCCESS(rv, rv);
 
       rv = mod->SetUpModification(aType, attr, novalues);
       NS_ENSURE_SUCCESS(rv, rv);
       
       printf("LDAP : removing attribute %s (%s)\n", attr.get(), props[i]);
-      modArray->AppendElement(mod, PR_FALSE);
+      modArray->AppendElement(mod, false);
       m_attributes.RemoveElementAt(index);
     }
   }
 
   NS_ADDREF(*aLDAPAddMessageInfo = modArray);
 
   return NS_OK;
 }
--- a/mailnews/addrbook/src/nsAbLDAPChangeLogData.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPChangeLogData.cpp
@@ -61,17 +61,17 @@
 enum UpdateOp {
  NO_OP,
  ENTRY_ADD,
  ENTRY_DELETE,
  ENTRY_MODIFY
 };
 
 nsAbLDAPProcessChangeLogData::nsAbLDAPProcessChangeLogData()
-: mUseChangeLog(PR_FALSE),
+: mUseChangeLog(false),
   mChangeLogEntriesCount(0),
   mEntriesAddedQueryCount(0)
 {
    mRootDSEEntry.firstChangeNumber = 0;
    mRootDSEEntry.lastChangeNumber = 0;
 }
 
 nsAbLDAPProcessChangeLogData::~nsAbLDAPProcessChangeLogData()
@@ -99,22 +99,22 @@ nsresult nsAbLDAPProcessChangeLogData::O
     NS_ENSURE_ARG_POINTER(aMessage);
 	if(!mInitialized) 
         return NS_ERROR_NOT_INITIALIZED;
 
     PRInt32 errCode;
 
     nsresult rv = aMessage->GetErrorCode(&errCode);
     if(NS_FAILED(rv)) {
-        Done(PR_FALSE);
+        Done(false);
         return rv;
     }
 
     if(errCode != nsILDAPErrors::SUCCESS) {
-        Done(PR_FALSE);
+        Done(false);
         return NS_ERROR_FAILURE;
     }
 
     switch(mState) {
     case kAnonymousBinding :
         rv = GetAuthData();
         if(NS_SUCCEEDED(rv)) 
             rv = mChangeLogQuery->QueryAuthDN(mAuthUserID);
@@ -214,24 +214,24 @@ nsresult nsAbLDAPProcessChangeLogData::O
                     break;
 
                 PRInt64 fileSize;
                 rv = dbPath->GetFileSize(&fileSize);
                 if(NS_FAILED(rv)) 
                     break;
 
                 if (!fileExists || !fileSize)
-                    mUseChangeLog = PR_FALSE;
+                    mUseChangeLog = false;
 
                 // Open / create the AB here since it calls Done,
                 // just return from here.
                 if (mUseChangeLog)
-                   rv = OpenABForReplicatedDir(PR_FALSE);
+                   rv = OpenABForReplicatedDir(false);
                 else
-                   rv = OpenABForReplicatedDir(PR_TRUE);
+                   rv = OpenABForReplicatedDir(true);
                 if (NS_FAILED(rv))
                    return rv;
                 
                 // Now start the appropriate query
                 rv = OnSearchRootDSEDone();
                 break;
              }
             case kFindingChanges:
@@ -370,21 +370,21 @@ nsresult nsAbLDAPProcessChangeLogData::P
     }
 
     PRInt32 lastChangeNumber;
     mDirectory->GetLastChangeNumber(&lastChangeNumber);
 
     if ((mRootDSEEntry.lastChangeNumber > 0) &&
         (lastChangeNumber < mRootDSEEntry.lastChangeNumber) &&
         (lastChangeNumber > mRootDSEEntry.firstChangeNumber))
-        mUseChangeLog = PR_TRUE;
+        mUseChangeLog = true;
 
     if (mRootDSEEntry.lastChangeNumber &&
         (lastChangeNumber == mRootDSEEntry.lastChangeNumber)) {
-        Done(PR_TRUE); // We are up to date no need to replicate, db not open yet so call Done
+        Done(true); // We are up to date no need to replicate, db not open yet so call Done
         return NS_OK;
     }
 
     return rv;
 }
 
 nsresult nsAbLDAPProcessChangeLogData::OnSearchRootDSEDone()
 {
@@ -394,25 +394,25 @@ nsresult nsAbLDAPProcessChangeLogData::O
     nsresult rv = NS_OK;
 
     if(mUseChangeLog) {
         rv = mChangeLogQuery->QueryChangeLog(mRootDSEEntry.changeLogDN, mRootDSEEntry.lastChangeNumber);
         if (NS_FAILED(rv))
            return rv;
         mState = kFindingChanges;
         if(mListener)
-            mListener->OnStateChange(nsnull, nsnull, nsIWebProgressListener::STATE_START, PR_FALSE);
+            mListener->OnStateChange(nsnull, nsnull, nsIWebProgressListener::STATE_START, false);
     }
     else {
         rv = mQuery->QueryAllEntries();
         if (NS_FAILED(rv))
            return rv;
         mState = kReplicatingAll;
         if(mListener)
-            mListener->OnStateChange(nsnull, nsnull, nsIWebProgressListener::STATE_START, PR_TRUE);
+            mListener->OnStateChange(nsnull, nsnull, nsIWebProgressListener::STATE_START, true);
     }
 
     rv = mDirectory->SetLastChangeNumber(mRootDSEEntry.lastChangeNumber);
     NS_ENSURE_SUCCESS(rv, rv);
 
     rv = mDirectory->SetDataVersion(mRootDSEEntry.dataVersion);
 
     return rv;
@@ -511,62 +511,62 @@ nsresult nsAbLDAPProcessChangeLogData::O
 
     // No entries to add/update (for updates too we delete and add) entries,
     // we took care of deletes in ParseChangeLogEntries, all Done!
     mEntriesAddedQueryCount = mEntriesToAdd.Count();
     if(mEntriesAddedQueryCount <= 0) {
         if(mReplicationDB && mDBOpen) {
             // Close the DB, no need to commit since we have not made
             // any changes yet to the DB.
-            rv = mReplicationDB->Close(PR_FALSE);
+            rv = mReplicationDB->Close(false);
             NS_ASSERTION(NS_SUCCEEDED(rv), "Replication DB Close(no commit) on Success failed");
-            mDBOpen = PR_FALSE;
+            mDBOpen = false;
             // Once are done with the replication file, delete the backup file
             if(mBackupReplicationFile) {
-                rv = mBackupReplicationFile->Remove(PR_FALSE);
+                rv = mBackupReplicationFile->Remove(false);
                 NS_ASSERTION(NS_SUCCEEDED(rv), "Replication BackupFile Remove on Success failed");
             }
         }
-        Done(PR_TRUE);
+        Done(true);
         return NS_OK;
     }
 
     // Decrement the count first to get the correct array element
     mEntriesAddedQueryCount--;
     rv = mChangeLogQuery->QueryChangedEntries(NS_ConvertUTF16toUTF8(*(mEntriesToAdd[mEntriesAddedQueryCount])));
     if (NS_FAILED(rv))
         return rv;
 
     if(mListener && NS_SUCCEEDED(rv))
-        mListener->OnStateChange(nsnull, nsnull, nsIWebProgressListener::STATE_START, PR_TRUE);
+        mListener->OnStateChange(nsnull, nsnull, nsIWebProgressListener::STATE_START, true);
 
     mState = kReplicatingChanges;
     return rv;
 }
 
 nsresult nsAbLDAPProcessChangeLogData::OnReplicatingChangeDone()
 {
     if(!mInitialized) 
         return NS_ERROR_NOT_INITIALIZED;
 
     nsresult rv = NS_OK;
 
     if(!mEntriesAddedQueryCount)
     {
         if(mReplicationDB && mDBOpen) {
-            rv = mReplicationDB->Close(PR_TRUE); // Commit and close the DB
+            rv = mReplicationDB->Close(true); // Commit and close the DB
             NS_ASSERTION(NS_SUCCEEDED(rv), "Replication DB Close (commit) on Success failed");
-            mDBOpen = PR_FALSE;
+            mDBOpen = false;
         }
         // Once we done with the replication file, delete the backup file.
         if(mBackupReplicationFile) {
-            rv = mBackupReplicationFile->Remove(PR_FALSE);
+            rv = mBackupReplicationFile->Remove(false);
             NS_ASSERTION(NS_SUCCEEDED(rv), "Replication BackupFile Remove on Success failed");
         }
-        Done(PR_TRUE);  // All data is received
+        Done(true);  // All data is received
         return NS_OK;
     }
 
     // Remove the entry already added from the list and query the next one.
     if(mEntriesAddedQueryCount < mEntriesToAdd.Count() && mEntriesAddedQueryCount >= 0)
         mEntriesToAdd.RemoveStringAt(mEntriesAddedQueryCount);
     mEntriesAddedQueryCount--;
     rv = mChangeLogQuery->QueryChangedEntries(NS_ConvertUTF16toUTF8(*(mEntriesToAdd[mEntriesAddedQueryCount])));
--- a/mailnews/addrbook/src/nsAbLDAPChangeLogQuery.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPChangeLogQuery.cpp
@@ -91,17 +91,17 @@ NS_IMETHODIMP nsAbLDAPChangeLogQuery::In
         return rv;
 
     // create the ChangeLog Data Processor
     mDataProcessor =  do_CreateInstance(NS_ABLDAP_PROCESSCHANGELOGDATA_CONTRACTID, &rv);
     if(NS_FAILED(rv)) 
         return rv;
 
     // 'this' initialized
-    mInitialized = PR_TRUE;
+    mInitialized = true;
 
     return mDataProcessor->Init(this, aProgressListener);
 }
 
 NS_IMETHODIMP nsAbLDAPChangeLogQuery::DoReplicationQuery()
 {
     if(!mInitialized) 
         return NS_ERROR_NOT_INITIALIZED;
--- a/mailnews/addrbook/src/nsAbLDAPDirectory.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPDirectory.cpp
@@ -72,17 +72,17 @@
 #include "nsMsgUtils.h"
 
 #define kDefaultMaxHits 100
 
 using namespace mozilla;
 
 nsAbLDAPDirectory::nsAbLDAPDirectory() :
   nsAbDirProperty(),
-  mPerformingQuery(PR_FALSE),
+  mPerformingQuery(false),
   mContext(0),
   mLock("nsAbLDAPDirectory.mLock")
 {
   mCache.Init();
 }
 
 nsAbLDAPDirectory::~nsAbLDAPDirectory()
 {
@@ -322,17 +322,17 @@ NS_IMETHODIMP nsAbLDAPDirectory::StartSe
     nsCOMPtr<nsIAbBooleanExpression> expression;
     rv = nsAbQueryStringToExpression::Convert(mQueryString,
                                               getter_AddRefs(expression));
     NS_ENSURE_SUCCESS(rv, rv);
 
     rv = arguments->SetExpression(expression);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    rv = arguments->SetQuerySubDirectories(PR_TRUE);
+    rv = arguments->SetQuerySubDirectories(true);
     NS_ENSURE_SUCCESS(rv, rv);
 
     // Get the max hits to return
     PRInt32 maxHits;
     rv = GetMaxHits(&maxHits);
     if (NS_FAILED(rv))
       maxHits = kDefaultMaxHits;
 
@@ -356,33 +356,33 @@ NS_IMETHODIMP nsAbLDAPDirectory::StartSe
     }
 
     // Perform the query
     rv = mDirectoryQuery->DoQuery(this, arguments, this, maxHits, 0, &mContext);
     NS_ENSURE_SUCCESS(rv, rv);
 
     // Enter lock
     MutexAutoLock lock(mLock);
-    mPerformingQuery = PR_TRUE;
+    mPerformingQuery = true;
     mCache.Clear();
 
     return rv;
 }  
 
 NS_IMETHODIMP nsAbLDAPDirectory::StopSearch ()
 {
   nsresult rv = Initiate();
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Enter lock
   {
     MutexAutoLock lockGuard(mLock);
     if (!mPerformingQuery)
       return NS_OK;
-    mPerformingQuery = PR_FALSE;
+    mPerformingQuery = false;
   }
   // Exit lock
 
   if (!mDirectoryQuery)
     return NS_ERROR_NULL_POINTER;
 
   return mDirectoryQuery->StopQuery(mContext);
 }
@@ -393,17 +393,17 @@ NS_IMETHODIMP nsAbLDAPDirectory::StopSea
  *
  */
 NS_IMETHODIMP nsAbLDAPDirectory::OnSearchFinished(PRInt32 aResult, const nsAString &aErrorMessage)
 {
   nsresult rv = Initiate();
   NS_ENSURE_SUCCESS(rv, rv);
 
   MutexAutoLock lock(mLock);
-  mPerformingQuery = PR_FALSE;
+  mPerformingQuery = false;
 
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbLDAPDirectory::OnSearchFoundCard(nsIAbCard* card)
 {
   nsresult rv = Initiate();
   NS_ENSURE_SUCCESS(rv, rv);
@@ -420,54 +420,54 @@ NS_IMETHODIMP nsAbLDAPDirectory::OnSearc
     abManager->NotifyDirectoryItemAdded(this, card);
 
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbLDAPDirectory::GetSupportsMailingLists(bool *aSupportsMailingsLists)
 {
   NS_ENSURE_ARG_POINTER(aSupportsMailingsLists);
-  *aSupportsMailingsLists = PR_FALSE;
+  *aSupportsMailingsLists = false;
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbLDAPDirectory::GetReadOnly(bool *aReadOnly)
 {
   NS_ENSURE_ARG_POINTER(aReadOnly);
 
-  *aReadOnly = PR_TRUE;
+  *aReadOnly = true;
 
 #ifdef MOZ_EXPERIMENTAL_WRITEABLE_LDAP
   bool readOnly;
-  nsresult rv = GetBoolValue("readonly", PR_FALSE, &readOnly);
+  nsresult rv = GetBoolValue("readonly", false, &readOnly);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (readOnly)
     return NS_OK;
 
   // when online, we'll allow writing as well
   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;
+    *aReadOnly = false;
 #endif
 
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbLDAPDirectory::GetIsRemote(bool *aIsRemote)
 {
   NS_ENSURE_ARG_POINTER(aIsRemote);
-  *aIsRemote = PR_TRUE;
+  *aIsRemote = true;
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbLDAPDirectory::GetIsSecure(bool *aIsSecure)
 {
   NS_ENSURE_ARG_POINTER(aIsSecure);
 
   nsCAutoString URI;
@@ -480,17 +480,17 @@ NS_IMETHODIMP nsAbLDAPDirectory::GetIsSe
 }
 
 NS_IMETHODIMP nsAbLDAPDirectory::UseForAutocomplete(const nsACString &aIdentityKey,
                                                     bool *aResult)
 {
   NS_ENSURE_ARG_POINTER(aResult);
 
   // Set this to false by default to make the code easier below.
-  *aResult = PR_FALSE;
+  *aResult = false;
 
   nsresult rv;
   bool offline = false;
   nsCOMPtr <nsIIOService> ioService =
     do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = ioService->GetOffline(&offline);
@@ -727,17 +727,17 @@ NS_IMETHODIMP nsAbLDAPDirectory::GetRepl
   nsCOMPtr<nsILocalFile> databaseFile;
  rv = GetReplicationFile(getter_AddRefs(databaseFile));
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIAddrDatabase> addrDBFactory =
     do_GetService(NS_ADDRDATABASE_CONTRACTID, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  return addrDBFactory->Open(databaseFile, PR_FALSE /* no create */, PR_TRUE,
+  return addrDBFactory->Open(databaseFile, false /* no create */, true,
                            aResult);
 }
 
 NS_IMETHODIMP nsAbLDAPDirectory::AddCard(nsIAbCard *aUpdatedCard,
                                          nsIAbCard **aAddedCard)
 {
   NS_ENSURE_ARG_POINTER(aUpdatedCard);
   NS_ENSURE_ARG_POINTER(aAddedCard);
--- a/mailnews/addrbook/src/nsAbLDAPDirectoryModify.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPDirectoryModify.cpp
@@ -111,42 +111,42 @@ nsAbModifyLDAPMessageListener::nsAbModif
     const nsACString &login,
     const PRInt32 timeOut) :
     nsAbLDAPListenerBase(directoryUrl, connection, login, timeOut),
     mType(type),
     mCardDN(cardDN),
     mModification(modArray),
     mNewRDN(newRDN),
     mNewBaseDN(newBaseDN),
-    mFinished(PR_FALSE),
-    mCanceled(PR_FALSE),
-    mFlagRename(PR_FALSE),
+    mFinished(false),
+    mCanceled(false),
+    mFlagRename(false),
     mServerSearchControls(serverSearchControls),
     mClientSearchControls(clientSearchControls)
 {
   if (mType == nsILDAPModification::MOD_REPLACE &&
       !mNewRDN.IsEmpty() && !mNewBaseDN.IsEmpty())
-    mFlagRename = PR_TRUE;
+    mFlagRename = true;
 }
 
 nsAbModifyLDAPMessageListener::~nsAbModifyLDAPMessageListener ()
 {
 }
 
 nsresult nsAbModifyLDAPMessageListener::Cancel ()
 {
   nsresult rv = Initiate();
   NS_ENSURE_SUCCESS(rv, rv);
 
   MutexAutoLock lock(mLock);
 
   if (mFinished || mCanceled)
     return NS_OK;
 
-  mCanceled = PR_TRUE;
+  mCanceled = true;
 
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbModifyLDAPMessageListener::OnLDAPMessage(nsILDAPMessage *aMessage)
 {
   nsresult rv = Initiate();
   NS_ENSURE_SUCCESS(rv, rv);
@@ -163,21 +163,21 @@ NS_IMETHODIMP nsAbModifyLDAPMessageListe
 
     if (mFinished)
       return NS_OK;
 
     // for these messages, no matter the outcome, we're done
     if ((messageType == nsILDAPMessage::RES_ADD) || 
         (messageType == nsILDAPMessage::RES_DELETE) ||
         (messageType == nsILDAPMessage::RES_MODIFY))
-      mFinished = PR_TRUE;
+      mFinished = true;
     else if (mCanceled)
     {
-      mFinished = PR_TRUE;
-      cancelOperation = PR_TRUE;
+      mFinished = true;
+      cancelOperation = true;
     }
   }
   // Leave lock
 
   //    nsCOMPtr<nsIAbDirectoryQueryResult> queryResult;
   if (!cancelOperation)
   {
     switch (messageType)
@@ -191,67 +191,67 @@ NS_IMETHODIMP nsAbModifyLDAPMessageListe
         rv = OnLDAPMessageModifyResult(aMessage);
       break;
     case nsILDAPMessage::RES_ADD:
     case nsILDAPMessage::RES_MODIFY:
     case nsILDAPMessage::RES_DELETE:
       rv = OnLDAPMessageModifyResult(aMessage);
       break;
     case nsILDAPMessage::RES_MODDN:
-      mFlagRename = PR_FALSE;
+      mFlagRename = false;
       rv = OnLDAPMessageRenameResult(aMessage);
       if (NS_FAILED(rv)) 
         // Rename failed, so we stop here
-        mFinished = PR_TRUE;
+        mFinished = true;
       break;
     default:
       break;
     }
   }
   else
   {
     if (mModifyOperation)
       rv = mModifyOperation->AbandonExt();
 
     // reset because we might re-use this listener...except don't do this
     // until the search is done, so we'll ignore results from a previous
     // search.
-    mCanceled = mFinished = PR_FALSE;
+    mCanceled = mFinished = false;
   }
 
   return rv;
 }
 
 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()
 {
   nsresult rv;
-  mCanceled = mFinished = PR_FALSE;
+  mCanceled = mFinished = false;
 
   mModifyOperation = do_CreateInstance(NS_LDAPOPERATION_CONTRACTID, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = mModifyOperation->Init (mConnection, this, nsnull);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // XXX do we need the search controls?
   rv = mModifyOperation->SetServerControls(mServerSearchControls);
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = mModifyOperation->SetClientControls(mClientSearchControls);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (mFlagRename)
-    return mModifyOperation->Rename(mCardDN, mNewRDN, mNewBaseDN, PR_TRUE);
+    return mModifyOperation->Rename(mCardDN, mNewRDN, mNewBaseDN, true);
 
   switch (mType)
   {
     case nsILDAPModification::MOD_ADD:
       return mModifyOperation->AddExt(mCardDN, mModification);
     case nsILDAPModification::MOD_DELETE:
       return mModifyOperation->DeleteExt(mCardDN);
     case nsILDAPModification::MOD_REPLACE:
--- a/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp
@@ -126,19 +126,19 @@ nsAbQueryLDAPMessageListener::nsAbQueryL
         const nsACString &mechanism,
         const PRInt32 resultLimit,
         const PRInt32 timeOut) :
   nsAbLDAPListenerBase(directoryUrl, connection, login, timeOut),
   mSearchUrl(searchUrl),
   mResultListener(resultListener),
   mQueryArguments(queryArguments),
   mResultLimit(resultLimit),
-  mFinished(PR_FALSE),
-  mCanceled(PR_FALSE),
-  mWaitingForPrevQueryToFinish(PR_FALSE),
+  mFinished(false),
+  mCanceled(false),
+  mWaitingForPrevQueryToFinish(false),
   mServerSearchControls(serverSearchControls),
   mClientSearchControls(clientSearchControls)
 {
   mSaslMechanism.Assign(mechanism);
 }
 
 nsAbQueryLDAPMessageListener::~nsAbQueryLDAPMessageListener ()
 {
@@ -149,19 +149,19 @@ nsresult nsAbQueryLDAPMessageListener::C
     nsresult rv = Initiate();
     NS_ENSURE_SUCCESS(rv, rv);
 
     MutexAutoLock lock(mLock);
 
     if (mFinished || mCanceled)
         return NS_OK;
 
-    mCanceled = PR_TRUE;
+    mCanceled = true;
     if (!mFinished)
-      mWaitingForPrevQueryToFinish = PR_TRUE;
+      mWaitingForPrevQueryToFinish = true;
 
     return NS_OK;
 }
 
 NS_IMETHODIMP nsAbQueryLDAPMessageListener::OnLDAPMessage(nsILDAPMessage *aMessage)
 {
   nsresult rv = Initiate();
   NS_ENSURE_SUCCESS(rv, rv);
@@ -175,21 +175,21 @@ NS_IMETHODIMP nsAbQueryLDAPMessageListen
   // Enter lock
   {
     MutexAutoLock lock (mLock);
 
     if (mFinished)
       return NS_OK;
 
     if (messageType == nsILDAPMessage::RES_SEARCH_RESULT)
-      mFinished = PR_TRUE;
+      mFinished = true;
     else if (mCanceled)
     {
-      mFinished = PR_TRUE;
-      cancelOperation = PR_TRUE;
+      mFinished = true;
+      cancelOperation = true;
     }
   }
   // Leave lock
 
   if (!mResultListener)
     return NS_ERROR_NULL_POINTER;
 
   if (!cancelOperation)
@@ -204,17 +204,17 @@ NS_IMETHODIMP nsAbQueryLDAPMessageListen
         // for us.
         rv = OnLDAPMessageSearchResult(aMessage);
       break;
     case nsILDAPMessage::RES_SEARCH_ENTRY:
       if (!mFinished && !mWaitingForPrevQueryToFinish)
         rv = OnLDAPMessageSearchEntry(aMessage);
       break;
     case nsILDAPMessage::RES_SEARCH_RESULT:
-      mWaitingForPrevQueryToFinish = PR_FALSE;
+      mWaitingForPrevQueryToFinish = false;
       rv = OnLDAPMessageSearchResult(aMessage);
       NS_ENSURE_SUCCESS(rv, rv);
     default:
       break;
     }
   }
   else
   {
@@ -223,26 +223,26 @@ NS_IMETHODIMP nsAbQueryLDAPMessageListen
 
     rv = mResultListener->OnQueryResult(
       nsIAbDirectoryQueryResultListener::queryResultStopped, 0);
 
     // reset because we might re-use this listener...except don't do this
     // until the search is done, so we'll ignore results from a previous
     // search.
     if (messageType == nsILDAPMessage::RES_SEARCH_RESULT)
-      mCanceled = mFinished = PR_FALSE;
+      mCanceled = mFinished = false;
   }
 
   return rv;
 }
 
 nsresult nsAbQueryLDAPMessageListener::DoTask()
 {
   nsresult rv;
-  mCanceled = mFinished = PR_FALSE;
+  mCanceled = mFinished = false;
 
   mOperation = do_CreateInstance(NS_LDAPOPERATION_CONTRACTID, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = mOperation->Init(mConnection, this, nsnull);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCAutoString dn;
@@ -328,17 +328,17 @@ nsresult nsAbQueryLDAPMessageListener::O
 }
 
 // nsAbLDAPDirectoryQuery
 
 NS_IMPL_THREADSAFE_ISUPPORTS2(nsAbLDAPDirectoryQuery, nsIAbDirectoryQuery,
                               nsIAbDirectoryQueryResultListener)
 
 nsAbLDAPDirectoryQuery::nsAbLDAPDirectoryQuery() :
-    mInitialized(PR_FALSE)
+    mInitialized(false)
 {
 }
 
 nsAbLDAPDirectoryQuery::~nsAbLDAPDirectoryQuery()
 {
 }
 
 NS_IMETHODIMP nsAbLDAPDirectoryQuery::DoQuery(nsIAbDirectory *aDirectory,
@@ -352,17 +352,17 @@ NS_IMETHODIMP nsAbLDAPDirectoryQuery::Do
   NS_ENSURE_ARG_POINTER(aArguments);
 
   mListeners.AppendObject(aListener);
 
   // Ensure existing query is stopped. Context id doesn't matter here
   nsresult rv = StopQuery(0);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  mInitialized = PR_TRUE;
+  mInitialized = true;
 
   // Get the current directory as LDAP specific
   nsCOMPtr<nsIAbLDAPDirectory> directory(do_QueryInterface(aDirectory, &rv));
   NS_ENSURE_SUCCESS(rv, rv);
   
   // We also need the current URL to check as well...
   nsCOMPtr<nsILDAPURL> currentUrl;
   rv = directory->GetLDAPURL(getter_AddRefs(currentUrl));
@@ -389,17 +389,17 @@ NS_IMETHODIMP nsAbLDAPDirectoryQuery::Do
   
   if (!mConnection || !mDirectoryUrl)
   {
     mDirectoryUrl = currentUrl;
     aDirectory->GetUuid(mDirectoryId);
     mCurrentLogin = login;
     mCurrentMechanism = saslMechanism;
     mCurrentProtocolVersion = protocolVersion;
-    redoConnection = PR_TRUE;
+    redoConnection = true;
   }
   else
   {
     bool equal;
     rv = mDirectoryUrl->Equals(currentUrl, &equal);
       NS_ENSURE_SUCCESS(rv, rv);
   
     nsCString spec;
@@ -408,26 +408,26 @@ NS_IMETHODIMP nsAbLDAPDirectoryQuery::Do
 
     if (!equal)
     {
       mDirectoryUrl = currentUrl;
       aDirectory->GetUuid(mDirectoryId);
       mCurrentLogin = login;
       mCurrentMechanism = saslMechanism;
       mCurrentProtocolVersion = protocolVersion;
-      redoConnection = PR_TRUE;
+      redoConnection = true;
     }
     else
     {
       // Has login or version changed?
       if (login != mCurrentLogin ||
           saslMechanism != mCurrentMechanism ||
           protocolVersion != mCurrentProtocolVersion)
       {
-        redoConnection = PR_TRUE;
+        redoConnection = true;
         mCurrentLogin = login;
         mCurrentMechanism = saslMechanism;
         mCurrentProtocolVersion = protocolVersion;
       }
     }
   }
 
   nsCOMPtr<nsIURI> uri;
@@ -594,17 +594,17 @@ NS_IMETHODIMP nsAbLDAPDirectoryQuery::Do
   NS_ENSURE_SUCCESS(rv, rv);
 
   return rv;
 }
 
 /* void stopQuery (in long contextID); */
 NS_IMETHODIMP nsAbLDAPDirectoryQuery::StopQuery(PRInt32 contextID)
 {
-  mInitialized = PR_TRUE;
+  mInitialized = true;
 
   if (!mListener)
     return NS_OK;
 
   nsAbQueryLDAPMessageListener *listener = 
     static_cast<nsAbQueryLDAPMessageListener *>(static_cast<nsILDAPMessageListener *>(mListener.get()));
   if (listener)
     return listener->Cancel();
--- a/mailnews/addrbook/src/nsAbLDAPListenerBase.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPListenerBase.cpp
@@ -54,34 +54,34 @@
 
 using namespace mozilla;
 
 nsAbLDAPListenerBase::nsAbLDAPListenerBase(nsILDAPURL* url,
                                            nsILDAPConnection* connection,
                                            const nsACString &login,
                                            const PRInt32 timeOut) :
   mDirectoryUrl(url), mConnection(connection), mLogin(login),
-  mTimeOut(timeOut), mBound(PR_FALSE), mInitialized(PR_FALSE),
+  mTimeOut(timeOut), mBound(false), mInitialized(false),
   mLock("nsAbLDAPListenerBase.mLock")
 {
 }
 
 nsAbLDAPListenerBase::~nsAbLDAPListenerBase()
 {
 }
 
 nsresult nsAbLDAPListenerBase::Initiate()
 {
   if (!mConnection || !mDirectoryUrl)
     return NS_ERROR_NULL_POINTER;
 
   if (mInitialized)
     return NS_OK;
 
-  mInitialized = PR_TRUE;
+  mInitialized = true;
 
   return NS_OK;
 }
 
 // If something fails in this function, we must call InitFailed() so that the
 // derived class (and listener) knows to cancel what its doing as there is
 // a problem.
 NS_IMETHODIMP nsAbLDAPListenerBase::OnLDAPInit(nsILDAPConnection *aConn, nsresult aStatus)
@@ -247,17 +247,17 @@ NS_IMETHODIMP nsAbLDAPListenerBase::OnLD
     {
       NS_ERROR("nsAbLDAPMessageBase::OnLDAPInit(): failed to prompt for"
                " password");
       InitFailed();
       return rv;
     }
     else if (!status)
     {
-      InitFailed(PR_TRUE);
+      InitFailed(true);
       return NS_OK;
     }
   }
 
   // Initiate the LDAP operation
   mOperation = do_CreateInstance(NS_LDAPOPERATION_CONTRACTID, &rv);
   if (NS_FAILED(rv))
   {
@@ -371,11 +371,11 @@ nsresult nsAbLDAPListenerBase::OnLDAPMes
       return OnLDAPInit(nsnull, NS_OK);
     }
 
     // Don't know how to handle this, so use the message error code in
     // the failure return value so we hopefully get it back to the UI.
     return NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_LDAP, errCode);
   }
 
-  mBound = PR_TRUE;
+  mBound = true;
   return DoTask();
 }
--- a/mailnews/addrbook/src/nsAbLDAPReplicationData.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPReplicationData.cpp
@@ -53,26 +53,26 @@
 // independently along with its related independent nsAbLDAPReplicationQuery object.
 NS_IMPL_THREADSAFE_ISUPPORTS2(nsAbLDAPProcessReplicationData, nsIAbLDAPProcessReplicationData, nsILDAPMessageListener)
 
 nsAbLDAPProcessReplicationData::nsAbLDAPProcessReplicationData() :
   nsAbLDAPListenerBase(),
   mState(kIdle),
   mProtocol(-1),
   mCount(0),
-  mDBOpen(PR_FALSE),
-  mInitialized(PR_FALSE)
+  mDBOpen(false),
+  mInitialized(false)
 {
 }
 
 nsAbLDAPProcessReplicationData::~nsAbLDAPProcessReplicationData()
 {
   /* destructor code */
   if(mDBOpen && mReplicationDB)
-      mReplicationDB->Close(PR_FALSE);
+      mReplicationDB->Close(false);
 }
 
 NS_IMETHODIMP nsAbLDAPProcessReplicationData::Init(
   nsIAbLDAPDirectory *aDirectory,
   nsILDAPConnection *aConnection,
   nsILDAPURL* aURL,
   nsIAbLDAPReplicationQuery *aQuery,
   nsIWebProgressListener *aProgressListener)
@@ -102,17 +102,17 @@ NS_IMETHODIMP nsAbLDAPProcessReplication
   }
   
   rv = mDirectory->GetSaslMechanism(mSaslMechanism);
   if (NS_FAILED(rv)) {
     mQuery = nsnull;
     return rv;
   }
 
-  mInitialized = PR_TRUE;
+  mInitialized = true;
 
   return rv;
 }
 
 NS_IMETHODIMP nsAbLDAPProcessReplicationData::GetReplicationState(PRInt32 *aReplicationState) 
 {
     NS_ENSURE_ARG_POINTER(aReplicationState);
     *aReplicationState = mState; 
@@ -131,17 +131,17 @@ NS_IMETHODIMP nsAbLDAPProcessReplication
   NS_ENSURE_ARG_POINTER(aMessage);
 
   if (!mInitialized)
     return NS_ERROR_NOT_INITIALIZED;
 
   PRInt32 messageType;
   nsresult rv = aMessage->GetType(&messageType);
   if (NS_FAILED(rv)) {
-    Done(PR_FALSE);
+    Done(false);
     return rv;
   }
 
   switch (messageType)
   {
   case nsILDAPMessage::RES_BIND:
     rv = OnLDAPMessageBind(aMessage);
     if (NS_FAILED(rv))
@@ -173,42 +173,42 @@ NS_IMETHODIMP nsAbLDAPProcessReplication
     rv = mOperation->AbandonExt();
     if (NS_SUCCEEDED(rv))
       mState = kIdle;
   }
 
   if (mReplicationDB && mDBOpen) {
     // force close since we need to delete the file.
     mReplicationDB->ForceClosed();
-    mDBOpen = PR_FALSE;
+    mDBOpen = false;
 
     // delete the unsaved replication file
     if (mReplicationFile) {
-      rv = mReplicationFile->Remove(PR_FALSE);
+      rv = mReplicationFile->Remove(false);
       if (NS_SUCCEEDED(rv) && mDirectory) {
         nsCAutoString fileName;
         rv = mDirectory->GetReplicationFileName(fileName);
         // now put back the backed up replicated file if aborted
         if (NS_SUCCEEDED(rv) && mBackupReplicationFile)
           rv = mBackupReplicationFile->MoveToNative(nsnull, fileName);
       }
     }
   }
 
-  Done(PR_FALSE);
+  Done(false);
 
   return rv;
 }
 
 nsresult nsAbLDAPProcessReplicationData::DoTask()
 {
   if (!mInitialized)
     return NS_ERROR_NOT_INITIALIZED;
 
-  nsresult rv = OpenABForReplicatedDir(PR_TRUE);
+  nsresult rv = OpenABForReplicatedDir(true);
   if (NS_FAILED(rv))
     // do not call done here since it is called by OpenABForReplicationDir
     return rv;
 
   mOperation = do_CreateInstance(NS_LDAPOPERATION_CONTRACTID, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = mOperation->Init(mConnection, this, nsnull);
@@ -237,25 +237,25 @@ nsresult nsAbLDAPProcessReplicationData:
   rv = mDirectoryUrl->GetAttributes(attributes);
   if (NS_FAILED(rv))
     return rv;
 
   mState = kReplicatingAll;
 
   if (mListener && NS_SUCCEEDED(rv))
     mListener->OnStateChange(nsnull, nsnull,
-                             nsIWebProgressListener::STATE_START, PR_TRUE);
+                             nsIWebProgressListener::STATE_START, true);
 
   return mOperation->SearchExt(dn, scope, urlFilter, attributes, 0, 0);
 }
 
 void nsAbLDAPProcessReplicationData::InitFailed(bool aCancelled)
 {
   // Just call Done() which will ensure everything is tidied up nicely.
-  Done(PR_FALSE);
+  Done(false);
 }
 
 nsresult nsAbLDAPProcessReplicationData::OnLDAPSearchEntry(nsILDAPMessage *aMessage)
 {
     NS_ENSURE_ARG_POINTER(aMessage);
     if (!mInitialized)
         return NS_ERROR_NOT_INITIALIZED;
     // since this runs on the main thread and is single threaded, this will 
@@ -279,31 +279,31 @@ nsresult nsAbLDAPProcessReplicationData:
     if (NS_FAILED(rv))
     {
         NS_WARNING("nsAbLDAPProcessReplicationData::OnLDAPSearchEntry"
            "No card properties could be set");
         // if some entries are bogus for us, continue with next one
         return NS_OK;
     }
 
-    rv = mReplicationDB->CreateNewCardAndAddToDB(newCard, PR_FALSE, nsnull);
+    rv = mReplicationDB->CreateNewCardAndAddToDB(newCard, false, nsnull);
     if(NS_FAILED(rv)) {
         Abort();
         return rv;
     }
 
     // now set the attribute for the DN of the entry in the card in the DB
     nsCAutoString authDN;
     rv = aMessage->GetDn(authDN);
     if(NS_SUCCEEDED(rv) && !authDN.IsEmpty())
     {
         newCard->SetPropertyAsAUTF8String("_DN", authDN);
     }
 
-    rv = mReplicationDB->EditCard(newCard, PR_FALSE, nsnull);
+    rv = mReplicationDB->EditCard(newCard, false, nsnull);
     if(NS_FAILED(rv)) {
         Abort();
         return rv;
     }
     
 
     mCount ++;
 
@@ -330,79 +330,79 @@ nsresult nsAbLDAPProcessReplicationData:
         return NS_ERROR_NOT_INITIALIZED;
 
     PRInt32 errorCode;
     nsresult rv = aMessage->GetErrorCode(&errorCode);
 
     if(NS_SUCCEEDED(rv)) {
         // We are done with the LDAP search for all entries.
         if(errorCode == nsILDAPErrors::SUCCESS || errorCode == nsILDAPErrors::SIZELIMIT_EXCEEDED) {
-            Done(PR_TRUE);
+            Done(true);
             if(mReplicationDB && mDBOpen) {
-                rv = mReplicationDB->Close(PR_TRUE);
+                rv = mReplicationDB->Close(true);
                 NS_ASSERTION(NS_SUCCEEDED(rv), "Replication DB Close on Success failed");
-                mDBOpen = PR_FALSE;
+                mDBOpen = false;
                 // once we have saved the new replication file, delete the backup file
                 if(mBackupReplicationFile)
                 {
-                    rv = mBackupReplicationFile->Remove(PR_FALSE);
+                    rv = mBackupReplicationFile->Remove(false);
                     NS_ASSERTION(NS_SUCCEEDED(rv), "Replication BackupFile Remove on Success failed");
                 }
             }
             return NS_OK;
         }
     }
 
     // in case if GetErrorCode returned error or errorCode is not SUCCESS / SIZELIMIT_EXCEEDED
     if(mReplicationDB && mDBOpen) {
         // if error result is returned close the DB without saving ???
         // should we commit anyway ??? whatever is returned is not lost then !!
         rv = mReplicationDB->ForceClosed(); // force close since we need to delete the file.
         NS_ASSERTION(NS_SUCCEEDED(rv), "Replication DB ForceClosed on Failure failed");
-        mDBOpen = PR_FALSE;
+        mDBOpen = false;
         // if error result is returned remove the replicated file
         if(mReplicationFile) {
-            rv = mReplicationFile->Remove(PR_FALSE);
+            rv = mReplicationFile->Remove(false);
             NS_ASSERTION(NS_SUCCEEDED(rv), "Replication File Remove on Failure failed");
             if(NS_SUCCEEDED(rv)) {
                 // now put back the backed up replicated file
                 if(mBackupReplicationFile && mDirectory) 
                 {
                   nsCAutoString fileName;
                   rv = mDirectory->GetReplicationFileName(fileName);
                   if (NS_SUCCEEDED(rv) && !fileName.IsEmpty())
                   {
                     rv = mBackupReplicationFile->MoveToNative(nsnull, fileName);
                     NS_ASSERTION(NS_SUCCEEDED(rv), "Replication Backup File Move back on Failure failed");
                   }
                 }
             }
         }
-        Done(PR_FALSE);
+        Done(false);
     }
 
     return NS_OK;
 }
 
 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);
+     Done(false);
      return NS_ERROR_FAILURE;
   }
 
   nsCString fileName;
   rv = mReplicationFile->GetNativeLeafName(fileName);
   if (NS_FAILED(rv)) {
-    Done(PR_FALSE);
+    Done(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
     bool fileExists;
     rv = mReplicationFile->Exists(&fileExists);
     if(NS_SUCCEEDED(rv) && fileExists) {
@@ -410,39 +410,39 @@ nsresult nsAbLDAPProcessReplicationData:
         // 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.
         nsCOMPtr<nsIFile> clone;
         rv = mReplicationFile->Clone(getter_AddRefs(clone));
         if(NS_FAILED(rv))  {
-            Done(PR_FALSE);
+            Done(false);
             return rv;
         }
         mBackupReplicationFile = do_QueryInterface(clone, &rv);
         if(NS_FAILED(rv))  {
-            Done(PR_FALSE);
+            Done(false);
             return rv;
         }
         rv = mBackupReplicationFile->CreateUnique(nsIFile::NORMAL_FILE_TYPE, 0777);
         if(NS_FAILED(rv))  {
-            Done(PR_FALSE);
+            Done(false);
             return rv;
         }
         nsAutoString backupFileLeafName;
         rv = mBackupReplicationFile->GetLeafName(backupFileLeafName);
         if(NS_FAILED(rv))  {
-            Done(PR_FALSE);
+            Done(false);
             return rv;
         }
         // remove the newly created unique backup file so that move and copy succeeds.
-        rv = mBackupReplicationFile->Remove(PR_FALSE);
+        rv = mBackupReplicationFile->Remove(false);
         if(NS_FAILED(rv))  {
-            Done(PR_FALSE);
+            Done(false);
             return rv;
         }
 
         if(aCreate) {
             // set backup file to existing replication file for move
             mBackupReplicationFile->SetNativeLeafName(fileName);
 
             rv = mBackupReplicationFile->MoveTo(nsnull, backupFileLeafName);
@@ -461,39 +461,39 @@ nsresult nsAbLDAPProcessReplicationData:
             rv = mBackupReplicationFile->GetParent(getter_AddRefs(parent));
             if (NS_SUCCEEDED(rv))
                 rv = mBackupReplicationFile->CopyTo(parent, backupFileLeafName);
             // set the backup file leaf name now
             if (NS_SUCCEEDED(rv))
                 mBackupReplicationFile->SetLeafName(backupFileLeafName);
         }
         if(NS_FAILED(rv))  {
-            Done(PR_FALSE);
+            Done(false);
             return rv;
         }
     }
 
     nsCOMPtr<nsIAddrDatabase> addrDBFactory = 
              do_GetService(NS_ADDRDATABASE_CONTRACTID, &rv);
     if(NS_FAILED(rv)) {
         if (mBackupReplicationFile)
-            mBackupReplicationFile->Remove(PR_FALSE);
-        Done(PR_FALSE);
+            mBackupReplicationFile->Remove(false);
+        Done(false);
         return rv;
     }
     
-    rv = addrDBFactory->Open(mReplicationFile, aCreate, PR_TRUE, getter_AddRefs(mReplicationDB));
+    rv = addrDBFactory->Open(mReplicationFile, aCreate, true, getter_AddRefs(mReplicationDB));
     if(NS_FAILED(rv)) {
-        Done(PR_FALSE);
+        Done(false);
         if (mBackupReplicationFile)
-            mBackupReplicationFile->Remove(PR_FALSE);
+            mBackupReplicationFile->Remove(false);
         return rv;
     }
 
-    mDBOpen = PR_TRUE;  // replication DB is now Open
+    mDBOpen = true;  // replication DB is now Open
     return rv;
 }
 
 void nsAbLDAPProcessReplicationData::Done(bool aSuccess)
 {
    if (!mInitialized) 
        return;
 
@@ -509,11 +509,11 @@ void nsAbLDAPProcessReplicationData::Don
    // failure or abort release the query now.
    mQuery = nsnull;
 }
 
 nsresult nsAbLDAPProcessReplicationData::DeleteCard(nsString & aDn)
 {
     nsCOMPtr<nsIAbCard> cardToDelete;
     mReplicationDB->GetCardFromAttribute(nsnull, "_DN", NS_ConvertUTF16toUTF8(aDn),
-                                         PR_FALSE, getter_AddRefs(cardToDelete));
-    return mReplicationDB->DeleteCard(cardToDelete, PR_FALSE, nsnull);
+                                         false, getter_AddRefs(cardToDelete));
+    return mReplicationDB->DeleteCard(cardToDelete, false, nsnull);
 }
--- a/mailnews/addrbook/src/nsAbLDAPReplicationQuery.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPReplicationQuery.cpp
@@ -49,17 +49,17 @@
 #include "prmem.h"
 #include "nsComponentManagerUtils.h"
 #include "nsMsgUtils.h"
 
 NS_IMPL_THREADSAFE_ISUPPORTS1(nsAbLDAPReplicationQuery,
                               nsIAbLDAPReplicationQuery)
 
 nsAbLDAPReplicationQuery::nsAbLDAPReplicationQuery()
-    :  mInitialized(PR_FALSE)
+    :  mInitialized(false)
 {
 }
 
 nsresult nsAbLDAPReplicationQuery::InitLDAPData()
 {
   nsCAutoString fileName;
   nsresult rv = mDirectory->GetReplicationFileName(fileName);
   NS_ENSURE_SUCCESS(rv, rv);
@@ -148,17 +148,17 @@ NS_IMETHODIMP nsAbLDAPReplicationQuery::
     return rv;
 
   mDataProcessor =
     do_CreateInstance(NS_ABLDAP_PROCESSREPLICATIONDATA_CONTRACTID, &rv);
   if (NS_FAILED(rv)) 
     return rv;
 
   // 'this' initialized
-  mInitialized = PR_TRUE;
+  mInitialized = true;
 
   return mDataProcessor->Init(mDirectory, mConnection, mURL, this,
                               aProgressListener);
 }
 
 NS_IMETHODIMP nsAbLDAPReplicationQuery::DoReplicationQuery()
 {
     return ConnectToLDAPServer();
--- a/mailnews/addrbook/src/nsAbLDAPReplicationService.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPReplicationService.cpp
@@ -47,17 +47,17 @@
 //#include "nsAbLDAPChangeLogQuery.h"
 #include "nsIAbLDAPReplicationData.h"
 
 /*** implementation of the service ******/
 
 NS_IMPL_ISUPPORTS1(nsAbLDAPReplicationService, nsIAbLDAPReplicationService)
 
 nsAbLDAPReplicationService::nsAbLDAPReplicationService() 
-    : mReplicating(PR_FALSE)
+    : mReplicating(false)
 {
 }
 
 nsAbLDAPReplicationService::~nsAbLDAPReplicationService()
 {
 }
 
 /* void startReplication(in string aURI, in nsIWebProgressListener progressListener); */
@@ -94,26 +94,26 @@ NS_IMETHODIMP nsAbLDAPReplicationService
   if (NS_SUCCEEDED(rv) && mQuery)
   {
     rv = mQuery->Init(mDirectory, progressListener);
     if (NS_SUCCEEDED(rv))
     {
       rv = mQuery->DoReplicationQuery();
       if (NS_SUCCEEDED(rv))
 	{
-	  mReplicating = PR_TRUE;
+	  mReplicating = true;
 	  return rv;
 	}
     }
   }
 
   if (progressListener && NS_FAILED(rv))
     progressListener->OnStateChange(nsnull, nsnull,
 				    nsIWebProgressListener::STATE_STOP,
-				    PR_FALSE);
+				    false);
 
   if (NS_FAILED(rv))
   {
     mDirectory = nsnull;
     mQuery = nsnull;
   }
 
   return rv;
@@ -129,24 +129,24 @@ NS_IMETHODIMP nsAbLDAPReplicationService
   if (aDirectory == mDirectory)
   {
     if (mQuery && mReplicating)
       rv = mQuery->CancelQuery();  
   }
 
   // If query has been cancelled successfully
   if (NS_SUCCEEDED(rv))
-    Done(PR_FALSE);
+    Done(false);
 
   return rv;
 }
 
 NS_IMETHODIMP nsAbLDAPReplicationService::Done(bool aSuccess)
 {
-  mReplicating = PR_FALSE;
+  mReplicating = false;
   if (mQuery)
   {
     mQuery = nsnull;  // Release query obj
     mDirectory = nsnull; // Release directory
   }
 
   return NS_OK;
 }
--- a/mailnews/addrbook/src/nsAbLDIFService.cpp
+++ b/mailnews/addrbook/src/nsAbLDIFService.cpp
@@ -53,17 +53,17 @@
 
 NS_IMPL_ISUPPORTS1(nsAbLDIFService, nsIAbLDIFService)
 
 // If we get a line longer than 32K it's just toooooo bad!
 #define kTextAddressBufferSz    (64 * 1024)
 
 nsAbLDIFService::nsAbLDIFService()
 {
-  mStoreLocAsHome = PR_FALSE;
+  mStoreLocAsHome = false;
   mLFCount = 0;
   mCRCount = 0;
 }
 
 nsAbLDIFService::~nsAbLDIFService()
 {
 }
 
@@ -121,34 +121,34 @@ NS_IMETHODIMP nsAbLDIFService::ImportLDI
   {
     if (NS_SUCCEEDED(inputStream->Read(pBuf, sizeof(buf), &len)) && len > 0)
     {
       startPos = 0;
 
       while (NS_SUCCEEDED(GetLdifStringRecord(buf, len, startPos)))
       {
         if (mLdifLine.Find("groupOfNames") == -1)
-          AddLdifRowToDatabase(aDb, PR_FALSE);
+          AddLdifRowToDatabase(aDb, false);
         else
         {
           //keep file position for mailing list
           listPosArray.AppendElement((void*)savedStartPos);
           listSizeArray.AppendElement((void*)(filePos + startPos-savedStartPos));
           ClearLdifRecordBuffer();
         }
         savedStartPos = filePos + startPos;
       }
       filePos += len;
       if (aProgress)
         *aProgress = (PRUint32)filePos;
     }
   }
   //last row
   if (!mLdifLine.IsEmpty() && mLdifLine.Find("groupOfNames") == -1)
-    AddLdifRowToDatabase(aDb, PR_FALSE); 
+    AddLdifRowToDatabase(aDb, false); 
 
   // mail Lists
   PRInt32 i, pos;
   PRUint32 size;
   PRInt32 listTotal = listPosArray.Count();
   char *listBuf;
   ClearLdifRecordBuffer();  // make sure the buffer is clean
 
@@ -168,17 +168,17 @@ NS_IMETHODIMP nsAbLDIFService::ImportLDI
       if (NS_SUCCEEDED(inputStream->Read(listBuf, size, &len)) && len > 0)
       {
         startPos = 0;
 
         while (NS_SUCCEEDED(GetLdifStringRecord(listBuf, len, startPos)))
         {
           if (mLdifLine.Find("groupOfNames") != -1)
           {
-            AddLdifRowToDatabase(aDb, PR_TRUE);
+            AddLdifRowToDatabase(aDb, true);
             if (NS_SUCCEEDED(seekableStream->Seek(nsISeekableStream::NS_SEEK_SET, 0)))
               break;
           }
         }
       }
     PR_FREEIF(listBuf);
     }
   }
@@ -795,17 +795,17 @@ static const char *const sLDIFFields[] =
 
 // 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, bool *_retval)
 {
   NS_ENSURE_ARG_POINTER(pSrc);
   NS_ENSURE_ARG_POINTER(_retval);
 
-  *_retval = PR_FALSE;
+  *_retval = false;
 
   nsresult rv = NS_OK;
 
   nsCOMPtr<nsIInputStream> fileStream;
   rv = NS_NewLocalFileInputStream(getter_AddRefs(fileStream), pSrc);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsILineInputStream> lineInputStream(do_QueryInterface(fileStream, &rv));
@@ -829,17 +829,17 @@ NS_IMETHODIMP nsAbLDIFService::IsLDIFFil
 
     if (NS_SUCCEEDED(rv) && more)
     {
       pChar = line.get();
       lineLen = line.Length();
       if (!lineLen && gotLDIF)
       {
         recCount++;
-        gotLDIF = PR_FALSE;
+        gotLDIF = false;
       }
                    
       if (lineLen && (*pChar != ' ') && (*pChar != 9))
       {
         fLen = 0;
 
         while (lineLen && (fLen < (kMaxLDIFLen - 1)) && (*pChar != ':'))
         {
@@ -855,17 +855,17 @@ NS_IMETHODIMP nsAbLDIFService::IsLDIFFil
         {
           // see if this is an ldif field (case insensitive)?
           i = 0;
           while (sLDIFFields[i])
           {
             if (!PL_strcasecmp( sLDIFFields[i], field))
             {
               ldifFields++;
-              gotLDIF = PR_TRUE;
+              gotLDIF = true;
               break;
             }
             i++;
           }
         }
       }
     }
     lineCount++;
@@ -878,17 +878,17 @@ NS_IMETHODIMP nsAbLDIFService::IsLDIFFil
   rv = fileStream->Close();
 
   if (recCount > 1)
     ldifFields /= recCount;
 
   // If the average field number >= 3 then it's a good ldif file.
   if (ldifFields >= 3)
   {
-    *_retval = PR_TRUE;
+    *_retval = true;
   }
 
   return rv;
 }
 
 void nsAbLDIFService::SplitCRLFAddressField(nsCString &inputAddress, nsCString &outputLine1, nsCString &outputLine2) const
 {
   PRInt32 crlfPos = inputAddress.Find("\r\n");
--- a/mailnews/addrbook/src/nsAbMDBCard.cpp
+++ b/mailnews/addrbook/src/nsAbMDBCard.cpp
@@ -46,17 +46,17 @@ nsAbMDBCard::~nsAbMDBCard(void)
 {
 }
 
 NS_IMPL_ISUPPORTS_INHERITED0(nsAbMDBCard, nsAbCardProperty)
 
 NS_IMETHODIMP nsAbMDBCard::Equals(nsIAbCard *card, bool *result)
 {
   if (this == card) {
-    *result = PR_TRUE;
+    *result = 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
   // know who our directory is, which may change in the future. For now,
   // however, the only known users of this method are for locating us in a list
   // of cards, most commonly mailing lists; a warning on the IDL has also
@@ -67,17 +67,17 @@ NS_IMETHODIMP nsAbMDBCard::Equals(nsIAbC
   // If the other directory is a local address book, we could return a spurious
   // true result. If not, then DbRowID should be unset and we can definitively
   // return false.
 
   PRUint32 row;
   nsresult rv = card->GetPropertyAsUint32("DbRowID", &row);
   if (NS_FAILED(rv))
   {
-    *result = PR_FALSE;
+    *result = false;
     return NS_OK;
   }
 
   PRUint32 ourRow;
   rv = GetPropertyAsUint32("DbRowID", &ourRow);
   NS_ENSURE_SUCCESS(rv, rv);
 
   *result = (row == ourRow);
--- a/mailnews/addrbook/src/nsAbMDBDirFactory.cpp
+++ b/mailnews/addrbook/src/nsAbMDBDirFactory.cpp
@@ -95,17 +95,17 @@ NS_IMETHODIMP nsAbMDBDirFactory::GetDire
       fileName = Substring(aURI, kMDBDirectoryRootLen, aURI.Length() - kMDBDirectoryRootLen);
 
     rv = dbPath->AppendNative(fileName);
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsCOMPtr<nsIAddrDatabase> addrDBFactory = do_GetService(NS_ADDRDATABASE_CONTRACTID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    rv = addrDBFactory->Open(dbPath, PR_TRUE, PR_TRUE, getter_AddRefs(listDatabase));
+    rv = addrDBFactory->Open(dbPath, true, true, getter_AddRefs(listDatabase));
   }
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = listDatabase->GetMailingListsFromDB(directory);
   NS_ENSURE_SUCCESS(rv, rv);
 
   return NS_NewSingletonEnumerator(_retval, directory);
 }
--- a/mailnews/addrbook/src/nsAbMDBDirProperty.cpp
+++ b/mailnews/addrbook/src/nsAbMDBDirProperty.cpp
@@ -92,34 +92,34 @@ NS_IMETHODIMP nsAbMDBDirProperty::AddMai
   {
     nsresult rv;
     m_AddressList = do_CreateInstance(NS_ARRAY_CONTRACTID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
   PRUint32 position;
   if (NS_FAILED(m_AddressList->IndexOf(0, mailList, &position)))
-    m_AddressList->AppendElement(mailList, PR_FALSE);
+    m_AddressList->AppendElement(mailList, false);
 
   return NS_OK;
 }
 
 /* add addresses to the mailing list */
 NS_IMETHODIMP nsAbMDBDirProperty::AddAddressToList(nsIAbCard *card)
 {
   if (!m_AddressList)
   {
     nsresult rv;
     m_AddressList = do_CreateInstance(NS_ARRAY_CONTRACTID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
   PRUint32 position;
   if (NS_FAILED(m_AddressList->IndexOf(0, card, &position)))
-    m_AddressList->AppendElement(card, PR_FALSE);
+    m_AddressList->AppendElement(card, false);
 
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbMDBDirProperty::CopyDBMailList(nsIAbMDBDirectory* srcListDB)
 {
 	nsresult err = NS_OK;
 	nsCOMPtr<nsIAbDirectory> srcList(do_QueryInterface(srcListDB));
--- a/mailnews/addrbook/src/nsAbMDBDirectory.cpp
+++ b/mailnews/addrbook/src/nsAbMDBDirectory.cpp
@@ -60,17 +60,17 @@
 #include "nsILocalFile.h"
 #include "nsComponentManagerUtils.h"
 #include "nsMemory.h"
 #include "nsArrayUtils.h"
 #include "nsUnicharUtils.h"
 
 nsAbMDBDirectory::nsAbMDBDirectory(void):
      nsAbMDBDirProperty(),
-     mPerformingQuery(PR_FALSE)
+     mPerformingQuery(false)
 {
   mSearchCache.Init();
 }
 
 nsAbMDBDirectory::~nsAbMDBDirectory(void)
 {
   if (mDatabase) {
     mDatabase->RemoveListener(this);
@@ -83,17 +83,17 @@ NS_IMPL_ISUPPORTS_INHERITED3(nsAbMDBDire
                              nsIAddrDBListener)
 
 NS_IMETHODIMP nsAbMDBDirectory::Init(const char *aUri)
 {
   // We need to ensure  that the m_DirPrefId is initialized properly
   nsDependentCString uri(aUri);
 
   if (uri.Find("MailList") != -1)
-    m_IsMailList = PR_TRUE;
+    m_IsMailList = true;
 
   // Mailing lists don't have their own prefs.
   if (m_DirPrefId.IsEmpty() && !m_IsMailList)
   {
     // Find the first ? (of the search params) if there is one.
     // We know we can start at the end of the moz-abmdbdirectory:// because
     // that's the URI we should have been passed.
     PRInt32 searchCharLocation = uri.FindChar('?', kMDBDirectoryRootLen);
@@ -188,17 +188,17 @@ nsresult nsAbMDBDirectory::RemoveCardFro
   NS_ENSURE_SUCCESS(rv,rv);
 
   for (i = listTotal - 1; i >= 0; i--)
   {
     nsCOMPtr<nsIAbDirectory> listDir(do_QueryElementAt(m_AddressList, i, &rv));
     if (listDir)
     {
       // First remove the instance in the database
-      mDatabase->DeleteCardFromMailList(listDir, card, PR_FALSE);
+      mDatabase->DeleteCardFromMailList(listDir, card, false);
 
       // Now remove the instance in any lists we hold.
       nsCOMPtr<nsIMutableArray> pAddressLists;
       listDir->GetAddressLists(getter_AddRefs(pAddressLists));
       if (pAddressLists)
       {  
         PRUint32 total;
         rv = pAddressLists->GetLength(&total);
@@ -389,17 +389,17 @@ NS_IMETHODIMP nsAbMDBDirectory::GetDatab
   nsCOMPtr<nsILocalFile> databaseFile;
   rv = GetDatabaseFile(getter_AddRefs(databaseFile));
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIAddrDatabase> addrDBFactory =
     do_GetService(NS_ADDRDATABASE_CONTRACTID, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  return addrDBFactory->Open(databaseFile, PR_FALSE /* no create */, PR_TRUE,
+  return addrDBFactory->Open(databaseFile, false /* no create */, true,
                            aResult);
 }
 
 // nsIAbDirectory methods
 
 NS_IMETHODIMP nsAbMDBDirectory::GetURI(nsACString &aURI)
 {
   if (mURI.IsEmpty())
@@ -417,17 +417,17 @@ NS_IMETHODIMP nsAbMDBDirectory::GetChild
   return NS_NewArrayEnumerator(aResult, mSubDirectories);
 }
 
 static PLDHashOperator 
 enumerateSearchCache(nsISupports *aKey, nsCOMPtr<nsIAbCard> &aData, void* aClosure)
 {
   nsIMutableArray* array = static_cast<nsIMutableArray*>(aClosure);
 
-  array->AppendElement(aData, PR_FALSE);
+  array->AppendElement(aData, false);
   return PL_DHASH_NEXT;
 }
 
 NS_IMETHODIMP nsAbMDBDirectory::GetChildCards(nsISimpleEnumerator* *result)
 {
   nsresult rv;
 
   if (mIsQueryURI)
@@ -509,17 +509,17 @@ NS_IMETHODIMP nsAbMDBDirectory::DeleteCa
       if (card)
       {
         PRUint32 rowID;
         rv = card->GetPropertyAsUint32("DbRowID", &rowID);
         NS_ENSURE_SUCCESS(rv, rv);
 
         if (m_IsMailList)
         {
-          mDatabase->DeleteCardFromMailList(this, card, PR_TRUE);
+          mDatabase->DeleteCardFromMailList(this, card, true);
 
           PRUint32 cardTotal = 0;
           PRInt32 i;
           if (m_AddressList)
             rv = m_AddressList->GetLength(&cardTotal);
           for (i = cardTotal - 1; i >= 0; i--)
           {            
             nsCOMPtr<nsIAbCard> arrayCard(do_QueryElementAt(m_AddressList, i, &rv));
@@ -530,17 +530,17 @@ NS_IMETHODIMP nsAbMDBDirectory::DeleteCa
               arrayCard->GetPropertyAsUint32("DbRowID", &arrayRowID);
               if (rowID == arrayRowID)
                 m_AddressList->RemoveElementAt(i);
             }
           }
         }
         else
         {
-          mDatabase->DeleteCard(card, PR_TRUE, this);
+          mDatabase->DeleteCard(card, true, this);
           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);
@@ -648,20 +648,20 @@ NS_IMETHODIMP nsAbMDBDirectory::AddMailL
       return NS_ERROR_OUT_OF_MEMORY;
 
     rv = newlist->CopyMailList(list);
     NS_ENSURE_SUCCESS(rv, rv);
 
     dblist = do_QueryInterface(newlist, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
     
-    mDatabase->CreateMailListAndAddToDB(newlist, PR_TRUE, this);
+    mDatabase->CreateMailListAndAddToDB(newlist, true, this);
   }
   else
-    mDatabase->CreateMailListAndAddToDB(list, PR_TRUE, this);
+    mDatabase->CreateMailListAndAddToDB(list, true, this);
 
   mDatabase->Commit(nsAddrDBCommitType::kLargeCommit);
 
   PRUint32 dbRowID;
   dblist->GetDbRowID(&dbRowID);
 
   nsCAutoString listUri(mURI);
   listUri.AppendLiteral("/MailList");
@@ -691,19 +691,19 @@ NS_IMETHODIMP nsAbMDBDirectory::AddCard(
   nsresult rv = NS_OK;
   if (!mDatabase)
     rv = GetAbDatabase();
 
   if (NS_FAILED(rv) || !mDatabase)
     return NS_ERROR_FAILURE;
 
   if (m_IsMailList)
-    rv = mDatabase->CreateNewListCardAndAddToDB(this, m_dbRowID, card, PR_TRUE /* notify */);
+    rv = mDatabase->CreateNewListCardAndAddToDB(this, m_dbRowID, card, true /* notify */);
   else
-    rv = mDatabase->CreateNewCardAndAddToDB(card, PR_TRUE, this);
+    rv = mDatabase->CreateNewCardAndAddToDB(card, true, this);
   NS_ENSURE_SUCCESS(rv, rv);
 
   mDatabase->Commit(nsAddrDBCommitType::kLargeCommit);
 
   NS_IF_ADDREF(*addedCard = card);
   return NS_OK;
 }
 
@@ -713,17 +713,17 @@ NS_IMETHODIMP nsAbMDBDirectory::ModifyCa
 
   nsresult rv;
   if (!mDatabase)
   {
     rv = GetAbDatabase();
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
-  rv = mDatabase->EditCard(aModifiedCard, PR_TRUE, this);
+  rv = mDatabase->EditCard(aModifiedCard, true, this);
   NS_ENSURE_SUCCESS(rv, rv);
   return mDatabase->Commit(nsAddrDBCommitType::kLargeCommit);
 }
 
 NS_IMETHODIMP nsAbMDBDirectory::DropCard(nsIAbCard* aCard, bool needToCopyCard)
 {
   NS_ENSURE_ARG_POINTER(aCard);
 
@@ -753,73 +753,73 @@ NS_IMETHODIMP nsAbMDBDirectory::DropCard
 
   if (m_IsMailList) {
     if (needToCopyCard) {
       nsCOMPtr <nsIMdbRow> cardRow;
       // if card doesn't exist in db, add the card to the directory that 
       // contains the mailing list.
       mDatabase->FindRowByCard(newCard, getter_AddRefs(cardRow));
       if (!cardRow)
-        mDatabase->CreateNewCardAndAddToDB(newCard, PR_TRUE /* notify */, this);
+        mDatabase->CreateNewCardAndAddToDB(newCard, true /* notify */, this);
       else
         mDatabase->InitCardFromRow(newCard, cardRow);
     }
     // since we didn't copy the card, we don't have to notify that it was inserted
-    mDatabase->CreateNewListCardAndAddToDB(this, m_dbRowID, newCard, PR_FALSE /* notify */);
+    mDatabase->CreateNewListCardAndAddToDB(this, m_dbRowID, newCard, false /* notify */);
   }
   else {
-    mDatabase->CreateNewCardAndAddToDB(newCard, PR_TRUE /* notify */, this);
+    mDatabase->CreateNewCardAndAddToDB(newCard, true /* notify */, this);
   }
   mDatabase->Commit(nsAddrDBCommitType::kLargeCommit);
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbMDBDirectory::EditMailListToDatabase(nsIAbCard *listCard)
 {
   if (mIsQueryURI)
     return NS_ERROR_NOT_IMPLEMENTED;
 
   if (!m_IsMailList)
     return NS_ERROR_UNEXPECTED;
 
   nsresult rv = GetAbDatabase();
   NS_ENSURE_SUCCESS(rv, rv);
 
-  mDatabase->EditMailList(this, listCard, PR_TRUE);
+  mDatabase->EditMailList(this, listCard, true);
   mDatabase->Commit(nsAddrDBCommitType::kLargeCommit);
 
   return NS_OK;
 }
 
 static bool ContainsDirectory(nsIAbDirectory *parent, nsIAbDirectory *directory)
 {
   // If parent is a maillist, 'addressLists' contains AbCards.
   bool bIsMailList = false;
   nsresult rv = parent->GetIsMailList(&bIsMailList);
-  NS_ENSURE_SUCCESS(rv, PR_FALSE);
+  NS_ENSURE_SUCCESS(rv, false);
 
   if (bIsMailList)
-    return PR_FALSE;
+    return false;
 
   nsCOMPtr<nsIMutableArray> pAddressLists;
   parent->GetAddressLists(getter_AddRefs(pAddressLists));
   if (pAddressLists)
   {
     PRUint32 total;
     rv = pAddressLists->GetLength(&total);
     for (PRUint32 i = 0; i < total; ++i)
     {
       nsCOMPtr<nsIAbDirectory> pList(do_QueryElementAt(pAddressLists, i, &rv));
 
       if (directory == pList)
-          return PR_TRUE;
+          return true;
     }
   }
 
-  return PR_FALSE;
+  return false;
 }
 
 // nsIAddrDBListener methods
 
 NS_IMETHODIMP nsAbMDBDirectory::OnCardAttribChange(PRUint32 abCode)
 {
   return NS_OK;
 }
@@ -911,17 +911,17 @@ NS_IMETHODIMP nsAbMDBDirectory::OnAnnoun
 
 NS_IMETHODIMP nsAbMDBDirectory::StartSearch()
 {
   if (!mIsQueryURI)
     return NS_ERROR_FAILURE;
 
   nsresult rv;
 
-  mPerformingQuery = PR_TRUE;
+  mPerformingQuery = true;
   mSearchCache.Clear();
 
   nsCOMPtr<nsIAbDirectoryQueryArguments> arguments = do_CreateInstance(NS_ABDIRECTORYQUERYARGUMENTS_CONTRACTID,&rv);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIAbBooleanExpression> expression;
   rv = nsAbQueryStringToExpression::Convert(mQueryString,
     getter_AddRefs(expression));
@@ -930,17 +930,17 @@ NS_IMETHODIMP nsAbMDBDirectory::StartSea
   rv = arguments->SetExpression(expression);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // don't search the subdirectories 
   // if the current directory is a mailing list, it won't have any subdirectories
   // if the current directory is a addressbook, searching both it
   // and the subdirectories (the mailing lists), will yield duplicate results
   // because every entry in a mailing list will be an entry in the parent addressbook
-  rv = arguments->SetQuerySubDirectories(PR_FALSE);
+  rv = arguments->SetQuerySubDirectories(false);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIAbManager> abManager =
       do_GetService(NS_ABMANAGER_CONTRACTID, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Get the directory without the query
   nsCOMPtr<nsIAbDirectory> directory;
@@ -982,17 +982,17 @@ NS_IMETHODIMP nsAbMDBDirectory::StopSear
 }
 
 
 // nsAbDirSearchListenerContext methods
 
 NS_IMETHODIMP nsAbMDBDirectory::OnSearchFinished(PRInt32 aResult,
                                                  const nsAString &aErrorMsg)
 {
-  mPerformingQuery = PR_FALSE;
+  mPerformingQuery = false;
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbMDBDirectory::OnSearchFoundCard(nsIAbCard* card)
 {
   mSearchCache.Put(card, card);
 
   // TODO
@@ -1072,22 +1072,22 @@ NS_IMETHODIMP nsAbMDBDirectory::CardForE
 
   // Convert Email to lower case in UTF-16 format. This correctly lower-cases
   // it and doing this change means that we can use a hash lookup in the
   // database rather than searching and comparing each line individually.
   NS_ConvertUTF8toUTF16 lowerEmail(aEmailAddress);
   ToLowerCase(lowerEmail);
 
   mDatabase->GetCardFromAttribute(this, kLowerPriEmailColumn, NS_ConvertUTF16toUTF8(lowerEmail),
-                                  PR_FALSE, aAbCard);
+                                  false, aAbCard);
   if (!*aAbCard)
     // We don't have a lower case second email column, so we have to search
     // case-sensitively here.
     mDatabase->GetCardFromAttribute(this, k2ndEmailProperty, aEmailAddress,
-                                    PR_TRUE, aAbCard);
+                                    true, aAbCard);
 
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbMDBDirectory::GetCardFromProperty(const char *aProperty,
                                                     const nsACString &aValue,
                                                     bool caseSensitive,
                                                     nsIAbCard **result)
--- a/mailnews/addrbook/src/nsAbManager.cpp
+++ b/mailnews/addrbook/src/nsAbManager.cpp
@@ -78,17 +78,17 @@ struct ExportAttributesTableStruct
   PRUint32 plainTextStringID;
 };
 
 // our schema is not fixed yet, but we still want some sort of objectclass
 // for now, use obsolete in the class name, hinting that this will change
 // see bugs bug #116692 and #118454
 #define MOZ_AB_OBJECTCLASS "mozillaAbPersonAlpha"
 
-// for now, the oder of the attributes with PR_TRUE for includeForPlainText
+// for now, the oder of the attributes with true for includeForPlainText
 // should be in the same order as they are in the import code
 // see importMsgProperties and nsImportStringBundle.
 // 
 // XXX todo, merge with what's in nsAbLDAPProperties.cpp, so we can
 // use this for LDAP and LDIF export
 //
 // here's how we're coming up with the ldapPropertyName values
 // if they are specified in RFC 2798, use them
@@ -172,21 +172,21 @@ nsresult nsAbManager::Init()
 {
   NS_ENSURE_TRUE(NS_IsMainThread(), NS_ERROR_FAILURE);
 
   nsresult rv;
   nsCOMPtr<nsIObserverService> observerService =
     do_GetService("@mozilla.org/observer-service;1", &rv);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = observerService->AddObserver(this, "profile-do-change", PR_FALSE);
+  rv = observerService->AddObserver(this, "profile-do-change", false);
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID,
-                                    PR_FALSE);
+                                    false);
   NS_ENSURE_SUCCESS(rv, rv);
 
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbManager::Observe(nsISupports *aSubject, const char *aTopic,
                                    const PRUnichar *someData)
 {
@@ -472,17 +472,17 @@ NS_IMETHODIMP nsAbManager::GetUserProfil
   return CallQueryInterface(profileDir, userDir);
 }
 
 NS_IMETHODIMP nsAbManager::MailListNameExists(const PRUnichar *name, bool *exist)
 {
   nsresult rv;
   NS_ENSURE_ARG_POINTER(exist);
 
-  *exist = PR_FALSE;
+  *exist = false;
 
   // now get the top-level book
   nsCOMPtr<nsIAbDirectory> topDirectory;
   rv = GetRootDirectory(getter_AddRefs(topDirectory));
 
   // now go through the address books
   nsCOMPtr<nsISimpleEnumerator> enumerator;
   rv = topDirectory->GetChildNodes(getter_AddRefs(enumerator));
@@ -582,17 +582,17 @@ NS_IMETHODIMP nsAbManager::ExportAddress
   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
     bool isFile;
     rv = localFile->IsFile(&isFile);
     if (NS_SUCCEEDED(rv) && isFile) {
-      rv = localFile->Remove(PR_FALSE /* recursive delete */);
+      rv = localFile->Remove(false /* recursive delete */);
       NS_ENSURE_SUCCESS(rv, rv);
     }
   }
 
   // The type of export is determined by the drop-down in
   // the file picker dialog.
   PRInt32 exportType;
   rv = filePicker->GetFilterIndex(&exportType);
@@ -602,41 +602,41 @@ NS_IMETHODIMP nsAbManager::ExportAddress
   rv = localFile->GetLeafName(fileName);
   NS_ENSURE_SUCCESS(rv, rv);
 
   switch ( exportType )
   {
     default:
     case LDIF_EXPORT_TYPE: // ldif
       // If filename does not have the correct ext, add one.
-      if ((MsgFind(fileName, LDIF_FILE_EXTENSION, PR_TRUE, fileName.Length() - strlen(LDIF_FILE_EXTENSION)) == -1) &&
-          (MsgFind(fileName, LDIF_FILE_EXTENSION2, PR_TRUE, fileName.Length() - strlen(LDIF_FILE_EXTENSION2)) == -1)) {
+      if ((MsgFind(fileName, LDIF_FILE_EXTENSION, true, fileName.Length() - strlen(LDIF_FILE_EXTENSION)) == -1) &&
+          (MsgFind(fileName, LDIF_FILE_EXTENSION2, true, fileName.Length() - strlen(LDIF_FILE_EXTENSION2)) == -1)) {
 
        // Add the extension and build a new localFile.
        fileName.AppendLiteral(LDIF_FILE_EXTENSION2);
        localFile->SetLeafName(fileName);
     }
       rv = ExportDirectoryToLDIF(aDirectory, localFile);
       break;
 
     case CSV_EXPORT_TYPE: // csv
       // If filename does not have the correct ext, add one.
-      if (MsgFind(fileName, CSV_FILE_EXTENSION, PR_TRUE, fileName.Length() - strlen(CSV_FILE_EXTENSION)) == -1) {
+      if (MsgFind(fileName, CSV_FILE_EXTENSION, true, fileName.Length() - strlen(CSV_FILE_EXTENSION)) == -1) {
 
        // Add the extension and build a new localFile.
        fileName.AppendLiteral(CSV_FILE_EXTENSION);
        localFile->SetLeafName(fileName);
     }
       rv = ExportDirectoryToDelimitedText(aDirectory, CSV_DELIM, CSV_DELIM_LEN, localFile);
       break;
 
     case TAB_EXPORT_TYPE: // tab & text
       // If filename does not have the correct ext, add one.
-      if ((MsgFind(fileName, TXT_FILE_EXTENSION, PR_TRUE, fileName.Length() - strlen(TXT_FILE_EXTENSION)) == -1) &&
-          (MsgFind(fileName, TAB_FILE_EXTENSION, PR_TRUE, fileName.Length() - strlen(TAB_FILE_EXTENSION)) == -1)) {
+      if ((MsgFind(fileName, TXT_FILE_EXTENSION, true, fileName.Length() - strlen(TXT_FILE_EXTENSION)) == -1) &&
+          (MsgFind(fileName, TAB_FILE_EXTENSION, true, fileName.Length() - strlen(TAB_FILE_EXTENSION)) == -1)) {
 
        // Add the extension and build a new localFile.
        fileName.AppendLiteral(TXT_FILE_EXTENSION);
        localFile->SetLeafName(fileName);
   }
       rv = ExportDirectoryToDelimitedText(aDirectory, TAB_DELIM, TAB_DELIM_LEN, localFile);
       break;
   };
@@ -741,38 +741,38 @@ nsAbManager::ExportDirectoryToDelimitedT
 
               // 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);
               bool needsQuotes = false;
               if(newValue.FindChar('"') != -1)
               {
-                needsQuotes = PR_TRUE;
+                needsQuotes = true;
                 
                 PRInt32 match = 0;
                 PRUint32 offset = 0;
                 nsString oldSubstr = NS_LITERAL_STRING("\"");
                 nsString newSubstr = NS_LITERAL_STRING("\"\""); 
                 while (offset < newValue.Length()) {
                     match = newValue.Find(oldSubstr, offset);
                     if (match == -1)
                         break;
 
                     newValue.Replace(offset + match, oldSubstr.Length(), newSubstr);
                     offset += (match + newSubstr.Length());
                 }
               }
               if (!needsQuotes && (newValue.FindChar(',') != -1 || newValue.FindChar('\x09') != -1))
-                needsQuotes = PR_TRUE;
+                needsQuotes = true;
 
               // Make sure we quote if containing CR/LF.
               if (newValue.FindChar('\r') != -1 ||
                   newValue.FindChar('\n') != -1)
-                  needsQuotes = PR_TRUE;
+                  needsQuotes = true;
 
               if (needsQuotes)
               {
                 newValue.Insert(NS_LITERAL_STRING("\""), 0);
                 newValue.AppendLiteral("\"");
               }
 
               rv = nsMsgI18NConvertFromUnicode(nsMsgI18NFileSystemCharset(),
@@ -1096,29 +1096,29 @@ nsresult nsAbManager::AppendBasicLDIFFor
 }
 
 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;
+    return false;
 
   PRUint32 i;
   PRUint32 len = NS_strlen(aStr);
   for (i=0; i<len; i++) {
     // If string contains CR or LF, it is not safe for LDIF
     // and MUST be base64 encoded
     if ((aStr[i] == PRUnichar('\n')) ||
         (aStr[i] == PRUnichar('\r')) ||
         (!NS_IsAscii(aStr[i])))
-      return PR_FALSE;
+      return false;
   }
-  return PR_TRUE;
+  return true;
 }
 
 nsresult nsAbManager::AppendProperty(const char *aProperty, const PRUnichar *aValue, nsACString &aResult)
 {
   NS_ENSURE_ARG_POINTER(aValue);
 
   aResult += aProperty;
 
@@ -1263,29 +1263,29 @@ NS_IMETHODIMP nsAbManager::EscapedVCardT
 }
 
 NS_IMETHODIMP
 nsAbManager::Handle(nsICommandLine* aCmdLine)
 {
   nsresult rv;
   bool found;
 
-  rv = aCmdLine->HandleFlag(NS_LITERAL_STRING("addressbook"), PR_FALSE, &found);
+  rv = aCmdLine->HandleFlag(NS_LITERAL_STRING("addressbook"), false, &found);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (!found)
     return NS_OK;
 
   nsCOMPtr<nsIWindowWatcher> wwatch (do_GetService(NS_WINDOWWATCHER_CONTRACTID));
   NS_ENSURE_TRUE(wwatch, NS_ERROR_FAILURE);
 
   nsCOMPtr<nsIDOMWindow> opened;
   wwatch->OpenWindow(nsnull, "chrome://messenger/content/addressbook/addressbook.xul",
                      "_blank", "chrome,extrachrome,menubar,resizable,scrollbars,status,toolbar", nsnull, getter_AddRefs(opened));
-  aCmdLine->SetPreventDefault(PR_TRUE);
+  aCmdLine->SetPreventDefault(true);
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsAbManager::GetHelpInfo(nsACString& aResult)
 {
   aResult.Assign(NS_LITERAL_CSTRING("  -addressbook       Open the address book at startup.\n"));
   return NS_OK;
--- a/mailnews/addrbook/src/nsAbOSXCard.mm
+++ b/mailnews/addrbook/src/nsAbOSXCard.mm
@@ -161,39 +161,39 @@ MapMultiValue(nsAbOSXCard *aCard, ABReco
       if ([[value labelAtIndex:j] isEqualToString:aMap.mOSXLabel]) {
         NSString *stringValue = (aMap.mOSXKey)
           ? [[value valueAtIndex:j] objectForKey:aMap.mOSXKey]
           : [value valueAtIndex:j];
         
         SetStringProperty(aCard, stringValue, aMap.mPropertyName, aNotify,
                           aAbManager);
         
-        return PR_TRUE;
+        return true;
       }
     }
   }
   // String wasn't found, set value of card to empty if it was set previously
   SetStringProperty(aCard, EmptyString(), aMap.mPropertyName, aNotify,
                     aAbManager);
   
-  return PR_FALSE;
+  return false;
 }
 
 nsresult
 nsAbOSXCard::Init(const char *aUri)
 {
   if (strncmp(aUri, NS_ABOSXCARD_URI_PREFIX,
               sizeof(NS_ABOSXCARD_URI_PREFIX) - 1) != 0)
     return NS_ERROR_FAILURE;
 
   mURI = aUri;
 
   SetLocalId(nsDependentCString(aUri));
 
-  return Update(PR_FALSE);
+  return Update(false);
 }
 
 nsresult
 nsAbOSXCard::GetURI(nsACString &aURI)
 {
   if (mURI.IsEmpty())
     return NS_ERROR_NOT_INITIALIZED;
 
@@ -213,17 +213,17 @@ nsAbOSXCard::Update(bool aNotify)
   nsCOMPtr<nsIAbManager> abManager;
   nsresult rv;
   if (aNotify) {
     abManager = do_GetService(NS_ABMANAGER_CONTRACTID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
   if ([card isKindOfClass:[ABGroup class]]) {
-    m_IsMailList = PR_TRUE;
+    m_IsMailList = true;
     m_MailListURI.AssignLiteral(NS_ABOSXDIRECTORY_URI_PREFIX);
     m_MailListURI.Append(uid);
     MapStringProperty(this, card, kABGroupNameProperty, "DisplayName", aNotify,
                       abManager);
     MapStringProperty(this, card, kABGroupNameProperty, "LastName", aNotify,
                       abManager);
 
     return NS_OK;
@@ -236,19 +236,19 @@ nsAbOSXCard::Update(bool aNotify)
     const nsAbOSXPropertyMap &propertyMap = nsAbOSXUtils::kPropertyMap[i];
     if (!propertyMap.mOSXProperty)
       continue;
     
     if (propertyMap.mOSXLabel) {
       if (MapMultiValue(this, card, propertyMap, aNotify,
                         abManager) && propertyMap.mOSXProperty == kABAddressProperty) {
         if (propertyMap.mOSXLabel == kABAddressHomeLabel) 
-          foundHome = PR_TRUE;
+          foundHome = true;
         else
-          foundWork = PR_TRUE;
+          foundWork = true;
       }
     }
     else {
       MapStringProperty(this, card, propertyMap.mOSXProperty,
                         propertyMap.mPropertyName, aNotify, abManager);
     }
   }
   
--- a/mailnews/addrbook/src/nsAbOSXDirectory.mm
+++ b/mailnews/addrbook/src/nsAbOSXDirectory.mm
@@ -165,17 +165,17 @@ Sync(NSString *aUid)
     nsCOMPtr<nsIAbOSXDirectory> osxDirectory =
       do_QueryInterface(directory, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
 
     rv = GetCard(card, getter_AddRefs(abCard), osxDirectory);
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsCOMPtr<nsIAbOSXCard> osxCard = do_QueryInterface(abCard);
-    osxCard->Update(PR_TRUE);
+    osxCard->Update(true);
   }
   return NS_OK;
 }
 
 @interface ABChangedMonitor : NSObject
 -(void)ABChanged:(NSNotification *)aNotification;
 @end
 
@@ -267,75 +267,75 @@ Sync(NSString *aUid)
   }
 }
 @end
 
 static nsresult
 MapConditionString(nsIAbBooleanConditionString *aCondition, bool aNegate,
                    bool &aCanHandle, ABSearchElement **aResult)
 {
-  aCanHandle = PR_FALSE;
+  aCanHandle = false;
   
   nsAbBooleanConditionType conditionType = 0;
   nsresult rv = aCondition->GetCondition(&conditionType);
   NS_ENSURE_SUCCESS(rv, rv);
   
   ABSearchComparison comparison;
   switch (conditionType) {
     case nsIAbBooleanConditionTypes::Contains:
     {
       if (!aNegate) {
         comparison = kABContainsSubString;
-        aCanHandle = PR_TRUE;
+        aCanHandle = true;
       }
       break;
     }
     case nsIAbBooleanConditionTypes::DoesNotContain:
     {
       if (aNegate) {
         comparison = kABContainsSubString;
-        aCanHandle = PR_TRUE;
+        aCanHandle = true;
       }
       break;
     }
     case nsIAbBooleanConditionTypes::Is:
     {
       comparison = aNegate ? kABNotEqual : kABEqual;
-      aCanHandle = PR_TRUE;
+      aCanHandle = true;
       break;
     }
     case nsIAbBooleanConditionTypes::IsNot:
     {
       comparison = aNegate ? kABEqual : kABNotEqual;
-      aCanHandle = PR_TRUE;
+      aCanHandle = true;
       break;
     }
     case nsIAbBooleanConditionTypes::BeginsWith:
     {
       if (!aNegate) {
         comparison = kABPrefixMatch;
-        aCanHandle = PR_TRUE;
+        aCanHandle = true;
       }
       break;
     }
     case nsIAbBooleanConditionTypes::EndsWith:
     {
       //comparison = kABSuffixMatch;
       break;
     }
     case nsIAbBooleanConditionTypes::LessThan:
     {
       comparison = aNegate ? kABGreaterThanOrEqual : kABLessThan;
-      aCanHandle = PR_TRUE;
+      aCanHandle = true;
       break;
     }
     case nsIAbBooleanConditionTypes::GreaterThan:
     {
       comparison = aNegate ? kABLessThanOrEqual : kABGreaterThan;
-      aCanHandle = PR_TRUE;
+      aCanHandle = true;
       break;
     }
   }
   
   if (!aCanHandle)
     return NS_OK;
   
   nsCString name;
@@ -382,27 +382,27 @@ MapConditionString(nsIAbBooleanCondition
                                   value:[NSString stringWithCharacters:value.get() length:length]
                              comparison:comparison];
     
     *aResult = [ABSearchElement searchElementForConjunction:kABSearchOr children:[NSArray arrayWithObjects:first, second, third, nil]];
     
     return NS_OK;
   }
   
-  aCanHandle = PR_FALSE;
+  aCanHandle = false;
   
   return NS_OK;
 }
 
 static nsresult
 BuildSearchElements(nsIAbBooleanExpression *aExpression,
                     bool &aCanHandle,
                     ABSearchElement **aResult)
 {
-  aCanHandle = PR_TRUE;
+  aCanHandle = true;
   
   nsCOMPtr<nsIArray> expressions;
   nsresult rv = aExpression->GetExpressions(getter_AddRefs(expressions));
   NS_ENSURE_SUCCESS(rv, rv);
   
   nsAbBooleanOperationType operation;
   rv = aExpression->GetOperation(&operation);
   NS_ENSURE_SUCCESS(rv, rv);
@@ -465,17 +465,17 @@ BuildSearchElements(nsIAbBooleanExpressi
 }
 
 static bool
 Search(nsIAbBooleanExpression *aExpression, NSArray **aResult)
 {
   bool canHandle = false;
   ABSearchElement *searchElement;
   nsresult rv = BuildSearchElements(aExpression, canHandle, &searchElement);
-  NS_ENSURE_SUCCESS(rv, PR_FALSE);
+  NS_ENSURE_SUCCESS(rv, false);
   
   if (canHandle)
     *aResult = [[ABAddressBook sharedAddressBook] recordsMatchingSearchElement:searchElement];
 
   return canHandle;
 }
 
 static PRUint32 sObserverCount = 0;
@@ -516,17 +516,17 @@ nsAbOSXDirectory::Init(const char *aUri)
   }
   ++sObserverCount;
 
   NSArray *cards;
   nsCOMPtr<nsIMutableArray> cardList;
   bool isRootOSXDirectory = false;
 
   if (!mIsQueryURI && mURINoQuery.Length() <= sizeof(NS_ABOSXDIRECTORY_URI_PREFIX))
-    isRootOSXDirectory = PR_TRUE;
+    isRootOSXDirectory = true;
 
   if (mIsQueryURI || isRootOSXDirectory)
   {
     m_DirPrefId.AssignLiteral("ldap_2.servers.osx");
 
     cards = [[addressBook people] arrayByAddingObjectsFromArray:[addressBook groups]];
     if (!mCardList)
       mCardList = do_CreateInstance(NS_ARRAY_CONTRACTID, &rv);
@@ -537,17 +537,17 @@ nsAbOSXDirectory::Init(const char *aUri)
     cardList = mCardList;
   }
   else
   {
     nsCAutoString uid(Substring(mURINoQuery, sizeof(NS_ABOSXDIRECTORY_URI_PREFIX) - 1));
     ABRecord *card = [addressBook recordForUniqueId:[NSString stringWithUTF8String:uid.get()]];
     NS_ASSERTION([card isKindOfClass:[ABGroup class]], "Huh.");
 
-    m_IsMailList = PR_TRUE;
+    m_IsMailList = true;
     AppendToString([card valueForProperty:kABGroupNameProperty], m_ListDirName);
 
     ABGroup *group = (ABGroup*)[addressBook recordForUniqueId:[NSString stringWithUTF8String:nsCAutoString(Substring(mURINoQuery, 21)).get()]];
     cards = [[group members] arrayByAddingObjectsFromArray:[group subgroups]];
 
     if (!m_AddressList)
       m_AddressList = do_CreateInstance(NS_ARRAY_CONTRACTID, &rv);
     else
@@ -610,47 +610,47 @@ nsAbOSXDirectory::GetURI(nsACString &aUR
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsAbOSXDirectory::GetReadOnly(bool *aReadOnly)
 {
   NS_ENSURE_ARG_POINTER(aReadOnly);
 
-  *aReadOnly = PR_TRUE;
+  *aReadOnly = true;
   return NS_OK;
 }
 
 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);
+  NS_ENSURE_SUCCESS(rv, false);
 
   nsCAutoString uri;
   rv = osxCard->GetURI(uri);
-  NS_ENSURE_SUCCESS(rv, PR_FALSE);
+  NS_ENSURE_SUCCESS(rv, false);
   NSString *uid = [NSString stringWithUTF8String:(uri.get() + 21)];
   
   unsigned int i, count = [aCardList count];
   for (i = 0; i < count; ++i) {
     if ([[[aCardList objectAtIndex:i] uniqueId] isEqualToString:uid]) {
       [aCardList removeObjectAtIndex:i];
       break;
     }
   }
 
   if (i == count) {
     aManager->NotifyDirectoryItemDeleted(aDirectory, aCard);
-    return PR_TRUE;
+    return true;
   }
   
-  return PR_FALSE;
+  return false;
 }
 
 nsresult
 nsAbOSXDirectory::GetRootOSXDirectory(nsIAbOSXDirectory **aResult)
 {
   if (!mCacheTopLevelOSXAb)
   {
     // Attempt to get card from the toplevel directories
@@ -853,32 +853,32 @@ nsAbOSXDirectory::AssertDirectory(nsIAbM
     return NS_OK;
 
   nsresult rv;
   if (!m_AddressList) {
     m_AddressList = do_CreateInstance(NS_ARRAY_CONTRACTID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
   }
   
-  rv = m_AddressList->AppendElement(aDirectory, PR_FALSE);
+  rv = m_AddressList->AppendElement(aDirectory, false);
   NS_ENSURE_SUCCESS(rv, rv);
 
   return aManager->NotifyDirectoryItemAdded(this, aDirectory);
 }
 
 nsresult
 nsAbOSXDirectory::AssertCard(nsIAbManager *aManager,
                              nsIAbCard *aCard)
 {
   nsCAutoString ourUuid;
   GetUuid(ourUuid);
   aCard->SetDirectoryId(ourUuid);
 
-  nsresult rv = m_IsMailList ? m_AddressList->AppendElement(aCard, PR_FALSE) :
-                               mCardList->AppendElement(aCard, PR_FALSE);
+  nsresult rv = m_IsMailList ? m_AddressList->AppendElement(aCard, false) :
+                               mCardList->AppendElement(aCard, false);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Get the card's URI and add it to our card store
   nsCOMPtr<nsIAbOSXCard> osxCard = do_QueryInterface(aCard, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCString uri;
   rv = osxCard->GetURI(uri);
@@ -976,17 +976,17 @@ nsAbOSXDirectory::GetChildCards(nsISimpl
 
       if (NS_FAILED(rv))
         rv = CreateCard([cards objectAtIndex:i],
                         getter_AddRefs(card));
 
       NS_ENSURE_SUCCESS(rv, rv);
       card->SetDirectoryId(ourUuid);
 
-      mCardList->AppendElement(card, PR_FALSE);
+      mCardList->AppendElement(card, false);
     }
 
     return NS_NewArrayEnumerator(aCards, mCardList);
   }
 
   // Not a search, so just return the appropriate list of items.
   return m_IsMailList ? NS_NewArrayEnumerator(aCards, m_AddressList) :
          NS_NewArrayEnumerator(aCards, mCardList);
@@ -1199,21 +1199,21 @@ nsAbOSXDirectory::HasCard(nsIAbCard *aCa
 
 NS_IMETHODIMP
 nsAbOSXDirectory::HasDirectory(nsIAbDirectory *aDirectory,
                                bool *aHasDirectory)
 {
   NS_ENSURE_ARG_POINTER(aDirectory);
   NS_ENSURE_ARG_POINTER(aHasDirectory);
   
-  *aHasDirectory = PR_FALSE;
+  *aHasDirectory = false;
 
   PRUint32 pos;
   if (m_AddressList && NS_SUCCEEDED(m_AddressList->IndexOf(0, aDirectory, &pos)))
-    *aHasDirectory = PR_TRUE;
+    *aHasDirectory = true;
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsAbOSXDirectory::OnSearchFinished(PRInt32 aResult, const nsAString &aErrorMsg)
 {
   return NS_OK;
@@ -1228,20 +1228,20 @@ nsAbOSXDirectory::OnSearchFoundCard(nsIA
     NS_ENSURE_SUCCESS(rv, rv);
   }
   
   if (!mCardList) {
     mCardList = do_CreateInstance(NS_ARRAY_CONTRACTID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
-  rv = m_AddressList->AppendElement(aCard, PR_FALSE);
+  rv = m_AddressList->AppendElement(aCard, false);
   NS_ENSURE_SUCCESS(rv, rv);
   
-  rv = mCardList->AppendElement(aCard, PR_FALSE);
+  rv = mCardList->AppendElement(aCard, false);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCAutoString ourUuid;
   GetUuid(ourUuid);
   aCard->SetDirectoryId(ourUuid);
   
   return NS_OK;
 }
@@ -1273,17 +1273,17 @@ nsAbOSXDirectory::FallbackSearch(nsIAbBo
   rv = arguments->SetExpression(aExpression);
   NS_ENSURE_SUCCESS(rv, rv);
   
   // Don't search the subdirectories. If the current directory is a mailing
   // list, it won't have any subdirectories. If the current directory is an
   // addressbook, searching both it and the subdirectories (the mailing
   // lists), will yield duplicate results because every entry in a mailing
   // list will be an entry in the parent addressbook.
-  rv = arguments->SetQuerySubDirectories(PR_FALSE);
+  rv = arguments->SetQuerySubDirectories(false);
   NS_ENSURE_SUCCESS(rv, rv);
   
   // Get the directory without the query
   nsCOMPtr<nsIAbManager> abManager = do_GetService(NS_ABMANAGER_CONTRACTID, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIAbDirectory> directory;
   rv = abManager->GetDirectory(mURINoQuery, getter_AddRefs(directory));
--- a/mailnews/addrbook/src/nsAbOutlookDirFactory.cpp
+++ b/mailnews/addrbook/src/nsAbOutlookDirFactory.cpp
@@ -104,17 +104,17 @@ nsAbOutlookDirFactory::GetDirectories(co
   for (ULONG i = 0; i < folders.mNbEntries; ++i) {
     folders.mEntries[i].ToString(entryId);
     buildAbWinUri(kOutlookDirectoryScheme, abType, uri);
     uri.Append(entryId);
 
 	nsCOMPtr<nsIAbDirectory> directory;
 	rv = abManager->GetDirectory(uri, getter_AddRefs(directory));
     NS_ENSURE_SUCCESS(rv, rv);
-    directories->AppendElement(directory, PR_FALSE);
+    directories->AppendElement(directory, false);
   }
   return NS_NewArrayEnumerator(aDirectories, directories);
 }
 
 // No actual deletion, since you cannot create the address books from Mozilla.
 NS_IMETHODIMP nsAbOutlookDirFactory::DeleteDirectory(nsIAbDirectory *aDirectory)
 {
   return NS_OK;
--- a/mailnews/addrbook/src/nsAbOutlookDirectory.cpp
+++ b/mailnews/addrbook/src/nsAbOutlookDirectory.cpp
@@ -122,21 +122,21 @@ NS_IMETHODIMP nsAbOutlookDirectory::Init
 
   if (mAbWinType == nsAbWinType_Outlook)
     prefix.AssignLiteral("OP ");
   else
     prefix.AssignLiteral("OE ");
   prefix.Append(unichars);
 
   if (objectType == MAPI_DISTLIST) {
-    m_IsMailList = PR_TRUE;
+    m_IsMailList = true;
     SetDirName(unichars);
   }
   else {
-    m_IsMailList = PR_FALSE;
+    m_IsMailList = false;
     SetDirName(prefix);
   }
 
   return UpdateAddressList();
 }
 
 // nsIAbDirectory methods
 
@@ -231,22 +231,22 @@ NS_IMETHODIMP nsAbOutlookDirectory::GetC
         // we must add the directory to m_AddressList
         nsCString mailListUri;
         rv = card->GetMailListURI(getter_Copies(mailListUri));
         NS_ENSURE_SUCCESS(rv, rv);
         nsCOMPtr<nsIAbDirectory> mailList;
         rv = abManager->GetDirectory(mailListUri, getter_AddRefs(mailList));
         NS_ENSURE_SUCCESS(rv, rv);
 
-        m_AddressList->AppendElement(mailList, PR_FALSE);
+        m_AddressList->AppendElement(mailList, false);
         NotifyItemAddition(mailList);
       }
       else if (m_IsMailList)
       {
-        m_AddressList->AppendElement(card, PR_FALSE);
+        m_AddressList->AppendElement(card, false);
         NotifyItemAddition(card);
       }
     }
   }
   return rv;
 }
 
 NS_IMETHODIMP nsAbOutlookDirectory::GetIsQuery(bool *aResult)
@@ -265,21 +265,21 @@ NS_IMETHODIMP nsAbOutlookDirectory::HasC
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbOutlookDirectory::HasDirectory(nsIAbDirectory *aDirectory, bool *aHasDirectory)
 {
   NS_ENSURE_ARG_POINTER(aDirectory);
   NS_ENSURE_ARG_POINTER(aHasDirectory);
 
-  *aHasDirectory = PR_FALSE;
+  *aHasDirectory = false;
 
   PRUint32 pos;
   if (m_AddressList && NS_SUCCEEDED(m_AddressList->IndexOf(0, aDirectory, &pos)))
-      *aHasDirectory = PR_TRUE;
+      *aHasDirectory = true;
 
   return NS_OK;
 }
 
 
 static nsresult ExtractCardEntry(nsIAbCard *aCard, nsCString& aEntry)
 {
   aEntry.Truncate();
@@ -411,17 +411,17 @@ NS_IMETHODIMP nsAbOutlookDirectory::AddC
 
     if (!m_AddressList)
     {
         m_AddressList = do_CreateInstance(NS_ARRAY_CONTRACTID, &retCode);
         NS_ENSURE_SUCCESS(retCode, retCode);
     }
 
     if (m_IsMailList)
-        m_AddressList->AppendElement(*addedCard, PR_FALSE);
+        m_AddressList->AppendElement(*addedCard, false);
     NotifyItemAddition(*addedCard) ;
     return retCode ;
 }
 
 NS_IMETHODIMP nsAbOutlookDirectory::DropCard(nsIAbCard *aData, bool needToCopyCard)
 {
     nsCOMPtr <nsIAbCard> addedCard;
     return AddCard(aData, getter_AddRefs(addedCard));
@@ -451,17 +451,17 @@ NS_IMETHODIMP nsAbOutlookDirectory::AddM
       mapiAddBook->CopyEntry(*mMapiData, sourceEntry, newEntry);
   }
   if (newEntry.mByteCount == 0)
   {
     if (!mapiAddBook->CreateDistList(*mMapiData, newEntry))
         return NS_ERROR_FAILURE;
   }
   else {
-    didCopy = PR_TRUE;
+    didCopy = true;
   }
   newEntry.ToString(entryString);
   nsCAutoString uri;
 
   buildAbWinUri(kOutlookDirectoryScheme, mAbWinType, uri);
   uri.Append(entryString);
 
   nsCOMPtr<nsIAbManager> abManager(do_GetService(NS_ABMANAGER_CONTRACTID,
@@ -480,17 +480,17 @@ NS_IMETHODIMP nsAbOutlookDirectory::AddM
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
   if (!m_AddressList)
   {
     m_AddressList = do_CreateInstance(NS_ARRAY_CONTRACTID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
   }
-  m_AddressList->AppendElement(newList, PR_FALSE);
+  m_AddressList->AppendElement(newList, false);
   NotifyItemAddition(newList);
   NS_IF_ADDREF(*addedList = newList);
 
   return rv;
 }
 
 NS_IMETHODIMP nsAbOutlookDirectory::EditMailListToDatabase(nsIAbCard *listCard)
 {
@@ -574,34 +574,34 @@ static ULONG findPropertyTag(const char 
     return 0 ;
 }
 
 static nsresult BuildRestriction(nsIAbBooleanConditionString *aCondition, 
                                  SRestriction& aRestriction,
                                  bool& aSkipItem)
 {
     if (!aCondition) { return NS_ERROR_NULL_POINTER ; }
-    aSkipItem = PR_FALSE ;
+    aSkipItem = false ;
     nsAbBooleanConditionType conditionType = 0 ;
     nsresult retCode = NS_OK ;
     nsCString name;
     nsString value;
     ULONG propertyTag = 0 ;
     nsCAutoString valueAscii ;
     
     retCode = aCondition->GetCondition(&conditionType) ;
     NS_ENSURE_SUCCESS(retCode, retCode) ;
     retCode = aCondition->GetName(getter_Copies(name)) ;
     NS_ENSURE_SUCCESS(retCode, retCode) ;
     retCode = aCondition->GetValue(getter_Copies(value)) ;
     NS_ENSURE_SUCCESS(retCode, retCode) ;
     LossyCopyUTF16toASCII(value, valueAscii);
     propertyTag = findPropertyTag(name.get()) ;
     if (propertyTag == 0) {
-        aSkipItem = PR_TRUE ;
+        aSkipItem = true ;
         return retCode ;
     }
     switch (conditionType) {
     case nsIAbBooleanConditionTypes::Exists :
         aRestriction.rt = RES_EXIST ;
         aRestriction.res.resExist.ulPropTag = propertyTag ;
         break ;
     case nsIAbBooleanConditionTypes::DoesNotExist :
@@ -660,35 +660,35 @@ static nsresult BuildRestriction(nsIAbBo
 #if 0
         aRestriction.rt = RES_PROPERTY ;
         aRestriction.res.resProperty.relop = RELOP_RE ;
         aRestriction.res.resProperty.ulPropTag = propertyTag ;
         aRestriction.res.resProperty.lpProp = new SPropValue ;
         aRestriction.res.resProperty.lpProp->ulPropTag = propertyTag ;
         aRestriction.res.resProperty.lpProp->Value.lpszA = strdup(valueAscii.get()) ;
 #else
-        aSkipItem = PR_TRUE ;
+        aSkipItem = true ;
 #endif // 0
         break ;
     case nsIAbBooleanConditionTypes::SoundsLike :
         // This condition cannot be implemented in MAPI.
-        aSkipItem = PR_TRUE ;
+        aSkipItem = true ;
         break ;
     case nsIAbBooleanConditionTypes::RegExp :
         // This condition should be implemented this way, but the following
         // code will never match (through MAPI's fault).
 #if 0
         aRestriction.rt = RES_PROPERTY ;
         aRestriction.res.resProperty.relop = RELOP_RE ;
         aRestriction.res.resProperty.ulPropTag = propertyTag ;
         aRestriction.res.resProperty.lpProp = new SPropValue ;
         aRestriction.res.resProperty.lpProp->ulPropTag = propertyTag ;
         aRestriction.res.resProperty.lpProp->Value.lpszA = strdup(valueAscii.get()) ;
 #else
-        aSkipItem = PR_TRUE ;
+        aSkipItem = true ;
 #endif // 0
         break ;
     case nsIAbBooleanConditionTypes::LessThan :
         aRestriction.rt = RES_PROPERTY ;
         aRestriction.res.resProperty.relop = RELOP_LT ;
         aRestriction.res.resProperty.ulPropTag = propertyTag ;
         aRestriction.res.resProperty.lpProp = new SPropValue ;
         aRestriction.res.resProperty.lpProp->ulPropTag = propertyTag ;
@@ -698,17 +698,17 @@ static nsresult BuildRestriction(nsIAbBo
         aRestriction.rt = RES_PROPERTY ;
         aRestriction.res.resProperty.relop = RELOP_GT ;
         aRestriction.res.resProperty.ulPropTag = propertyTag ;
         aRestriction.res.resProperty.lpProp = new SPropValue ;
         aRestriction.res.resProperty.lpProp->ulPropTag = propertyTag ;
         aRestriction.res.resProperty.lpProp->Value.lpszA = strdup(valueAscii.get()) ;
         break ;
     default :
-        aSkipItem = PR_TRUE ;
+        aSkipItem = true ;
         break ;
     }
     return retCode ;
 }
 
 static nsresult BuildRestriction(nsIAbBooleanExpression *aLevel, 
                                  SRestriction& aRestriction)
 {
@@ -964,17 +964,17 @@ NS_IMETHODIMP nsAbOutlookDirectory::Star
     nsCOMPtr<nsIAbDirectoryQueryArguments> arguments = do_CreateInstance(NS_ABDIRECTORYQUERYARGUMENTS_CONTRACTID,&retCode);
     NS_ENSURE_SUCCESS(retCode, retCode);
 
     retCode = nsAbQueryStringToExpression::Convert(mQueryString, getter_AddRefs(expression)) ;
     NS_ENSURE_SUCCESS(retCode, retCode) ;
     retCode = arguments->SetExpression(expression) ;
     NS_ENSURE_SUCCESS(retCode, retCode) ;
 
-    retCode = arguments->SetQuerySubDirectories(PR_TRUE) ;
+    retCode = arguments->SetQuerySubDirectories(true) ;
     NS_ENSURE_SUCCESS(retCode, retCode) ;
 
     return DoQuery(this, arguments, this, -1, 0, &mSearchContext);
 }
 
 NS_IMETHODIMP nsAbOutlookDirectory::StopSearch(void) 
 {
     if (!mIsQueryURI) { return NS_ERROR_NOT_IMPLEMENTED ; }
@@ -1072,17 +1072,17 @@ nsresult nsAbOutlookDirectory::GetChildC
     cardEntries.mEntries[card].ToString(entryId);
     buildAbWinUri(kOutlookCardScheme, mAbWinType, uriName);
     uriName.Append(entryId);
 
     rv = OutlookCardForURI(uriName, getter_AddRefs(childCard));
     NS_ENSURE_SUCCESS(rv, rv);
     childCard->SetDirectoryId(ourUuid);
 
-    aCards->AppendElement(childCard, PR_FALSE);
+    aCards->AppendElement(childCard, false);
   }
   return rv;
 }
 
 nsresult nsAbOutlookDirectory::GetChildNodes(nsIMutableArray* aNodes)
 {
   NS_ENSURE_ARG_POINTER(aNodes);
 
@@ -1112,17 +1112,17 @@ nsresult nsAbOutlookDirectory::GetChildN
     nodeEntries.mEntries[node].ToString(entryId);
     buildAbWinUri(kOutlookDirectoryScheme, mAbWinType, uriName);
     uriName.Append(entryId);
 
     nsCOMPtr <nsIAbDirectory> directory;
     rv = abManager->GetDirectory(uriName, getter_AddRefs(directory));
     NS_ENSURE_SUCCESS(rv, rv);
 
-    aNodes->AppendElement(directory, PR_FALSE);
+    aNodes->AppendElement(directory, false);
   }
   return rv;
 }
 
 nsresult nsAbOutlookDirectory::NotifyItemDeletion(nsISupports *aItem) 
 {
   nsresult rv;
   nsCOMPtr<nsIAbManager> abManager(do_GetService(NS_ABMANAGER_CONTRACTID, &rv));
@@ -1181,17 +1181,17 @@ nsresult nsAbOutlookDirectory::CommitAdd
         NS_ENSURE_SUCCESS(rv, rv);
 
         // The entry was not already there
         nsCOMPtr<nsIAbCard> card(do_QueryInterface(element, &rv));
         NS_ENSURE_SUCCESS(rv, rv);
 
         rv = CreateCard(card, getter_AddRefs(newCard));
         NS_ENSURE_SUCCESS(rv, rv);
-        m_AddressList->ReplaceElementAt(newCard, i, PR_FALSE);
+        m_AddressList->ReplaceElementAt(newCard, i, false);
     }
   }
   return DeleteCards(oldList);
 }
 
 nsresult nsAbOutlookDirectory::UpdateAddressList(void)
 {
     if (!m_AddressList)
@@ -1224,17 +1224,17 @@ nsresult nsAbOutlookDirectory::CreateCar
         
         
         sourceEntry.Assign(entryString) ;
         if (m_IsMailList) {
             // In the case of a mailing list, we can use the address
             // as a direct template to build the new one (which is done
             // by CopyEntry).
             mapiAddBook->CopyEntry(*mMapiData, sourceEntry, newEntry) ;
-            didCopy = PR_TRUE ;
+            didCopy = true ;
         }
         else {
             // Else, we have to create a temporary address and copy the
             // source into it. Yes it's silly.
             mapiAddBook->CreateEntry(*mMapiData, newEntry) ;
         }
     }
     // If this approach doesn't work, well we're back to creating and copying.
@@ -1443,17 +1443,17 @@ NS_IMETHODIMP nsAbOutlookDirectory::OnQu
                                                   PRInt32 aErrorCode)
 {
   return OnSearchFinished(aResult, EmptyString());
 }
 
 NS_IMETHODIMP nsAbOutlookDirectory::UseForAutocomplete(const nsACString &aIdentityKey, bool *aResult)
 {
   NS_ENSURE_ARG_POINTER(aResult);
-  *aResult = PR_FALSE;
+  *aResult = false;
   return NS_OK;
 }
 
 static void splitString(nsString& aSource, nsString& aTarget)
 {
   aTarget.Truncate();
   PRInt32 offset = aSource.FindChar('\n');
 
--- a/mailnews/addrbook/src/nsAbQueryStringToExpression.cpp
+++ b/mailnews/addrbook/src/nsAbQueryStringToExpression.cpp
@@ -154,17 +154,17 @@ nsresult nsAbQueryStringToExpression::Pa
     // Case: ")(*)(*)....(*))"
     // printf ("Case: )(*)(*)....(*)): %s\n", *index);
     while (**index == '(')
     {
         nsCOMPtr<nsISupports> childExpression;
         rv = ParseExpression(index, getter_AddRefs (childExpression));
         NS_ENSURE_SUCCESS(rv, rv);
 
-        expressions->AppendElement(childExpression, PR_FALSE);
+        expressions->AppendElement(childExpression, false);
     }
 
     if (**index == 0)
         return NS_ERROR_FAILURE;
 
     // Case: "))"
     // printf ("Case: )): %s\n", *index);
 
--- a/mailnews/addrbook/src/nsAbView.cpp
+++ b/mailnews/addrbook/src/nsAbView.cpp
@@ -68,19 +68,19 @@
 #define PREF_MAIL_ADDR_BOOK_DISPLAYNAME_AUTOGENERATION "mail.addr_book.displayName.autoGeneration"
 #define PREF_MAIL_ADDR_BOOK_DISPLAYNAME_LASTNAMEFIRST "mail.addr_book.displayName.lastnamefirst"
 
 // Also, our default primary sort
 #define GENERATED_NAME_COLUMN_ID "GeneratedName" 
 
 NS_IMPL_ISUPPORTS4(nsAbView, nsIAbView, nsITreeView, nsIAbListener, nsIObserver)
 
-nsAbView::nsAbView() : mInitialized(PR_FALSE),
-                       mSuppressSelectionChange(PR_FALSE),
-                       mSuppressCountChange(PR_FALSE),
+nsAbView::nsAbView() : mInitialized(false),
+                       mSuppressSelectionChange(false),
+                       mSuppressCountChange(false),
                        mGeneratedNameFormat(0)
 {
   mMailListAtom = MsgGetAtom("MailList");
 }
 
 nsAbView::~nsAbView()
 {
   if (mInitialized) {
@@ -95,17 +95,17 @@ NS_IMETHODIMP nsAbView::ClearView()
   if (mTree)
     mTree->SetView(nsnull);
   mTree = nsnull;
   mTreeSelection = nsnull;
 
   if (mInitialized)
   {
     nsresult rv;
-    mInitialized = PR_FALSE;
+    mInitialized = false;
     nsCOMPtr<nsIPrefBranch2> pbi(do_GetService(NS_PREFSERVICE_CONTRACTID,
                                                &rv));
     NS_ENSURE_SUCCESS(rv,rv);
 
     rv = pbi->RemoveObserver(PREF_MAIL_ADDR_BOOK_LASTNAMEFIRST, this);
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsCOMPtr<nsIAbManager> abManager(do_GetService(NS_ABMANAGER_CONTRACTID,
@@ -157,29 +157,29 @@ nsresult nsAbView::SetGeneratedNameForma
   return prefBranchInt->GetIntPref(PREF_MAIL_ADDR_BOOK_LASTNAMEFIRST, &mGeneratedNameFormat);
 }
 
 nsresult nsAbView::Initialize()
 {
   if (mInitialized)
     return NS_OK;
 
-  mInitialized = PR_TRUE;
+  mInitialized = true;
 
   nsresult rv;
   nsCOMPtr<nsIAbManager> abManager(do_GetService(NS_ABMANAGER_CONTRACTID, &rv));
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = abManager->AddAddressBookListener(this, nsIAbListener::all);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIPrefBranch2> pbi(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = pbi->AddObserver(PREF_MAIL_ADDR_BOOK_LASTNAMEFIRST, this, PR_FALSE);
+  rv = pbi->AddObserver(PREF_MAIL_ADDR_BOOK_LASTNAMEFIRST, this, false);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (!mABBundle)
   {
     nsCOMPtr<nsIStringBundleService> stringBundleService =
       do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); 
     NS_ENSURE_SUCCESS(rv, rv);
 
@@ -357,33 +357,33 @@ NS_IMETHODIMP nsAbView::GetCellPropertie
 
 NS_IMETHODIMP nsAbView::GetColumnProperties(nsITreeColumn* col, nsISupportsArray *properties)
 {
     return NS_OK;
 }
 
 NS_IMETHODIMP nsAbView::IsContainer(PRInt32 index, bool *_retval)
 {
-    *_retval = PR_FALSE;
+    *_retval = false;
     return NS_OK;
 }
 
 NS_IMETHODIMP nsAbView::IsContainerOpen(PRInt32 index, bool *_retval)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP nsAbView::IsContainerEmpty(PRInt32 index, bool *_retval)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP nsAbView::IsSeparator(PRInt32 index, bool *_retval)
 {
-  *_retval = PR_FALSE;
+  *_retval = false;
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAbView::IsSorted(bool *_retval)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
@@ -439,17 +439,17 @@ nsresult nsAbView::GetCardValue(nsIAbCar
 {
   // "G" == "GeneratedName", "_P" == "_PhoneticName"
   // else, standard column (like PrimaryEmail and _AimScreenName)
   if (colID[0] == PRUnichar('G'))
     return card->GenerateName(mGeneratedNameFormat, mABBundle, _retval);
 
   if (colID[0] == PRUnichar('_') && colID[1] == PRUnichar('P'))
     // Use LN/FN order for the phonetic name
-    return card->GeneratePhoneticName(PR_TRUE, _retval);
+    return card->GeneratePhoneticName(true, _retval);
 
   nsresult rv = card->GetPropertyAsAString(NS_ConvertUTF16toUTF8(colID).get(), _retval);
   if (rv == NS_ERROR_NOT_AVAILABLE) {
     rv = NS_OK;
     _retval.Truncate();
   }
   return rv;
 }
@@ -807,17 +807,17 @@ NS_IMETHODIMP nsAbView::OnItemAdded(nsIS
 
       abcard->card = addedCard;
       NS_IF_ADDREF(abcard->card);
     
       rv = GenerateCollationKeysForCard(mSortColumn.get(), abcard);
       NS_ENSURE_SUCCESS(rv,rv);
 
       PRInt32 index;
-      rv = AddCard(abcard, PR_FALSE /* select card */, &index);
+      rv = AddCard(abcard, false /* select card */, &index);
       NS_ENSURE_SUCCESS(rv,rv);
     }
   }
   return rv;
 }
 
 NS_IMETHODIMP nsAbView::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *someData)
 {
@@ -844,17 +844,17 @@ nsresult nsAbView::AddCard(AbCard *abcar
     
   // This needs to happen after we insert the card, as RowCountChanged() will call GetRowCount()
   if (mTree)
     rv = mTree->RowCountChanged(*index, 1);
 
   // Checking for mTree here works around core bug 399227
   if (selectCardAfterAdding && mTreeSelection && mTree) {
     mTreeSelection->SetCurrentIndex(*index);
-    mTreeSelection->RangedSelect(*index, *index, PR_FALSE /* augment */);
+    mTreeSelection->RangedSelect(*index, *index, false /* augment */);
   }
 
   if (mAbViewListener && !mSuppressCountChange) {
     rv = mAbViewListener->OnCountChanged(mCards.Count());
     NS_ENSURE_SUCCESS(rv,rv);
   }
 
   return rv;
@@ -923,31 +923,31 @@ nsresult nsAbView::RemoveCardAndSelectNe
     if (index != CARD_NOT_FOUND) {
       bool selectNextCard = false;
       if (mTreeSelection) {
         PRInt32 selectedIndex;
         // XXX todo
         // Make sure it works if nothing selected
         mTreeSelection->GetCurrentIndex(&selectedIndex);
         if (index == selectedIndex)
-          selectNextCard = PR_TRUE;
+          selectNextCard = true;
       }
 
       rv = RemoveCardAt(index);
       NS_ENSURE_SUCCESS(rv,rv);
 
       if (selectNextCard) {
       PRInt32 count = mCards.Count();
       if (count && mTreeSelection) {
         // If we deleted the last card, adjust so we select the new "last" card
         if (index >= (count - 1)) {
           index = count -1;
         }
         mTreeSelection->SetCurrentIndex(index);
-        mTreeSelection->RangedSelect(index, index, PR_FALSE /* augment */);
+        mTreeSelection->RangedSelect(index, index, false /* augment */);
       }
     }
   }
   }
   return rv;
 }
 
 PRInt32 nsAbView::FindIndexForCard(nsIAbCard *card)
@@ -1013,29 +1013,29 @@ NS_IMETHODIMP nsAbView::OnItemPropertyCh
       nsMemory::Free(newCard->secondaryCollationKey);
     PR_FREEIF(newCard);
 
     // Still need to invalidate, as the other columns may have changed.
     rv = InvalidateTree(index);
     NS_ENSURE_SUCCESS(rv,rv);
   }
   else {
-    mSuppressSelectionChange = PR_TRUE;
-    mSuppressCountChange = PR_TRUE;
+    mSuppressSelectionChange = true;
+    mSuppressCountChange = true;
 
     // Remove the old card.
     rv = RemoveCardAt(index);
     NS_ASSERTION(NS_SUCCEEDED(rv), "remove card failed\n");
 
     // Add the card we created, and select it (to restore selection) if it was selected.
     rv = AddCard(newCard, cardWasSelected /* select card */, &index);
     NS_ASSERTION(NS_SUCCEEDED(rv), "add card failed\n");
 
-    mSuppressSelectionChange = PR_FALSE;
-    mSuppressCountChange = PR_FALSE;
+    mSuppressSelectionChange = false;
+    mSuppressCountChange = false;
 
     // Ensure restored selection is visible
     if (cardWasSelected && mTree) 
       mTree->EnsureRowIsVisible(index);
   }
 
   // Although the selection hasn't changed, the card that is selected may need
   // to be displayed differently, therefore pretend that the selection has
@@ -1085,17 +1085,17 @@ nsresult nsAbView::ReselectCards(nsIArra
   if (!count)
     return NS_OK;
 
   for (i = 0; i < count; i++) {
     nsCOMPtr<nsIAbCard> card = do_QueryElementAt(aCards, i);
     if (card) {
       PRInt32 index = FindIndexForCard(card);
       if (index != CARD_NOT_FOUND) {
-        mTreeSelection->RangedSelect(index, index, PR_TRUE /* augment */);
+        mTreeSelection->RangedSelect(index, index, true /* augment */);
       }
     }
   }
 
   // Reset the index card, and ensure it is visible.
   if (aIndexCard) {
     PRInt32 currentIndex = FindIndexForCard(aIndexCard);
     rv = mTreeSelection->SetCurrentIndex(currentIndex);
@@ -1149,17 +1149,17 @@ nsresult nsAbView::GetSelectedCards(nsCO
     PRInt32 totalCards = mCards.Count();
     if (startRange >= 0 && startRange < totalCards)
     {
       for (PRInt32 rangeIndex = startRange; rangeIndex <= endRange && rangeIndex < totalCards; rangeIndex++) {
         nsCOMPtr<nsIAbCard> abCard;
         rv = GetCardFromRow(rangeIndex, getter_AddRefs(abCard));
         NS_ENSURE_SUCCESS(rv,rv);
         
-        rv = aSelectedCards->AppendElement(abCard, PR_FALSE);
+        rv = aSelectedCards->AppendElement(abCard, false);
         NS_ENSURE_SUCCESS(rv, rv);
       }
     }
   }
 
   return NS_OK;
 }
 
@@ -1344,28 +1344,28 @@ NS_IMETHODIMP nsAbView::GetSelectedAddre
         NS_ENSURE_SUCCESS(rv,rv);
 
         rv = mailListCard->GetPrimaryEmail(primaryEmail);
         NS_ENSURE_SUCCESS(rv,rv);
 
         if (!primaryEmail.IsEmpty()) {
           nsCOMPtr<nsISupportsString> supportsEmail(do_CreateInstance(NS_SUPPORTS_STRING_CONTRACTID));
           supportsEmail->SetData(primaryEmail);
-          addresses->AppendElement(supportsEmail, PR_FALSE);
+          addresses->AppendElement(supportsEmail, false);
         }
       }
     }
     else {
       rv = card->GetPrimaryEmail(primaryEmail);
       NS_ENSURE_SUCCESS(rv,rv);
 
       if (!primaryEmail.IsEmpty()) {
         nsCOMPtr<nsISupportsString> supportsEmail(do_CreateInstance(NS_SUPPORTS_STRING_CONTRACTID));
         supportsEmail->SetData(primaryEmail);
-        addresses->AppendElement(supportsEmail, PR_FALSE);
+        addresses->AppendElement(supportsEmail, false);
       }
     }    
   }
 
   NS_IF_ADDREF(*_retval = addresses);
 
   return NS_OK;
 }
--- a/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp
+++ b/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp
@@ -103,17 +103,17 @@ NS_IMETHODIMP nsAddbookProtocolHandler::
   NS_ADDREF(*_retval = uri);
   return NS_OK;
 }
 
 NS_IMETHODIMP 
 nsAddbookProtocolHandler::AllowPort(PRInt32 port, const char *scheme, bool *_retval)
 {
     // don't override anything.  
-    *_retval = PR_FALSE;
+    *_retval = false;
     return NS_OK;
 }
 
 nsresult
 nsAddbookProtocolHandler::GenerateXMLOutputChannel( nsString &aOutput,
                                                      nsIAddbookUrl *addbookUrl,
                                                      nsIURI *aURI, 
                                                      nsIChannel **_retval)
@@ -159,17 +159,17 @@ nsAddbookProtocolHandler::NewChannel(nsI
   }
  
   if (mAddbookOperation == nsIAddbookUrlOperation::AddVCard) {
       // create an empty pipe for use with the input stream channel.
       nsCOMPtr<nsIAsyncInputStream> pipeIn;
       nsCOMPtr<nsIAsyncOutputStream> pipeOut;
       nsCOMPtr<nsIPipe> pipe = do_CreateInstance("@mozilla.org/pipe;1");
       
-      rv = pipe->Init(PR_FALSE, PR_FALSE, 0, 0, nsnull);
+      rv = pipe->Init(false, false, 0, 0, nsnull);
       NS_ENSURE_SUCCESS(rv, rv);
 
       pipe->GetInputStream(getter_AddRefs(pipeIn));
       pipe->GetOutputStream(getter_AddRefs(pipeOut));
       
       pipeOut->Close();
       
       return NS_NewInputStreamChannel(_retval, aURI, pipeIn,
--- a/mailnews/addrbook/src/nsAddrDatabase.cpp
+++ b/mailnews/addrbook/src/nsAddrDatabase.cpp
@@ -99,17 +99,17 @@ static const char kLowerListNameColumn[]
 struct mdbOid gAddressBookTableOID;
 
 static const char kMailListAddressFormat[] = "Address%d";
 
 nsAddrDatabase::nsAddrDatabase()
     : m_mdbEnv(nsnull), m_mdbStore(nsnull),
       m_mdbPabTable(nsnull),
       m_mdbDeletedCardsTable(nsnull),
-      m_mdbTokensInitialized(PR_FALSE),
+      m_mdbTokensInitialized(false),
       m_PabTableKind(0),
       m_MailListTableKind(0),
       m_DeletedCardsTableKind(0),
       m_CardRowScopeToken(0),
       m_FirstNameColumnToken(0),
       m_LastNameColumnToken(0),
       m_PhoneticFirstNameColumnToken(0),
       m_PhoneticLastNameColumnToken(0),
@@ -165,17 +165,17 @@ nsAddrDatabase::nsAddrDatabase()
       m_AddressCharSetColumnToken(0),
       m_LastRecordKey(0),
       m_dbDirectory(nsnull)
 {
 }
 
 nsAddrDatabase::~nsAddrDatabase()
 {
-    Close(PR_FALSE);    // better have already been closed.
+    Close(false);    // better have already been closed.
 
     // better not be any listeners, because we're going away.
     NS_ASSERTION(m_ChangeListeners.Length() == 0, "shouldn't have any listeners");
 
     RemoveFromCache(this);
 }
 
 NS_IMPL_THREADSAFE_ADDREF(nsAddrDatabase)
@@ -320,17 +320,17 @@ nsAddrDatabase* nsAddrDatabase::FindInCa
 }
 
 bool nsAddrDatabase::MatchDbName(nsIFile* dbName)    // returns true if they match
 {
     bool dbMatches = false;
 
     nsresult rv = m_dbName->Equals(dbName, &dbMatches);
     if (NS_FAILED(rv))
-      return PR_FALSE;
+      return false;
 
     return dbMatches;
 }
 
 //----------------------------------------------------------------------
 // RemoveFromCache
 //----------------------------------------------------------------------
 void nsAddrDatabase::RemoveFromCache(nsAddrDatabase* pAddrDB)
@@ -382,17 +382,17 @@ NS_IMETHODIMP nsAddrDatabase::Open
     return NS_OK;
 
   if (rv == NS_ERROR_FILE_ACCESS_DENIED)
   {
     static bool gAlreadyAlerted;
      // only do this once per session to avoid annoying the user
     if (!gAlreadyAlerted)
     {
-      gAlreadyAlerted = PR_TRUE;
+      gAlreadyAlerted = true;
       nsAutoString mabFileName;
       rv = aMabFile->GetLeafName(mabFileName);
       NS_ENSURE_SUCCESS(rv, rv);
       AlertAboutLockedMabFile(mabFileName.get());
 
       // We just overwrote rv, so return the proper value here.
       return NS_ERROR_FILE_ACCESS_DENIED;
     }
@@ -552,17 +552,17 @@ NS_IMETHODIMP nsAddrDatabase::OpenMDB(ns
 
       ret = dbName->GetNativePath(filePath);
       NS_ENSURE_SUCCESS(ret, ret);
 
       nsIMdbHeap* dbHeap = 0;
       mdb_bool dbFrozen = mdbBool_kFalse; // not readonly, we want modifiable
 
       if (m_mdbEnv)
-        m_mdbEnv->SetAutoClear(PR_TRUE);
+        m_mdbEnv->SetAutoClear(true);
 
       bool dbNameExists = false;
       ret = dbName->Exists(&dbNameExists);
       NS_ENSURE_SUCCESS(ret, ret);
 
       if (!dbNameExists)
         ret = NS_ERROR_FILE_NOT_FOUND;
       else
@@ -600,35 +600,35 @@ NS_IMETHODIMP nsAddrDatabase::OpenMDB(ns
         if (NS_FAILED(ret))
           ret = NS_ERROR_FILE_ACCESS_DENIED;
       }
 
       if (NS_SUCCEEDED(ret) && thumb)
       {
         mdb_count outTotal;    // total somethings to do in operation
         mdb_count outCurrent;  // subportion of total completed so far
-        mdb_bool outDone = PR_FALSE;      // is operation finished?
+        mdb_bool outDone = false;      // is operation finished?
         mdb_bool outBroken;     // is operation irreparably dead and broken?
         do
         {
           ret = thumb->DoMore(m_mdbEnv, &outTotal, &outCurrent, &outDone, &outBroken);
           if (ret != 0)
           {
-            outDone = PR_TRUE;
+            outDone = true;
             break;
           }
         }
         while (NS_SUCCEEDED(ret) && !outBroken && !outDone);
         if (NS_SUCCEEDED(ret) && outDone)
         {
           ret = mdbFactory->ThumbToOpenStore(m_mdbEnv, thumb, &m_mdbStore);
           if (ret == NS_OK && m_mdbStore)
           {
             ret = InitExistingDB();
-            create = PR_FALSE;
+            create = false;
           }
         }
       }
       else if (create && ret != NS_ERROR_FILE_ACCESS_DENIED)
       {
         nsIMdbFile* newFile = 0;
         ret = mdbFactory->CreateNewFile(m_mdbEnv, dbHeap, filePath.get(), &newFile);
         if ( newFile )
@@ -676,17 +676,17 @@ NS_IMETHODIMP nsAddrDatabase::ForceClose
     nsCOMPtr<nsIAddrDatabase> aDb(do_QueryInterface(this, &err));
 
     // make sure someone has a reference so object won't get deleted out from under us.
     AddRef();
     NotifyAnnouncerGoingAway();
     // OK, remove from cache first and close the store.
     RemoveFromCache(this);
 
-    err = CloseMDB(PR_FALSE);    // since we're about to delete it, no need to commit.
+    err = CloseMDB(false);    // since we're about to delete it, no need to commit.
     NS_IF_RELEASE(m_mdbStore);
     Release();
     return err;
 }
 
 NS_IMETHODIMP nsAddrDatabase::Commit(PRUint32 commitType)
 {
   nsresult err = NS_OK;
@@ -728,18 +728,18 @@ NS_IMETHODIMP nsAddrDatabase::Commit(PRU
         err = m_mdbStore->CompressCommit(m_mdbEnv, &commitThumb);
         break;
       }
   }
   if (commitThumb && m_mdbEnv)
   {
     mdb_count outTotal = 0;    // total somethings to do in operation
     mdb_count outCurrent = 0;  // subportion of total completed so far
-    mdb_bool outDone = PR_FALSE;      // is operation finished?
-    mdb_bool outBroken = PR_FALSE;     // is operation irreparably dead and broken?
+    mdb_bool outDone = false;      // is operation finished?
+    mdb_bool outBroken = false;     // is operation irreparably dead and broken?
     while (!outDone && !outBroken && err == NS_OK)
     {
       err = commitThumb->DoMore(m_mdbEnv, &outTotal, &outCurrent, &outDone, &outBroken);
     }
     NS_RELEASE(commitThumb);
   }
   // ### do something with error, but clear it now because mork errors out on commits.
   if (m_mdbEnv)
@@ -767,17 +767,17 @@ nsresult nsAddrDatabase::InitNewDB()
 
 nsresult nsAddrDatabase::AddRowToDeletedCardsTable(nsIAbCard *card, nsIMdbRow **pCardRow)
 {
   if (!m_mdbEnv)
     return NS_ERROR_NULL_POINTER;
 
   nsresult rv = NS_OK;
   if (!m_mdbDeletedCardsTable)
-    rv = InitDeletedCardsTable(PR_TRUE);
+    rv = InitDeletedCardsTable(true);
 
   if (NS_SUCCEEDED(rv)) {
     // lets first purge old records if there are more than PURGE_CUTOFF_COUNT records
     PurgeDeletedCardTable();
     nsCOMPtr<nsIMdbRow> cardRow;
     rv = GetNewRow(getter_AddRefs(cardRow));
     if (NS_SUCCEEDED(rv) && cardRow) {
       mdb_err merror = m_mdbDeletedCardsTable->AddRow(m_mdbEnv, cardRow);
@@ -803,17 +803,17 @@ nsresult nsAddrDatabase::AddRowToDeleted
 
       nsString value;
       GetCardValue(card, CARD_ATTRIB_PALMID, getter_Copies(value));
       if (!value.IsEmpty())
       {
         nsCOMPtr<nsIAbCard> addedCard;
         rv = CreateCardFromDeletedCardsTable(cardRow, 0, getter_AddRefs(addedCard));
         if (NS_SUCCEEDED(rv))
-          SetCardValue(addedCard, CARD_ATTRIB_PALMID, value.get(), PR_FALSE);
+          SetCardValue(addedCard, CARD_ATTRIB_PALMID, value.get(), false);
       }
       NS_IF_ADDREF(*pCardRow = cardRow);
     }
     Commit(nsAddrDBCommitType::kLargeCommit);
   }
   return rv;
 }
 
@@ -842,30 +842,30 @@ nsresult nsAddrDatabase::InitDeletedCard
     if (m_mdbStore && m_mdbEnv)
     {
       m_mdbStore->GetTable(m_mdbEnv, &deletedCardsTableOID, &m_mdbDeletedCardsTable);
       // if deletedCardsTable does not exist and bCreate is set, create a new one
       if (!m_mdbDeletedCardsTable && aCreate)
       {
         mdberr = (nsresult) m_mdbStore->NewTableWithOid(m_mdbEnv, &deletedCardsTableOID,
                                                         m_DeletedCardsTableKind,
-                                                        PR_TRUE, (const mdbOid*)nsnull,
+                                                        true, (const mdbOid*)nsnull,
                                                         &m_mdbDeletedCardsTable);
       }
     }
   }
   return mdberr;
 }
 
 nsresult nsAddrDatabase::InitPabTable()
 {
   return m_mdbStore && m_mdbEnv ? m_mdbStore->NewTableWithOid(m_mdbEnv,
                                                   &gAddressBookTableOID,
                                                   m_PabTableKind,
-                                                  PR_FALSE,
+                                                  false,
                                                   (const mdbOid*)nsnull,
                                                   &m_mdbPabTable)
       : NS_ERROR_NULL_POINTER;
 }
 
 //save the last record number, store in m_DataRowScopeToken, row 1
 nsresult nsAddrDatabase::InitLastRecorKey()
 {
@@ -1036,27 +1036,27 @@ nsresult nsAddrDatabase::UpdateLowercase
         if (IsCardRowScopeToken(rowOid.mOid_Scope))
         {
           err = GetStringColumn(findRow, m_LowerPriEmailColumnToken, tempString);
           if (NS_SUCCEEDED(err))
             break;
 
           err = ConvertAndAddLowercaseColumn(findRow, m_PriEmailColumnToken,
             m_LowerPriEmailColumnToken);
-          commitRequired = PR_TRUE;
+          commitRequired = true;
         }
         else if (IsListRowScopeToken(rowOid.mOid_Scope))
         {
           err = GetStringColumn(findRow, m_LowerListNameColumnToken, tempString);
           if (NS_SUCCEEDED(err))
             break;
 
           err = ConvertAndAddLowercaseColumn(findRow, m_ListNameColumnToken,
             m_LowerListNameColumnToken);
-          commitRequired = PR_TRUE;
+          commitRequired = true;
         }
       }
       findRow->Release();
     }
   } while (findRow);
 
   if (findRow)
     findRow->Release();
@@ -1098,17 +1098,17 @@ nsresult nsAddrDatabase::AddUnicodeToCol
 
 // initialize the various tokens and tables in our db's env
 nsresult nsAddrDatabase::InitMDBInfo()
 {
   nsresult err = NS_OK;
 
   if (!m_mdbTokensInitialized && m_mdbStore && m_mdbEnv)
   {
-    m_mdbTokensInitialized = PR_TRUE;
+    m_mdbTokensInitialized = true;
     err = m_mdbStore->StringToToken(m_mdbEnv, kCardRowScope, &m_CardRowScopeToken);
     err = m_mdbStore->StringToToken(m_mdbEnv, kListRowScope, &m_ListRowScopeToken);
     err = m_mdbStore->StringToToken(m_mdbEnv, kDataRowScope, &m_DataRowScopeToken);
     gAddressBookTableOID.mOid_Scope = m_CardRowScopeToken;
     gAddressBookTableOID.mOid_Id = ID_PAB_TABLE;
     if (NS_SUCCEEDED(err))
     {
       m_mdbStore->StringToToken(m_mdbEnv,  kFirstNameProperty, &m_FirstNameColumnToken);
@@ -1385,20 +1385,20 @@ NS_IMETHODIMP nsAddrDatabase::CreateNewL
       return NS_OK;
     }
   }
 
   // start from 1
   PRUint32 totalAddress = GetListAddressTotal(pListRow) + 1;
   SetListAddressTotal(pListRow, totalAddress);
   nsCOMPtr<nsIAbCard> pNewCard;
-  rv = AddListCardColumnsToRow(newCard, pListRow, totalAddress, getter_AddRefs(pNewCard), PR_TRUE /* aInMailingList */, aList, nsnull);
+  rv = AddListCardColumnsToRow(newCard, pListRow, totalAddress, getter_AddRefs(pNewCard), true /* aInMailingList */, aList, nsnull);
   NS_ENSURE_SUCCESS(rv,rv);
 
-  addressList->AppendElement(newCard, PR_FALSE);
+  addressList->AppendElement(newCard, false);
 
   if (notify)
     NotifyCardEntryChange(AB_NotifyInserted, newCard, aList);
 
     return rv;
 }
 
 NS_IMETHODIMP nsAddrDatabase::AddListCardColumnsToRow
@@ -1409,35 +1409,35 @@ NS_IMETHODIMP nsAddrDatabase::AddListCar
 
   nsresult    err = NS_OK;
   nsString email;
   aPCard->GetPrimaryEmail(email);
   if (!email.IsEmpty())
   {
     nsIMdbRow    *pCardRow = nsnull;
     // Please DO NOT change the 3rd param of GetRowFromAttribute() call to
-    // PR_TRUE (ie, case insensitive) without reading bugs #128535 and #121478.
+    // true (ie, case insensitive) without reading bugs #128535 and #121478.
     err = GetRowFromAttribute(kPriEmailProperty, NS_ConvertUTF16toUTF8(email),
-                              PR_FALSE /* retain case */, &pCardRow, nsnull);
+                              false /* retain case */, &pCardRow, nsnull);
     bool cardWasAdded = false;
     if (NS_FAILED(err) || !pCardRow)
     {
       //New Email, then add a new row with this email
       err  = GetNewRow(&pCardRow);
 
       if (NS_SUCCEEDED(err) && pCardRow)
       {
         AddPrimaryEmail(pCardRow, NS_ConvertUTF16toUTF8(email).get());
         err = m_mdbPabTable->AddRow(m_mdbEnv, pCardRow);
         // Create a key for this row as well.
         if (NS_SUCCEEDED(err))
           AddRecordKeyColumnToRow(pCardRow);
       }
 
-      cardWasAdded = PR_TRUE;
+      cardWasAdded = true;
     }
 
     NS_ENSURE_TRUE(pCardRow, NS_ERROR_NULL_POINTER);
 
     nsString name;
     aPCard->GetDisplayName(name);
     if (!name.IsEmpty()) {
       AddDisplayName(pCardRow, NS_ConvertUTF16toUTF8(name).get());
@@ -1553,17 +1553,17 @@ nsresult nsAddrDatabase::AddListAttribut
             // start from 1
             pos = i + 1;
             pCard->GetPrimaryEmail(email);
             if (!email.IsEmpty())
             {
                 nsCOMPtr<nsIAbCard> pNewCard;
                 err = AddListCardColumnsToRow(pCard, listRow, pos, getter_AddRefs(pNewCard), listHasCard, list, aParent);
                 if (pNewCard)
-                    pAddressLists->ReplaceElementAt(pNewCard, i, PR_FALSE);
+                    pAddressLists->ReplaceElementAt(pNewCard, i, false);
             }
         }
     }
     return NS_OK;
 }
 
 PRUint32 nsAddrDatabase::GetListAddressTotal(nsIMdbRow* listRow)
 {
@@ -1577,17 +1577,17 @@ NS_IMETHODIMP nsAddrDatabase::SetListAdd
     return AddIntColumn(aListRow, m_ListTotalColumnToken, aTotal);
 }
 
 NS_IMETHODIMP nsAddrDatabase::FindRowByCard(nsIAbCard * aCard,nsIMdbRow **aRow)
 {
     nsString primaryEmail;
     aCard->GetPrimaryEmail(primaryEmail);
     return GetRowForCharColumn(primaryEmail.get(), m_PriEmailColumnToken,
-                               PR_TRUE, PR_TRUE, aRow, nsnull);
+                               true, true, aRow, nsnull);
 }
 
 nsresult nsAddrDatabase::GetAddressRowByPos(nsIMdbRow* listRow, PRUint16 pos, nsIMdbRow** cardRow)
 {
   if (!m_mdbStore || !listRow || !cardRow || !m_mdbEnv)
     return NS_ERROR_NULL_POINTER;
 
   mdb_token listAddressColumnToken;
@@ -1878,17 +1878,17 @@ NS_IMETHODIMP nsAddrDatabase::GetDeleted
   *aResult = nsnull;
 
   nsresult rv;
   nsCOMPtr<nsIMutableArray> resultCardArray =
     do_CreateInstance(NS_ARRAY_CONTRACTID, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // make sure the member is set properly
-  InitDeletedCardsTable(PR_FALSE);
+  InitDeletedCardsTable(false);
   if (m_mdbDeletedCardsTable)
   {
     nsCOMPtr<nsIMdbTableRowCursor>      rowCursor;
     mdb_pos                             rowPos;
     bool                                done = false;
     nsCOMPtr<nsIMdbRow>                 currentRow;
 
     m_mdbDeletedCardsTable->GetTableRowCursor(m_mdbEnv, -1, getter_AddRefs(rowCursor));
@@ -1900,35 +1900,35 @@ NS_IMETHODIMP nsAddrDatabase::GetDeleted
       if (currentRow && NS_SUCCEEDED(rv))
       {
         mdbOid rowOid;
         if (currentRow->GetOid(m_mdbEnv, &rowOid) == NS_OK)
         {
           nsCOMPtr<nsIAbCard>    card;
           rv = CreateCardFromDeletedCardsTable(currentRow, 0, getter_AddRefs(card));
           if (NS_SUCCEEDED(rv)) {
-            resultCardArray->AppendElement(card, PR_FALSE);
+            resultCardArray->AppendElement(card, false);
           }
         }
       }
       else
-          done = PR_TRUE;
+          done = true;
     }
   }
 
   NS_IF_ADDREF(*aResult = resultCardArray);
 
   return NS_OK;
 }
 
 NS_IMETHODIMP nsAddrDatabase::GetDeletedCardCount(PRUint32 *aCount)
 {
     // initialize count first
     *aCount = 0;
-    InitDeletedCardsTable(PR_FALSE);
+    InitDeletedCardsTable(false);
     if (m_mdbDeletedCardsTable)
       return m_mdbDeletedCardsTable->GetCount(m_mdbEnv, aCount);
     return NS_OK;
 }
 
 NS_IMETHODIMP nsAddrDatabase::PurgeDeletedCardTable()
 {
   if (!m_mdbEnv)
@@ -2167,18 +2167,18 @@ NS_IMETHODIMP nsAddrDatabase::AddLdifLis
   //add member
   nsCAutoString valueString(value);
   nsCAutoString email;
   PRInt32 emailPos = valueString.Find("mail=");
   emailPos += strlen("mail=");
   email = Substring(valueString, emailPos);
   nsCOMPtr <nsIMdbRow> cardRow;
   // Please DO NOT change the 3rd param of GetRowFromAttribute() call to
-  // PR_TRUE (ie, case insensitive) without reading bugs #128535 and #121478.
-  nsresult rv = GetRowFromAttribute(kPriEmailProperty, email, PR_FALSE /* retain case */,
+  // true (ie, case insensitive) without reading bugs #128535 and #121478.
+  nsresult rv = GetRowFromAttribute(kPriEmailProperty, email, false /* retain case */,
                                     getter_AddRefs(cardRow), nsnull);
   if (NS_SUCCEEDED(rv) && cardRow)
   {
     mdbOid outOid;
     mdb_id rowID = 0;
     if (cardRow->GetOid(m_mdbEnv, &outOid) == NS_OK)
       rowID = outOid.mOid_Id;
 
@@ -2374,17 +2374,17 @@ nsresult nsAddrDatabase::GetBoolColumn(n
             cardCell->AliasYarn(m_mdbEnv, &yarn);
             YarnToUInt32(&yarn, &nValue);
             cardCell->Release();
         }
         else
             err = NS_ERROR_FAILURE;
     }
 
-    *pValue = nValue ? PR_TRUE : PR_FALSE;
+    *pValue = nValue ? true : false;
     return err;
 }
 
 /*  value is UTF8 string */
 NS_IMETHODIMP nsAddrDatabase::AddPrimaryEmail(nsIMdbRow *aRow, const char *aValue)
 {
   NS_ENSURE_ARG_POINTER(aValue);
 
@@ -2612,17 +2612,17 @@ void nsAddrDBEnumerator::Clear()
 }
 
 NS_IMPL_ISUPPORTS2(nsAddrDBEnumerator, nsISimpleEnumerator, nsIAddrDBListener)
 
 NS_IMETHODIMP
 nsAddrDBEnumerator::HasMoreElements(bool *aResult)
 {
   NS_ENSURE_ARG_POINTER(aResult);
-    *aResult = PR_FALSE;
+    *aResult = false;
 
     if (!mDbTable || !mDb->GetEnv())
     {
         return NS_ERROR_NULL_POINTER;
     }
 
     nsCOMPtr<nsIMdbTableRowCursor> rowCursor;
     mDbTable->GetTableRowCursor(mDb->GetEnv(), mRowPos,
@@ -2631,17 +2631,17 @@ nsAddrDBEnumerator::HasMoreElements(bool
 
     mdbOid rowOid;
     rowCursor->NextRowOid(mDb->GetEnv(), &rowOid, nsnull);
     while (rowOid.mOid_Id != (mdb_id)-1)
     {
         if (mDb->IsListRowScopeToken(rowOid.mOid_Scope) ||
             mDb->IsCardRowScopeToken(rowOid.mOid_Scope))
         {
-            *aResult = PR_TRUE;
+            *aResult = true;
 
             return NS_OK;
         }
 
         if (!mDb->IsDataRowScopeToken(rowOid.mOid_Scope))
         {
             return NS_ERROR_FAILURE;
         }
@@ -2767,17 +2767,17 @@ nsListAddressEnumerator::nsListAddressEn
 
 NS_IMPL_ISUPPORTS1(nsListAddressEnumerator, nsISimpleEnumerator)
 
 NS_IMETHODIMP
 nsListAddressEnumerator::HasMoreElements(bool *aResult)
 {
   NS_ENSURE_ARG_POINTER(aResult);
 
-  *aResult = PR_FALSE;
+  *aResult = false;
 
   if (!mDbTable || !mDb->GetEnv())
   {
     return NS_ERROR_NULL_POINTER;
   }
 
   // In some cases it is possible that GetAddressRowByPos returns success,
   // but currentRow is null. This is typically due to the fact that a card
@@ -2790,17 +2790,17 @@ nsListAddressEnumerator::HasMoreElements
   {
     nsCOMPtr<nsIMdbRow> currentRow;
     nsresult rv = mDb->GetAddressRowByPos(mListRow, mAddressPos + 1,
                                           getter_AddRefs(currentRow));
     NS_ENSURE_SUCCESS(rv, rv);
 
     if (currentRow)
     {
-      *aResult = PR_TRUE;
+      *aResult = true;
       break;
     }
 
     ++mAddressPos;
   }
 
   return NS_OK;
 }
@@ -2879,17 +2879,17 @@ NS_IMETHODIMP nsAddrDatabase::GetMailing
 
             if (currentRow->GetOid(m_mdbEnv, &rowOid) == NS_OK)
             {
                 if (IsListRowScopeToken(rowOid.mOid_Scope))
                     rv = CreateABList(currentRow, getter_AddRefs(resultList));
             }
         }
         else
-            done = PR_TRUE;
+            done = true;
     }
         NS_IF_RELEASE(rowCursor);
     return NS_OK;
 }
 
 NS_IMETHODIMP nsAddrDatabase::EnumerateListAddresses(nsIAbDirectory *directory, nsISimpleEnumerator **result)
 {
     nsresult rv = NS_OK;
@@ -3011,17 +3011,17 @@ nsresult nsAddrDatabase::CreateABListCar
         personCard = do_CreateInstance(NS_ABMDBCARD_CONTRACTID, &rv);
         NS_ENSURE_SUCCESS(rv,rv);
 
         if (personCard)
         {
             GetListCardFromDB(personCard, listRow);
 
             personCard->SetPropertyAsUint32(kRowIDProperty, rowID);
-            personCard->SetIsMailList(PR_TRUE);
+            personCard->SetIsMailList(true);
             personCard->SetMailListURI(listURI);
 
             nsCAutoString id;
             id.AppendInt(rowID);
             personCard->SetLocalId(id);
 
             nsCOMPtr<nsIAbDirectory> abDir(do_QueryReferent(m_dbDirectory));
             if (abDir)
@@ -3077,17 +3077,17 @@ nsresult nsAddrDatabase::CreateABList(ns
             // be a mailing list, with a valid row and all the entries
             // in that scenario, we can skip GetListFromDB(), which would have
             // have added all the cards to the list again.
             // see bug #134743
             mdb_id existingID;
             dbmailList->GetDbRowID(&existingID);
             if (existingID != rowID) {
               // Ensure IsMailList is set up first.
-              mailList->SetIsMailList(PR_TRUE);
+              mailList->SetIsMailList(true);
               GetListFromDB(mailList, listRow);
               dbmailList->SetDbRowID(rowID);
             }
 
             dbm_dbDirectory->AddMailListToDirectory(mailList);
             NS_IF_ADDREF(*result = mailList);
         }
     }
@@ -3132,17 +3132,17 @@ nsresult nsAddrDatabase::GetRowFromAttri
   NS_ENSURE_ARG_POINTER(aCardRow);
   if (!m_mdbStore || !m_mdbEnv)
     return NS_ERROR_NULL_POINTER;
 
   mdb_token token;
   m_mdbStore->StringToToken(m_mdbEnv, aName, &token);
   NS_ConvertUTF8toUTF16 newUnicodeString(aUTF8Value);
 
-  return GetRowForCharColumn(newUnicodeString.get(), token, PR_TRUE,
+  return GetRowForCharColumn(newUnicodeString.get(), token, true,
                              aCaseInsensitive, aCardRow, aRowPos);
 }
 
 NS_IMETHODIMP nsAddrDatabase::GetCardFromAttribute(nsIAbDirectory *aDirectory,
                                                    const char *aName,
                                                    const nsACString &aUTF8Value,
                                                    bool aCaseInsensitive,
                                                    nsIAbCard **aCardResult)
@@ -3179,17 +3179,17 @@ NS_IMETHODIMP nsAddrDatabase::GetCardsFr
     if (NS_SUCCEEDED(GetRowFromAttribute(aName, aUTF8Value, aCaseInsensitive,
                                          getter_AddRefs(row), &rowPos)) && row)
     {
       if (NS_FAILED(CreateABCard(row, 0, getter_AddRefs(card))))
         continue;
       list.AppendObject(card);
     }
     else
-      done = PR_TRUE;
+      done = true;
   } while (!done);
 
   return NS_NewArrayEnumerator(cards, list);
 }
 
 NS_IMETHODIMP nsAddrDatabase::AddListDirNode(nsIMdbRow * listRow)
 {
   nsresult rv = NS_OK;
@@ -3227,18 +3227,18 @@ NS_IMETHODIMP nsAddrDatabase::AddListDir
 
 NS_IMETHODIMP nsAddrDatabase::FindMailListbyUnicodeName(const PRUnichar *listName, bool *exist)
 {
   nsAutoString unicodeString(listName);
   ToLowerCase(unicodeString);
 
   nsCOMPtr <nsIMdbRow> listRow;
   nsresult rv = GetRowForCharColumn(unicodeString.get(),
-                                    m_LowerListNameColumnToken, PR_FALSE,
-                                    PR_FALSE, getter_AddRefs(listRow), nsnull);
+                                    m_LowerListNameColumnToken, false,
+                                    false, getter_AddRefs(listRow), nsnull);
   *exist = (NS_SUCCEEDED(rv) && listRow);
   return rv;
 }
 
 NS_IMETHODIMP nsAddrDatabase::GetCardCount(PRUint32 *count)
 {
     mdb_err rv;
     mdb_count c;
@@ -3248,17 +3248,17 @@ NS_IMETHODIMP nsAddrDatabase::GetCardCou
 
     return rv;
 }
 
 bool
 nsAddrDatabase::HasRowButDeletedForCharColumn(const PRUnichar *unicodeStr, mdb_column findColumn, bool aIsCard, nsIMdbRow **aFindRow)
 {
   if (!m_mdbStore || !aFindRow || !m_mdbEnv)
-    return PR_FALSE;
+    return false;
 
   mdbYarn    sourceYarn;
 
   NS_ConvertUTF16toUTF8 UTF8String(unicodeStr);
   sourceYarn.mYarn_Buf = (void *) UTF8String.get();
   sourceYarn.mYarn_Fill = UTF8String.Length();
   sourceYarn.mYarn_Form = 0;
   sourceYarn.mYarn_Size = sourceYarn.mYarn_Fill;
@@ -3268,29 +3268,29 @@ nsAddrDatabase::HasRowButDeletedForCharC
 
   if (aIsCard)
   {
     rv = m_mdbStore->FindRow(m_mdbEnv, m_CardRowScopeToken,
       findColumn, &sourceYarn,  &outRowId, aFindRow);
 
     // no such card, so bail out early
     if (NS_FAILED(rv) || !*aFindRow)
-      return PR_FALSE;
+      return false;
 
     // we might not have loaded the "delete cards" table yet
     // so do that (but don't create it, if we don't have one),
     // so we can see if the row is really a delete card.
     if (!m_mdbDeletedCardsTable)
-      rv = InitDeletedCardsTable(PR_FALSE);
+      rv = InitDeletedCardsTable(false);
 
     // if still no deleted cards table, there are no deleted cards
     if (!m_mdbDeletedCardsTable)
-      return PR_FALSE;
-
-    mdb_bool hasRow = PR_FALSE;
+      return false;
+
+    mdb_bool hasRow = false;
     rv = m_mdbDeletedCardsTable->HasRow(m_mdbEnv, *aFindRow, &hasRow);
     return (NS_SUCCEEDED(rv) && hasRow);
   }
 
   rv = m_mdbStore->FindRow(m_mdbEnv, m_ListRowScopeToken,
     findColumn, &sourceYarn,  &outRowId, aFindRow);
   return (NS_SUCCEEDED(rv) && *aFindRow);
 }
@@ -3383,17 +3383,17 @@ nsAddrDatabase::GetRowForCharColumn(cons
           NS_IF_ADDREF(*aFindRow = currentRow);
           if (aRowPos)
             *aRowPos = rowPos;
           return NS_OK;
         }
       }
     }
     else
-      done = PR_TRUE;
+      done = true;
   }
   return NS_ERROR_FAILURE;
 }
 
 nsresult nsAddrDatabase::DeleteRow(nsIMdbTable* dbTable, nsIMdbRow* dbRow)
 {
   if (!m_mdbEnv)
     return NS_ERROR_NULL_POINTER;
--- a/mailnews/addrbook/src/nsDirPrefs.cpp
+++ b/mailnews/addrbook/src/nsDirPrefs.cpp
@@ -196,17 +196,17 @@ static nsresult DIR_GetDirServers()
         return rv;
       prefObserver = new DirPrefObserver();
 
       if (!prefObserver)
         return NS_ERROR_OUT_OF_MEMORY;
 
       NS_ADDREF(prefObserver);
 
-      pbi->AddObserver(PREF_LDAP_SERVER_TREE_NAME, prefObserver, PR_TRUE);
+      pbi->AddObserver(PREF_LDAP_SERVER_TREE_NAME, prefObserver, true);
     }
   }
   return rv;
 }
 
 nsVoidArray* DIR_GetDirectories()
 {
     if (!dir_ServerList)
@@ -275,22 +275,22 @@ nsresult DIR_ContainsServer(DIR_Server* 
   {
     PRInt32 count = dir_ServerList->Count();
     PRInt32 i;
     for (i = 0; i < count; i++)
     {
       DIR_Server* server = (DIR_Server *)(dir_ServerList->ElementAt(i));
       if (server == pServer)
       {
-        *hasDir = PR_TRUE;
+        *hasDir = true;
         return NS_OK;
       }
     }
   }
-  *hasDir = PR_FALSE;
+  *hasDir = false;
   return NS_OK;
 }
 
 nsresult DIR_AddNewAddressBook(const nsAString &dirName,
                                const nsACString &fileName,
                                const nsACString &uri, 
                                DirectoryType dirType,
                                const nsACString &prefName,
@@ -343,53 +343,53 @@ static void DIR_InitServer(DIR_Server *s
   if (!server) {
     NS_WARNING("DIR_InitServer: server parameter not initialized");
     return;
   }
 
   memset(server, 0, sizeof(DIR_Server));
   server->position = kDefaultPosition;
   server->uri = nsnull;
-  server->savingServer = PR_FALSE;
+  server->savingServer = false;
   server->dirType = dirType;
 }
 
 /* Function for setting the position of a server.  Can be used to append,
  * delete, or move a server in a server list.
  *
  * The third parameter specifies the new position the server is to occupy.
  * The resulting position may differ depending on the lock state of the
  * given server and other servers in the list.  The following special values
  * are supported:
  *   DIR_POS_APPEND - Appends the server to the end of the list.  If the server
  *                    is already in the list, does nothing.
  *   DIR_POS_DELETE - Deletes the given server from the list.  Note that this
  *                    does not cause the server structure to be freed.
  *
- * Returns PR_TRUE if the server list was re-sorted.
+ * Returns true if the server list was re-sorted.
  */
 static bool DIR_SetServerPosition(nsVoidArray *wholeList, DIR_Server *server, PRInt32 position)
  {
-   NS_ENSURE_TRUE(wholeList, PR_FALSE);
+   NS_ENSURE_TRUE(wholeList, false);
 
    PRInt32    i, count, num;
    bool       resort = false;
    DIR_Server *s=nsnull;
    
    switch (position) {
    case DIR_POS_APPEND:
    /* Do nothing if the request is to append a server that is already
      * in the list.
      */
      count = wholeList->Count();
      for (i= 0; i < count; i++)
      {
        if  ((s = (DIR_Server *)wholeList->ElementAt(i)) != nsnull)
          if (s == server)
-           return PR_FALSE;
+           return false;
      }
      /* In general, if there are any servers already in the list, set the
      * position to the position of the last server plus one.  If there
      * are none, set it to position 1.
      */
      if (count > 0)
      {
        s = (DIR_Server *)wholeList->ElementAt(count - 1);
@@ -406,17 +406,17 @@ static bool DIR_SetServerPosition(nsVoid
        * value is nsnull, the server has never been saved and there are no
        * prefs to remove.
      */
      if (server->prefName)
      {
        nsresult rv;
        nsCOMPtr<nsIPrefBranch> pPref(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
        if (NS_FAILED(rv))
-         return PR_FALSE;
+         return false;
 
        pPref->DeleteBranch(server->prefName);
 
        // mark the server as deleted by setting its position to 0
        DIR_SetIntPref(server->prefName, "position", 0, -1);
      }
      
      /* If the server is in the server list, remove it.
@@ -429,17 +429,17 @@ static bool DIR_SetServerPosition(nsVoid
        */
        count = wholeList->Count();
        if (num == count - 1)
        {
          wholeList->RemoveElementAt(num);
        }
        else
        {
-         resort = PR_TRUE;
+         resort = true;
          wholeList->RemoveElement(server);
        }
      }
      break;
      
    default:
    /* See if the server is already in the list.
      */
@@ -452,27 +452,27 @@ static bool DIR_SetServerPosition(nsVoid
      }
      
      /* If the server is not in the list, add it to the beginning and re-sort.
      */
      if (s == nsnull)
      {
        server->position = position;
        wholeList->AppendElement(server);
-       resort = PR_TRUE;
+       resort = true;
      }
      
        /* Don't re-sort if the server is already in the requested position.
      */
      else if (server->position != position)
      {
        server->position = position;
        wholeList->RemoveElement(server);
        wholeList->AppendElement(server);
-       resort = PR_TRUE;
+       resort = true;
      }
      break;
         }
         
         /* Make sure our position changes get saved back to prefs
         */
         DIR_SaveServerPreferences(wholeList);
         
@@ -540,17 +540,17 @@ static bool dir_ValidateAndAddNewServer(
         {
           DIR_Server *server = (DIR_Server *)PR_Malloc(sizeof(DIR_Server));
           if (server)
           {
             DIR_InitServer(server, (DirectoryType)dirType);
             server->prefName = prefname;
             DIR_GetPrefsForOneServer(server);
             DIR_SetServerPosition(wholeList, server, server->position);
-            rc = PR_TRUE;
+            rc = true;
           }
           PR_FREEIF(t2);
         }
         PR_Free(t1);
       }
       else
         PR_Free(prefname);
     }
@@ -674,21 +674,21 @@ nsresult DIR_DeleteServerFromList(DIR_Se
       rv = dbPath->AppendNative(nsDependentCString(server->fileName));
       NS_ENSURE_SUCCESS(rv, rv);
 
       // close file before delete it
       nsCOMPtr<nsIAddrDatabase> addrDBFactory = 
                do_GetService(NS_ADDRDATABASE_CONTRACTID, &rv);
 
       if (NS_SUCCEEDED(rv) && addrDBFactory)
-        rv = addrDBFactory->Open(dbPath, PR_FALSE, PR_TRUE, getter_AddRefs(database));
+        rv = addrDBFactory->Open(dbPath, false, true, getter_AddRefs(database));
       if (database)  /* database exists */
       {
         database->ForceClosed();
-        rv = dbPath->Remove(PR_FALSE);
+        rv = dbPath->Remove(false);
         NS_ENSURE_SUCCESS(rv, rv);
       }
     }
 
     nsVoidArray *dirList = DIR_GetDirectories();
     DIR_SetServerPosition(dirList, server, DIR_POS_DELETE);
     DIR_DeleteServer(server);
 
@@ -1061,29 +1061,29 @@ static char *dir_CreateServerPrefName (D
   }
 
   if (leafName)
   {
     PRInt32 uniqueIDCnt = 0;
         char **children = nsnull;
     /* we need to verify that this pref string name is unique */
     prefName = PR_smprintf(PREF_LDAP_SERVER_TREE_NAME".%s", leafName);
-    isUnique = PR_FALSE;
+    isUnique = false;
     PRUint32 prefCount;
     nsresult rv = dir_GetChildList(NS_LITERAL_CSTRING(PREF_LDAP_SERVER_TREE_NAME "."),
                                    &prefCount, &children);
     if (NS_SUCCEEDED(rv))
     {
       while (!isUnique && prefName)
       {
-        isUnique = PR_TRUE; /* now flip the logic and assume we are unique until we find a match */
+        isUnique = true; /* now flip the logic and assume we are unique until we find a match */
         for (PRUint32 i = 0; i < prefCount && isUnique; ++i)
         {
           if (!PL_strcasecmp(children[i], prefName)) /* are they the same branch? */
-            isUnique = PR_FALSE;
+            isUnique = false;
         }
         if (!isUnique) /* then try generating a new pref name and try again */
         {
           PR_smprintf_free(prefName);
           prefName = PR_smprintf(PREF_LDAP_SERVER_TREE_NAME".%s_%d", leafName, ++uniqueIDCnt);
         }
       } /* if we have a list of pref Names */
 
@@ -1431,30 +1431,30 @@ void DIR_SavePrefsForOneServer(DIR_Serve
     return;
 
   char *prefstring;
 
   if (server->prefName == nsnull)
     server->prefName = dir_CreateServerPrefName(server);
   prefstring = server->prefName;
 
-  server->savingServer = PR_TRUE;
+  server->savingServer = true;
 
   DIR_SetIntPref (prefstring, "position", server->position, kDefaultPosition);
 
   // Only save the non-default address book name
   DIR_SetLocalizedStringPref(prefstring, "description", server->description);
 
   DIR_SetStringPref(prefstring, "filename", server->fileName, "");
   DIR_SetIntPref(prefstring, "dirType", server->dirType, LDAPDirectory);
 
   if (server->dirType != PABDirectory)
     DIR_SetStringPref(prefstring, "uri", server->uri, "");
 
-  server->savingServer = PR_FALSE;
+  server->savingServer = false;
 }
 
 static void DIR_SaveServerPreferences(nsVoidArray *wholeList)
 {
   if (wholeList)
   {
     nsresult rv;
     nsCOMPtr<nsIPrefBranch> pPref(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv)); 
--- a/mailnews/addrbook/src/nsLDAPAutoCompleteSession.cpp
+++ b/mailnews/addrbook/src/nsLDAPAutoCompleteSession.cpp
@@ -1101,17 +1101,17 @@ nsLDAPAutoCompleteSession::SetCjkMinStri
 // Check to see if the message returned is related to our current operation
 // if there is no current operation, it's not. :-)
 nsresult 
 nsLDAPAutoCompleteSession::IsMessageCurrent(nsILDAPMessage *aMessage, 
                                             bool *aIsCurrent)
 {
     // If there's no operation, this message must be stale (ie non-current).
     if ( !mOperation ) {
-        *aIsCurrent = PR_FALSE;
+        *aIsCurrent = false;
         return NS_OK;
     }
 
     // Get the message id from the current operation.
     PRInt32 currentId;
     nsresult rv = mOperation->GetMessageID(&currentId);
     if (NS_FAILED(rv)) {
         PR_LOG(sLDAPAutoCompleteLogModule, PR_LOG_DEBUG, 
--- a/mailnews/addrbook/src/nsVCardObj.cpp
+++ b/mailnews/addrbook/src/nsVCardObj.cpp
@@ -118,21 +118,21 @@ static void initVObjectIterator(VObjectI
    ----------------------------------------------------------------------*/
 
 static bool needsQuotedPrintable (const char *s)
 {
   const unsigned char *p = (const unsigned char *)s;
 
   while (*p) {
     if (*p & 0x80 || *p == '\015' || *p == '\012')
-      return PR_TRUE;
+      return true;
     p++;
   }
 
-  return PR_FALSE;
+  return false;
 }
 
 VObject* newVObject_(const char *id)
 {
     VObject *p = (VObject*) new(VObject);
     p->next = 0;
     p->id = id;
     p->prop = 0;
@@ -1011,76 +1011,76 @@ static void writeQPString(OFile *fp, con
         }
         else
         {
           appendsOFile(fp,"=0D");
           appendsOFile(fp,"=0A");
           appendcOFile(fp,'=');
           appendcOFile(fp,'\n');
           appendcOFile(fp,'\t');
-          contWhite = PR_FALSE;
+          contWhite = false;
         }
 
         /* If its CRLF, swallow two chars instead of one. */
         if (*p == '\r' && *(p+1) == '\n')
           p++;
-        white = PR_FALSE;
+        white = false;
         current_column = 0;
       }
       else
       {
         if ((*p >= 33 && *p <= 60) ||   /* safe printing chars */
           (*p >= 62 && *p <= 126) ||
           (mb_p && (*p == 61 || *p == 127 || *p == 0x1B)))
         {
           appendcOFile(fp,*p);
           current_column++;
-          white = PR_FALSE;
-          contWhite = PR_FALSE;
+          white = false;
+          contWhite = false;
         }
         else if (*p == ' ' || *p == '\t')   /* whitespace */
         {
           if (contWhite) 
           {
             appendcOFile(fp,'=');
             appendcOFile(fp,hexdigits[*p >> 4]);
             appendcOFile(fp,hexdigits[*p & 0xF]);
             current_column += 3;
-            contWhite = PR_FALSE;
+            contWhite = false;
           }
           else
           {
             appendcOFile(fp,*p);
             current_column++;
           }
-          white = PR_TRUE;
+          white = true;
         }
         else                    /* print as =FF */
         {
           appendcOFile(fp,'=');
           appendcOFile(fp,hexdigits[*p >> 4]);
           appendcOFile(fp,hexdigits[*p & 0xF]);
           current_column += 3;
-          white = PR_FALSE;
-          contWhite = PR_FALSE;
+          white = false;
+          contWhite = false;
         }
 
         NS_ASSERTION(current_column <= 76, "1.10 <rhp@netscape.com> 06 Jan 2000 08:01"); /* Hard limit required by spec */
 
         if (current_column >= 73 || ((*(p+1) == ' ') && (current_column + 3 >= 73)))    /* soft line break: "=\r\n" */
         {
           appendcOFile(fp,'=');
           appendcOFile(fp,'\n');
           appendcOFile(fp,'\t');
           current_column = 0;
           if (white)
-            contWhite = PR_TRUE;
+            contWhite = true;
           else 
-            contWhite = PR_FALSE;
-          white = PR_FALSE;
+            contWhite = false;
+          white = false;
         }
       } 
       p++;
     }  /* while */
   }  /* if */
   else 
   {
       while (*p) {
--- a/mailnews/base/search/public/nsMsgSearchBoolExpression.h
+++ b/mailnews/base/search/public/nsMsgSearchBoolExpression.h
@@ -90,17 +90,17 @@ public:
   // accessors
 
     // Offline
   static nsMsgSearchBoolExpression * AddSearchTerm (nsMsgSearchBoolExpression * aOrigExpr, nsIMsgSearchTerm * aNewTerm, char * aEncodingStr); // IMAP/NNTP
     static nsMsgSearchBoolExpression * AddExpressionTree(nsMsgSearchBoolExpression * aOrigExpr, nsMsgSearchBoolExpression * aExpression, bool aBoolOp);
 
     // parses the expression tree and all
     // expressions underneath this node to
-    // determine if the end result is PR_TRUE or PR_FALSE.
+    // determine if the end result is true or false.
   bool OfflineEvaluate(nsIMsgDBHdr *msgToMatch,
           const char *defaultCharset, nsIMsgSearchScopeTerm *scope,
           nsIMsgDatabase *db, const char *headers, PRUint32 headerSize,
           bool Filtering);
 
     // assuming the expression is for online
     // searches, determine the length of the
     // resulting IMAP/NNTP encoding string
--- a/mailnews/base/search/src/nsMsgBodyHandler.cpp
+++ b/mailnews/base/search/src/nsMsgBodyHandler.cpp
@@ -51,44 +51,44 @@
 nsMsgBodyHandler::nsMsgBodyHandler (nsIMsgSearchScopeTerm * scope,
                                     PRUint32 numLines,
                                     nsIMsgDBHdr* msg, nsIMsgDatabase * db)
 {
   m_scope = scope;
   m_numLocalLines = numLines;
   PRUint32 flags;
   m_lineCountInBodyLines = NS_SUCCEEDED(msg->GetFlags(&flags)) ?
-    !(flags & nsMsgMessageFlags::Offline) : PR_TRUE;
+    !(flags & nsMsgMessageFlags::Offline) : true;
   // account for added x-mozilla-status lines, and envelope line.
   if (!m_lineCountInBodyLines)
     m_numLocalLines += 3;
   m_msgHdr = msg;
   m_db = db;
   
   // the following are variables used when the body handler is handling stuff from filters....through this constructor, that is not the
   // case so we set them to NULL.
   m_headers = NULL;
   m_headersSize = 0;
-  m_Filtering = PR_FALSE; // make sure we set this before we call initialize...
+  m_Filtering = false; // make sure we set this before we call initialize...
   
   Initialize();  // common initialization stuff
   OpenLocalFolder();      
 }
 
 nsMsgBodyHandler::nsMsgBodyHandler(nsIMsgSearchScopeTerm * scope,
                                    PRUint32 numLines,
                                    nsIMsgDBHdr* msg, nsIMsgDatabase* db,
                                    const char * headers, PRUint32 headersSize,
                                    bool Filtering)
 {
   m_scope = scope;
   m_numLocalLines = numLines;
   PRUint32 flags;
   m_lineCountInBodyLines = NS_SUCCEEDED(msg->GetFlags(&flags)) ?
-    !(flags & nsMsgMessageFlags::Offline) : PR_TRUE;
+    !(flags & nsMsgMessageFlags::Offline) : true;
   // account for added x-mozilla-status lines, and envelope line.
   if (!m_lineCountInBodyLines)
     m_numLocalLines += 3;
   m_msgHdr = msg;
   m_db = db;
   m_headersSize = headersSize;
   m_Filtering = Filtering;
   
@@ -99,23 +99,23 @@ nsMsgBodyHandler::nsMsgBodyHandler(nsIMs
   else
     OpenLocalFolder();  // if nothing else applies, then we must be a POP folder file
 }
 
 void nsMsgBodyHandler::Initialize()
 // common initialization code regardless of what body type we are handling...
 {
   // Default transformations for local message search and MAPI access
-  m_stripHeaders = PR_TRUE;
-  m_stripHtml = PR_TRUE;
-  m_partIsHtml = PR_FALSE;
-  m_base64part = PR_FALSE;
-  m_isMultipart = PR_FALSE;
-  m_partIsText = PR_TRUE; // default is text/plain
-  m_pastHeaders = PR_FALSE;
+  m_stripHeaders = true;
+  m_stripHtml = true;
+  m_partIsHtml = false;
+  m_base64part = false;
+  m_isMultipart = false;
+  m_partIsText = true; // default is text/plain
+  m_pastHeaders = false;
   m_headerBytesRead = 0;
 }
 
 nsMsgBodyHandler::~nsMsgBodyHandler()
 {
 }
 
 PRInt32 nsMsgBodyHandler::GetNextLine (nsCString &buf)
@@ -149,17 +149,17 @@ PRInt32 nsMsgBodyHandler::GetNextLine (n
   if (outLength < 0)
     return -1; // eof out
 
   // For non-multipart messages, the entire message minus headers is encoded
   // ApplyTransformations can only decode a part
   if (!m_isMultipart && m_base64part)
   {
     Base64Decode(buf);
-    m_base64part = PR_FALSE;
+    m_base64part = false;
     // And reapply our transformations...
     outLength = ApplyTransformations(buf, buf.Length(), eatThisLine, buf);
   }
 
   return outLength;
 }
 
 void nsMsgBodyHandler::OpenLocalFolder()
@@ -251,22 +251,22 @@ PRInt32 nsMsgBodyHandler::GetNextLocalLi
  *                            decoding; else, it is treated as an out param (a
  *                            redundant version of line).
  * @return            the length of the line after applying transformations
  */
 PRInt32 nsMsgBodyHandler::ApplyTransformations (const nsCString &line, PRInt32 length,
                                                 bool &eatThisLine, nsCString &buf)
 {
   PRInt32 newLength = length;
-  eatThisLine = PR_FALSE;
+  eatThisLine = false;
   
   if (!m_pastHeaders)  // line is a line from the message headers
   {
     if (m_stripHeaders)
-      eatThisLine = PR_TRUE;
+      eatThisLine = true;
 
     // We have already grabbed all worthwhile information from the headers,
     // so there is no need to keep track of the current lines
     buf.Assign(line);
    
     SniffPossibleMIMEHeader(buf);
     
     m_pastHeaders = buf.IsEmpty() || buf.First() == '\r' ||
@@ -280,53 +280,53 @@ PRInt32 nsMsgBodyHandler::ApplyTransform
   {
     if (m_base64part && m_partIsText) 
     {
       Base64Decode(buf);
       // Work on the parsed string
       if (!buf.Length())
       {
         NS_WARNING("Trying to transform an empty buffer");
-        eatThisLine = PR_TRUE;
+        eatThisLine = true;
       }
       else
       {
         ApplyTransformations(buf, buf.Length(), eatThisLine, buf);
         // Avoid spurious failures
-        eatThisLine = PR_FALSE;
+        eatThisLine = false;
       }
     }
     else
     {
       buf.Truncate();
-      eatThisLine = PR_TRUE; // We have no content...
+      eatThisLine = true; // We have no content...
     }
 
     // Reset all assumed headers
-    m_base64part = PR_FALSE;
-    m_pastHeaders = PR_FALSE;
-    m_partIsHtml = PR_FALSE;
-    m_partIsText = PR_TRUE;
+    m_base64part = false;
+    m_pastHeaders = false;
+    m_partIsHtml = false;
+    m_partIsText = true;
 
     return buf.Length();
   }
  
   if (!m_partIsText)
   {
     // Ignore non-text parts
     buf.Truncate();
-    eatThisLine = PR_TRUE;
+    eatThisLine = true;
     return 0;
   }
 
   if (m_base64part)
   {
     // We need to keep track of all lines to parse base64encoded...
     buf.Append(line.get());
-    eatThisLine = PR_TRUE;
+    eatThisLine = true;
     return buf.Length();
   }
     
   // ... but there's no point if we're not parsing base64.
   buf.Assign(line);
   if (m_stripHtml && m_partIsHtml)
   {
     StripHtml (buf);
@@ -344,22 +344,22 @@ void nsMsgBodyHandler::StripHtml (nsCStr
     char *pWalk = pBuf;
     
     char *pWalkInOut = (char *) pBufInOut.get();
     bool inTag = false;
     while (*pWalkInOut) // throw away everything inside < >
     {
       if (!inTag)
         if (*pWalkInOut == '<')
-          inTag = PR_TRUE;
+          inTag = true;
         else
           *pWalk++ = *pWalkInOut;
         else
           if (*pWalkInOut == '>')
-            inTag = PR_FALSE;
+            inTag = false;
           pWalkInOut++;
     }
     *pWalk = 0; // null terminator
     
     pBufInOut.Adopt(pBuf);
   }
 }
 
@@ -378,17 +378,17 @@ void nsMsgBodyHandler::SniffPossibleMIME
   // about are also case-insensitive, with the sole exception of the boundary
   // string, so we can't just take the input line and make it lower case.
   nsCString lowerCaseLine(line);
   ToLowerCase(lowerCaseLine);
 
   if (StringBeginsWith(lowerCaseLine, NS_LITERAL_CSTRING("content-type:")))
   {
     if (lowerCaseLine.Find("text/html", CaseInsensitiveCompare) != -1)
-      m_partIsHtml = PR_TRUE;
+      m_partIsHtml = true;
     // Strenuous edge case: a message/rfc822 is equivalent to the content type
     // of whatever the message is. Headers should be ignored here. Even more
     // strenuous are message/partial and message/external-body, where the first
     // case requires reassembly across messages and the second is actually an
     // external source. And of course, there are other message types to handle.
     // RFC 3798 complicates things with the message/disposition-notification
     // MIME type. message/rfc822 is best treated as a multipart with no proper
     // boundary; since we only use boundaries for retriggering the headers,
@@ -397,22 +397,22 @@ void nsMsgBodyHandler::SniffPossibleMIME
         lowerCaseLine.Find("message/", CaseInsensitiveCompare) != -1)
     {
       if (m_isMultipart)
       {
         // This means we have a nested multipart tree. Since we currently only
         // handle the first children, we are probably better off assuming that
         // this nested part is going to have text/* children. After all, the
         // biggest usage that I've seen is multipart/signed.
-        m_partIsText = PR_TRUE;
+        m_partIsText = true;
       }
-      m_isMultipart = PR_TRUE;
+      m_isMultipart = true;
     }
     else if (lowerCaseLine.Find("text/", CaseInsensitiveCompare) == -1)
-      m_partIsText = PR_FALSE; // We have disproved our assumption
+      m_partIsText = false; // We have disproved our assumption
   }
 
   // TODO: make this work for nested multiparts (requires some redesign)
   if (m_isMultipart && boundary.IsEmpty() &&
       lowerCaseLine.Find("boundary=", CaseInsensitiveCompare) != -1)
   {
     PRInt32 start = lowerCaseLine.Find("boundary=", CaseInsensitiveCompare);
     start += 9;
@@ -424,17 +424,17 @@ void nsMsgBodyHandler::SniffPossibleMIME
 
     boundary.Assign("--");
     boundary.Append(Substring(line,start,end-start));
   }
 
   if (StringBeginsWith(lowerCaseLine,
                        NS_LITERAL_CSTRING("content-transfer-encoding:")) &&
       lowerCaseLine.Find("base64", CaseInsensitiveCompare) != kNotFound)
-    m_base64part = PR_TRUE;
+    m_base64part = true;
 }
 
 /**
  * Decodes the given base64 string.
  *
  * It returns its decoded string in its input.
  *
  * @param pBufInOut   (inout) a buffer of the string
--- a/mailnews/base/search/src/nsMsgFilter.cpp
+++ b/mailnews/base/search/src/nsMsgFilter.cpp
@@ -197,18 +197,18 @@ NS_IMETHODIMP nsMsgRuleAction::GetCustom
   }
 
   // found the correct custom action
   NS_ADDREF(*aCustomAction = m_customAction);
   return NS_OK;
 }
 
 nsMsgFilter::nsMsgFilter():
-    m_temporary(PR_FALSE),
-    m_unparseable(PR_FALSE),
+    m_temporary(false),
+    m_unparseable(false),
     m_filterList(nsnull),
     m_expressionTree(nsnull)
 {
   NS_NewISupportsArray(getter_AddRefs(m_termList));
   NS_NewISupportsArray(getter_AddRefs(m_actionList));
 
   m_type = nsMsgFilterType::InboxRule | nsMsgFilterType::Manual;
 }
@@ -261,17 +261,17 @@ NS_IMETHODIMP nsMsgFilter::SetUnparsedBu
   return NS_OK;
 }
 
 NS_IMETHODIMP nsMsgFilter::AddTerm(
                                    nsMsgSearchAttribValue attrib,    /* attribute for this term          */
                                    nsMsgSearchOpValue op,         /* operator e.g. opContains           */
                                    nsIMsgSearchValue *value,        /* value e.g. "Dogbert"               */
                                   bool BooleanAND,       /* true if AND is the boolean operator.
-                                                            PR_FALSE if OR is the boolean operators */
+                                                            false if OR is the boolean operators */
                                   const nsACString & arbitraryHeader)  /* arbitrary header specified by user.
                                   ignored unless attrib = attribOtherHeader */
 {
   return NS_OK;
 }
 
 NS_IMETHODIMP nsMsgFilter::AppendTerm(nsIMsgSearchTerm * aTerm)
 {
@@ -753,17 +753,17 @@ nsresult nsMsgFilter::ConvertMoveOrCopyT
         {
           nsAutoString unicodeStr;
           rv = nsMsgI18NConvertToUnicode(nsMsgI18NFileSystemCharset(),
                                          moveValue, unicodeStr);
           NS_ENSURE_SUCCESS(rv, rv);
           rv = NS_MsgEscapeEncodeURLPath(unicodeStr, moveValue);
         }
         destFolderUri.Append(moveValue);
-        localMailRootMsgFolder->GetChildWithURI (destFolderUri, PR_TRUE, PR_FALSE /*caseInsensitive*/, getter_AddRefs(destIMsgFolder));
+        localMailRootMsgFolder->GetChildWithURI (destFolderUri, true, false /*caseInsensitive*/, getter_AddRefs(destIMsgFolder));
 
         if (destIMsgFolder)
         {
           destIMsgFolder->GetURI(folderUri);
           filterAction->SetTargetFolderUri(folderUri);
           moveValue.Assign(folderUri);
         }
       }
@@ -778,17 +778,17 @@ nsresult nsMsgFilter::ConvertMoveOrCopyT
 
 nsresult nsMsgFilter::SaveToTextFile(nsIOutputStream *aStream)
 {
   NS_ENSURE_ARG_POINTER(aStream);
   if (m_unparseable)
   {
     PRUint32 bytesWritten;
     //we need to trim leading whitespaces before filing out
-    m_unparsedBuffer.Trim(kWhitespace, PR_TRUE /*leadingCharacters*/, PR_FALSE /*trailingCharacters*/);
+    m_unparsedBuffer.Trim(kWhitespace, true /*leadingC