Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 678155 - Remove NS_COM. r=bsmedberg

Browse Source
This commit is contained in:
Matheus Kerschbaum 2011-08-18 15:46:39 +02:00
parent a4e61699e9
commit 8a4cb927fd
87 changed files with 362 additions and 424 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xpcom/base/FunctionTimer.h
View File

@ -133,7 +133,7 @@
namespace mozilla {
class NS_COM FunctionTimerLog
class FunctionTimerLog
{
public:
FunctionTimerLog(const char *fname);
@ -148,7 +148,7 @@ private:
TimeStamp mLatest;
};
class NS_COM FunctionTimer
class FunctionTimer
{
static nsAutoPtr<FunctionTimerLog> sLog;
static char *sBuf1;

14
xpcom/base/nsCycleCollector.h
View File

@ -64,8 +64,8 @@ struct nsCycleCollectionLanguageRuntime
nsresult nsCycleCollector_startup();
// Returns the number of collected nodes.
NS_COM PRUint32 nsCycleCollector_collect(nsICycleCollectorListener *aListener);
NS_COM PRUint32 nsCycleCollector_suspectedCount();
PRUint32 nsCycleCollector_collect(nsICycleCollectorListener *aListener);
PRUint32 nsCycleCollector_suspectedCount();
void nsCycleCollector_shutdownThreads();
void nsCycleCollector_shutdown();
@ -88,15 +88,15 @@ struct nsCycleCollectionJSRuntime : public nsCycleCollectionLanguageRuntime
};
#ifdef DEBUG
NS_COM void nsCycleCollector_DEBUG_shouldBeFreed(nsISupports *n);
NS_COM void nsCycleCollector_DEBUG_wasFreed(nsISupports *n);
void nsCycleCollector_DEBUG_shouldBeFreed(nsISupports *n);
void nsCycleCollector_DEBUG_wasFreed(nsISupports *n);
#endif
// Helpers for interacting with language-identified scripts
NS_COM void nsCycleCollector_registerRuntime(PRUint32 langID, nsCycleCollectionLanguageRuntime *rt);
NS_COM nsCycleCollectionLanguageRuntime * nsCycleCollector_getRuntime(PRUint32 langID);
NS_COM void nsCycleCollector_forgetRuntime(PRUint32 langID);
void nsCycleCollector_registerRuntime(PRUint32 langID, nsCycleCollectionLanguageRuntime *rt);
nsCycleCollectionLanguageRuntime * nsCycleCollector_getRuntime(PRUint32 langID);
void nsCycleCollector_forgetRuntime(PRUint32 langID);
#define NS_CYCLE_COLLECTOR_LOGGER_CID \
{ 0x58be81b4, 0x39d2, 0x437c, \

4
xpcom/base/nsDebugImpl.cpp
View File

@ -533,7 +533,7 @@ nsDebugImpl::Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr)
////////////////////////////////////////////////////////////////////////////////
NS_COM nsresult
nsresult
NS_ErrorAccordingToNSPR()
{
PRErrorCode err = PR_GetError();
@ -559,7 +559,7 @@ NS_ErrorAccordingToNSPR()
////////////////////////////////////////////////////////////////////////////////
#ifdef XP_WIN
NS_COM PRBool sXPCOMHasLoadedNewDLLs = PR_FALSE;
PRBool sXPCOMHasLoadedNewDLLs = PR_FALSE;
NS_EXPORT void
NS_SetHasLoadedNewDLLs()

4
xpcom/base/nsError.h
View File

@ -327,7 +327,7 @@ inline int NS_SUCCEEDED(nsresult _nsresult) {
* Do not depend on this function. It will be going away!
***********************************************************************
*/
extern NS_COM nsresult
extern nsresult
NS_ErrorAccordingToNSPR();
@ -337,7 +337,7 @@ NS_ErrorAccordingToNSPR();
#endif
#ifdef XP_WIN
extern NS_COM PRBool sXPCOMHasLoadedNewDLLs;
extern PRBool sXPCOMHasLoadedNewDLLs;
NS_EXPORT void NS_SetHasLoadedNewDLLs();
#endif

8
xpcom/base/nsIMemoryReporter.idl
View File

@ -292,10 +292,10 @@ interface nsIMemoryReporterManager : nsISupports
#define NS_MEMORY_REPORTER_NAME(_classname) MemoryReporter_##_classname
NS_COM nsresult NS_RegisterMemoryReporter (nsIMemoryReporter *reporter);
NS_COM nsresult NS_RegisterMemoryMultiReporter (nsIMemoryMultiReporter *reporter);
nsresult NS_RegisterMemoryReporter (nsIMemoryReporter *reporter);
nsresult NS_RegisterMemoryMultiReporter (nsIMemoryMultiReporter *reporter);
NS_COM nsresult NS_UnregisterMemoryReporter (nsIMemoryReporter *reporter);
NS_COM nsresult NS_UnregisterMemoryMultiReporter (nsIMemoryMultiReporter *reporter);
nsresult NS_UnregisterMemoryReporter (nsIMemoryReporter *reporter);
nsresult NS_UnregisterMemoryMultiReporter (nsIMemoryMultiReporter *reporter);
%}

2
xpcom/base/nsInterfaceRequestorAgg.h
View File

@ -46,7 +46,7 @@
* failed to supply the requested interface. Both aFirst and aSecond may
* be null.
*/
extern NS_COM nsresult
extern nsresult
NS_NewInterfaceRequestorAggregation(nsIInterfaceRequestor *aFirst,
nsIInterfaceRequestor *aSecond,
nsIInterfaceRequestor **aResult);

8
xpcom/base/nsMemoryReporterManager.cpp
View File

@ -746,7 +746,7 @@ NS_IMETHODIMP nsMemoryReporter::GetDescription(nsACString &aDescription)
return NS_OK;
}
NS_COM nsresult
nsresult
NS_RegisterMemoryReporter (nsIMemoryReporter *reporter)
{
nsCOMPtr<nsIMemoryReporterManager> mgr = do_GetService("@mozilla.org/memory-reporter-manager;1");
@ -755,7 +755,7 @@ NS_RegisterMemoryReporter (nsIMemoryReporter *reporter)
return mgr->RegisterReporter(reporter);
}
NS_COM nsresult
nsresult
NS_RegisterMemoryMultiReporter (nsIMemoryMultiReporter *reporter)
{
nsCOMPtr<nsIMemoryReporterManager> mgr = do_GetService("@mozilla.org/memory-reporter-manager;1");
@ -764,7 +764,7 @@ NS_RegisterMemoryMultiReporter (nsIMemoryMultiReporter *reporter)
return mgr->RegisterMultiReporter(reporter);
}
NS_COM nsresult
nsresult
NS_UnregisterMemoryReporter (nsIMemoryReporter *reporter)
{
nsCOMPtr<nsIMemoryReporterManager> mgr = do_GetService("@mozilla.org/memory-reporter-manager;1");
@ -773,7 +773,7 @@ NS_UnregisterMemoryReporter (nsIMemoryReporter *reporter)
return mgr->UnregisterReporter(reporter);
}
NS_COM nsresult
nsresult
NS_UnregisterMemoryMultiReporter (nsIMemoryMultiReporter *reporter)
{
nsCOMPtr<nsIMemoryReporterManager> mgr = do_GetService("@mozilla.org/memory-reporter-manager;1");

16
xpcom/base/nsTraceRefcntImpl.cpp
View File

@ -73,7 +73,7 @@
////////////////////////////////////////////////////////////////////////////////
NS_COM void
void
NS_MeanAndStdDev(double n, double sumOfValues, double sumOfSquaredValues,
double *meanResult, double *stdDevResult)
{
@ -507,7 +507,7 @@ class nsDefaultComparator <BloatEntry*, BloatEntry*> {
#endif /* NS_IMPL_REFCNT_LOGGING */
NS_COM nsresult
nsresult
nsTraceRefcntImpl::DumpStatistics(StatisticsType type, FILE* out)
{
#ifdef NS_IMPL_REFCNT_LOGGING
@ -570,7 +570,7 @@ nsTraceRefcntImpl::DumpStatistics(StatisticsType type, FILE* out)
return NS_OK;
}
NS_COM void
void
nsTraceRefcntImpl::ResetStatistics()
{
#ifdef NS_IMPL_REFCNT_LOGGING
@ -879,7 +879,7 @@ static void PrintStackFrame(void *aPC, void *aClosure)
}
NS_COM void
void
nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
{
NS_StackWalk(PrintStackFrame, 2, aStream);
@ -894,7 +894,7 @@ nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
#include <stdlib.h> // for free()
#endif // MOZ_DEMANGLE_SYMBOLS
NS_COM void
void
nsTraceRefcntImpl::DemangleSymbol(const char * aSymbol,
char * aBuffer,
int aBufLen)
@ -1260,12 +1260,12 @@ NS_LogCOMPtrRelease(void* aCOMPtr, nsISupports* aObject)
#endif
}
NS_COM void
void
nsTraceRefcntImpl::Startup()
{
}
NS_COM void
void
nsTraceRefcntImpl::Shutdown()
{
#ifdef NS_IMPL_REFCNT_LOGGING
@ -1309,7 +1309,7 @@ nsTraceRefcntImpl::Shutdown()
#endif
}
NS_COM void
void
nsTraceRefcntImpl::SetActivityIsLegal(PRBool aLegal)
{
#ifdef NS_IMPL_REFCNT_LOGGING

16
xpcom/base/nsTraceRefcntImpl.h
View File

@ -48,30 +48,30 @@ public:
NS_DECL_ISUPPORTS
NS_DECL_NSITRACEREFCNT
static NS_COM void Startup();
static NS_COM void Shutdown();
static void Startup();
static void Shutdown();
enum StatisticsType {
ALL_STATS,
NEW_STATS
};
static NS_COM nsresult DumpStatistics(StatisticsType type = ALL_STATS,
static nsresult DumpStatistics(StatisticsType type = ALL_STATS,
FILE* out = 0);
static NS_COM void ResetStatistics(void);
static void ResetStatistics(void);
static NS_COM void DemangleSymbol(const char * aSymbol,
static void DemangleSymbol(const char * aSymbol,
char * aBuffer,
int aBufLen);
static NS_COM void WalkTheStack(FILE* aStream);
static void WalkTheStack(FILE* aStream);
/**
* Tell nsTraceRefcnt whether refcounting, allocation, and destruction
* activity is legal. This is used to trigger assertions for any such
* activity that occurs because of static constructors or destructors.
*/
static NS_COM void SetActivityIsLegal(PRBool aLegal);
static void SetActivityIsLegal(PRBool aLegal);
static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr);
};
@ -89,7 +89,7 @@ public:
////////////////////////////////////////////////////////////////////////////////
// And now for that utility that you've all been asking for...
extern "C" NS_COM void
extern "C" void
NS_MeanAndStdDev(double n, double sumOfValues, double sumOfSquaredValues,
double *meanResult, double *stdDevResult);

5
xpcom/base/nscore.h
View File

@ -34,6 +34,7 @@
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#ifndef nscore_h___
#define nscore_h___
@ -295,10 +296,8 @@
#define XPCOM_API(type) IMPORT_XPCOM_API(type)
#endif
#define NS_COM
#ifdef MOZILLA_INTERNAL_API
# define NS_COM_GLUE NS_COM
# define NS_COM_GLUE
/*
The frozen string API has different definitions of nsAC?String
classes than the internal API. On systems that explicitly declare

2
xpcom/build/Services.cpp
View File

@ -64,7 +64,7 @@ using namespace mozilla::services;
#define MOZ_SERVICE(NAME, TYPE, CONTRACT_ID) \
static TYPE* g##NAME = nsnull; \
\
NS_COM already_AddRefed<TYPE> \
already_AddRefed<TYPE> \
mozilla::services::Get##NAME() \
{ \
if (!g##NAME) { \

2
xpcom/build/Services.h
View File

@ -52,7 +52,7 @@
namespace mozilla {
namespace services {
#define MOZ_SERVICE(NAME, TYPE, SERVICE_CID) NS_COM already_AddRefed<TYPE> Get##NAME();
#define MOZ_SERVICE(NAME, TYPE, SERVICE_CID) already_AddRefed<TYPE> Get##NAME();
#include "ServiceList.h"
#undef MOZ_SERVICE

2
xpcom/components/nsCategoryManager.cpp
View File

@ -742,7 +742,7 @@ nsCategoryManager::SuppressNotifications(PRBool aSuppress)
* this will attempt to notify the observer with the origin, observerTopic string
* as parameter.
*/
NS_COM void
void
NS_CreateServicesFromCategory(const char *category,
nsISupports *origin,
const char *observerTopic)

2
xpcom/components/nsCategoryManagerUtils.h
View File

@ -40,7 +40,7 @@
#include "nsICategoryManager.h"
NS_COM void
void
NS_CreateServicesFromCategory(const char *category,
nsISupports *origin,
const char *observerTopic);

10
xpcom/components/nsComponentManager.cpp
View File

@ -46,11 +46,13 @@
* Date Modified by Description of modification
* 04/20/2000 IBM Corp. Added PR_CALLBACK for Optlink use in OS2
*/
#include <stdlib.h>
#include "nscore.h"
#include "nsISupports.h"
#include "nspr.h"
#include "nsCRT.h" // for atoll
// Arena used by component manager for storing contractid string, dll
// location strings and small objects
// CAUTION: Arena align mask needs to be defined before including plarena.h
@ -107,7 +109,7 @@ static NS_DEFINE_CID(kZipReaderCID, NS_ZIPREADER_CID);
using namespace mozilla;
NS_COM PRLogModuleInfo* nsComponentManagerLog = nsnull;
PRLogModuleInfo* nsComponentManagerLog = nsnull;
#if 0 || defined (DEBUG_timeless)
#define SHOW_DENIED_ON_SHUTDOWN
@ -1993,7 +1995,7 @@ nsFactoryEntry::GetFactory()
// Static Access Functions
////////////////////////////////////////////////////////////////////////////////
NS_COM nsresult
nsresult
NS_GetComponentManager(nsIComponentManager* *result)
{
if (!nsComponentManagerImpl::gComponentManager)
@ -2003,7 +2005,7 @@ NS_GetComponentManager(nsIComponentManager* *result)
return NS_OK;
}
NS_COM nsresult
nsresult
NS_GetServiceManager(nsIServiceManager* *result)
{
if (!nsComponentManagerImpl::gComponentManager)
@ -2014,7 +2016,7 @@ NS_GetServiceManager(nsIServiceManager* *result)
}
NS_COM nsresult
nsresult
NS_GetComponentRegistrar(nsIComponentRegistrar* *result)
{
if (!nsComponentManagerImpl::gComponentManager)

4
xpcom/ds/TimeStamp.h
View File

@ -57,7 +57,7 @@ class TimeStamp;
* system-dependent unit must be constant, otherwise the semantics of
* this class would be broken.
*/
class NS_COM TimeDuration
class TimeDuration
{
public:
// The default duration is 0.
@ -186,7 +186,7 @@ private:
* - PRIntervalTime otherwise. We detect wraparounds of
* PRIntervalTime and work around them.
*/
class NS_COM TimeStamp
class TimeStamp
{
public:
/**

18
xpcom/ds/nsAtomTable.cpp
View File

@ -419,7 +419,7 @@ class CheckStaticAtomSizes
}
};
NS_COM nsresult
nsresult
NS_RegisterStaticAtoms(const nsStaticAtom* aAtoms, PRUint32 aAtomCount)
{
// this does three things:
@ -490,13 +490,13 @@ NS_RegisterStaticAtoms(const nsStaticAtom* aAtoms, PRUint32 aAtomCount)
return NS_OK;
}
NS_COM nsIAtom*
nsIAtom*
NS_NewAtom(const char* aUTF8String)
{
return NS_NewAtom(nsDependentCString(aUTF8String));
}
NS_COM nsIAtom*
nsIAtom*
NS_NewAtom(const nsACString& aUTF8String)
{
AtomTableEntry *he = GetAtomHashEntry(aUTF8String.Data(),
@ -521,13 +521,13 @@ NS_NewAtom(const nsACString& aUTF8String)
return atom;
}
NS_COM nsIAtom*
nsIAtom*
NS_NewAtom(const PRUnichar* aUTF16String)
{
return NS_NewAtom(nsDependentString(aUTF16String));
}
NS_COM nsIAtom*
nsIAtom*
NS_NewAtom(const nsAString& aUTF16String)
{
AtomTableEntry *he = GetAtomHashEntry(aUTF16String.Data(),
@ -547,7 +547,7 @@ NS_NewAtom(const nsAString& aUTF16String)
return atom;
}
NS_COM nsIAtom*
nsIAtom*
NS_NewPermanentAtom(const nsAString& aUTF16String)
{
AtomTableEntry *he = GetAtomHashEntry(aUTF16String.Data(),
@ -568,13 +568,13 @@ NS_NewPermanentAtom(const nsAString& aUTF16String)
return atom;
}
NS_COM nsrefcnt
nsrefcnt
NS_GetNumberOfAtoms(void)
{
return gAtomTable.entryCount;
}
NS_COM nsIAtom*
nsIAtom*
NS_GetStaticAtom(const nsAString& aUTF16String)
{
NS_PRECONDITION(gStaticAtomTable, "Static atom table not created yet.");
@ -586,7 +586,7 @@ NS_GetStaticAtom(const nsAString& aUTF16String)
return atom;
}
NS_COM void
void
NS_SealStaticAtomTable()
{
gStaticAtomTableSealed = PR_TRUE;

2
xpcom/ds/nsByteBuffer.cpp
View File

@ -151,7 +151,7 @@ ByteBufferImpl::Fill(nsresult* aErrorCode, nsIInputStream* aStream,
return nb;
}
NS_COM nsresult NS_NewByteBuffer(nsIByteBuffer** aInstancePtrResult,
nsresult NS_NewByteBuffer(nsIByteBuffer** aInstancePtrResult,
nsISupports* aOuter,
PRUint32 aBufferSize)
{

2
xpcom/ds/nsCRT.h
View File

@ -95,7 +95,7 @@ extern const PRUnichar kIsoLatin1ToUCS2[256];
/// This is a wrapper class around all the C runtime functions.
class NS_COM nsCRT {
class nsCRT {
public:
enum {
LF='\n' /* Line Feed */,

4
xpcom/ds/nsCheapSets.h
View File

@ -44,7 +44,7 @@
* A string set that takes up minimal size when there are 0 or 1 strings in the
* set. Use for cases where sizes of 0 and 1 are even slightly common.
*/
class NS_COM nsCheapStringSet {
class nsCheapStringSet {
public:
nsCheapStringSet() : mValOrHash(nsnull)
{
@ -119,7 +119,7 @@ private:
* An integer set that takes up only 4 bytes when there are 0 or 1 integers
* in the set. Use for cases where sizes of 0 and 1 are even slightly common.
*/
class NS_COM nsCheapInt32Set {
class nsCheapInt32Set {
public:
nsCheapInt32Set() : mValOrHash(nsnull)
{

8
xpcom/ds/nsDoubleHashtable.h
View File

@ -398,7 +398,7 @@ void CLASSNAME::Remove(const KEY_TYPE aKey) { \
//
// String-key entry
//
class NS_COM PLDHashStringEntry : public PLDHashEntryHdr
class PLDHashStringEntry : public PLDHashEntryHdr
{
public:
PLDHashStringEntry(const void* aKey) :
@ -418,7 +418,7 @@ public:
//
// CString-key entry
//
class NS_COM PLDHashCStringEntry : public PLDHashEntryHdr
class PLDHashCStringEntry : public PLDHashEntryHdr
{
public:
PLDHashCStringEntry(const void* aKey) :
@ -438,7 +438,7 @@ public:
//
// Int-key entry
//
class NS_COM PLDHashInt32Entry : public PLDHashEntryHdr
class PLDHashInt32Entry : public PLDHashEntryHdr
{
public:
PLDHashInt32Entry(const void* aKey) :
@ -459,7 +459,7 @@ public:
//
// Void-key entry
//
class NS_COM PLDHashVoidEntry : public PLDHashEntryHdr
class PLDHashVoidEntry : public PLDHashEntryHdr
{
public:
PLDHashVoidEntry(const void* aKey) :

2
xpcom/ds/nsFixedSizeAllocator.h
View File

@ -134,7 +134,7 @@
#define NS_SIZE_IN_HEAP(_size) (_size)
class NS_COM nsFixedSizeAllocator
class nsFixedSizeAllocator
{
protected:
PLArenaPool mPool;

9
xpcom/ds/nsHashPropertyBag.h
View File

@ -48,12 +48,7 @@
#include "nsIWritablePropertyBag2.h"
#include "nsInterfaceHashtable.h"
// Set IMETHOD_VISIBILITY to empty so that the class-level NS_COM declaration
// controls member method visibility.
#undef IMETHOD_VISIBILITY
#define IMETHOD_VISIBILITY
class NS_COM nsHashPropertyBag : public nsIWritablePropertyBag
class nsHashPropertyBag : public nsIWritablePropertyBag
, public nsIWritablePropertyBag2
{
public:
@ -82,7 +77,7 @@ protected:
// Note: NS_NewHashPropertyBag returns a HPB that
// uses a non-thread-safe internal hash
extern "C" NS_COM nsresult
extern "C" nsresult
NS_NewHashPropertyBag(nsIWritablePropertyBag* *_retval);
#endif /* nsHashPropertyBag_h___ */

2
xpcom/ds/nsHashSets.h
View File

@ -93,7 +93,7 @@ public: \
DHASH_WRAPPER(CLASSNAME##Super,ENTRY_CLASS,KEY_TYPE)
#undef DHASH_EXPORT
#define DHASH_EXPORT NS_COM
#define DHASH_EXPORT
DECL_DHASH_SET(nsStringHashSet, PLDHashStringEntry, nsAString&)
DECL_DHASH_SET(nsCStringHashSet,PLDHashCStringEntry,nsACString&)

14
xpcom/ds/nsHashtable.h
View File

@ -66,7 +66,7 @@ class nsIObjectOutputStream;
class nsHashtable;
class nsStringKey;
class NS_COM nsHashKey {
class nsHashKey {
protected:
nsHashKey(void) {
#ifdef DEBUG
@ -128,7 +128,7 @@ typedef void
typedef nsresult
(* nsHashtableWriteDataFunc)(nsIObjectOutputStream *aStream, void *aData);
class NS_COM nsHashtable {
class nsHashtable {
protected:
// members
PRLock* mLock;
@ -163,7 +163,7 @@ class NS_COM nsHashtable {
typedef void* (* nsHashtableCloneElementFunc)(nsHashKey *aKey, void *aData, void* aClosure);
class NS_COM nsObjectHashtable : public nsHashtable {
class nsObjectHashtable : public nsHashtable {
public:
nsObjectHashtable(nsHashtableCloneElementFunc cloneElementFun,
void* cloneElementClosure,
@ -192,7 +192,7 @@ class NS_COM nsObjectHashtable : public nsHashtable {
class nsISupports;
class NS_COM nsSupportsHashtable
class nsSupportsHashtable
: private nsHashtable
{
public:
@ -231,7 +231,7 @@ class NS_COM nsSupportsHashtable
#include "nsISupports.h"
class NS_COM nsISupportsKey : public nsHashKey {
class nsISupportsKey : public nsHashKey {
protected:
nsISupports* mKey;
@ -337,7 +337,7 @@ class nsVoidKey : public nsHashKey {
#include "nsString.h"
// for null-terminated c-strings
class NS_COM nsCStringKey : public nsHashKey {
class nsCStringKey : public nsHashKey {
public:
// NB: when serializing, NEVER_OWN keys are deserialized as OWN.
@ -371,7 +371,7 @@ class NS_COM nsCStringKey : public nsHashKey {
};
// for null-terminated unicode strings
class NS_COM nsStringKey : public nsHashKey {
class nsStringKey : public nsHashKey {
public:
// NB: when serializing, NEVER_OWN keys are deserialized as OWN.

16
xpcom/ds/nsIAtom.idl
View File

@ -118,7 +118,7 @@ protected:
* Find an atom that matches the given UTF-8 string.
* The string is assumed to be zero terminated.
*/
extern NS_COM nsIAtom* NS_NewAtom(const char* aUTF8String);
extern nsIAtom* NS_NewAtom(const char* aUTF8String);
inline already_AddRefed<nsIAtom> do_GetAtom(const char* aUTF8String)
{ return NS_NewAtom(aUTF8String); }
@ -126,7 +126,7 @@ inline already_AddRefed<nsIAtom> do_GetAtom(const char* aUTF8String)
/**
* Find an atom that matches the given UTF-8 string.
*/
extern NS_COM nsIAtom* NS_NewAtom(const nsACString& aUTF8String);
extern nsIAtom* NS_NewAtom(const nsACString& aUTF8String);
inline already_AddRefed<nsIAtom> do_GetAtom(const nsACString& aUTF8String)
{ return NS_NewAtom(aUTF8String); }
@ -134,15 +134,15 @@ inline already_AddRefed<nsIAtom> do_GetAtom(const nsACString& aUTF8String)
* Find an atom that matches the given UTF-16 string.
* The string is assumed to be zero terminated.
*/
extern NS_COM nsIAtom* NS_NewAtom(const PRUnichar* aUTF16String);
extern nsIAtom* NS_NewAtom(const PRUnichar* aUTF16String);
inline already_AddRefed<nsIAtom> do_GetAtom(const PRUnichar* aUTF16String)
{ return NS_NewAtom(aUTF16String); }
/**
* Find an atom that matches the given UTF-16 string.
*/
extern NS_COM nsIAtom* NS_NewAtom(const nsAString& aUTF16String);
extern NS_COM nsIAtom* NS_NewPermanentAtom(const nsAString& aUTF16String);
extern nsIAtom* NS_NewAtom(const nsAString& aUTF16String);
extern nsIAtom* NS_NewPermanentAtom(const nsAString& aUTF16String);
inline already_AddRefed<nsIAtom> do_GetAtom(const nsAString& aUTF16String)
{ return NS_NewAtom(aUTF16String); }
@ -150,18 +150,18 @@ inline already_AddRefed<nsIAtom> do_GetAtom(const nsAString& aUTF16String)
* Return a count of the total number of atoms currently
* alive in the system.
*/
extern NS_COM nsrefcnt NS_GetNumberOfAtoms(void);
extern nsrefcnt NS_GetNumberOfAtoms(void);
/**
* Return a pointer for a static atom for the string or null if there's
* no static atom for this string.
*/
extern NS_COM nsIAtom* NS_GetStaticAtom(const nsAString& aUTF16String);
extern nsIAtom* NS_GetStaticAtom(const nsAString& aUTF16String);
/**
* Seal the static atom table
*/
extern NS_COM void NS_SealStaticAtomTable();
extern void NS_SealStaticAtomTable();
class nsAtomString : public nsString
{

2
xpcom/ds/nsIByteBuffer.h
View File

@ -88,7 +88,7 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsIByteBuffer, NS_IBYTEBUFFER_IID)
}
/** Create a new byte buffer using the given buffer size. */
extern NS_COM nsresult
extern nsresult
NS_NewByteBuffer(nsIByteBuffer** aInstancePtrResult,
nsISupports* aOuter,
PRUint32 aBufferSize = 0);

2
xpcom/ds/nsICollection.idl
View File

@ -63,7 +63,7 @@ interface nsICollection : nsISerializable
#include "nsCOMPtr.h"
#endif
class NS_COM nsQueryElementAt : public nsCOMPtr_helper
class nsQueryElementAt : public nsCOMPtr_helper
{
public:
nsQueryElementAt( nsICollection* aCollection, PRUint32 aIndex, nsresult* aErrorPtr )

6
xpcom/ds/nsISupportsArray.idl
View File

@ -67,7 +67,7 @@ class nsISupportsArray;
// Enumerator callback function. Return PR_FALSE to stop
typedef PRBool (*nsISupportsArrayEnumFunc)(nsISupports* aElement, void *aData);
NS_COM nsresult
nsresult
NS_NewArrayEnumerator(nsISimpleEnumerator* *result NS_OUTPARAM,
nsISupportsArray* array);
%}
@ -131,11 +131,11 @@ interface nsISupportsArray : nsICollection {
%{C++
// Construct and return a default implementation of nsISupportsArray:
extern NS_COM nsresult
extern nsresult
NS_NewISupportsArray(nsISupportsArray** aInstancePtrResult);
// Construct and return a default implementation of an enumerator for nsISupportsArrays:
extern NS_COM nsresult
extern nsresult
NS_NewISupportsArrayEnumerator(nsISupportsArray* array,
nsIBidirectionalEnumerator* *aInstancePtrResult);

2
xpcom/ds/nsIUnicharBuffer.h
View File

@ -59,7 +59,7 @@ public:
NS_DEFINE_STATIC_IID_ACCESSOR(nsIUnicharBuffer, NS_IUNICHARBUFFER_IID)
/// Factory method for nsIUnicharBuffer.
extern NS_COM nsresult
extern nsresult
NS_NewUnicharBuffer(nsIUnicharBuffer** aInstancePtrResult,
nsISupports* aOuter,
PRUint32 aBufferSize = 0);

2
xpcom/ds/nsRecyclingAllocator.h
View File

@ -71,7 +71,7 @@
class nsITimer;
class nsIMemory;
class NS_COM nsRecyclingAllocator {
class nsRecyclingAllocator {
protected:
struct Block {
PRSize bytes;

2
xpcom/ds/nsStaticAtom.h
View File

@ -77,7 +77,7 @@ struct nsFakeStringBuffer {
};
// Register static atoms with the atom table
NS_COM nsresult
nsresult
NS_RegisterStaticAtoms(const nsStaticAtom*, PRUint32 aAtomCount);
#endif

2
xpcom/ds/nsStaticNameTable.h
View File

@ -59,7 +59,7 @@
* as long as this table object - typically a static string array.
*/
class NS_COM nsStaticCaseInsensitiveNameTable
class nsStaticCaseInsensitiveNameTable
{
public:
enum { NOT_FOUND = -1 };

12
xpcom/ds/nsStringEnumerator.cpp
View File

@ -191,7 +191,7 @@ StringEnumeratorTail(T** aResult NS_INPARAM)
// constructors
//
NS_COM nsresult
nsresult
NS_NewStringEnumerator(nsIStringEnumerator** aResult,
const nsTArray<nsString>* aArray, nsISupports* aOwner)
{
@ -203,7 +203,7 @@ NS_NewStringEnumerator(nsIStringEnumerator** aResult,
}
NS_COM nsresult
nsresult
NS_NewUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult,
const nsTArray<nsCString>* aArray, nsISupports* aOwner)
{
@ -214,7 +214,7 @@ NS_NewUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult,
return StringEnumeratorTail(aResult);
}
NS_COM nsresult
nsresult
NS_NewAdoptingStringEnumerator(nsIStringEnumerator** aResult,
nsTArray<nsString>* aArray)
{
@ -225,7 +225,7 @@ NS_NewAdoptingStringEnumerator(nsIStringEnumerator** aResult,
return StringEnumeratorTail(aResult);
}
NS_COM nsresult
nsresult
NS_NewAdoptingUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult,
nsTArray<nsCString>* aArray)
{
@ -237,7 +237,7 @@ NS_NewAdoptingUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult,
}
// const ones internally just forward to the non-const equivalents
NS_COM nsresult
nsresult
NS_NewStringEnumerator(nsIStringEnumerator** aResult,
const nsTArray<nsString>* aArray)
{
@ -248,7 +248,7 @@ NS_NewStringEnumerator(nsIStringEnumerator** aResult,
return StringEnumeratorTail(aResult);
}
NS_COM nsresult
nsresult
NS_NewUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult,
const nsTArray<nsCString>* aArray)
{

12
xpcom/ds/nsStringEnumerator.h
View File

@ -75,15 +75,15 @@
// InternalMethod(enumerator);
// NS_RELEASE(enumerator);
//
NS_COM nsresult
nsresult
NS_NewStringEnumerator(nsIStringEnumerator** aResult NS_OUTPARAM,
const nsTArray<nsString>* aArray,
nsISupports* aOwner);
NS_COM nsresult
nsresult
NS_NewUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult NS_OUTPARAM,
const nsTArray<nsCString>* aArray);
NS_COM nsresult
nsresult
NS_NewStringEnumerator(nsIStringEnumerator** aResult NS_OUTPARAM,
const nsTArray<nsString>* aArray);
@ -96,11 +96,11 @@ NS_NewStringEnumerator(nsIStringEnumerator** aResult NS_OUTPARAM,
// nsTArray<nsCString>* array = new nsTArray<nsCString>;
// array->AppendString("abcd");
// NS_NewAdoptingStringEnumerator(&result, array);
NS_COM nsresult
nsresult
NS_NewAdoptingStringEnumerator(nsIStringEnumerator** aResult NS_OUTPARAM,
nsTArray<nsString>* aArray);
NS_COM nsresult
nsresult
NS_NewAdoptingUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult NS_OUTPARAM,
nsTArray<nsCString>* aArray);
@ -117,7 +117,7 @@ NS_NewAdoptingUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult NS_OUTPARAM
// return NS_NewStringEnumerator(aResult, mCategoryList, this);
// }
//
NS_COM nsresult
nsresult
NS_NewUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult NS_OUTPARAM,
const nsTArray<nsCString>* aArray,
nsISupports* aOwner);

2
xpcom/ds/nsSupportsArray.cpp
View File

@ -673,7 +673,7 @@ nsSupportsArray::Clone(nsISupportsArray* *result)
return NS_OK;
}
NS_COM nsresult
nsresult
NS_NewISupportsArray(nsISupportsArray** aInstancePtrResult)
{
nsresult rv;

7
xpcom/ds/nsSupportsArray.h
View File

@ -44,12 +44,7 @@
static const PRUint32 kAutoArraySize = 8;
// Set IMETHOD_VISIBILITY to empty so that the class-level NS_COM declaration
// controls member method visibility.
#undef IMETHOD_VISIBILITY
#define IMETHOD_VISIBILITY
class NS_COM nsSupportsArray : public nsISupportsArray {
class nsSupportsArray : public nsISupportsArray {
public:
nsSupportsArray(void);
~nsSupportsArray(void); // nonvirtual since we're not subclassed

2
xpcom/ds/nsSupportsArrayEnumerator.cpp
View File

@ -130,7 +130,7 @@ nsSupportsArrayEnumerator::Prev()
////////////////////////////////////////////////////////////////////////////////
NS_COM nsresult
nsresult
NS_NewISupportsArrayEnumerator(nsISupportsArray* array,
nsIBidirectionalEnumerator* *aInstancePtrResult)
{

2
xpcom/ds/nsUnicharBuffer.cpp
View File

@ -121,7 +121,7 @@ UnicharBufferImpl::Grow(PRInt32 aNewSize)
return PR_FALSE;
}
NS_COM nsresult
nsresult
NS_NewUnicharBuffer(nsIUnicharBuffer** aInstancePtrResult,
nsISupports* aOuter,
PRUint32 aBufferSize)

2
xpcom/ds/nsVariant.h
View File

@ -113,7 +113,7 @@ struct nsDiscriminatedUnion
* use to help them do all the 'standard' nsIVariant data conversions.
*/
class NS_COM nsVariant : public nsIWritableVariant
class nsVariant : public nsIWritableVariant
{
public:
NS_DECL_ISUPPORTS

2
xpcom/ds/nsWindowsRegKey.h
View File

@ -53,7 +53,7 @@
* This function may be used to instantiate a windows registry key object prior
* to XPCOM being initialized.
*/
extern "C" NS_COM nsresult
extern "C" nsresult
NS_NewWindowsRegKey(nsIWindowsRegKey **result);
//-----------------------------------------------------------------------------

2
xpcom/glue/nsCycleCollectorUtils.h
View File

@ -43,7 +43,7 @@
#if defined(MOZILLA_INTERNAL_API)
#define NS_IsCycleCollectorThread NS_IsCycleCollectorThread_P
#if defined(XP_WIN)
NS_COM bool NS_IsCycleCollectorThread();
bool NS_IsCycleCollectorThread();
#elif defined(NS_TLS)
// Defined in nsThreadManager.cpp.
extern NS_TLS mozilla::threads::ID gTLSThreadID;

2
xpcom/glue/nsThreadUtils.h
View File

@ -105,7 +105,7 @@ extern NS_COM_GLUE NS_METHOD
NS_GetMainThread(nsIThread **result);
#if defined(MOZILLA_INTERNAL_API) && defined(XP_WIN)
NS_COM bool NS_IsMainThread();
bool NS_IsMainThread();
#elif defined(MOZILLA_INTERNAL_API) && defined(NS_TLS)
// This is defined in nsThreadManager.cpp and initialized to `Main` for the
// main thread by nsThreadManager::Init.

4
xpcom/io/SpecialSystemDirectory.cpp
View File

@ -105,7 +105,7 @@ static nsGetKnownFolderPath gGetKnownFolderPath = NULL;
static HINSTANCE gShell32DLLInst = NULL;
#endif
NS_COM void StartupSpecialSystemDirectory()
void StartupSpecialSystemDirectory()
{
#if defined (XP_WIN)
// SHGetKnownFolderPath is only available on Windows Vista
@ -119,7 +119,7 @@ NS_COM void StartupSpecialSystemDirectory()
#endif
}
NS_COM void ShutdownSpecialSystemDirectory()
void ShutdownSpecialSystemDirectory()
{
#if defined (XP_WIN)
if (gShell32DLLInst)

5
xpcom/io/SpecialSystemDirectory.h
View File

@ -50,9 +50,8 @@
#include "prenv.h"
#endif
extern NS_COM void StartupSpecialSystemDirectory();
extern NS_COM void ShutdownSpecialSystemDirectory();
extern void StartupSpecialSystemDirectory();
extern void ShutdownSpecialSystemDirectory();
enum SystemDirectories {

14
xpcom/io/nsEscape.cpp
View File

@ -156,7 +156,7 @@ static char* nsEscapeCount(
}
//----------------------------------------------------------------------------------------
NS_COM char* nsEscape(const char * str, nsEscapeMask flags)
char* nsEscape(const char * str, nsEscapeMask flags)
//----------------------------------------------------------------------------------------
{
if(!str)
@ -165,7 +165,7 @@ NS_COM char* nsEscape(const char * str, nsEscapeMask flags)
}
//----------------------------------------------------------------------------------------
NS_COM char* nsUnescape(char * str)
char* nsUnescape(char * str)
//----------------------------------------------------------------------------------------
{
nsUnescapeCount(str);
@ -173,7 +173,7 @@ NS_COM char* nsUnescape(char * str)
}
//----------------------------------------------------------------------------------------
NS_COM PRInt32 nsUnescapeCount(char * str)
PRInt32 nsUnescapeCount(char * str)
//----------------------------------------------------------------------------------------
{
register char *src = str;
@ -219,7 +219,7 @@ NS_COM PRInt32 nsUnescapeCount(char * str)
} /* NET_UnEscapeCnt */
NS_COM char *
char *
nsEscapeHTML(const char * string)
{
char *rv = nsnull;
@ -285,7 +285,7 @@ nsEscapeHTML(const char * string)
return(rv);
}
NS_COM PRUnichar *
PRUnichar *
nsEscapeHTML2(const PRUnichar *aSourceBuffer, PRInt32 aSourceBufferLen)
{
// if the caller didn't calculate the length
@ -391,7 +391,7 @@ const int EscapeChars[256] =
esc_Forced = 1024
*/
NS_COM PRBool NS_EscapeURL(const char *part,
PRBool NS_EscapeURL(const char *part,
PRInt32 partLen,
PRUint32 flags,
nsACString &result)
@ -477,7 +477,7 @@ NS_COM PRBool NS_EscapeURL(const char *part,
#define ISHEX(c) memchr(hexChars, c, sizeof(hexChars)-1)
NS_COM PRBool NS_UnescapeURL(const char *str, PRInt32 len, PRUint32 flags, nsACString &result)
PRBool NS_UnescapeURL(const char *str, PRInt32 len, PRUint32 flags, nsACString &result)
{
if (!str) {
NS_NOTREACHED("null pointer");

14
xpcom/io/nsEscape.h
View File

@ -68,23 +68,23 @@ extern "C" {
* @return A newly allocated escaped string that must be free'd with
* nsCRT::free, or null on failure
*/
NS_COM char * nsEscape(const char * str, nsEscapeMask mask);
char * nsEscape(const char * str, nsEscapeMask mask);
NS_COM char * nsUnescape(char * str);
char * nsUnescape(char * str);
/* decode % escaped hex codes into character values,
* modifies the parameter, returns the same buffer
*/
NS_COM PRInt32 nsUnescapeCount (char * str);
PRInt32 nsUnescapeCount (char * str);
/* decode % escaped hex codes into character values,
* modifies the parameter buffer, returns the length of the result
* (result may contain \0's).
*/
NS_COM char *
char *
nsEscapeHTML(const char * string);
NS_COM PRUnichar *
PRUnichar *
nsEscapeHTML2(const PRUnichar *aSourceBuffer,
PRInt32 aSourceBufferLen = -1);
/*
@ -142,7 +142,7 @@ enum EscapeMask {
*
* @return TRUE if escaping was performed, FALSE otherwise.
*/
NS_COM PRBool NS_EscapeURL(const char *str,
PRBool NS_EscapeURL(const char *str,
PRInt32 len,
PRUint32 flags,
nsACString &result);
@ -158,7 +158,7 @@ NS_COM PRBool NS_EscapeURL(const char *str,
*
* @return TRUE if unescaping was performed, FALSE otherwise.
*/
NS_COM PRBool NS_UnescapeURL(const char *str,
PRBool NS_UnescapeURL(const char *str,
PRInt32 len,
PRUint32 flags,
nsACString &result);

4
xpcom/io/nsIInputStreamTee.idl
View File

@ -63,12 +63,12 @@ interface nsIInputStreamTee : nsIInputStream
%{C++
// factory methods
extern NS_COM nsresult
extern nsresult
NS_NewInputStreamTee(nsIInputStream **tee, // read from this input stream
nsIInputStream *source,
nsIOutputStream *sink);
extern NS_COM nsresult
extern nsresult
NS_NewInputStreamTeeAsync(nsIInputStream **tee, // read from this input stream
nsIInputStream *source,
nsIOutputStream *sink,

4
xpcom/io/nsIPipe.idl
View File

@ -161,7 +161,7 @@ interface nsISearchableInputStream : nsISupports
* pass reference to nsIMemory to have all pipe allocations use this
* allocator (pass null to use the default allocator)
*/
extern NS_COM nsresult
extern nsresult
NS_NewPipe2(nsIAsyncInputStream **pipeIn,
nsIAsyncOutputStream **pipeOut,
PRBool nonBlockingInput = PR_FALSE,
@ -198,7 +198,7 @@ NS_NewPipe2(nsIAsyncInputStream **pipeIn,
* pass reference to nsIMemory to have all pipe allocations use this
* allocator (pass null to use the default allocator)
*/
extern NS_COM nsresult
extern nsresult
NS_NewPipe(nsIInputStream **pipeIn,
nsIOutputStream **pipeOut,
PRUint32 segmentSize = 0,

2
xpcom/io/nsIStorageStream.idl
View File

@ -102,6 +102,6 @@ interface nsIStorageStream : nsISupports
%{C++
// Factory method
NS_COM nsresult
nsresult
NS_NewStorageStream(PRUint32 segmentSize, PRUint32 maxSize, nsIStorageStream **result);
%}

4
xpcom/io/nsInputStreamTee.cpp
View File

@ -338,7 +338,7 @@ nsInputStreamTee::GetEventTarget(nsIEventTarget **anEventTarget)
}
NS_COM nsresult
nsresult
NS_NewInputStreamTeeAsync(nsIInputStream **result,
nsIInputStream *source,
nsIOutputStream *sink,
@ -363,7 +363,7 @@ NS_NewInputStreamTeeAsync(nsIInputStream **result,
return rv;
}
NS_COM nsresult
nsresult
NS_NewInputStreamTee(nsIInputStream **result,
nsIInputStream *source,
nsIOutputStream *sink)

6
xpcom/io/nsLinebreakConverter.h
View File

@ -38,13 +38,12 @@
#ifndef nsLinebreakConverter_h_
#define nsLinebreakConverter_h_
#include "nscore.h"
#include "nsString.h"
// utility class for converting between different line breaks.
class NS_COM nsLinebreakConverter
class nsLinebreakConverter
{
public:
@ -152,7 +151,4 @@ public:
};
#endif // nsLinebreakConverter_h_

4
xpcom/io/nsLocalFileOS2.h
View File

@ -67,8 +67,8 @@
class TypeEaEnumerator;
class NS_COM nsLocalFile : public nsILocalFileOS2,
public nsIHashable
class nsLocalFile : public nsILocalFileOS2,
public nsIHashable
{
public:
NS_DEFINE_STATIC_CID_ACCESSOR(NS_LOCAL_FILE_CID)

2
xpcom/io/nsLocalFileUnix.cpp
View File

@ -132,7 +132,7 @@ static nsresult MacErrorMapper(OSErr inErr);
PR_END_MACRO
/* directory enumerator */
class NS_COM
class
nsDirEnumeratorUnix : public nsISimpleEnumerator,
public nsIDirectoryEnumerator
{

2
xpcom/io/nsLocalFileUnix.h
View File

@ -108,7 +108,7 @@
#endif
class NS_COM nsLocalFile :
class nsLocalFile :
#ifdef XP_MACOSX
public nsILocalFileMac,
#else

26
xpcom/io/nsNativeCharsetUtils.cpp
View File

@ -51,14 +51,14 @@
#include "nsReadableUtils.h"
#include "nsString.h"
NS_COM nsresult
nsresult
NS_CopyNativeToUnicode(const nsACString &input, nsAString &output)
{
CopyUTF8toUTF16(input, output);
return NS_OK;
}
NS_COM nsresult
nsresult
NS_CopyUnicodeToNative(const nsAString &input, nsACString &output)
{
CopyUTF16toUTF8(input, output);
@ -802,7 +802,7 @@ nsNativeCharsetConverter::IsNativeUTF8()
// API implementation
//-----------------------------------------------------------------------------
NS_COM nsresult
nsresult
NS_CopyNativeToUnicode(const nsACString &input, nsAString &output)
{
output.Truncate();
@ -839,7 +839,7 @@ NS_CopyNativeToUnicode(const nsACString &input, nsAString &output)
return rv;
}
NS_COM nsresult
nsresult
NS_CopyUnicodeToNative(const nsAString &input, nsACString &output)
{
output.Truncate();
@ -868,7 +868,7 @@ NS_CopyUnicodeToNative(const nsAString &input, nsACString &output)
return NS_OK;
}
NS_COM PRBool
PRBool
NS_IsNativeUTF8()
{
return nsNativeCharsetConverter::IsNativeUTF8();
@ -905,7 +905,7 @@ NS_ShutdownNativeCharsetUtils()
#include "nsAString.h"
#include "nsReadableUtils.h"
NS_COM nsresult
nsresult
NS_CopyNativeToUnicode(const nsACString &input, nsAString &output)
{
PRUint32 inputLen = input.Length();
@ -935,7 +935,7 @@ NS_CopyNativeToUnicode(const nsACString &input, nsAString &output)
return NS_OK;
}
NS_COM nsresult
nsresult
NS_CopyUnicodeToNative(const nsAString &input, nsACString &output)
{
PRUint32 inputLen = input.Length();
@ -972,13 +972,13 @@ NS_CopyUnicodeToNative(const nsAString &input, nsACString &output)
}
// moved from widget/src/windows/nsToolkit.cpp
NS_COM PRInt32
PRInt32
NS_ConvertAtoW(const char *aStrInA, int aBufferSize, PRUnichar *aStrOutW)
{
return MultiByteToWideChar(CP_ACP, 0, aStrInA, -1, aStrOutW, aBufferSize);
}
NS_COM PRInt32
PRInt32
NS_ConvertWtoA(const PRUnichar *aStrInW, int aBufferSizeOut,
char *aStrOutA, const char *aDefault)
{
@ -1022,7 +1022,7 @@ NS_ConvertWtoA(const PRUnichar *aStrInW, int aBufferSizeOut,
static UconvObject UnicodeConverter = NULL;
NS_COM nsresult
nsresult
NS_CopyNativeToUnicode(const nsACString &input, nsAString &output)
{
PRUint32 inputLen = input.Length();
@ -1062,7 +1062,7 @@ NS_CopyNativeToUnicode(const nsACString &input, nsAString &output)
return NS_OK;
}
NS_COM nsresult
nsresult
NS_CopyUnicodeToNative(const nsAString &input, nsACString &output)
{
size_t inputLen = input.Length();
@ -1136,14 +1136,14 @@ NS_ShutdownNativeCharsetUtils()
#include "nsReadableUtils.h"
NS_COM nsresult
nsresult
NS_CopyNativeToUnicode(const nsACString &input, nsAString &output)
{
CopyASCIItoUTF16(input, output);
return NS_OK;
}
NS_COM nsresult
nsresult
NS_CopyUnicodeToNative(const nsAString &input, nsACString &output)
{
LossyCopyUTF16toASCII(input, output);

6
xpcom/io/nsNativeCharsetUtils.h
View File

@ -54,8 +54,8 @@
/**
* thread-safe conversion routines that do not depend on uconv libraries.
*/
NS_COM nsresult NS_CopyNativeToUnicode(const nsACString &input, nsAString &output);
NS_COM nsresult NS_CopyUnicodeToNative(const nsAString &input, nsACString &output);
nsresult NS_CopyNativeToUnicode(const nsACString &input, nsAString &output);
nsresult NS_CopyUnicodeToNative(const nsAString &input, nsACString &output);
/*
* This function indicates whether the character encoding used in the file
@ -71,7 +71,7 @@ NS_COM nsresult NS_CopyUnicodeToNative(const nsAString &input, nsACString &outp
* and other platforms (e.g. OS2), it's never UTF-8.
*/
#if defined(XP_UNIX) && !defined(XP_MACOSX) && !defined(ANDROID)
NS_COM PRBool NS_IsNativeUTF8();
PRBool NS_IsNativeUTF8();
#else
inline PRBool NS_IsNativeUTF8()
{

4
xpcom/io/nsPipe3.cpp
View File

@ -1258,7 +1258,7 @@ nsPipeOutputStream::AsyncWait(nsIOutputStreamCallback *callback,
////////////////////////////////////////////////////////////////////////////////
NS_COM nsresult
nsresult
NS_NewPipe(nsIInputStream **pipeIn,
nsIOutputStream **pipeOut,
PRUint32 segmentSize,
@ -1288,7 +1288,7 @@ NS_NewPipe(nsIInputStream **pipeIn,
return NS_OK;
}
NS_COM nsresult
nsresult
NS_NewPipe2(nsIAsyncInputStream **pipeIn,
nsIAsyncOutputStream **pipeOut,
PRBool nonBlockingInput,

2
xpcom/io/nsSegmentedBuffer.cpp
View File

@ -168,7 +168,7 @@ nsSegmentedBuffer::Empty()
}
#if 0
NS_COM void
void
TestSegmentedBuffer()
{
nsSegmentedBuffer* buf = new nsSegmentedBuffer();

6
xpcom/io/nsSegmentedBuffer.h
View File

@ -56,10 +56,10 @@ public:
}
NS_COM nsresult Init(PRUint32 segmentSize, PRUint32 maxSize,
nsresult Init(PRUint32 segmentSize, PRUint32 maxSize,
nsIMemory* allocator = nsnull);
NS_COM char* AppendNewSegment(); // pushes at end
char* AppendNewSegment(); // pushes at end
// returns true if no more segments remain:
PRBool DeleteFirstSegment(); // pops from beginning
@ -71,7 +71,7 @@ public:
// consumption when data is not an exact multiple of segment size.
PRBool ReallocLastSegment(size_t newSize);
NS_COM void Empty(); // frees all segments
void Empty(); // frees all segments
inline PRUint32 GetSegmentCount() {
if (mFirstSegmentIndex <= mLastSegmentIndex)

2
xpcom/io/nsStorageStream.cpp
View File

@ -543,7 +543,7 @@ nsStorageInputStream::Seek(PRUint32 aPosition)
return NS_OK;
}
NS_COM nsresult
nsresult
NS_NewStorageStream(PRUint32 segmentSize, PRUint32 maxSize, nsIStorageStream **result)
{
NS_ENSURE_ARG(result);

22
xpcom/io/nsStreamUtils.cpp
View File

@ -207,7 +207,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS2(nsOutputStreamReadyEvent, nsIRunnable,
//-----------------------------------------------------------------------------
NS_COM nsresult
nsresult
NS_NewInputStreamReadyEvent(nsIInputStreamCallback **event,
nsIInputStreamCallback *callback,
nsIEventTarget *target)
@ -221,7 +221,7 @@ NS_NewInputStreamReadyEvent(nsIInputStreamCallback **event,
return NS_OK;
}
NS_COM nsresult
nsresult
NS_NewOutputStreamReadyEvent(nsIOutputStreamCallback **event,
nsIOutputStreamCallback *callback,
nsIEventTarget *target)
@ -584,7 +584,7 @@ public:
//-----------------------------------------------------------------------------
NS_COM nsresult
nsresult
NS_AsyncCopy(nsIInputStream *source,
nsIOutputStream *sink,
nsIEventTarget *target,
@ -626,7 +626,7 @@ NS_AsyncCopy(nsIInputStream *source,
//-----------------------------------------------------------------------------
NS_COM nsresult
nsresult
NS_CancelAsyncCopy(nsISupports *aCopierCtx, nsresult aReason)
{
nsAStreamCopier *copier = static_cast<nsAStreamCopier *>(
@ -636,7 +636,7 @@ NS_CancelAsyncCopy(nsISupports *aCopierCtx, nsresult aReason)
//-----------------------------------------------------------------------------
NS_COM nsresult
nsresult
NS_ConsumeStream(nsIInputStream *stream, PRUint32 maxCount, nsACString &result)
{
nsresult rv = NS_OK;
@ -691,7 +691,7 @@ TestInputStream(nsIInputStream *inStr,
return NS_ERROR_ABORT; // don't call me anymore
}
NS_COM PRBool
PRBool
NS_InputStreamIsBuffered(nsIInputStream *stream)
{
PRBool result = PR_FALSE;
@ -714,7 +714,7 @@ TestOutputStream(nsIOutputStream *outStr,
return NS_ERROR_ABORT; // don't call me anymore
}
NS_COM PRBool
PRBool
NS_OutputStreamIsBuffered(nsIOutputStream *stream)
{
PRBool result = PR_FALSE;
@ -725,7 +725,7 @@ NS_OutputStreamIsBuffered(nsIOutputStream *stream)
//-----------------------------------------------------------------------------
NS_COM NS_METHOD
NS_METHOD
NS_CopySegmentToStream(nsIInputStream *inStr,
void *closure,
const char *buffer,
@ -747,7 +747,7 @@ NS_CopySegmentToStream(nsIInputStream *inStr,
return NS_OK;
}
NS_COM NS_METHOD
NS_METHOD
NS_CopySegmentToBuffer(nsIInputStream *inStr,
void *closure,
const char *buffer,
@ -761,7 +761,7 @@ NS_CopySegmentToBuffer(nsIInputStream *inStr,
return NS_OK;
}
NS_COM NS_METHOD
NS_METHOD
NS_DiscardSegment(nsIInputStream *inStr,
void *closure,
const char *buffer,
@ -775,7 +775,7 @@ NS_DiscardSegment(nsIInputStream *inStr,
//-----------------------------------------------------------------------------
NS_COM NS_METHOD
NS_METHOD
NS_WriteSegmentThunk(nsIInputStream *inStr,
void *closure,
const char *buffer,

22
xpcom/io/nsStreamUtils.h
View File

@ -56,7 +56,7 @@ class nsIEventTarget;
* This function is designed to be used to implement AsyncWait when the
* aTarget parameter is non-null.
*/
extern NS_COM nsresult
extern nsresult
NS_NewInputStreamReadyEvent(nsIInputStreamCallback **aEvent,
nsIInputStreamCallback *aNotify,
nsIEventTarget *aTarget);
@ -71,7 +71,7 @@ NS_NewInputStreamReadyEvent(nsIInputStreamCallback **aEvent,
* This function is designed to be used to implement AsyncWait when the
* aTarget parameter is non-null.
*/
extern NS_COM nsresult
extern nsresult
NS_NewOutputStreamReadyEvent(nsIOutputStreamCallback **aEvent,
nsIOutputStreamCallback *aNotify,
nsIEventTarget *aTarget);
@ -105,7 +105,7 @@ typedef void (* nsAsyncCopyCallbackFun)(void *closure, nsresult status);
*
* Caller can obtain aCopierCtx to be able to cancel copying.
*/
extern NS_COM nsresult
extern nsresult
NS_AsyncCopy(nsIInputStream *aSource,
nsIOutputStream *aSink,
nsIEventTarget *aTarget,
@ -126,7 +126,7 @@ NS_AsyncCopy(nsIInputStream *aSource,
* A failure code indicating why the operation is being canceled.
* It is an error to pass a success code.
*/
extern NS_COM nsresult
extern nsresult
NS_CancelAsyncCopy(nsISupports *aCopierCtx, nsresult aReason);
/**
@ -152,7 +152,7 @@ NS_CancelAsyncCopy(nsISupports *aCopierCtx, nsresult aReason);
* Note: The data copied to the string may contain null bytes and may
* contain non-ASCII values.
*/
extern NS_COM nsresult
extern nsresult
NS_ConsumeStream(nsIInputStream *aSource, PRUint32 aMaxCount,
nsACString &aBuffer);
@ -169,7 +169,7 @@ NS_ConsumeStream(nsIInputStream *aSource, PRUint32 aMaxCount,
* @param aInputStream
* The input stream to test.
*/
extern NS_COM PRBool
extern PRBool
NS_InputStreamIsBuffered(nsIInputStream *aInputStream);
/**
@ -185,7 +185,7 @@ NS_InputStreamIsBuffered(nsIInputStream *aInputStream);
* @param aOutputStream
* The output stream to test.
*/
extern NS_COM PRBool
extern PRBool
NS_OutputStreamIsBuffered(nsIOutputStream *aOutputStream);
/**
@ -195,7 +195,7 @@ NS_OutputStreamIsBuffered(nsIOutputStream *aOutputStream);
*
* @see nsIInputStream.idl for a description of this function's parameters.
*/
extern NS_COM NS_METHOD
extern NS_METHOD
NS_CopySegmentToStream(nsIInputStream *aInputStream, void *aClosure,
const char *aFromSegment, PRUint32 aToOffset,
PRUint32 aCount, PRUint32 *aWriteCount);
@ -208,7 +208,7 @@ NS_CopySegmentToStream(nsIInputStream *aInputStream, void *aClosure,
*
* @see nsIInputStream.idl for a description of this function's parameters.
*/
extern NS_COM NS_METHOD
extern NS_METHOD
NS_CopySegmentToBuffer(nsIInputStream *aInputStream, void *aClosure,
const char *aFromSegment, PRUint32 aToOffset,
PRUint32 aCount, PRUint32 *aWriteCount);
@ -220,7 +220,7 @@ NS_CopySegmentToBuffer(nsIInputStream *aInputStream, void *aClosure,
*
* @see nsIInputStream.idl for a description of this function's parameters.
*/
extern NS_COM NS_METHOD
extern NS_METHOD
NS_DiscardSegment(nsIInputStream *aInputStream, void *aClosure,
const char *aFromSegment, PRUint32 aToOffset,
PRUint32 aCount, PRUint32 *aWriteCount);
@ -236,7 +236,7 @@ NS_DiscardSegment(nsIInputStream *aInputStream, void *aClosure,
* This function comes in handy when implementing ReadSegments in terms of an
* inner stream's ReadSegments.
*/
extern NS_COM NS_METHOD
extern NS_METHOD
NS_WriteSegmentThunk(nsIInputStream *aInputStream, void *aClosure,
const char *aFromSegment, PRUint32 aToOffset,
PRUint32 aCount, PRUint32 *aWriteCount);

6
xpcom/io/nsStringStream.cpp
View File

@ -387,7 +387,7 @@ nsStringInputStream::Write(IPC::Message *aMsg)
WriteParam(aMsg, value);
}
NS_COM nsresult
nsresult
NS_NewByteInputStream(nsIInputStream** aStreamResult,
const char* aStringToRead, PRInt32 aLength,
nsAssignmentType aAssignment)
@ -425,7 +425,7 @@ NS_NewByteInputStream(nsIInputStream** aStreamResult,
return NS_OK;
}
NS_COM nsresult
nsresult
NS_NewStringInputStream(nsIInputStream** aStreamResult,
const nsAString& aStringToRead)
{
@ -441,7 +441,7 @@ NS_NewStringInputStream(nsIInputStream** aStreamResult,
return rv;
}
NS_COM nsresult
nsresult
NS_NewCStringInputStream(nsIInputStream** aStreamResult,
const nsACString& aStringToRead)
{

6
xpcom/io/nsStringStream.h
View File

@ -80,7 +80,7 @@
* If aLength is less than zero, then the length of aStringToRead will be
* determined by scanning the buffer for the first null byte.
*/
extern NS_COM nsresult
extern nsresult
NS_NewByteInputStream(nsIInputStream** aStreamResult,
const char* aStringToRead, PRInt32 aLength = -1,
nsAssignmentType aAssignment = NS_ASSIGNMENT_DEPEND);
@ -93,7 +93,7 @@ NS_NewByteInputStream(nsIInputStream** aStreamResult,
* truncation (i.e., the high-order byte of each character will be discarded).
* This could result in data-loss, so be careful when using this function.
*/
extern NS_COM nsresult
extern nsresult
NS_NewStringInputStream(nsIInputStream** aStreamResult,
const nsAString& aStringToRead);
@ -101,7 +101,7 @@ NS_NewStringInputStream(nsIInputStream** aStreamResult,
* Factory method to get an nsInputStream from an nsACString. Result will
* implement nsIStringInputStream and nsISeekableStream.
*/
extern NS_COM nsresult
extern nsresult
NS_NewCStringInputStream(nsIInputStream** aStreamResult,
const nsACString& aStringToRead);

2
xpcom/io/nsUnicharInputStream.h
View File

@ -56,7 +56,7 @@ public:
NS_DECL_NSIFACTORY
NS_DECL_NSISIMPLEUNICHARSTREAMFACTORY
static NS_COM nsSimpleUnicharStreamFactory* GetInstance();
static nsSimpleUnicharStreamFactory* GetInstance();
private:
static const nsSimpleUnicharStreamFactory kInstance;

10
xpcom/io/nsWildCard.cpp
View File

@ -170,13 +170,13 @@ NS_WildCardValid_(const T *expr)
return (x < 0 ? x : VALID_SXP);
}
NS_COM int
int
NS_WildCardValid(const char *expr)
{
return NS_WildCardValid_(expr);
}
NS_COM int
int
NS_WildCardValid(const PRUnichar *expr)
{
return NS_WildCardValid_(expr);
@ -444,7 +444,7 @@ ns_WildCardMatch(const T *str, const T *xp, PRBool case_insensitive)
}
template<class T>
NS_COM int
int
NS_WildCardMatch_(const T *str, const T *expr, PRBool case_insensitive)
{
int is_valid = NS_WildCardValid(expr);
@ -456,14 +456,14 @@ NS_WildCardMatch_(const T *str, const T *expr, PRBool case_insensitive)
}
}
NS_COM int
int
NS_WildCardMatch(const char *str, const char *xp,
PRBool case_insensitive)
{
return NS_WildCardMatch_(str, xp, case_insensitive);
}
NS_COM int
int
NS_WildCardMatch(const PRUnichar *str, const PRUnichar *xp,
PRBool case_insensitive)
{

8
xpcom/io/nsWildCard.h
View File

@ -70,9 +70,9 @@
#define INVALID_SXP -2
#define VALID_SXP 1
NS_COM int NS_WildCardValid(const char *expr);
int NS_WildCardValid(const char *expr);
NS_COM int NS_WildCardValid(const PRUnichar *expr);
int NS_WildCardValid(const PRUnichar *expr);
/* return values for the search routines */
#define MATCH 0
@ -87,10 +87,10 @@ NS_COM int NS_WildCardValid(const PRUnichar *expr);
* Returns 0 on match and 1 on non-match.
*/
NS_COM int NS_WildCardMatch(const char *str, const char *expr,
int NS_WildCardMatch(const char *str, const char *expr,
PRBool case_insensitive);
NS_COM int NS_WildCardMatch(const PRUnichar *str, const PRUnichar *expr,
int NS_WildCardMatch(const PRUnichar *str, const PRUnichar *expr,
PRBool case_insensitive);
#endif /* nsWildCard_h__ */

2
xpcom/proxy/public/nsIProxyObjectManager.idl
View File

@ -137,7 +137,7 @@ interface nsIProxyObjectManager : nsISupports
* manager themselves every single time, thus making the calling code more
* readable. The parameters are the same as for GetProxyForObject.
*/
extern NS_COM nsresult
extern nsresult
NS_GetProxyForObject(nsIEventTarget *target, REFNSIID iid, nsISupports* object,
PRInt32 proxyType, void** result);
#endif

2
xpcom/proxy/src/nsProxyObjectManager.cpp
View File

@ -326,7 +326,7 @@ nsProxyObjectManager::GetClass(REFNSIID aIID, nsProxyEventClass **aResult)
* themselves every single time, thus making the calling code more
* readable.
*/
NS_COM nsresult
nsresult
NS_GetProxyForObject(nsIEventTarget *target,
REFNSIID aIID,
nsISupports* aObj,

2
xpcom/string/public/nsAString.h
View File

@ -74,7 +74,7 @@
* ASCII case-insensitive comparator. (for Unicode case-insensitive
* comparision, see nsUnicharUtils.h)
*/
class NS_COM nsCaseInsensitiveCStringComparator
class nsCaseInsensitiveCStringComparator
: public nsCStringComparator
{
public:

4
xpcom/string/public/nsCharTraits.h
View File

@ -151,7 +151,7 @@ struct nsCharTraits<PRUnichar>
typedef PRUint16 unsigned_char_type;
typedef char incompatible_char_type;
NS_COM static char_type *sEmptyBuffer;
static char_type *sEmptyBuffer;
static
void
@ -441,7 +441,7 @@ struct nsCharTraits<char>
typedef unsigned char unsigned_char_type;
typedef PRUnichar incompatible_char_type;
NS_COM static char_type *sEmptyBuffer;
static char_type *sEmptyBuffer;
static
void

2
xpcom/string/public/nsPrintfCString.h
View File

@ -67,7 +67,7 @@
* much more efficiently handled with |NS_LITERAL_[C]STRING| and |nsLiteral[C]String|.
*/
class NS_COM nsPrintfCString : public nsCString
class nsPrintfCString : public nsCString
{
typedef nsCString string_type;

106
xpcom/string/public/nsReadableUtils.h
View File

@ -59,29 +59,29 @@ inline size_t Distance( const nsReadingIterator<char>& start, const nsReadingIte
return end.get() - start.get();
}
NS_COM void LossyCopyUTF16toASCII( const nsAString& aSource, nsACString& aDest NS_OUTPARAM );
NS_COM void CopyASCIItoUTF16( const nsACString& aSource, nsAString& aDest NS_OUTPARAM );
void LossyCopyUTF16toASCII( const nsAString& aSource, nsACString& aDest NS_OUTPARAM );
void CopyASCIItoUTF16( const nsACString& aSource, nsAString& aDest NS_OUTPARAM );
NS_COM void LossyCopyUTF16toASCII( const PRUnichar* aSource, nsACString& aDest NS_OUTPARAM );
NS_COM void CopyASCIItoUTF16( const char* aSource, nsAString& aDest NS_OUTPARAM );
void LossyCopyUTF16toASCII( const PRUnichar* aSource, nsACString& aDest NS_OUTPARAM );
void CopyASCIItoUTF16( const char* aSource, nsAString& aDest NS_OUTPARAM );
NS_COM void CopyUTF16toUTF8( const nsAString& aSource, nsACString& aDest NS_OUTPARAM );
NS_COM void CopyUTF8toUTF16( const nsACString& aSource, nsAString& aDest NS_OUTPARAM );
void CopyUTF16toUTF8( const nsAString& aSource, nsACString& aDest NS_OUTPARAM );
void CopyUTF8toUTF16( const nsACString& aSource, nsAString& aDest NS_OUTPARAM );
NS_COM void CopyUTF16toUTF8( const PRUnichar* aSource, nsACString& aDest NS_OUTPARAM );
NS_COM void CopyUTF8toUTF16( const char* aSource, nsAString& aDest NS_OUTPARAM );
void CopyUTF16toUTF8( const PRUnichar* aSource, nsACString& aDest NS_OUTPARAM );
void CopyUTF8toUTF16( const char* aSource, nsAString& aDest NS_OUTPARAM );
NS_COM void LossyAppendUTF16toASCII( const nsAString& aSource, nsACString& aDest );
NS_COM void AppendASCIItoUTF16( const nsACString& aSource, nsAString& aDest );
void LossyAppendUTF16toASCII( const nsAString& aSource, nsACString& aDest );
void AppendASCIItoUTF16( const nsACString& aSource, nsAString& aDest );
NS_COM void LossyAppendUTF16toASCII( const PRUnichar* aSource, nsACString& aDest );
NS_COM void AppendASCIItoUTF16( const char* aSource, nsAString& aDest );
void LossyAppendUTF16toASCII( const PRUnichar* aSource, nsACString& aDest );
void AppendASCIItoUTF16( const char* aSource, nsAString& aDest );
NS_COM void AppendUTF16toUTF8( const nsAString& aSource, nsACString& aDest );
NS_COM void AppendUTF8toUTF16( const nsACString& aSource, nsAString& aDest );
void AppendUTF16toUTF8( const nsAString& aSource, nsACString& aDest );
void AppendUTF8toUTF16( const nsACString& aSource, nsAString& aDest );
NS_COM void AppendUTF16toUTF8( const PRUnichar* aSource, nsACString& aDest );
NS_COM void AppendUTF8toUTF16( const char* aSource, nsAString& aDest );
void AppendUTF16toUTF8( const PRUnichar* aSource, nsACString& aDest );
void AppendUTF8toUTF16( const char* aSource, nsAString& aDest );
/**
* Returns a new |char| buffer containing a zero-terminated copy of |aSource|.
@ -94,7 +94,7 @@ NS_COM void AppendUTF8toUTF16( const char* aSource, nsAString& aDest );
* @param aSource a 16-bit wide string
* @return a new |char| buffer you must free with |nsMemory::Free|.
*/
NS_COM char* ToNewCString( const nsAString& aSource );
char* ToNewCString( const nsAString& aSource );
/**
@ -106,7 +106,7 @@ NS_COM char* ToNewCString( const nsAString& aSource );
* @param aSource an 8-bit wide string
* @return a new |char| buffer you must free with |nsMemory::Free|.
*/
NS_COM char* ToNewCString( const nsACString& aSource );
char* ToNewCString( const nsACString& aSource );
/**
* Returns a new |char| buffer containing a zero-terminated copy of |aSource|.
@ -123,7 +123,7 @@ NS_COM char* ToNewCString( const nsACString& aSource );
* @return a new |char| buffer you must free with |nsMemory::Free|.
*/
NS_COM char* ToNewUTF8String( const nsAString& aSource, PRUint32 *aUTF8Count = nsnull );
char* ToNewUTF8String( const nsAString& aSource, PRUint32 *aUTF8Count = nsnull );
/**
@ -138,7 +138,7 @@ NS_COM char* ToNewUTF8String( const nsAString& aSource, PRUint32 *aUTF8Count = n
* @param aSource a UTF-16 string
* @return a new |PRUnichar| buffer you must free with |nsMemory::Free|.
*/
NS_COM PRUnichar* ToNewUnicode( const nsAString& aSource );
PRUnichar* ToNewUnicode( const nsAString& aSource );
/**
@ -152,7 +152,7 @@ NS_COM PRUnichar* ToNewUnicode( const nsAString& aSource );
* @param aSource an 8-bit wide string (a C-string, NOT UTF-8)
* @return a new |PRUnichar| buffer you must free with |nsMemory::Free|.
*/
NS_COM PRUnichar* ToNewUnicode( const nsACString& aSource );
PRUnichar* ToNewUnicode( const nsACString& aSource );
/**
* Returns a new |PRUnichar| buffer containing a zero-terminated copy
@ -169,7 +169,7 @@ NS_COM PRUnichar* ToNewUnicode( const nsACString& aSource );
* @return a new |PRUnichar| buffer you must free with |nsMemory::Free|.
* (UTF-16 encoded)
*/
NS_COM PRUnichar* UTF8ToNewUnicode( const nsACString& aSource, PRUint32 *aUTF16Count = nsnull );
PRUnichar* UTF8ToNewUnicode( const nsACString& aSource, PRUint32 *aUTF16Count = nsnull );
/**
* Copies |aLength| 16-bit code units from the start of |aSource| to the
@ -183,7 +183,7 @@ NS_COM PRUnichar* UTF8ToNewUnicode( const nsACString& aSource, PRUint32 *aUTF16C
* @param aLength the number of 16-bit code units to copy
* @return pointer to destination buffer - identical to |aDest|
*/
NS_COM PRUnichar* CopyUnicodeTo( const nsAString& aSource,
PRUnichar* CopyUnicodeTo( const nsAString& aSource,
PRUint32 aSrcOffset,
PRUnichar* aDest,
PRUint32 aLength );
@ -200,7 +200,7 @@ NS_COM PRUnichar* CopyUnicodeTo( const nsAString& aSource,
* @param aSrcEnd end source iterator
* @param aDest destination for the copy
*/
NS_COM void CopyUnicodeTo( const nsAString::const_iterator& aSrcStart,
void CopyUnicodeTo( const nsAString::const_iterator& aSrcStart,
const nsAString::const_iterator& aSrcEnd,
nsAString& aDest );
@ -214,7 +214,7 @@ NS_COM void CopyUnicodeTo( const nsAString::const_iterator& aSrcStart,
* @param aSrcEnd end source iterator
* @param aDest destination for the copy
*/
NS_COM void AppendUnicodeTo( const nsAString::const_iterator& aSrcStart,
void AppendUnicodeTo( const nsAString::const_iterator& aSrcStart,
const nsAString::const_iterator& aSrcEnd,
nsAString& aDest );
@ -223,15 +223,14 @@ NS_COM void AppendUnicodeTo( const nsAString::const_iterator& aSrcStart,
*
* @param aString a 16-bit wide string to scan
*/
NS_COM PRBool IsASCII( const nsAString& aString );
PRBool IsASCII( const nsAString& aString );
/**
* Returns |PR_TRUE| if |aString| contains only ASCII characters, that is, characters in the range (0x00, 0x7F).
*
* @param aString a 8-bit wide string to scan
*/
NS_COM PRBool IsASCII( const nsACString& aString );
PRBool IsASCII( const nsACString& aString );
/**
* Returns |PR_TRUE| if |aString| is a valid UTF-8 string.
@ -251,28 +250,28 @@ NS_COM PRBool IsASCII( const nsACString& aString );
*
* @param aString an 8-bit wide string to scan
*/
NS_COM PRBool IsUTF8( const nsACString& aString );
PRBool IsUTF8( const nsACString& aString );
NS_COM PRBool ParseString(const nsACString& aAstring, char aDelimiter,
PRBool ParseString(const nsACString& aAstring, char aDelimiter,
nsTArray<nsCString>& aArray);
/**
* Converts case in place in the argument string.
*/
NS_COM void ToUpperCase( nsACString& );
void ToUpperCase( nsACString& );
NS_COM void ToLowerCase( nsACString& );
void ToLowerCase( nsACString& );
NS_COM void ToUpperCase( nsCSubstring& );
void ToUpperCase( nsCSubstring& );
NS_COM void ToLowerCase( nsCSubstring& );
void ToLowerCase( nsCSubstring& );
/**
* Converts case from string aSource to aDest.
*/
NS_COM void ToUpperCase( const nsACString& aSource, nsACString& aDest );
void ToUpperCase( const nsACString& aSource, nsACString& aDest );
NS_COM void ToLowerCase( const nsACString& aSource, nsACString& aDest );
void ToLowerCase( const nsACString& aSource, nsACString& aDest );
/**
* Finds the leftmost occurrence of |aPattern|, if any in the range |aSearchStart|..|aSearchEnd|.
@ -284,8 +283,8 @@ NS_COM void ToLowerCase( const nsACString& aSource, nsACString& aDest );
* If we need something faster, then we can implement that later.
*/
NS_COM PRBool FindInReadable( const nsAString& aPattern, nsAString::const_iterator&, nsAString::const_iterator&, const nsStringComparator& = nsDefaultStringComparator() );
NS_COM PRBool FindInReadable( const nsACString& aPattern, nsACString::const_iterator&, nsACString::const_iterator&, const nsCStringComparator& = nsDefaultCStringComparator() );
PRBool FindInReadable( const nsAString& aPattern, nsAString::const_iterator&, nsAString::const_iterator&, const nsStringComparator& = nsDefaultStringComparator() );
PRBool FindInReadable( const nsACString& aPattern, nsACString::const_iterator&, nsACString::const_iterator&, const nsCStringComparator& = nsDefaultCStringComparator() );
/* sometimes we don't care about where the string was, just that we
* found it or not */
@ -306,7 +305,7 @@ inline PRBool FindInReadable( const nsACString& aPattern, const nsACString& aSou
}
NS_COM PRBool CaseInsensitiveFindInReadable( const nsACString& aPattern, nsACString::const_iterator&, nsACString::const_iterator& );
PRBool CaseInsensitiveFindInReadable( const nsACString& aPattern, nsACString::const_iterator&, nsACString::const_iterator& );
/**
* Finds the rightmost occurrence of |aPattern|
@ -314,8 +313,8 @@ NS_COM PRBool CaseInsensitiveFindInReadable( const nsACString& aPattern, nsACStr
* point to the match. If no match was found, returns |PR_FALSE| and makes |aSearchStart == aSearchEnd|.
*
*/
NS_COM PRBool RFindInReadable( const nsAString& aPattern, nsAString::const_iterator&, nsAString::const_iterator&, const nsStringComparator& = nsDefaultStringComparator() );
NS_COM PRBool RFindInReadable( const nsACString& aPattern, nsACString::const_iterator&, nsACString::const_iterator&, const nsCStringComparator& = nsDefaultCStringComparator() );
PRBool RFindInReadable( const nsAString& aPattern, nsAString::const_iterator&, nsAString::const_iterator&, const nsStringComparator& = nsDefaultStringComparator() );
PRBool RFindInReadable( const nsACString& aPattern, nsACString::const_iterator&, nsACString::const_iterator&, const nsCStringComparator& = nsDefaultCStringComparator() );
/**
* Finds the leftmost occurrence of |aChar|, if any in the range
@ -325,37 +324,36 @@ NS_COM PRBool RFindInReadable( const nsACString& aPattern, nsACString::const_ite
* point to the match. If no match was found, returns |PR_FALSE| and
* makes |aSearchStart == aSearchEnd|.
*/
NS_COM PRBool FindCharInReadable( PRUnichar aChar, nsAString::const_iterator& aSearchStart, const nsAString::const_iterator& aSearchEnd );
NS_COM PRBool FindCharInReadable( char aChar, nsACString::const_iterator& aSearchStart, const nsACString::const_iterator& aSearchEnd );
PRBool FindCharInReadable( PRUnichar aChar, nsAString::const_iterator& aSearchStart, const nsAString::const_iterator& aSearchEnd );
PRBool FindCharInReadable( char aChar, nsACString::const_iterator& aSearchStart, const nsACString::const_iterator& aSearchEnd );
/**
* Finds the number of occurences of |aChar| in the string |aStr|
*/
NS_COM PRUint32 CountCharInReadable( const nsAString& aStr,
PRUint32 CountCharInReadable( const nsAString& aStr,
PRUnichar aChar );
NS_COM PRUint32 CountCharInReadable( const nsACString& aStr,
PRUint32 CountCharInReadable( const nsACString& aStr,
char aChar );
NS_COM PRBool
PRBool
StringBeginsWith( const nsAString& aSource, const nsAString& aSubstring,
const nsStringComparator& aComparator =
nsDefaultStringComparator() );
NS_COM PRBool
PRBool
StringBeginsWith( const nsACString& aSource, const nsACString& aSubstring,
const nsCStringComparator& aComparator =
nsDefaultCStringComparator() );
NS_COM PRBool
PRBool
StringEndsWith( const nsAString& aSource, const nsAString& aSubstring,
const nsStringComparator& aComparator =
nsDefaultStringComparator() );
NS_COM PRBool
PRBool
StringEndsWith( const nsACString& aSource, const nsACString& aSubstring,
const nsCStringComparator& aComparator =
nsDefaultCStringComparator() );
NS_COM const nsAFlatString& EmptyString();
NS_COM const nsAFlatCString& EmptyCString();
const nsAFlatString& EmptyString();
const nsAFlatCString& EmptyCString();
/**
* Compare a UTF-8 string to an UTF-16 string.
@ -365,11 +363,11 @@ NS_COM const nsAFlatCString& EmptyCString();
* error (eg the strings are not valid UTF8 and UTF16 respectively),
* this method will return PR_INT32_MIN.
*/
NS_COM PRInt32
PRInt32
CompareUTF8toUTF16(const nsASingleFragmentCString& aUTF8String,
const nsASingleFragmentString& aUTF16String);
NS_COM void
void
AppendUCS4ToUTF16(const PRUint32 aSource, nsAString& aDest);
template<class T>

16
xpcom/string/public/nsStringBuffer.h
View File

@ -73,7 +73,7 @@ class nsStringBuffer
*
* @return new string buffer or null if out of memory.
*/
NS_COM static nsStringBuffer* Alloc(size_t storageSize);
static nsStringBuffer* Alloc(size_t storageSize);
/**
* Resizes the given string buffer to the specified storage size. This
@ -86,18 +86,18 @@ class nsStringBuffer
*
* @see IsReadonly
*/
NS_COM static nsStringBuffer* Realloc(nsStringBuffer* buf, size_t storageSize);
static nsStringBuffer* Realloc(nsStringBuffer* buf, size_t storageSize);
/**
* Increment the reference count on this string buffer.
*/
NS_COM void NS_FASTCALL AddRef();
void NS_FASTCALL AddRef();
/**
* Decrement the reference count on this string buffer. The string
* buffer will be destroyed when its reference count reaches zero.
*/
NS_COM void NS_FASTCALL Release();
void NS_FASTCALL Release();
/**
* This method returns the string buffer corresponding to the given data
@ -148,8 +148,8 @@ class nsStringBuffer
* the returned string buffer must have its reference count incremented
* via a call to the AddRef method.
*/
NS_COM static nsStringBuffer* FromString(const nsAString &str);
NS_COM static nsStringBuffer* FromString(const nsACString &str);
static nsStringBuffer* FromString(const nsAString &str);
static nsStringBuffer* FromString(const nsACString &str);
/**
* The ToString methods assign this string buffer to a given string
@ -165,9 +165,9 @@ class nsStringBuffer
* however, string length is always measured in storage units
* (2-byte units for wide strings).
*/
NS_COM void ToString(PRUint32 len, nsAString &str,
void ToString(PRUint32 len, nsAString &str,
PRBool aMoveOwnership = PR_FALSE);
NS_COM void ToString(PRUint32 len, nsACString &str,
void ToString(PRUint32 len, nsACString &str,
PRBool aMoveOwnership = PR_FALSE);
};

2
xpcom/string/public/nsTDependentString.h
View File

@ -117,7 +117,7 @@ class nsTDependentString_CharT : public nsTString_CharT
Rebind(data, PRUint32(char_traits::length(data)));
}
NS_COM void Rebind( const char_type* data, size_type length );
void Rebind( const char_type* data, size_type length );
void Rebind( const char_type* start, const char_type* end )
{

4
xpcom/string/public/nsTDependentSubstring.h
View File

@ -57,9 +57,9 @@ class nsTDependentSubstring_CharT : public nsTSubstring_CharT
public:
NS_COM void Rebind( const substring_type&, PRUint32 startPos, PRUint32 length = size_type(-1) );
void Rebind( const substring_type&, PRUint32 startPos, PRUint32 length = size_type(-1) );
NS_COM void Rebind( const char_type* start, const char_type* end );
void Rebind( const char_type* start, const char_type* end );
nsTDependentSubstring_CharT( const substring_type& str, PRUint32 startPos, PRUint32 length = size_type(-1) )
: substring_type()

2
xpcom/string/public/nsTPromiseFlatString.h
View File

@ -99,7 +99,7 @@ class nsTPromiseFlatString_CharT : public nsTString_CharT
private:
NS_COM void Init( const substring_type& );
void Init( const substring_type& );
// NOT TO BE IMPLEMENTED
void operator=( const self_type& );

62
xpcom/string/public/nsTString.h
View File

@ -150,12 +150,12 @@ class nsTString_CharT : public nsTSubstring_CharT
* @return offset in string, or kNotFound
*/
NS_COM PRInt32 Find( const nsCString& aString, PRBool aIgnoreCase=PR_FALSE, PRInt32 aOffset=0, PRInt32 aCount=-1 ) const;
NS_COM PRInt32 Find( const char* aString, PRBool aIgnoreCase=PR_FALSE, PRInt32 aOffset=0, PRInt32 aCount=-1 ) const;
PRInt32 Find( const nsCString& aString, PRBool aIgnoreCase=PR_FALSE, PRInt32 aOffset=0, PRInt32 aCount=-1 ) const;
PRInt32 Find( const char* aString, PRBool aIgnoreCase=PR_FALSE, PRInt32 aOffset=0, PRInt32 aCount=-1 ) const;
#ifdef CharT_is_PRUnichar
NS_COM PRInt32 Find( const nsAFlatString& aString, PRInt32 aOffset=0, PRInt32 aCount=-1 ) const;
NS_COM PRInt32 Find( const PRUnichar* aString, PRInt32 aOffset=0, PRInt32 aCount=-1 ) const;
PRInt32 Find( const nsAFlatString& aString, PRInt32 aOffset=0, PRInt32 aCount=-1 ) const;
PRInt32 Find( const PRUnichar* aString, PRInt32 aOffset=0, PRInt32 aCount=-1 ) const;
#endif
@ -171,12 +171,12 @@ class nsTString_CharT : public nsTSubstring_CharT
* @return offset in string, or kNotFound
*/
NS_COM PRInt32 RFind( const nsCString& aString, PRBool aIgnoreCase=PR_FALSE, PRInt32 aOffset=-1, PRInt32 aCount=-1 ) const;
NS_COM PRInt32 RFind( const char* aCString, PRBool aIgnoreCase=PR_FALSE, PRInt32 aOffset=-1, PRInt32 aCount=-1 ) const;
PRInt32 RFind( const nsCString& aString, PRBool aIgnoreCase=PR_FALSE, PRInt32 aOffset=-1, PRInt32 aCount=-1 ) const;
PRInt32 RFind( const char* aCString, PRBool aIgnoreCase=PR_FALSE, PRInt32 aOffset=-1, PRInt32 aCount=-1 ) const;
#ifdef CharT_is_PRUnichar
NS_COM PRInt32 RFind( const nsAFlatString& aString, PRInt32 aOffset=-1, PRInt32 aCount=-1 ) const;
NS_COM PRInt32 RFind( const PRUnichar* aString, PRInt32 aOffset=-1, PRInt32 aCount=-1 ) const;
PRInt32 RFind( const nsAFlatString& aString, PRInt32 aOffset=-1, PRInt32 aCount=-1 ) const;
PRInt32 RFind( const PRUnichar* aString, PRInt32 aOffset=-1, PRInt32 aCount=-1 ) const;
#endif
@ -191,7 +191,7 @@ class nsTString_CharT : public nsTSubstring_CharT
*/
// PRInt32 FindChar( PRUnichar aChar, PRInt32 aOffset=0, PRInt32 aCount=-1 ) const;
NS_COM PRInt32 RFindChar( PRUnichar aChar, PRInt32 aOffset=-1, PRInt32 aCount=-1 ) const;
PRInt32 RFindChar( PRUnichar aChar, PRInt32 aOffset=-1, PRInt32 aCount=-1 ) const;
/**
@ -204,14 +204,14 @@ class nsTString_CharT : public nsTSubstring_CharT
* @return offset in string, or kNotFound
*/
NS_COM PRInt32 FindCharInSet( const char* aString, PRInt32 aOffset=0 ) const;
PRInt32 FindCharInSet( const char* aString, PRInt32 aOffset=0 ) const;
PRInt32 FindCharInSet( const self_type& aString, PRInt32 aOffset=0 ) const
{
return FindCharInSet(aString.get(), aOffset);
}
#ifdef CharT_is_PRUnichar
NS_COM PRInt32 FindCharInSet( const PRUnichar* aString, PRInt32 aOffset=0 ) const;
PRInt32 FindCharInSet( const PRUnichar* aString, PRInt32 aOffset=0 ) const;
#endif
@ -225,7 +225,7 @@ class nsTString_CharT : public nsTSubstring_CharT
* @return offset in string, or kNotFound
*/
NS_COM PRInt32 RFindCharInSet( const char_type* aString, PRInt32 aOffset=-1 ) const;
PRInt32 RFindCharInSet( const char_type* aString, PRInt32 aOffset=-1 ) const;
PRInt32 RFindCharInSet( const self_type& aString, PRInt32 aOffset=-1 ) const
{
return RFindCharInSet(aString.get(), aOffset);
@ -242,7 +242,7 @@ class nsTString_CharT : public nsTSubstring_CharT
*/
#ifdef CharT_is_char
NS_COM PRInt32 Compare( const char* aString, PRBool aIgnoreCase=PR_FALSE, PRInt32 aCount=-1 ) const;
PRInt32 Compare( const char* aString, PRBool aIgnoreCase=PR_FALSE, PRInt32 aCount=-1 ) const;
#endif
@ -259,7 +259,7 @@ class nsTString_CharT : public nsTSubstring_CharT
return Compare(aString, PR_TRUE, aCount) == 0;
}
#else
NS_COM PRBool EqualsIgnoreCase( const char* aString, PRInt32 aCount=-1 ) const;
PRBool EqualsIgnoreCase( const char* aString, PRInt32 aCount=-1 ) const;
#endif // !CharT_is_PRUnichar
@ -270,7 +270,7 @@ class nsTString_CharT : public nsTSubstring_CharT
* @param aErrorCode will contain error if one occurs
* @return double-precision float rep of string value
*/
NS_COM double ToDouble( PRInt32* aErrorCode ) const;
double ToDouble( PRInt32* aErrorCode ) const;
/**
* Perform string to single-precision float conversion.
@ -289,7 +289,7 @@ class nsTString_CharT : public nsTSubstring_CharT
* @param aRadix tells us which radix to assume; kAutoDetect tells us to determine the radix for you.
* @return int rep of string value, and possible (out) error code
*/
NS_COM PRInt32 ToInteger( PRInt32* aErrorCode, PRUint32 aRadix=kRadix10 ) const;
PRInt32 ToInteger( PRInt32* aErrorCode, PRUint32 aRadix=kRadix10 ) const;
PRInt32 ToInteger( nsresult* aErrorCode, PRUint32 aRadix=kRadix10 ) const {
return ToInteger(reinterpret_cast<PRInt32*>(aErrorCode), aRadix);
}
@ -311,7 +311,7 @@ class nsTString_CharT : public nsTSubstring_CharT
* aWritable = Substring(aReadable, 0, 17);
*/
NS_COM size_type Mid( self_type& aResult, PRUint32 aStartPos, PRUint32 aCount ) const;
size_type Mid( self_type& aResult, PRUint32 aStartPos, PRUint32 aCount ) const;
size_type Left( self_type& aResult, size_type aCount ) const
{
@ -333,7 +333,7 @@ class nsTString_CharT : public nsTSubstring_CharT
* @return TRUE if successful
*/
NS_COM PRBool SetCharAt( PRUnichar aChar, PRUint32 aIndex );
PRBool SetCharAt( PRUnichar aChar, PRUint32 aIndex );
/**
@ -342,23 +342,23 @@ class nsTString_CharT : public nsTSubstring_CharT
*
* @param aSet -- characters to be cut from this
*/
NS_COM void StripChars( const char* aSet );
void StripChars( const char* aSet );
/**
* This method strips whitespace throughout the string.
*/
NS_COM void StripWhitespace();
void StripWhitespace();
/**
* swaps occurence of 1 string for another
*/
NS_COM void ReplaceChar( char_type aOldChar, char_type aNewChar );
NS_COM void ReplaceChar( const char* aSet, char_type aNewChar );
NS_COM void ReplaceSubstring( const self_type& aTarget, const self_type& aNewValue);
NS_COM void ReplaceSubstring( const char_type* aTarget, const char_type* aNewValue);
void ReplaceChar( char_type aOldChar, char_type aNewChar );
void ReplaceChar( const char* aSet, char_type aNewChar );
void ReplaceSubstring( const self_type& aTarget, const self_type& aNewValue);
void ReplaceSubstring( const char_type* aTarget, const char_type* aNewValue);
/**
@ -371,7 +371,7 @@ class nsTString_CharT : public nsTSubstring_CharT
* @param aIgnoreQuotes -- if true, causes surrounding quotes to be ignored
* @return this
*/
NS_COM void Trim( const char* aSet, PRBool aEliminateLeading=PR_TRUE, PRBool aEliminateTrailing=PR_TRUE, PRBool aIgnoreQuotes=PR_FALSE );
void Trim( const char* aSet, PRBool aEliminateLeading=PR_TRUE, PRBool aEliminateTrailing=PR_TRUE, PRBool aIgnoreQuotes=PR_FALSE );
/**
* This method strips whitespace from string.
@ -381,18 +381,18 @@ class nsTString_CharT : public nsTSubstring_CharT
* @param aEliminateLeading controls stripping of leading ws
* @param aEliminateTrailing controls stripping of trailing ws
*/
NS_COM void CompressWhitespace( PRBool aEliminateLeading=PR_TRUE, PRBool aEliminateTrailing=PR_TRUE );
void CompressWhitespace( PRBool aEliminateLeading=PR_TRUE, PRBool aEliminateTrailing=PR_TRUE );
/**
* assign/append/insert with _LOSSY_ conversion
*/
NS_COM void AssignWithConversion( const nsTAString_IncompatibleCharT& aString );
NS_COM void AssignWithConversion( const incompatible_char_type* aData, PRInt32 aLength=-1 );
void AssignWithConversion( const nsTAString_IncompatibleCharT& aString );
void AssignWithConversion( const incompatible_char_type* aData, PRInt32 aLength=-1 );
NS_COM void AppendWithConversion( const nsTAString_IncompatibleCharT& aString );
NS_COM void AppendWithConversion( const incompatible_char_type* aData, PRInt32 aLength=-1 );
void AppendWithConversion( const nsTAString_IncompatibleCharT& aString );
void AppendWithConversion( const incompatible_char_type* aData, PRInt32 aLength=-1 );
#endif // !MOZ_STRING_WITH_OBSOLETE_API
@ -701,7 +701,7 @@ class nsTAdoptingString_CharT : public nsTXPIDLString_CharT
// Adopt(), if possible, when assigning to a self_type&. Note
// that this violates the constness of str, str is always
// truncated when this operator is called.
NS_COM self_type& operator=( const self_type& str );
self_type& operator=( const self_type& str );
private:
// NOT TO BE IMPLEMENTED.

67
xpcom/string/public/nsTSubstring.h
View File

@ -43,7 +43,7 @@
/**
* The base for string comparators
*/
class NS_COM nsTStringComparator_CharT
class nsTStringComparator_CharT
{
public:
typedef CharT char_type;
@ -57,7 +57,7 @@ class NS_COM nsTStringComparator_CharT
/**
* The default string comparator (case-sensitive comparision)
*/
class NS_COM nsTDefaultStringComparator_CharT
class nsTDefaultStringComparator_CharT
: public nsTStringComparator_CharT
{
public:
@ -252,32 +252,32 @@ class nsTSubstring_CharT
return mData[mLength - 1];
}
NS_COM size_type NS_FASTCALL CountChar( char_type ) const;
NS_COM PRInt32 NS_FASTCALL FindChar( char_type, index_type offset = 0 ) const;
size_type NS_FASTCALL CountChar( char_type ) const;
PRInt32 NS_FASTCALL FindChar( char_type, index_type offset = 0 ) const;
/**
* equality
*/
NS_COM PRBool NS_FASTCALL Equals( const self_type& ) const;
NS_COM PRBool NS_FASTCALL Equals( const self_type&, const comparator_type& ) const;
PRBool NS_FASTCALL Equals( const self_type& ) const;
PRBool NS_FASTCALL Equals( const self_type&, const comparator_type& ) const;
NS_COM PRBool NS_FASTCALL Equals( const char_type* data ) const;
NS_COM PRBool NS_FASTCALL Equals( const char_type* data, const comparator_type& comp ) const;
PRBool NS_FASTCALL Equals( const char_type* data ) const;
PRBool NS_FASTCALL Equals( const char_type* data, const comparator_type& comp ) const;
/**
* An efficient comparison with ASCII that can be used even
* for wide strings. Call this version when you know the
* length of 'data'.
*/
NS_COM PRBool NS_FASTCALL EqualsASCII( const char* data, size_type len ) const;
PRBool NS_FASTCALL EqualsASCII( const char* data, size_type len ) const;
/**
* An efficient comparison with ASCII that can be used even
* for wide strings. Call this version when 'data' is
* null-terminated.
*/
NS_COM PRBool NS_FASTCALL EqualsASCII( const char* data ) const;
PRBool NS_FASTCALL EqualsASCII( const char* data ) const;
// EqualsLiteral must ONLY be applied to an actual literal string.
// Do not attempt to use it with a regular char* pointer, or with a char
@ -308,8 +308,8 @@ class nsTSubstring_CharT
// *not* lowercased for you. If you compare to an ASCII or literal
// string that contains an uppercase character, it is guaranteed to
// return false. We will throw assertions too.
NS_COM PRBool NS_FASTCALL LowerCaseEqualsASCII( const char* data, size_type len ) const;
NS_COM PRBool NS_FASTCALL LowerCaseEqualsASCII( const char* data ) const;
PRBool NS_FASTCALL LowerCaseEqualsASCII( const char* data, size_type len ) const;
PRBool NS_FASTCALL LowerCaseEqualsASCII( const char* data ) const;
// LowerCaseEqualsLiteral must ONLY be applied to an actual
// literal string. Do not attempt to use it with a regular char*
@ -338,13 +338,13 @@ class nsTSubstring_CharT
* assignment
*/
NS_COM void NS_FASTCALL Assign( char_type c );
NS_COM void NS_FASTCALL Assign( const char_type* data, size_type length = size_type(-1) );
NS_COM void NS_FASTCALL Assign( const self_type& );
NS_COM void NS_FASTCALL Assign( const substring_tuple_type& );
void NS_FASTCALL Assign( char_type c );
void NS_FASTCALL Assign( const char_type* data, size_type length = size_type(-1) );
void NS_FASTCALL Assign( const self_type& );
void NS_FASTCALL Assign( const substring_tuple_type& );
NS_COM void NS_FASTCALL AssignASCII( const char* data, size_type length );
NS_COM void NS_FASTCALL AssignASCII( const char* data );
void NS_FASTCALL AssignASCII( const char* data, size_type length );
void NS_FASTCALL AssignASCII( const char* data );
// AssignLiteral must ONLY be applied to an actual literal string.
// Do not attempt to use it with a regular char* pointer, or with a char
@ -366,19 +366,19 @@ class nsTSubstring_CharT
self_type& operator=( const self_type& str ) { Assign(str); return *this; }
self_type& operator=( const substring_tuple_type& tuple ) { Assign(tuple); return *this; }
NS_COM void NS_FASTCALL Adopt( char_type* data, size_type length = size_type(-1) );
void NS_FASTCALL Adopt( char_type* data, size_type length = size_type(-1) );
/**
* buffer manipulation
*/
NS_COM void NS_FASTCALL Replace( index_type cutStart, size_type cutLength, char_type c );
NS_COM void NS_FASTCALL Replace( index_type cutStart, size_type cutLength, const char_type* data, size_type length = size_type(-1) );
void NS_FASTCALL Replace( index_type cutStart, size_type cutLength, char_type c );
void NS_FASTCALL Replace( index_type cutStart, size_type cutLength, const char_type* data, size_type length = size_type(-1) );
void Replace( index_type cutStart, size_type cutLength, const self_type& str ) { Replace(cutStart, cutLength, str.Data(), str.Length()); }
NS_COM void NS_FASTCALL Replace( index_type cutStart, size_type cutLength, const substring_tuple_type& tuple );
void NS_FASTCALL Replace( index_type cutStart, size_type cutLength, const substring_tuple_type& tuple );
NS_COM void NS_FASTCALL ReplaceASCII( index_type cutStart, size_type cutLength, const char* data, size_type length = size_type(-1) );
void NS_FASTCALL ReplaceASCII( index_type cutStart, size_type cutLength, const char* data, size_type length = size_type(-1) );
void Append( char_type c ) { Replace(mLength, 0, c); }
void Append( const char_type* data, size_type length = size_type(-1) ) { Replace(mLength, 0, data, length); }
@ -388,7 +388,7 @@ class nsTSubstring_CharT
void AppendASCII( const char* data, size_type length = size_type(-1) ) { ReplaceASCII(mLength, 0, data, length); }
// AppendPrintf truncates output to 31 ASCII characters
NS_COM void AppendPrintf( const char* format, ... );
void AppendPrintf( const char* format, ... );
void AppendInt( PRInt32 aInteger )
{ AppendPrintf( "%d", aInteger ); }
void AppendInt( PRInt32 aInteger, int aRadix )
@ -426,7 +426,7 @@ class nsTSubstring_CharT
void AppendFloat( double aFloat )
{ DoAppendFloat(aFloat, 15); }
private:
NS_COM void NS_FASTCALL DoAppendFloat( double aFloat, int digits );
void NS_FASTCALL DoAppendFloat( double aFloat, int digits );
public:
// AppendLiteral must ONLY be applied to an actual literal string.
@ -469,9 +469,9 @@ class nsTSubstring_CharT
* PR_FALSE on out-of-memory, or if requesting a size bigger
* than a string can hold (2^31 chars).
*/
NS_COM PRBool NS_FASTCALL SetCapacity( size_type newCapacity );
PRBool NS_FASTCALL SetCapacity( size_type newCapacity );
NS_COM void NS_FASTCALL SetLength( size_type newLength );
void NS_FASTCALL SetLength( size_type newLength );
void Truncate( size_type newLength = 0 )
{
@ -525,7 +525,7 @@ class nsTSubstring_CharT
* string will be truncated. @see nsTSubstring::IsVoid
*/
NS_COM void NS_FASTCALL SetIsVoid( PRBool );
void NS_FASTCALL SetIsVoid( PRBool );
/**
* This method is used to remove all occurrences of aChar from this
@ -535,7 +535,7 @@ class nsTSubstring_CharT
* @param aOffset -- where in this string to start stripping chars
*/
NS_COM void StripChar( char_type aChar, PRInt32 aOffset=0 );
void StripChar( char_type aChar, PRInt32 aOffset=0 );
/**
* This method is used to remove all occurrences of aChars from this
@ -545,7 +545,7 @@ class nsTSubstring_CharT
* @param aOffset -- where in this string to start stripping chars
*/
NS_COM void StripChars( const char_type* aChars, PRUint32 aOffset=0 );
void StripChars( const char_type* aChars, PRUint32 aOffset=0 );
/**
* If the string uses a shared buffer, this method
@ -584,7 +584,7 @@ class nsTSubstring_CharT
// XXXbz or can I just include nscore.h and use NS_BUILD_REFCNT_LOGGING?
#if defined(DEBUG) || defined(FORCE_BUILD_REFCNT_LOGGING)
#define XPCOM_STRING_CONSTRUCTOR_OUT_OF_LINE
NS_COM nsTSubstring_CharT( char_type *data, size_type length, PRUint32 flags );
nsTSubstring_CharT( char_type *data, size_type length, PRUint32 flags );
#else
#undef XPCOM_STRING_CONSTRUCTOR_OUT_OF_LINE
nsTSubstring_CharT( char_type *data, size_type length, PRUint32 flags )
@ -628,7 +628,7 @@ class nsTSubstring_CharT
* any of its member variables. in other words, this function acts
* like a destructor.
*/
void NS_COM NS_FASTCALL Finalize();
void NS_FASTCALL Finalize();
/**
* this function prepares mData to be mutated.
@ -702,7 +702,7 @@ class nsTSubstring_CharT
* this helper function can be called prior to directly manipulating
* the contents of mData. see, for example, BeginWriting.
*/
NS_COM PRBool NS_FASTCALL EnsureMutable( size_type newLen = size_type(-1) );
PRBool NS_FASTCALL EnsureMutable( size_type newLen = size_type(-1) );
/**
* returns true if this string overlaps with the given string fragment.
@ -787,7 +787,6 @@ class nsTSubstring_CharT
//
};
NS_COM
int NS_FASTCALL Compare( const nsTSubstring_CharT::base_string_type& lhs, const nsTSubstring_CharT::base_string_type& rhs, const nsTStringComparator_CharT& = nsTDefaultStringComparator_CharT() );

6
xpcom/string/public/nsTSubstringTuple.h
View File

@ -73,20 +73,20 @@ class nsTSubstringTuple_CharT
/**
* computes the aggregate string length
*/
NS_COM size_type Length() const;
size_type Length() const;
/**
* writes the aggregate string to the given buffer. bufLen is assumed
* to be equal to or greater than the value returned by the Length()
* method. the string written to |buf| is not null-terminated.
*/
NS_COM void WriteTo(char_type *buf, PRUint32 bufLen) const;
void WriteTo(char_type *buf, PRUint32 bufLen) const;
/**
* returns true if this tuple is dependent on (i.e., overlapping with)
* the given char sequence.
*/
NS_COM PRBool IsDependentOn(const char_type *start, const char_type *end) const;
PRBool IsDependentOn(const char_type *start, const char_type *end) const;
private:

69
xpcom/string/src/nsReadableUtils.cpp
View File

@ -41,7 +41,6 @@
#include "nsString.h"
#include "nsUTF8Utils.h"
NS_COM
void
LossyCopyUTF16toASCII( const nsAString& aSource, nsACString& aDest )
{
@ -49,7 +48,6 @@ LossyCopyUTF16toASCII( const nsAString& aSource, nsACString& aDest )
LossyAppendUTF16toASCII(aSource, aDest);
}
NS_COM
void
CopyASCIItoUTF16( const nsACString& aSource, nsAString& aDest )
{
@ -57,7 +55,6 @@ CopyASCIItoUTF16( const nsACString& aSource, nsAString& aDest )
AppendASCIItoUTF16(aSource, aDest);
}
NS_COM
void
LossyCopyUTF16toASCII( const PRUnichar* aSource, nsACString& aDest )
{
@ -67,7 +64,6 @@ LossyCopyUTF16toASCII( const PRUnichar* aSource, nsACString& aDest )
}
}
NS_COM
void
CopyASCIItoUTF16( const char* aSource, nsAString& aDest )
{
@ -77,7 +73,6 @@ CopyASCIItoUTF16( const char* aSource, nsAString& aDest )
}
}
NS_COM
void
CopyUTF16toUTF8( const nsAString& aSource, nsACString& aDest )
{
@ -85,7 +80,6 @@ CopyUTF16toUTF8( const nsAString& aSource, nsACString& aDest )
AppendUTF16toUTF8(aSource, aDest);
}
NS_COM
void
CopyUTF8toUTF16( const nsACString& aSource, nsAString& aDest )
{
@ -93,7 +87,6 @@ CopyUTF8toUTF16( const nsACString& aSource, nsAString& aDest )
AppendUTF8toUTF16(aSource, aDest);
}
NS_COM
void
CopyUTF16toUTF8( const PRUnichar* aSource, nsACString& aDest )
{
@ -101,7 +94,6 @@ CopyUTF16toUTF8( const PRUnichar* aSource, nsACString& aDest )
AppendUTF16toUTF8(aSource, aDest);
}
NS_COM
void
CopyUTF8toUTF16( const char* aSource, nsAString& aDest )
{
@ -130,7 +122,6 @@ SetLengthForWritingC(nsACString& aDest, PRUint32 aDesiredLength)
}
NS_COM
void
LossyAppendUTF16toASCII( const nsAString& aSource, nsACString& aDest )
{
@ -151,7 +142,6 @@ LossyAppendUTF16toASCII( const nsAString& aSource, nsACString& aDest )
copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), converter);
}
NS_COM
void
AppendASCIItoUTF16( const nsACString& aSource, nsAString& aDest )
{
@ -172,7 +162,6 @@ AppendASCIItoUTF16( const nsACString& aSource, nsAString& aDest )
copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), converter);
}
NS_COM
void
LossyAppendUTF16toASCII( const PRUnichar* aSource, nsACString& aDest )
{
@ -181,7 +170,6 @@ LossyAppendUTF16toASCII( const PRUnichar* aSource, nsACString& aDest )
}
}
NS_COM
void
AppendASCIItoUTF16( const char* aSource, nsAString& aDest )
{
@ -190,7 +178,6 @@ AppendASCIItoUTF16( const char* aSource, nsAString& aDest )
}
}
NS_COM
void
AppendUTF16toUTF8( const nsAString& aSource, nsACString& aDest )
{
@ -221,7 +208,6 @@ AppendUTF16toUTF8( const nsAString& aSource, nsACString& aDest )
}
}
NS_COM
void
AppendUTF8toUTF16( const nsACString& aSource, nsAString& aDest )
{
@ -259,7 +245,6 @@ AppendUTF8toUTF16( const nsACString& aSource, nsAString& aDest )
}
}
NS_COM
void
AppendUTF16toUTF8( const PRUnichar* aSource, nsACString& aDest )
{
@ -268,7 +253,6 @@ AppendUTF16toUTF8( const PRUnichar* aSource, nsACString& aDest )
}
}
NS_COM
void
AppendUTF8toUTF16( const char* aSource, nsAString& aDest )
{
@ -294,7 +278,6 @@ AllocateStringCopy( const FromStringT& aSource, ToCharT* )
}
NS_COM
char*
ToNewCString( const nsAString& aSource )
{
@ -308,7 +291,6 @@ ToNewCString( const nsAString& aSource )
return result;
}
NS_COM
char*
ToNewUTF8String( const nsAString& aSource, PRUint32 *aUTF8Count )
{
@ -333,7 +315,6 @@ ToNewUTF8String( const nsAString& aSource, PRUint32 *aUTF8Count )
return result;
}
NS_COM
char*
ToNewCString( const nsACString& aSource )
{
@ -349,7 +330,6 @@ ToNewCString( const nsACString& aSource )
return result;
}
NS_COM
PRUnichar*
ToNewUnicode( const nsAString& aSource )
{
@ -365,7 +345,6 @@ ToNewUnicode( const nsAString& aSource )
return result;
}
NS_COM
PRUnichar*
ToNewUnicode( const nsACString& aSource )
{
@ -379,7 +358,6 @@ ToNewUnicode( const nsACString& aSource )
return result;
}
NS_COM
PRUnichar*
UTF8ToNewUnicode( const nsACString& aSource, PRUint32 *aUTF16Count )
{
@ -404,7 +382,6 @@ UTF8ToNewUnicode( const nsACString& aSource, PRUint32 *aUTF16Count )
return result;
}
NS_COM
PRUnichar*
CopyUnicodeTo( const nsAString& aSource, PRUint32 aSrcOffset, PRUnichar* aDest, PRUint32 aLength )
{
@ -414,8 +391,7 @@ CopyUnicodeTo( const nsAString& aSource, PRUint32 aSrcOffset, PRUnichar* aDest,
return aDest;
}
NS_COM
void
void
CopyUnicodeTo( const nsAString::const_iterator& aSrcStart,
const nsAString::const_iterator& aSrcEnd,
nsAString& aDest )
@ -430,8 +406,7 @@ CopyUnicodeTo( const nsAString::const_iterator& aSrcStart,
copy_string(fromBegin, aSrcEnd, writer);
}
NS_COM
void
void
AppendUnicodeTo( const nsAString::const_iterator& aSrcStart,
const nsAString::const_iterator& aSrcEnd,
nsAString& aDest )
@ -447,7 +422,6 @@ AppendUnicodeTo( const nsAString::const_iterator& aSrcStart,
copy_string(fromBegin, aSrcEnd, writer);
}
NS_COM
PRBool
IsASCII( const nsAString& aString )
{
@ -472,7 +446,6 @@ IsASCII( const nsAString& aString )
return PR_TRUE;
}
NS_COM
PRBool
IsASCII( const nsACString& aString )
{
@ -497,7 +470,6 @@ IsASCII( const nsACString& aString )
return PR_TRUE;
}
NS_COM
PRBool
IsUTF8( const nsACString& aString )
{
@ -612,7 +584,6 @@ class ConvertToUpperCase
}
};
NS_COM
void
ToUpperCase( nsCSubstring& aCString )
{
@ -657,7 +628,6 @@ class CopyToUpperCase
nsACString::iterator& mIter;
};
NS_COM
void
ToUpperCase( const nsACString& aSource, nsACString& aDest )
{
@ -693,7 +663,6 @@ class ConvertToLowerCase
}
};
NS_COM
void
ToLowerCase( nsCSubstring& aCString )
{
@ -738,7 +707,6 @@ class CopyToLowerCase
nsACString::iterator& mIter;
};
NS_COM
void
ToLowerCase( const nsACString& aSource, nsACString& aDest )
{
@ -751,7 +719,6 @@ ToLowerCase( const nsACString& aSource, nsACString& aDest )
copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), converter);
}
NS_COM
PRBool
ParseString(const nsACString& aSource, char aDelimiter,
nsTArray<nsCString>& aArray)
@ -910,43 +877,37 @@ RFindInReadable_Impl( const StringT& aPattern, IteratorT& aSearchStart, Iterator
return PR_FALSE;
}
NS_COM
PRBool
FindInReadable( const nsAString& aPattern, nsAString::const_iterator& aSearchStart, nsAString::const_iterator& aSearchEnd, const nsStringComparator& aComparator )
{
return FindInReadable_Impl(aPattern, aSearchStart, aSearchEnd, aComparator);
}
NS_COM
PRBool
FindInReadable( const nsACString& aPattern, nsACString::const_iterator& aSearchStart, nsACString::const_iterator& aSearchEnd, const nsCStringComparator& aComparator)
{
return FindInReadable_Impl(aPattern, aSearchStart, aSearchEnd, aComparator);
}
NS_COM
PRBool
CaseInsensitiveFindInReadable( const nsACString& aPattern, nsACString::const_iterator& aSearchStart, nsACString::const_iterator& aSearchEnd )
{
return FindInReadable_Impl(aPattern, aSearchStart, aSearchEnd, nsCaseInsensitiveCStringComparator());
}
NS_COM
PRBool
RFindInReadable( const nsAString& aPattern, nsAString::const_iterator& aSearchStart, nsAString::const_iterator& aSearchEnd, const nsStringComparator& aComparator)
{
return RFindInReadable_Impl(aPattern, aSearchStart, aSearchEnd, aComparator);
}
NS_COM
PRBool
RFindInReadable( const nsACString& aPattern, nsACString::const_iterator& aSearchStart, nsACString::const_iterator& aSearchEnd, const nsCStringComparator& aComparator)
{
return RFindInReadable_Impl(aPattern, aSearchStart, aSearchEnd, aComparator);
}
NS_COM
PRBool
PRBool
FindCharInReadable( PRUnichar aChar, nsAString::const_iterator& aSearchStart, const nsAString::const_iterator& aSearchEnd )
{
PRInt32 fragmentLength = aSearchEnd.get() - aSearchStart.get();
@ -961,8 +922,7 @@ FindCharInReadable( PRUnichar aChar, nsAString::const_iterator& aSearchStart, co
return PR_FALSE;
}
NS_COM
PRBool
PRBool
FindCharInReadable( char aChar, nsACString::const_iterator& aSearchStart, const nsACString::const_iterator& aSearchEnd )
{
PRInt32 fragmentLength = aSearchEnd.get() - aSearchStart.get();
@ -975,10 +935,9 @@ FindCharInReadable( char aChar, nsACString::const_iterator& aSearchStart, const
aSearchStart.advance(fragmentLength);
return PR_FALSE;
}
}
NS_COM
PRUint32
PRUint32
CountCharInReadable( const nsAString& aStr,
PRUnichar aChar )
{
@ -998,8 +957,7 @@ CountCharInReadable( const nsAString& aStr,
return count;
}
NS_COM
PRUint32
PRUint32
CountCharInReadable( const nsACString& aStr,
char aChar )
{
@ -1019,7 +977,7 @@ CountCharInReadable( const nsACString& aStr,
return count;
}
NS_COM PRBool
PRBool
StringBeginsWith( const nsAString& aSource, const nsAString& aSubstring,
const nsStringComparator& aComparator )
{
@ -1030,7 +988,7 @@ StringBeginsWith( const nsAString& aSource, const nsAString& aSubstring,
return Substring(aSource, 0, sub_len).Equals(aSubstring, aComparator);
}
NS_COM PRBool
PRBool
StringBeginsWith( const nsACString& aSource, const nsACString& aSubstring,
const nsCStringComparator& aComparator )
{
@ -1041,7 +999,7 @@ StringBeginsWith( const nsACString& aSource, const nsACString& aSubstring,
return Substring(aSource, 0, sub_len).Equals(aSubstring, aComparator);
}
NS_COM PRBool
PRBool
StringEndsWith( const nsAString& aSource, const nsAString& aSubstring,
const nsStringComparator& aComparator )
{
@ -1053,7 +1011,7 @@ StringEndsWith( const nsAString& aSource, const nsAString& aSubstring,
aComparator);
}
NS_COM PRBool
PRBool
StringEndsWith( const nsACString& aSource, const nsACString& aSubstring,
const nsCStringComparator& aComparator )
{
@ -1069,7 +1027,6 @@ StringEndsWith( const nsACString& aSource, const nsACString& aSubstring,
static const PRUnichar empty_buffer[1] = { '\0' };
NS_COM
const nsAFlatString&
EmptyString()
{
@ -1078,7 +1035,6 @@ EmptyString()
return sEmpty;
}
NS_COM
const nsAFlatCString&
EmptyCString()
{
@ -1087,7 +1043,7 @@ EmptyCString()
return sEmpty;
}
NS_COM PRInt32
PRInt32
CompareUTF8toUTF16(const nsASingleFragmentCString& aUTF8String,
const nsASingleFragmentString& aUTF16String)
{
@ -1164,7 +1120,6 @@ CompareUTF8toUTF16(const nsASingleFragmentCString& aUTF8String,
return 0;
}
NS_COM
void
AppendUCS4ToUTF16(const PRUint32 aSource, nsAString& aDest)
{

2
xpcom/string/src/nsTString.cpp
View File

@ -37,7 +37,7 @@
*
* ***** END LICENSE BLOCK ***** */
NS_COM nsTAdoptingString_CharT&
nsTAdoptingString_CharT&
nsTAdoptingString_CharT::operator=( const self_type& str )
{
// This'll violate the constness of this argument, that's just

2
xpcom/string/src/nsTStringComparator.cpp
View File

@ -36,7 +36,7 @@
*
* ***** END LICENSE BLOCK ***** */
NS_COM int NS_FASTCALL
int NS_FASTCALL
Compare( const nsTSubstring_CharT::base_string_type& lhs, const nsTSubstring_CharT::base_string_type& rhs, const nsTStringComparator_CharT& comp )
{
typedef nsTSubstring_CharT::size_type size_type;

2
xpcom/tests/TestPipes.cpp
View File

@ -472,7 +472,7 @@ RunTests(PRUint32 segSize, PRUint32 segCount)
////////////////////////////////////////////////////////////////////////////////
#if 0
extern NS_COM void
extern void
TestSegmentedBuffer();
#endif

2
xpcom/threads/nsEventQueue.h
View File

@ -44,7 +44,7 @@
#include "nsIRunnable.h"
// A threadsafe FIFO event queue...
class NS_COM nsEventQueue
class nsEventQueue
{
typedef mozilla::ReentrantMonitor ReentrantMonitor;

2
xpcom/threads/nsThreadUtilsInternal.h
View File

@ -54,7 +54,7 @@ class nsIThreadObserver;
* other threads will return an error.
*/
extern nsresult
NS_COM NS_SetGlobalThreadObserver(nsIThreadObserver* aObserver);
NS_SetGlobalThreadObserver(nsIThreadObserver* aObserver);
#endif // MOZILLA_INTERNAL_API