diff options
Diffstat (limited to 'mailnews/addrbook/src')
22 files changed, 6 insertions, 33 deletions
diff --git a/mailnews/addrbook/src/nsAbBSDirectory.cpp b/mailnews/addrbook/src/nsAbBSDirectory.cpp index 7ebe67845..446963bb2 100644 --- a/mailnews/addrbook/src/nsAbBSDirectory.cpp +++ b/mailnews/addrbook/src/nsAbBSDirectory.cpp @@ -3,7 +3,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "nsIPrefService.h" #include "nsAbBSDirectory.h" #include "nsDirPrefs.h" diff --git a/mailnews/addrbook/src/nsAbCardProperty.cpp b/mailnews/addrbook/src/nsAbCardProperty.cpp index 2c40a4034..aa4b51db1 100644 --- a/mailnews/addrbook/src/nsAbCardProperty.cpp +++ b/mailnews/addrbook/src/nsAbCardProperty.cpp @@ -6,7 +6,7 @@ #include "nsAbCardProperty.h" #include "nsAbBaseCID.h" #include "nsIPrefService.h" -#include "nsIAddrDatabase.h" +#include "nsIAbDirectory.h" #include "plbase64.h" #include "nsIStringBundle.h" #include "plstr.h" diff --git a/mailnews/addrbook/src/nsAbDirProperty.h b/mailnews/addrbook/src/nsAbDirProperty.h index 99d16a133..5e15a15fc 100644 --- a/mailnews/addrbook/src/nsAbDirProperty.h +++ b/mailnews/addrbook/src/nsAbDirProperty.h @@ -13,10 +13,8 @@ #define nsAbDirProperty_h__ #include "nsIAbDirectory.h" /* include the interface we are going to support */ -#include "nsIAbCard.h" #include "nsCOMPtr.h" #include "nsDirPrefs.h" -#include "nsIAddrDatabase.h" #include "nsStringGlue.h" #include "nsIPrefBranch.h" #include "nsIMutableArray.h" diff --git a/mailnews/addrbook/src/nsAbLDAPChangeLogData.cpp b/mailnews/addrbook/src/nsAbLDAPChangeLogData.cpp index cc4c04250..acec2e539 100644 --- a/mailnews/addrbook/src/nsAbLDAPChangeLogData.cpp +++ b/mailnews/addrbook/src/nsAbLDAPChangeLogData.cpp @@ -7,7 +7,6 @@ #include "nsAbLDAPChangeLogData.h" #include "nsAbLDAPChangeLogQuery.h" #include "nsILDAPMessage.h" -#include "nsIAbCard.h" #include "nsIAddrBookSession.h" #include "nsAbBaseCID.h" #include "nsAbUtils.h" diff --git a/mailnews/addrbook/src/nsAbLDAPDirectory.cpp b/mailnews/addrbook/src/nsAbLDAPDirectory.cpp index d1bb484c0..480de0564 100644 --- a/mailnews/addrbook/src/nsAbLDAPDirectory.cpp +++ b/mailnews/addrbook/src/nsAbLDAPDirectory.cpp @@ -8,7 +8,6 @@ #include "nsAbQueryStringToExpression.h" #include "nsAbBaseCID.h" -#include "nsIAbManager.h" #include "nsServiceManagerUtils.h" #include "nsComponentManagerUtils.h" #include "nsNetCID.h" @@ -18,6 +17,8 @@ #include "nsEnumeratorUtils.h" #include "nsIAbLDAPAttributeMap.h" #include "nsIAbMDBDirectory.h" +#include "nsIAbManager.h" +#include "nsIAddrDatabase.h" #include "nsILDAPURL.h" #include "nsILDAPConnection.h" #include "nsAppDirectoryServiceDefs.h" diff --git a/mailnews/addrbook/src/nsAbLDAPDirectoryModify.cpp b/mailnews/addrbook/src/nsAbLDAPDirectoryModify.cpp index 95af79c04..8322f6974 100644 --- a/mailnews/addrbook/src/nsAbLDAPDirectoryModify.cpp +++ b/mailnews/addrbook/src/nsAbLDAPDirectoryModify.cpp @@ -8,7 +8,6 @@ #include "nsILDAPConnection.h" #include "nsILDAPErrors.h" #include "nsILDAPModification.h" -#include "nsIServiceManager.h" #include "nsIAbLDAPDirectory.h" #include "nsIMutableArray.h" #include "nsComponentManagerUtils.h" diff --git a/mailnews/addrbook/src/nsAbLDAPDirectoryModify.h b/mailnews/addrbook/src/nsAbLDAPDirectoryModify.h index 8e14b8368..c1a2f591f 100644 --- a/mailnews/addrbook/src/nsAbLDAPDirectoryModify.h +++ b/mailnews/addrbook/src/nsAbLDAPDirectoryModify.h @@ -8,7 +8,6 @@ #include "nsAbLDAPListenerBase.h" #include "nsIAbLDAPDirectory.h" -#include "nsILDAPOperation.h" #include "nsIArray.h" class nsILDAPURL; diff --git a/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp b/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp index 9b22c796c..18964a380 100644 --- a/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp +++ b/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp @@ -7,7 +7,6 @@ #include "nsAbBoolExprToLDAPFilter.h" #include "nsILDAPMessage.h" #include "nsILDAPErrors.h" -#include "nsILDAPOperation.h" #include "nsIAbLDAPAttributeMap.h" #include "nsIAbLDAPCard.h" #include "nsAbUtils.h" diff --git a/mailnews/addrbook/src/nsAbLDAPReplicationQuery.cpp b/mailnews/addrbook/src/nsAbLDAPReplicationQuery.cpp index d82a8336c..cab9825ed 100644 --- a/mailnews/addrbook/src/nsAbLDAPReplicationQuery.cpp +++ b/mailnews/addrbook/src/nsAbLDAPReplicationQuery.cpp @@ -8,7 +8,6 @@ #include "nsAbLDAPReplicationQuery.h" #include "nsAbLDAPReplicationService.h" #include "nsAbLDAPReplicationData.h" -#include "nsILDAPURL.h" #include "nsAbBaseCID.h" #include "nsAbUtils.h" #include "nsDirPrefs.h" diff --git a/mailnews/addrbook/src/nsAbLDAPReplicationQuery.h b/mailnews/addrbook/src/nsAbLDAPReplicationQuery.h index f5d7cdda7..ebae95cbd 100644 --- a/mailnews/addrbook/src/nsAbLDAPReplicationQuery.h +++ b/mailnews/addrbook/src/nsAbLDAPReplicationQuery.h @@ -6,7 +6,6 @@ #ifndef nsAbLDAPReplicationQuery_h__ #define nsAbLDAPReplicationQuery_h__ -#include "nsIWebProgressListener.h" #include "nsIAbLDAPReplicationQuery.h" #include "nsIAbLDAPReplicationData.h" #include "nsIAbLDAPDirectory.h" diff --git a/mailnews/addrbook/src/nsAbMDBDirFactory.cpp b/mailnews/addrbook/src/nsAbMDBDirFactory.cpp index 73ecb32fc..546a80d17 100644 --- a/mailnews/addrbook/src/nsAbMDBDirFactory.cpp +++ b/mailnews/addrbook/src/nsAbMDBDirFactory.cpp @@ -11,7 +11,6 @@ #include "nsIAbManager.h" #include "nsIAbMDBDirectory.h" #include "nsAbMDBDirFactory.h" -#include "nsIAddrDBListener.h" #include "nsIAddrDatabase.h" #include "nsEnumeratorUtils.h" #include "nsIMutableArray.h" diff --git a/mailnews/addrbook/src/nsAbMDBDirProperty.cpp b/mailnews/addrbook/src/nsAbMDBDirProperty.cpp index 7df904d87..1a7ae59d7 100644 --- a/mailnews/addrbook/src/nsAbMDBDirProperty.cpp +++ b/mailnews/addrbook/src/nsAbMDBDirProperty.cpp @@ -3,14 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "nsAbMDBDirProperty.h" -#include "nsIServiceManager.h" +#include "nsAbMDBDirProperty.h" #include "nsStringGlue.h" #include "nsCOMPtr.h" #include "nsAbBaseCID.h" #include "nsAddrDatabase.h" #include "nsIAbCard.h" -#include "nsIAbListener.h" #include "nsArrayUtils.h" #include "mdb.h" #include "nsComponentManagerUtils.h" diff --git a/mailnews/addrbook/src/nsAbMDBDirectory.cpp b/mailnews/addrbook/src/nsAbMDBDirectory.cpp index be4799cf1..cb212158e 100644 --- a/mailnews/addrbook/src/nsAbMDBDirectory.cpp +++ b/mailnews/addrbook/src/nsAbMDBDirectory.cpp @@ -8,9 +8,7 @@ #include "nsCOMPtr.h" #include "nsAbBaseCID.h" #include "nsAddrDatabase.h" -#include "nsIAbListener.h" #include "nsIAbManager.h" -#include "nsIURL.h" #include "nsNetCID.h" #include "nsAbDirectoryQuery.h" #include "nsIAbDirectoryQueryProxy.h" diff --git a/mailnews/addrbook/src/nsAbManager.cpp b/mailnews/addrbook/src/nsAbManager.cpp index 2de1b4468..ca640248e 100644 --- a/mailnews/addrbook/src/nsAbManager.cpp +++ b/mailnews/addrbook/src/nsAbManager.cpp @@ -6,7 +6,6 @@ #include "nsAbManager.h" #include "nsAbBaseCID.h" #include "nsAddrDatabase.h" -#include "nsIAbMDBDirectory.h" #include "nsIOutputStream.h" #include "nsNetUtil.h" #include "nsMsgI18N.h" @@ -15,7 +14,6 @@ #include "nsAppDirectoryServiceDefs.h" #include "plstr.h" #include "prmem.h" -#include "nsIServiceManager.h" #include "mozIDOMWindow.h" #include "nsIFilePicker.h" #include "plbase64.h" @@ -32,9 +30,7 @@ #include "nsIObserverService.h" #include "nsDirPrefs.h" #include "nsThreadUtils.h" -#include "nsIAbDirFactory.h" #include "nsComponentManagerUtils.h" -#include "nsIIOService.h" #include "nsAbQueryStringToExpression.h" #include "mozilla/ArrayUtils.h" #include "mozilla/Services.h" diff --git a/mailnews/addrbook/src/nsAbManager.h b/mailnews/addrbook/src/nsAbManager.h index 066fa8a08..0922db38d 100644 --- a/mailnews/addrbook/src/nsAbManager.h +++ b/mailnews/addrbook/src/nsAbManager.h @@ -12,7 +12,6 @@ #include "nsICommandLineHandler.h" #include "nsIObserver.h" #include "nsInterfaceHashtable.h" -#include "nsIAbDirFactoryService.h" #include "nsIAbDirectory.h" class nsIAbLDAPAttributeMap; diff --git a/mailnews/addrbook/src/nsAbOSXDirectory.h b/mailnews/addrbook/src/nsAbOSXDirectory.h index 7e3fad96c..1be054480 100644 --- a/mailnews/addrbook/src/nsAbOSXDirectory.h +++ b/mailnews/addrbook/src/nsAbOSXDirectory.h @@ -10,8 +10,6 @@ #include "nsISupports.h" #include "nsAbBaseCID.h" #include "nsAbDirProperty.h" -#include "nsIAbDirectoryQuery.h" -#include "nsIAbDirectorySearch.h" #include "nsIAbDirSearchListener.h" #include "nsIMutableArray.h" #include "nsInterfaceHashtable.h" diff --git a/mailnews/addrbook/src/nsAbView.cpp b/mailnews/addrbook/src/nsAbView.cpp index aed4390de..0cd52396d 100644 --- a/mailnews/addrbook/src/nsAbView.cpp +++ b/mailnews/addrbook/src/nsAbView.cpp @@ -8,7 +8,6 @@ #include "nsAbView.h" #include "nsISupports.h" #include "nsCOMPtr.h" -#include "nsIServiceManager.h" #include "nsIAbCard.h" #include "nsILocale.h" #include "nsILocaleService.h" @@ -26,7 +25,7 @@ #include "nsIStringBundle.h" #include "nsIPrefLocalizedString.h" #include "nsArrayUtils.h" -#include "nsIAddrDatabase.h" // for kPriEmailColumn +#include "nsIAddrDatabase.h" // for kPhoneticNameColumn #include "nsMsgUtils.h" #include "mozilla/Services.h" diff --git a/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp b/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp index 9507a3cc9..8681ae4a6 100644 --- a/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp +++ b/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp @@ -4,9 +4,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "msgCore.h" // precompiled header... #include "nsStringGlue.h" -#include "nsIIOService.h" -#include "nsIStreamListener.h" #include "nsAddbookProtocolHandler.h" #include "nsAddbookUrl.h" @@ -21,7 +19,6 @@ #include "nsIAbView.h" #include "nsITreeView.h" #include "nsIStringBundle.h" -#include "nsIServiceManager.h" #include "mozilla/Services.h" #include "nsIAsyncInputStream.h" #include "nsIAsyncOutputStream.h" diff --git a/mailnews/addrbook/src/nsAddbookProtocolHandler.h b/mailnews/addrbook/src/nsAddbookProtocolHandler.h index 1eb07a4ff..f14d54c4e 100644 --- a/mailnews/addrbook/src/nsAddbookProtocolHandler.h +++ b/mailnews/addrbook/src/nsAddbookProtocolHandler.h @@ -11,7 +11,7 @@ #include "nsAddbookProtocolHandler.h" #include "nsIProtocolHandler.h" #include "nsIAddbookUrl.h" -#include "nsIAddrDatabase.h" +#include "nsIAbDirectory.h" class nsAddbookProtocolHandler : public nsIProtocolHandler { diff --git a/mailnews/addrbook/src/nsAddrDatabase.cpp b/mailnews/addrbook/src/nsAddrDatabase.cpp index 9b1450b94..463437958 100644 --- a/mailnews/addrbook/src/nsAddrDatabase.cpp +++ b/mailnews/addrbook/src/nsAddrDatabase.cpp @@ -31,7 +31,6 @@ #include "nsIPrefBranch.h" #include "nsIAbManager.h" #include "mozilla/Services.h" -#include <algorithm> #define ID_PAB_TABLE 1 #define ID_DELETEDCARDS_TABLE 2 diff --git a/mailnews/addrbook/src/nsAddrDatabase.h b/mailnews/addrbook/src/nsAddrDatabase.h index 3b4e4eee6..6a12f1744 100644 --- a/mailnews/addrbook/src/nsAddrDatabase.h +++ b/mailnews/addrbook/src/nsAddrDatabase.h @@ -14,7 +14,6 @@ #include "nsCOMPtr.h" #include "nsTObserverArray.h" #include "nsWeakPtr.h" -#include "nsIWeakReferenceUtils.h" typedef enum { diff --git a/mailnews/addrbook/src/nsWabAddressBook.cpp b/mailnews/addrbook/src/nsWabAddressBook.cpp index 9c991ddf5..44ccdea2c 100644 --- a/mailnews/addrbook/src/nsWabAddressBook.cpp +++ b/mailnews/addrbook/src/nsWabAddressBook.cpp @@ -6,7 +6,6 @@ #include <tchar.h> #include "nsWabAddressBook.h" #include "mozilla/Logging.h" -#include <algorithm> #ifdef PR_LOGGING static PRLogModuleInfo* gWabAddressBookLog |