From dbbc84bf94267acf3916e8dd61a971150d592437 Mon Sep 17 00:00:00 2001 From: "bryner%brianryner.com" Date: Sun, 7 Sep 2003 22:37:27 +0000 Subject: [PATCH] Fix build on gcc 3.4 by removing extra semicolons (bug 218551). r/sr=dbaron, a=brendan. git-svn-id: svn://10.0.0.236/trunk@146620 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/js/jsd/jsd_xpc.cpp | 22 ++-- mozilla/js/src/liveconnect/nsCLiveconnect.cpp | 2 +- .../xpconnect/loader/mozJSComponentLoader.cpp | 6 +- .../loader/mozJSLoaderConstructors.h | 4 +- mozilla/js/src/xpconnect/shell/xpcshell.cpp | 2 +- .../js/src/xpconnect/src/nsScriptError.cpp | 4 +- .../js/src/xpconnect/src/xpccomponents.cpp | 14 +- mozilla/js/src/xpconnect/src/xpcjsid.cpp | 2 +- .../js/src/xpconnect/src/xpcruntimesvc.cpp | 2 +- .../tests/components/xpctest_array.cpp | 2 +- .../tests/components/xpctest_attributes.cpp | 56 ++++---- .../tests/components/xpctest_calljs.cpp | 20 +-- .../tests/components/xpctest_child.cpp | 6 +- .../tests/components/xpctest_const.cpp | 6 +- .../tests/components/xpctest_domstring.cpp | 2 +- .../tests/components/xpctest_echo.cpp | 4 +- .../xpconnect/tests/components/xpctest_in.cpp | 66 +++++----- .../tests/components/xpctest_inout.cpp | 66 +++++----- .../tests/components/xpctest_multiple.cpp | 96 +++++++------- .../tests/components/xpctest_out.cpp | 122 +++++++++--------- .../tests/components/xpctest_overloaded.cpp | 2 +- .../tests/components/xpctest_string.cpp | 2 +- mozilla/layout/base/bidicattable.h | 4 +- mozilla/layout/base/nsCSSFrameConstructor.cpp | 2 +- mozilla/layout/base/nsCaret.cpp | 2 +- .../layout/base/nsFrameContentIterator.cpp | 2 +- mozilla/layout/base/nsFrameTraversal.cpp | 2 +- mozilla/layout/base/nsLayoutHistoryState.cpp | 2 +- mozilla/layout/base/nsPresShell.cpp | 6 +- mozilla/layout/base/src/bidicattable.h | 4 +- mozilla/layout/base/src/nsCaret.cpp | 2 +- mozilla/layout/base/src/nsFrameTraversal.cpp | 2 +- .../layout/base/src/nsLayoutHistoryState.cpp | 2 +- mozilla/layout/build/nsContentDLF.cpp | 2 +- mozilla/layout/forms/nsTextControlFrame.cpp | 4 +- mozilla/layout/generic/nsImageMap.cpp | 2 +- mozilla/layout/generic/nsObjectFrame.cpp | 2 +- mozilla/layout/html/base/src/nsImageMap.cpp | 2 +- .../layout/html/base/src/nsObjectFrame.cpp | 2 +- mozilla/layout/html/base/src/nsPresShell.cpp | 6 +- .../html/forms/src/nsTextControlFrame.cpp | 4 +- .../html/style/src/nsCSSFrameConstructor.cpp | 2 +- .../html/style/src/nsFrameContentIterator.cpp | 2 +- .../layout/mathml/base/src/nsMathMLChar.cpp | 2 +- mozilla/layout/tools/genbidicattable.pl | 4 +- .../xul/base/src/grid/nsGridLayout2.cpp | 4 +- .../xul/base/src/grid/nsGridRowLayout.cpp | 4 +- mozilla/layout/xul/base/src/nsBoxLayout.cpp | 4 +- .../xul/base/src/nsBoxToBlockAdaptor.cpp | 4 +- mozilla/layout/xul/base/src/nsSliderFrame.cpp | 4 +- 50 files changed, 296 insertions(+), 296 deletions(-) diff --git a/mozilla/js/jsd/jsd_xpc.cpp b/mozilla/js/jsd/jsd_xpc.cpp index af569522f0e..234da980981 100644 --- a/mozilla/js/jsd/jsd_xpc.cpp +++ b/mozilla/js/jsd/jsd_xpc.cpp @@ -790,7 +790,7 @@ jsdContext::GetJSDContext(JSDContext **_rval) */ /* Objects */ -NS_IMPL_THREADSAFE_ISUPPORTS1(jsdObject, jsdIObject); +NS_IMPL_THREADSAFE_ISUPPORTS1(jsdObject, jsdIObject) NS_IMETHODIMP jsdObject::GetJSDContext(JSDContext **_rval) @@ -858,7 +858,7 @@ jsdObject::GetValue(jsdIValue **_rval) } /* Properties */ -NS_IMPL_THREADSAFE_ISUPPORTS2(jsdProperty, jsdIProperty, jsdIEphemeral); +NS_IMPL_THREADSAFE_ISUPPORTS2(jsdProperty, jsdIProperty, jsdIEphemeral) jsdProperty::jsdProperty (JSDContext *aCx, JSDProperty *aProperty) : mCx(aCx), mProperty(aProperty) @@ -956,7 +956,7 @@ jsdProperty::GetVarArgSlot(PRUint32 *_rval) } /* Scripts */ -NS_IMPL_THREADSAFE_ISUPPORTS2(jsdScript, jsdIScript, jsdIEphemeral); +NS_IMPL_THREADSAFE_ISUPPORTS2(jsdScript, jsdIScript, jsdIEphemeral) jsdScript::jsdScript (JSDContext *aCx, JSDScript *aScript) : mValid(PR_FALSE), mTag(0), @@ -1421,7 +1421,7 @@ jsdScript::ClearAllBreakpoints() } /* Contexts */ -NS_IMPL_THREADSAFE_ISUPPORTS2(jsdContext, jsdIContext, jsdIEphemeral); +NS_IMPL_THREADSAFE_ISUPPORTS2(jsdContext, jsdIContext, jsdIEphemeral) jsdIContext * jsdContext::FromPtr (JSDContext *aJSDCx, JSContext *aJSCx) @@ -1621,7 +1621,7 @@ jsdContext::SetScriptsEnabled (PRBool _rval) } /* Stack Frames */ -NS_IMPL_THREADSAFE_ISUPPORTS2(jsdStackFrame, jsdIStackFrame, jsdIEphemeral); +NS_IMPL_THREADSAFE_ISUPPORTS2(jsdStackFrame, jsdIStackFrame, jsdIEphemeral) jsdStackFrame::jsdStackFrame (JSDContext *aCx, JSDThreadState *aThreadState, JSDStackFrameInfo *aStackFrameInfo) : @@ -1903,7 +1903,7 @@ jsdStackFrame::Eval (const nsAString &bytes, const char *fileName, } /* Values */ -NS_IMPL_THREADSAFE_ISUPPORTS2(jsdValue, jsdIValue, jsdIEphemeral); +NS_IMPL_THREADSAFE_ISUPPORTS2(jsdValue, jsdIValue, jsdIEphemeral) jsdIValue * jsdValue::FromPtr (JSDContext *aCx, JSDValue *aValue) { @@ -2243,7 +2243,7 @@ jsdValue::GetWrappedValue() /****************************************************************************** * debugger service implementation ******************************************************************************/ -NS_IMPL_THREADSAFE_ISUPPORTS1(jsdService, jsdIDebuggerService); +NS_IMPL_THREADSAFE_ISUPPORTS1(jsdService, jsdIDebuggerService) NS_IMETHODIMP jsdService::GetJSDContext(JSDContext **_rval) @@ -3223,7 +3223,7 @@ jsdService::GetService () return gJsds; } -NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(jsdService, jsdService::GetService); +NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(jsdService, jsdService::GetService) /* app-start observer. turns on the debugger at app-start. this is inserted * and/or removed from the app-start category by the jsdService::initAtStartup @@ -3238,7 +3238,7 @@ class jsdASObserver : public nsIObserver jsdASObserver () {} }; -NS_IMPL_THREADSAFE_ISUPPORTS1(jsdASObserver, nsIObserver); +NS_IMPL_THREADSAFE_ISUPPORTS1(jsdASObserver, nsIObserver) NS_IMETHODIMP jsdASObserver::Observe (nsISupports *aSubject, const char *aTopic, @@ -3271,14 +3271,14 @@ jsdASObserver::Observe (nsISupports *aSubject, const char *aTopic, return jsds->SetFlags(JSD_DISABLE_OBJECT_TRACE); } -NS_GENERIC_FACTORY_CONSTRUCTOR(jsdASObserver); +NS_GENERIC_FACTORY_CONSTRUCTOR(jsdASObserver) static const nsModuleComponentInfo components[] = { {"JSDService", JSDSERVICE_CID, jsdServiceCtrID, jsdServiceConstructor}, {"JSDASObserver", JSDASO_CID, jsdASObserverCtrID, jsdASObserverConstructor} }; -NS_IMPL_NSGETMODULE(JavaScript_Debugger, components); +NS_IMPL_NSGETMODULE(JavaScript_Debugger, components) /******************************************************************************** ******************************************************************************** diff --git a/mozilla/js/src/liveconnect/nsCLiveconnect.cpp b/mozilla/js/src/liveconnect/nsCLiveconnect.cpp index 8f01e833a33..072ee91fd77 100644 --- a/mozilla/js/src/liveconnect/nsCLiveconnect.cpp +++ b/mozilla/js/src/liveconnect/nsCLiveconnect.cpp @@ -243,7 +243,7 @@ AutoPushJSContext::~AutoPushJSContext() // Thes macro expands to the aggregated query interface scheme. -NS_IMPL_AGGREGATED(nsCLiveconnect); +NS_IMPL_AGGREGATED(nsCLiveconnect) NS_METHOD nsCLiveconnect::AggregatedQueryInterface(const nsIID& aIID, void** aInstancePtr) diff --git a/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp b/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp index eb13fc1a995..190d97f2e7b 100644 --- a/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp +++ b/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp @@ -329,7 +329,7 @@ private: nsCOMPtr mPrincipal; }; -NS_IMPL_THREADSAFE_ISUPPORTS2(BackstagePass, nsIScriptObjectPrincipal, nsIXPCScriptable); +NS_IMPL_THREADSAFE_ISUPPORTS2(BackstagePass, nsIScriptObjectPrincipal, nsIXPCScriptable) #else @@ -346,7 +346,7 @@ public: virtual ~BackstagePass() { } }; -NS_IMPL_THREADSAFE_ISUPPORTS1(BackstagePass, nsIXPCScriptable); +NS_IMPL_THREADSAFE_ISUPPORTS1(BackstagePass, nsIXPCScriptable) #endif @@ -415,7 +415,7 @@ mozJSComponentLoader::~mozJSComponentLoader() { } -NS_IMPL_THREADSAFE_ISUPPORTS1(mozJSComponentLoader, nsIComponentLoader); +NS_IMPL_THREADSAFE_ISUPPORTS1(mozJSComponentLoader, nsIComponentLoader) NS_IMETHODIMP mozJSComponentLoader::GetFactory(const nsIID &aCID, diff --git a/mozilla/js/src/xpconnect/loader/mozJSLoaderConstructors.h b/mozilla/js/src/xpconnect/loader/mozJSLoaderConstructors.h index 9955332702f..601c884d10d 100644 --- a/mozilla/js/src/xpconnect/loader/mozJSLoaderConstructors.h +++ b/mozilla/js/src/xpconnect/loader/mozJSLoaderConstructors.h @@ -71,8 +71,8 @@ UnregisterJSLoader(nsIComponentManager *aCompMgr, nsIFile *aPath, return NS_OK; } -NS_GENERIC_FACTORY_CONSTRUCTOR(mozJSComponentLoader); +NS_GENERIC_FACTORY_CONSTRUCTOR(mozJSComponentLoader) #ifndef NO_SUBSCRIPT_LOADER -NS_GENERIC_FACTORY_CONSTRUCTOR(mozJSSubScriptLoader); +NS_GENERIC_FACTORY_CONSTRUCTOR(mozJSSubScriptLoader) #endif diff --git a/mozilla/js/src/xpconnect/shell/xpcshell.cpp b/mozilla/js/src/xpconnect/shell/xpcshell.cpp index c4ae754374c..742f82416bc 100644 --- a/mozilla/js/src/xpconnect/shell/xpcshell.cpp +++ b/mozilla/js/src/xpconnect/shell/xpcshell.cpp @@ -787,7 +787,7 @@ public: FullTrustSecMan(); }; -NS_IMPL_ISUPPORTS1(FullTrustSecMan, nsIXPCSecurityManager); +NS_IMPL_ISUPPORTS1(FullTrustSecMan, nsIXPCSecurityManager) FullTrustSecMan::FullTrustSecMan() { diff --git a/mozilla/js/src/xpconnect/src/nsScriptError.cpp b/mozilla/js/src/xpconnect/src/nsScriptError.cpp index 799f3ddb92f..9daf2ecec97 100644 --- a/mozilla/js/src/xpconnect/src/nsScriptError.cpp +++ b/mozilla/js/src/xpconnect/src/nsScriptError.cpp @@ -44,7 +44,7 @@ #include "xpcprivate.h" -NS_IMPL_THREADSAFE_ISUPPORTS2(nsScriptError, nsIConsoleMessage, nsIScriptError); +NS_IMPL_THREADSAFE_ISUPPORTS2(nsScriptError, nsIConsoleMessage, nsIScriptError) nsScriptError::nsScriptError() : mMessage(nsnull), @@ -57,7 +57,7 @@ nsScriptError::nsScriptError() { } -nsScriptError::~nsScriptError() {}; +nsScriptError::~nsScriptError() {} // nsIConsoleMessage methods NS_IMETHODIMP diff --git a/mozilla/js/src/xpconnect/src/xpccomponents.cpp b/mozilla/js/src/xpconnect/src/xpccomponents.cpp index 46e393331df..2d7d8f7f312 100644 --- a/mozilla/js/src/xpconnect/src/xpccomponents.cpp +++ b/mozilla/js/src/xpconnect/src/xpccomponents.cpp @@ -1575,13 +1575,13 @@ NS_IMETHODIMP nsXPCComponents::Get##_n(_b##_n * *a##_n) { \ return NS_OK; \ } -XPC_IMPL_GET_OBJ_METHOD(nsIScriptable, Interfaces); -XPC_IMPL_GET_OBJ_METHOD(nsIXPCComponents_, Classes); -XPC_IMPL_GET_OBJ_METHOD(nsIXPCComponents_, ClassesByID); -XPC_IMPL_GET_OBJ_METHOD(nsIXPCComponents_, Results); -XPC_IMPL_GET_OBJ_METHOD(nsIXPCComponents_, ID); -XPC_IMPL_GET_OBJ_METHOD(nsIXPCComponents_, Exception); -XPC_IMPL_GET_OBJ_METHOD(nsIXPCComponents_, Constructor); +XPC_IMPL_GET_OBJ_METHOD(nsIScriptable, Interfaces) +XPC_IMPL_GET_OBJ_METHOD(nsIXPCComponents_, Classes) +XPC_IMPL_GET_OBJ_METHOD(nsIXPCComponents_, ClassesByID) +XPC_IMPL_GET_OBJ_METHOD(nsIXPCComponents_, Results) +XPC_IMPL_GET_OBJ_METHOD(nsIXPCComponents_, ID) +XPC_IMPL_GET_OBJ_METHOD(nsIXPCComponents_, Exception) +XPC_IMPL_GET_OBJ_METHOD(nsIXPCComponents_, Constructor) #undef XPC_IMPL_GET_OBJ_METHOD /*******************************************/ diff --git a/mozilla/js/src/xpconnect/src/xpcjsid.cpp b/mozilla/js/src/xpconnect/src/xpcjsid.cpp index 947ada7a715..0c5a97bd9f0 100644 --- a/mozilla/js/src/xpconnect/src/xpcjsid.cpp +++ b/mozilla/js/src/xpconnect/src/xpcjsid.cpp @@ -48,7 +48,7 @@ char nsJSID::gNoString[] = ""; nsJSID::nsJSID() : mID(GetInvalidIID()), mNumber(gNoString), mName(gNoString) { -}; +} nsJSID::~nsJSID() { diff --git a/mozilla/js/src/xpconnect/src/xpcruntimesvc.cpp b/mozilla/js/src/xpconnect/src/xpcruntimesvc.cpp index 57c0dd914ca..872596971bc 100644 --- a/mozilla/js/src/xpconnect/src/xpcruntimesvc.cpp +++ b/mozilla/js/src/xpconnect/src/xpcruntimesvc.cpp @@ -62,7 +62,7 @@ nsJSRuntimeServiceImpl::~nsJSRuntimeServiceImpl() { NS_IMPL_THREADSAFE_ISUPPORTS2(nsJSRuntimeServiceImpl, nsIJSRuntimeService, - nsISupportsWeakReference); + nsISupportsWeakReference) static nsJSRuntimeServiceImpl* gJSRuntimeService = nsnull; diff --git a/mozilla/js/src/xpconnect/tests/components/xpctest_array.cpp b/mozilla/js/src/xpconnect/tests/components/xpctest_array.cpp index 900eb912531..873a5f40eac 100644 --- a/mozilla/js/src/xpconnect/tests/components/xpctest_array.cpp +++ b/mozilla/js/src/xpconnect/tests/components/xpctest_array.cpp @@ -60,7 +60,7 @@ xpcarraytest::~xpcarraytest() NS_IF_RELEASE(mReceiver); } -NS_IMPL_ISUPPORTS1(xpcarraytest, nsIXPCTestArray); +NS_IMPL_ISUPPORTS1(xpcarraytest, nsIXPCTestArray) NS_IMETHODIMP xpcarraytest::SetReceiver(nsIXPCTestArray* aReceiver) { diff --git a/mozilla/js/src/xpconnect/tests/components/xpctest_attributes.cpp b/mozilla/js/src/xpconnect/tests/components/xpctest_attributes.cpp index a966b60f9c9..2ae031a7fb2 100644 --- a/mozilla/js/src/xpconnect/tests/components/xpctest_attributes.cpp +++ b/mozilla/js/src/xpconnect/tests/components/xpctest_attributes.cpp @@ -56,7 +56,7 @@ class xpcTestObjectReadOnly : public nsIXPCTestObjectReadOnly { char *stringID; }; -NS_IMPL_ISUPPORTS1(xpcTestObjectReadOnly, nsIXPCTestObjectReadOnly); +NS_IMPL_ISUPPORTS1(xpcTestObjectReadOnly, nsIXPCTestObjectReadOnly) xpcTestObjectReadOnly :: xpcTestObjectReadOnly() { NS_ADDREF_THIS(); @@ -68,7 +68,7 @@ xpcTestObjectReadOnly :: xpcTestObjectReadOnly() { const char _id[] = "a68cc6a6-6552-11d3-82ef-0060b0eb596f"; stringID = (char*) nsMemory::Clone(_id, sizeof(char)*(strlen(_id)+1)); -}; +} NS_IMETHODIMP xpcTestObjectReadOnly :: GetID(char **_retval) { *_retval= (char*) nsMemory::Clone(stringID, @@ -84,28 +84,28 @@ NS_IMETHODIMP xpcTestObjectReadOnly :: GetStrReadOnly(char * *aStrReadOnly){ *aStrReadOnly = (char*) nsMemory::Clone(aStrReadOnly, sizeof(char)*(strlen(aString)+1)); return *aStrReadOnly ? NS_OK : NS_ERROR_OUT_OF_MEMORY; -}; +} NS_IMETHODIMP xpcTestObjectReadOnly :: GetBoolReadOnly(PRBool *aBoolReadOnly) { *aBoolReadOnly = boolProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestObjectReadOnly :: GetShortReadOnly(PRInt16 *aShortReadOnly){ *aShortReadOnly = shortProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestObjectReadOnly :: GetLongReadOnly(PRInt32 *aLongReadOnly){ *aLongReadOnly = longProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestObjectReadOnly :: GetFloatReadOnly(float *aFloatReadOnly){ *aFloatReadOnly = floatProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestObjectReadOnly :: GetCharReadOnly(char *aCharReadOnly){ *aCharReadOnly = charProperty; return NS_OK; -}; +} NS_IMETHODIMP xpctest::ConstructXPCTestObjectReadOnly(nsISupports *aOuter, REFNSIID aIID, void **aResult) { @@ -126,7 +126,7 @@ xpctest::ConstructXPCTestObjectReadOnly(nsISupports *aOuter, REFNSIID aIID, void } return rv; -}; +} /****************************************************************************/ /* starting interface: nsIXPCTestObjectReadWrite */ /* {3b9b1d38-491a-11d3-82ef-0060b0eb596f} */ @@ -154,7 +154,7 @@ class xpcTestObjectReadWrite : public nsIXPCTestObjectReadWrite { const char *stringProperty; }; -NS_IMPL_ISUPPORTS1(xpcTestObjectReadWrite, nsIXPCTestObjectReadWrite); +NS_IMPL_ISUPPORTS1(xpcTestObjectReadWrite, nsIXPCTestObjectReadWrite) xpcTestObjectReadWrite :: xpcTestObjectReadWrite() { NS_ADDREF_THIS(); @@ -168,7 +168,7 @@ xpcTestObjectReadWrite :: xpcTestObjectReadWrite() { const char s[] = "XPConnect Read-Writable String"; stringProperty = (char*) nsMemory::Clone(s, sizeof(char)*(strlen(s)+1)); -}; +} NS_IMETHODIMP xpcTestObjectReadWrite :: GetStringProperty(char * *aStringProperty) { if(!aStringProperty) @@ -177,52 +177,52 @@ NS_IMETHODIMP xpcTestObjectReadWrite :: GetStringProperty(char * *aStringPropert sizeof(char)*(strlen(stringProperty)+1)); return *aStringProperty ? NS_OK : NS_ERROR_OUT_OF_MEMORY; -}; +} NS_IMETHODIMP xpcTestObjectReadWrite :: SetStringProperty(const char * aStringProperty) { stringProperty = aStringProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestObjectReadWrite :: GetBooleanProperty(PRBool *aBooleanProperty) { *aBooleanProperty = boolProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestObjectReadWrite :: SetBooleanProperty(PRBool aBooleanProperty) { boolProperty = aBooleanProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestObjectReadWrite :: GetShortProperty(PRInt16 *aShortProperty) { *aShortProperty = shortProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestObjectReadWrite :: SetShortProperty(PRInt16 aShortProperty) { shortProperty = aShortProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestObjectReadWrite :: GetLongProperty(PRInt32 *aLongProperty) { *aLongProperty = longProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestObjectReadWrite :: SetLongProperty(PRInt32 aLongProperty) { longProperty = aLongProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestObjectReadWrite :: GetFloatProperty(float *aFloatProperty) { *aFloatProperty = floatProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestObjectReadWrite :: SetFloatProperty(float aFloatProperty) { floatProperty = aFloatProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestObjectReadWrite :: GetCharProperty(char *aCharProperty) { *aCharProperty = charProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestObjectReadWrite :: SetCharProperty(char aCharProperty) { charProperty = aCharProperty; return NS_OK; -}; +} NS_IMETHODIMP xpctest::ConstructXPCTestObjectReadWrite(nsISupports *aOuter, REFNSIID aIID, void **aResult) { @@ -242,7 +242,7 @@ xpctest::ConstructXPCTestObjectReadWrite(nsISupports *aOuter, REFNSIID aIID, voi rv = NS_ERROR_OUT_OF_MEMORY; } return rv; -}; +} /****************************************************************************/ @@ -262,7 +262,7 @@ private: char *name; }; -NS_IMPL_ISUPPORTS2(xpcTestAttributes, nsIXPCTestObjectReadWrite, nsIXPCTestObjectReadOnly); +NS_IMPL_ISUPPORTS2(xpcTestAttributes, nsIXPCTestObjectReadWrite, nsIXPCTestObjectReadOnly) NS_IMETHODIMP xpcTestAttributes ::GetName(char * *aString) { if(!aString) @@ -271,11 +271,11 @@ NS_IMETHODIMP xpcTestAttributes ::GetName(char * *aString) { sizeof(char)*(strlen(name)+1)); return *aString ? NS_OK : NS_ERROR_OUT_OF_MEMORY; -}; +} NS_IMETHODIMP xpcTestAttributes ::SetName(char * aString) { name = aString; return NS_OK; -}; +} NS_IMETHODIMP xpctest::ConstructXPCTestAttributes(nsISupports *aOuter, REFNSIID aIID, void **aResult) @@ -296,5 +296,5 @@ xpctest::ConstructXPCTestAttributes(nsISupports *aOuter, REFNSIID aIID, void **a rv = NS_ERROR_OUT_OF_MEMORY; } return rv; -}; +} */ diff --git a/mozilla/js/src/xpconnect/tests/components/xpctest_calljs.cpp b/mozilla/js/src/xpconnect/tests/components/xpctest_calljs.cpp index 60547367207..e6f395df881 100644 --- a/mozilla/js/src/xpconnect/tests/components/xpctest_calljs.cpp +++ b/mozilla/js/src/xpconnect/tests/components/xpctest_calljs.cpp @@ -51,7 +51,7 @@ private: }; -NS_IMPL_ISUPPORTS2_CI(xpcTestCallJS, nsIXPCTestCallJS, nsIXPCScriptable); +NS_IMPL_ISUPPORTS2_CI(xpcTestCallJS, nsIXPCTestCallJS, nsIXPCScriptable) // The nsIXPCScriptable map declaration that will generate stubs for us... #define XPC_MAP_CLASSNAME xpcTestCallJS @@ -61,11 +61,11 @@ NS_IMPL_ISUPPORTS2_CI(xpcTestCallJS, nsIXPCTestCallJS, nsIXPCScriptable); xpcTestCallJS :: xpcTestCallJS() { NS_ADDREF_THIS(); -}; +} xpcTestCallJS :: ~xpcTestCallJS() { -}; +} NS_IMETHODIMP xpcTestCallJS :: SetJSObject( nsIXPCTestCallJS* o ) { //if (jsobject) @@ -74,18 +74,18 @@ NS_IMETHODIMP xpcTestCallJS :: SetJSObject( nsIXPCTestCallJS* o ) { if ( jsobject ) NS_ADDREF( jsobject ); return NS_OK; -}; +} NS_IMETHODIMP xpcTestCallJS :: CallMethodNoArgs(PRBool *_retval) { *_retval = PR_TRUE; return NS_OK; -}; +} NS_IMETHODIMP xpcTestCallJS :: Evaluate ( const char *s ) { if (jsobject) return jsobject->Evaluate(s); return NS_OK; -}; +} NS_IMETHODIMP xpcTestCallJS :: EvaluateAndReturnError(nsresult in, nsresult *_retval){ @@ -95,17 +95,17 @@ xpcTestCallJS :: EvaluateAndReturnError(nsresult in, nsresult *_retval){ *_retval = in; } return *_retval; -}; +} NS_IMETHODIMP xpcTestCallJS :: EvaluateAndEatErrors(const char *s) { if ( jsobject ) jsobject->Evaluate(s); return NS_OK; -}; +} NS_IMETHODIMP xpcTestCallJS :: UnscriptableMethod() { return NS_OK; -}; +} NS_IMETHODIMP xpctest::ConstructXPCTestCallJS(nsISupports *aOuter, REFNSIID aIID, void **aResult) @@ -126,4 +126,4 @@ xpctest::ConstructXPCTestCallJS(nsISupports *aOuter, REFNSIID aIID, void **aResu rv = NS_ERROR_OUT_OF_MEMORY; } return rv; -}; +} diff --git a/mozilla/js/src/xpconnect/tests/components/xpctest_child.cpp b/mozilla/js/src/xpconnect/tests/components/xpctest_child.cpp index 4c6a66f23d1..415831166bd 100644 --- a/mozilla/js/src/xpconnect/tests/components/xpctest_child.cpp +++ b/mozilla/js/src/xpconnect/tests/components/xpctest_child.cpp @@ -62,7 +62,7 @@ public: xpctestChild(); }; -NS_IMPL_ISUPPORTS1(xpctestOther, nsIXPCTestOther); +NS_IMPL_ISUPPORTS1(xpctestOther, nsIXPCTestOther) xpctestOther::xpctestOther() { @@ -146,8 +146,8 @@ public: xpctestChild(); }; -NS_IMPL_ADDREF(xpctestChild); -NS_IMPL_RELEASE(xpctestChild); +NS_IMPL_ADDREF(xpctestChild) +NS_IMPL_RELEASE(xpctestChild) NS_IMETHODIMP xpctestChild::QueryInterface(REFNSIID iid, void** result) diff --git a/mozilla/js/src/xpconnect/tests/components/xpctest_const.cpp b/mozilla/js/src/xpconnect/tests/components/xpctest_const.cpp index c2bc8677aa7..30603bc7a44 100644 --- a/mozilla/js/src/xpconnect/tests/components/xpctest_const.cpp +++ b/mozilla/js/src/xpconnect/tests/components/xpctest_const.cpp @@ -44,11 +44,11 @@ public: xpcTestConst(); }; -NS_IMPL_ISUPPORTS1(xpcTestConst, nsIXPCTestConst); +NS_IMPL_ISUPPORTS1(xpcTestConst, nsIXPCTestConst) xpcTestConst :: xpcTestConst() { NS_ADDREF_THIS(); -}; +} NS_IMETHODIMP xpctest::ConstructXPCTestConst(nsISupports *aOuter, REFNSIID aIID, void **aResult) @@ -68,4 +68,4 @@ xpctest::ConstructXPCTestConst(nsISupports *aOuter, REFNSIID aIID, void **aResul rv = NS_ERROR_OUT_OF_MEMORY; } return rv; -}; +} diff --git a/mozilla/js/src/xpconnect/tests/components/xpctest_domstring.cpp b/mozilla/js/src/xpconnect/tests/components/xpctest_domstring.cpp index 507c07d21e8..553e64a3406 100644 --- a/mozilla/js/src/xpconnect/tests/components/xpctest_domstring.cpp +++ b/mozilla/js/src/xpconnect/tests/components/xpctest_domstring.cpp @@ -48,7 +48,7 @@ private: const nsSharedBufferHandle *mHandle; }; -NS_IMPL_ISUPPORTS1(xpcTestDOMString, nsIXPCTestDOMString); +NS_IMPL_ISUPPORTS1(xpcTestDOMString, nsIXPCTestDOMString) xpcTestDOMString::xpcTestDOMString() : mHandle(0) diff --git a/mozilla/js/src/xpconnect/tests/components/xpctest_echo.cpp b/mozilla/js/src/xpconnect/tests/components/xpctest_echo.cpp index 83beaede1bb..49618a2b7d6 100644 --- a/mozilla/js/src/xpconnect/tests/components/xpctest_echo.cpp +++ b/mozilla/js/src/xpconnect/tests/components/xpctest_echo.cpp @@ -65,9 +65,9 @@ private: /***************************************************************************/ #ifdef IMPLEMENT_TIMER_STUFF -NS_IMPL_ISUPPORTS2(xpctestEcho, nsIEcho, nsITimerCallback); +NS_IMPL_ISUPPORTS2(xpctestEcho, nsIEcho, nsITimerCallback) #else -NS_IMPL_ISUPPORTS1(xpctestEcho, nsIEcho); +NS_IMPL_ISUPPORTS1(xpctestEcho, nsIEcho) #endif // IMPLEMENT_TIMER_STUFF xpctestEcho::xpctestEcho() diff --git a/mozilla/js/src/xpconnect/tests/components/xpctest_in.cpp b/mozilla/js/src/xpconnect/tests/components/xpctest_in.cpp index c845ca13774..bc15bf25904 100644 --- a/mozilla/js/src/xpconnect/tests/components/xpctest_in.cpp +++ b/mozilla/js/src/xpconnect/tests/components/xpctest_in.cpp @@ -49,56 +49,56 @@ public: xpcTestIn(); }; -NS_IMPL_ISUPPORTS1(xpcTestIn, nsIXPCTestIn); +NS_IMPL_ISUPPORTS1(xpcTestIn, nsIXPCTestIn) xpcTestIn :: xpcTestIn() { NS_ADDREF_THIS(); -}; +} NS_IMETHODIMP xpcTestIn :: EchoLong(PRInt32 l, PRInt32 *_retval) { *_retval = l; return NS_OK; -}; +} NS_IMETHODIMP xpcTestIn :: EchoShort(PRInt16 a, PRInt16 *_retval) { *_retval = a; return NS_OK; -}; +} NS_IMETHODIMP xpcTestIn :: EchoChar(char c, char *_retval) { *_retval = c; return NS_OK; -}; +} NS_IMETHODIMP xpcTestIn :: EchoBoolean(PRBool b, PRBool *_retval) { *_retval = b; return NS_OK; -}; +} NS_IMETHODIMP xpcTestIn :: EchoOctet(PRUint8 o, PRUint8 *_retval) { *_retval = o; return NS_OK; -}; +} NS_IMETHODIMP xpcTestIn :: EchoLongLong(PRInt64 ll, PRInt64 *_retval) { *_retval = ll; return NS_OK; -}; +} NS_IMETHODIMP xpcTestIn :: EchoUnsignedShort(PRUint16 us, PRUint16 *_retval) { *_retval = us; return NS_OK; -}; +} NS_IMETHODIMP xpcTestIn :: EchoUnsignedLong(PRUint32 ul, PRUint32 *_retval) { *_retval = ul; return NS_OK; -}; +} NS_IMETHODIMP xpcTestIn :: EchoFloat(float f, float *_retval) { *_retval = f; return NS_OK; -}; +} NS_IMETHODIMP xpcTestIn :: EchoDouble(double d, double *_retval) { *_retval = d; return NS_OK; -}; +} NS_IMETHODIMP xpcTestIn :: EchoWchar(PRUnichar wc, PRUnichar *_retval) { *_retval = wc; return NS_OK; -}; +} NS_IMETHODIMP xpcTestIn :: EchoString(const PRUnichar *ws, char **_retval) { /* const char s[] = *ws; **_retval= (char*) nsMemory::Clone(s, @@ -106,76 +106,76 @@ NS_IMETHODIMP xpcTestIn :: EchoString(const PRUnichar *ws, char **_retval) { return **_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY; */ return NS_OK; -}; +} NS_IMETHODIMP xpcTestIn :: EchoPRBool(PRBool b, PRBool *_retval) { *_retval = b; return NS_OK; -}; +} NS_IMETHODIMP xpcTestIn :: EchoPRInt32(PRInt32 l, PRInt32 *_retval) { *_retval = l; return NS_OK; -}; +} NS_IMETHODIMP xpcTestIn :: EchoPRInt16(PRInt16 l, PRInt16 *_retval) { *_retval = l; return NS_OK; -}; +} NS_IMETHODIMP xpcTestIn :: EchoPRInt64(PRInt64 i, PRInt64 *_retval) { *_retval = i; return NS_OK; -}; +} NS_IMETHODIMP xpcTestIn :: EchoPRUint8(PRUint8 i, PRUint8 *_retval){ *_retval = i; return NS_OK; -}; +} NS_IMETHODIMP xpcTestIn :: EchoPRUint16(PRUint16 i, PRUint16 *_retval){ *_retval = i; return NS_OK; -}; +} NS_IMETHODIMP xpcTestIn :: EchoPRUint32(PRUint32 i, PRUint32 *_retval){ *_retval = i; return NS_OK; -}; +} NS_IMETHODIMP xpcTestIn :: EchoPRUint64(PRUint64 i, PRUint64 *_retval) { *_retval = i; return NS_OK; -}; +} NS_IMETHODIMP xpcTestIn :: EchoVoidPtr(void * vs, void * *_retval) { *_retval = vs; return NS_OK; -}; +} NS_IMETHODIMP xpcTestIn :: EchoCharPtr(char * cs, char * *_retval) { **_retval = *cs; return NS_OK; -}; +} NS_IMETHODIMP xpcTestIn :: EchoPRUint32_2(PRUint32 i, PRUint32 *_retval){ *_retval = i; return NS_OK; -}; +} /* NS_IMETHODIMP xpcTestIn :: EchoNsIDRef(const nsID & r, nsID & *_retval) { &*_retval = r; -}; +} NS_IMETHODIMP xpcTestIn :: EchoNsCIDRef(const nsCID & r, nsCID & *_retval) { &*_retval = r; -}; +} NS_IMETHODIMP xpcTestIn :: EchoNsIDPtr(const nsID * p, nsID * *_retval) { **_retval = p; -}; +} NS_IMETHODIMP xpcTestIn :: EchoNsIIDPtr(const nsIID * p, nsIID * *_retval) { *_retval = p; -}; +} NS_IMETHODIMP xpcTestIn :: EchoNsCIDPtr(const nsCID * p, nsCID * *_retval) { *_retval = p; -}; +} NS_IMETHODIMP xpcTestIn :: EchoNsQIResult(void * r, void * *_retval) { **_retval = r; -}; +} */ NS_IMETHODIMP xpcTestIn :: EchoVoid(void) { return NS_OK; -}; +} NS_IMETHODIMP xpctest::ConstructXPCTestIn(nsISupports *aOuter, REFNSIID aIID, void **aResult) @@ -196,4 +196,4 @@ xpctest::ConstructXPCTestIn(nsISupports *aOuter, REFNSIID aIID, void **aResult) rv = NS_ERROR_OUT_OF_MEMORY; } return rv; -}; +} diff --git a/mozilla/js/src/xpconnect/tests/components/xpctest_inout.cpp b/mozilla/js/src/xpconnect/tests/components/xpctest_inout.cpp index 1215e7a2f44..bef5e909782 100644 --- a/mozilla/js/src/xpconnect/tests/components/xpctest_inout.cpp +++ b/mozilla/js/src/xpconnect/tests/components/xpctest_inout.cpp @@ -45,104 +45,104 @@ public: xpcTestInOut(); }; -NS_IMPL_ISUPPORTS1(xpcTestInOut, nsIXPCTestInOut); +NS_IMPL_ISUPPORTS1(xpcTestInOut, nsIXPCTestInOut) xpcTestInOut :: xpcTestInOut() { NS_ADDREF_THIS(); -}; +} NS_IMETHODIMP xpcTestInOut :: EchoLong(PRInt32 li, PRInt32 *lo){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoShort(PRInt16 si, PRInt16 *so){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoChar(char ci, char *co){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoBoolean(PRBool bi, PRBool *bo){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoOctet(PRUint8 oi, PRUint8 *oo){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoLongLong(PRInt64 lli, PRInt64 *llo){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoUnsignedShort(PRUint16 usi, PRUint16 *uso){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoUnsignedLong(PRUint32 uli, PRUint32 *ulo){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoFloat(float fi, float *fo){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoDouble(double di, double *dout){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoWchar(PRUnichar wci, PRUnichar *wco){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoString(const PRUnichar *wsi, PRUnichar **wso){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoPRBool(PRBool bi, PRBool *bo){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoPRInt32(PRInt32 li, PRInt32 *lo){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoPRInt16(PRInt16 li, PRInt16 *lo){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoPRInt64(PRInt64 ii, PRInt64 *io){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoPRUint8(PRUint8 ii, PRUint8 *io){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoPRUint16(PRUint16 ii, PRUint16 *io){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoPRUint32(PRUint32 ii, PRUint32 *io){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoPRUint32_2(PRUint32 ii, PRUint32 *io){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoPRUint64(PRUint64 ii, PRUint64 *io){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoVoidPtr(void * vsi, void * *vso){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoCharPtr(char * csi, char * *cso){ return NS_OK; -}; +} /* NS_IMETHODIMP xpcTestInOut :: EchoNsIDRef(const nsID & ri, nsID & *ro){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoNsCIDRef(const nsCID & ri, nsCID & *ro){ return NS_OK; -}; +} */ NS_IMETHODIMP xpcTestInOut :: EchoNsIDPtr(const nsID * pi, nsID * *po){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoNsIIDPtr(const nsIID * pi, nsIID * *po){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoNsCIDPtr(const nsCID * pi, nsCID * *po){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoNsQIResult(void * ri, void * *ro){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestInOut :: EchoVoid(void) { return NS_OK; -}; +} NS_IMETHODIMP xpctest::ConstructXPCTestInOut(nsISupports *aOuter, REFNSIID aIID, void **aResult) @@ -163,4 +163,4 @@ xpctest::ConstructXPCTestInOut(nsISupports *aOuter, REFNSIID aIID, void **aResul rv = NS_ERROR_OUT_OF_MEMORY; } return rv; -}; +} diff --git a/mozilla/js/src/xpconnect/tests/components/xpctest_multiple.cpp b/mozilla/js/src/xpconnect/tests/components/xpctest_multiple.cpp index f8acb7adae2..b279d88e1b1 100644 --- a/mozilla/js/src/xpconnect/tests/components/xpctest_multiple.cpp +++ b/mozilla/js/src/xpconnect/tests/components/xpctest_multiple.cpp @@ -46,12 +46,12 @@ private: const char *name; }; -NS_IMPL_ISUPPORTS1(xpcTestParentOne, nsIXPCTestParentOne); +NS_IMPL_ISUPPORTS1(xpcTestParentOne, nsIXPCTestParentOne) xpcTestParentOne :: xpcTestParentOne() { NS_ADDREF_THIS(); -}; +} NS_IMETHODIMP xpcTestParentOne :: GetParentOneAttribute(char * *_retval) { @@ -59,13 +59,13 @@ NS_IMETHODIMP xpcTestParentOne :: GetParentOneAttribute(char * *_retval) *_retval = (char*) nsMemory::Clone(aString, sizeof(char)*(strlen(aString)+1)); return **_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY; -}; +} NS_IMETHODIMP xpcTestParentOne :: SetParentOneAttribute(const char * aParentOneAttribute) { name = aParentOneAttribute; return NS_OK; -}; +} NS_IMETHODIMP xpcTestParentOne :: ParentOneMethod(char * *_retval) @@ -74,7 +74,7 @@ xpcTestParentOne :: ParentOneMethod(char * *_retval) *_retval = (char*) nsMemory::Clone(aString, sizeof(char)*(strlen(aString)+1)); return **_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY; -}; +} NS_IMETHODIMP xpctest::ConstructXPCTestParentOne(nsISupports *aOuter, REFNSIID aIID, void **aResult) { @@ -95,7 +95,7 @@ xpctest::ConstructXPCTestParentOne(nsISupports *aOuter, REFNSIID aIID, void **aR } return rv; -}; +} /*****************************************************************************/ @@ -109,12 +109,12 @@ private: const char *name; }; -NS_IMPL_ISUPPORTS1(xpcTestParentTwo, nsIXPCTestParentTwo); +NS_IMPL_ISUPPORTS1(xpcTestParentTwo, nsIXPCTestParentTwo) xpcTestParentTwo :: xpcTestParentTwo() { NS_ADDREF_THIS(); -}; +} NS_IMETHODIMP xpcTestParentTwo :: GetParentTwoAttribute(char * *_retval) @@ -123,14 +123,14 @@ xpcTestParentTwo :: GetParentTwoAttribute(char * *_retval) *_retval = (char*) nsMemory::Clone(aString, sizeof(char)*(strlen(aString)+1)); return **_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY; -}; +} NS_IMETHODIMP xpcTestParentTwo :: SetParentTwoAttribute(const char * aParentTwoAttribute) { name = aParentTwoAttribute; return NS_OK; -}; +} NS_IMETHODIMP xpcTestParentTwo :: ParentTwoMethod(char **_retval) @@ -139,7 +139,7 @@ xpcTestParentTwo :: ParentTwoMethod(char **_retval) *_retval = (char*) nsMemory::Clone(aString, sizeof(char)*(strlen(aString)+1)); return **_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY; -}; +} NS_IMETHODIMP xpctest::ConstructXPCTestParentTwo(nsISupports *aOuter, REFNSIID aIID, void **aResult) @@ -161,7 +161,7 @@ xpctest::ConstructXPCTestParentTwo(nsISupports *aOuter, REFNSIID aIID, void **aR } return rv; -}; +} /*****************************************************************************/ /** @@ -179,12 +179,12 @@ private: const char *name; }; -NS_IMPL_ISUPPORTS3_CI(xpcTestChild2,nsIXPCTestChild2,nsIXPCTestParentOne,nsIXPCTestParentTwo); +NS_IMPL_ISUPPORTS3_CI(xpcTestChild2,nsIXPCTestChild2,nsIXPCTestParentOne,nsIXPCTestParentTwo) xpcTestChild2 :: xpcTestChild2() { NS_ADDREF_THIS(); -}; +} NS_IMETHODIMP xpcTestChild2:: GetChildAttribute(char * *_retval) @@ -193,14 +193,14 @@ xpcTestChild2:: GetChildAttribute(char * *_retval) *_retval = (char*) nsMemory::Clone(aString, sizeof(char)*(strlen(aString)+1)); return **_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY; -}; +} NS_IMETHODIMP xpcTestChild2:: SetChildAttribute(const char * aChildAttribute) { name = aChildAttribute; return NS_OK; -}; +} NS_IMETHODIMP xpcTestChild2 ::ChildMethod(char **_retval) @@ -209,7 +209,7 @@ xpcTestChild2 ::ChildMethod(char **_retval) *_retval = (char*) nsMemory::Clone(aString, sizeof(char)*(strlen(aString)+1)); return **_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY; -}; +} NS_IMETHODIMP @@ -219,14 +219,14 @@ xpcTestChild2 :: GetParentOneAttribute(char * *_retval) *_retval = (char*) nsMemory::Clone(aString, sizeof(char)*(strlen(aString)+1)); return **_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY; -}; +} NS_IMETHODIMP xpcTestChild2:: SetParentOneAttribute(const char * aParentOneAttribute) { name = aParentOneAttribute; return NS_OK; -}; +} NS_IMETHODIMP xpcTestChild2 :: ParentOneMethod(char * *_retval) @@ -235,7 +235,7 @@ xpcTestChild2 :: ParentOneMethod(char * *_retval) *_retval = (char*) nsMemory::Clone(aString, sizeof(char)*(strlen(aString)+1)); return **_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY; -}; +} NS_IMETHODIMP xpcTestChild2 :: GetParentTwoAttribute(char * *_retval) @@ -244,14 +244,14 @@ xpcTestChild2 :: GetParentTwoAttribute(char * *_retval) *_retval = (char*) nsMemory::Clone(aString, sizeof(char)*(strlen(aString)+1)); return **_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY; -}; +} NS_IMETHODIMP xpcTestChild2 :: SetParentTwoAttribute(const char * aParentTwoAttribute) { name = aParentTwoAttribute; return NS_OK; -}; +} NS_IMETHODIMP xpcTestChild2 :: ParentTwoMethod(char **_retval) { @@ -259,7 +259,7 @@ xpcTestChild2 :: ParentTwoMethod(char **_retval) { *_retval = (char*) nsMemory::Clone(aString, sizeof(char)*(strlen(aString)+1)); return **_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY; -}; +} NS_IMETHODIMP xpctest::ConstructXPCTestChild2(nsISupports *aOuter, REFNSIID aIID, void **aResult) @@ -281,7 +281,7 @@ xpctest::ConstructXPCTestChild2(nsISupports *aOuter, REFNSIID aIID, void **aResu } return rv; -}; +} /*****************************************************************************/ @@ -300,13 +300,13 @@ private: const char *name; }; -NS_IMPL_ISUPPORTS2(xpcTestChild3,nsIXPCTestChild3,nsIXPCTestParentOne); +NS_IMPL_ISUPPORTS2(xpcTestChild3,nsIXPCTestChild3,nsIXPCTestParentOne) xpcTestChild3 :: xpcTestChild3() { NS_ADDREF_THIS(); -}; +} NS_IMETHODIMP xpcTestChild3:: GetChildAttribute(char * *_retval) @@ -315,14 +315,14 @@ xpcTestChild3:: GetChildAttribute(char * *_retval) *_retval = (char*) nsMemory::Clone(aString, sizeof(char)*(strlen(aString)+1)); return **_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY; -}; +} NS_IMETHODIMP xpcTestChild3 :: SetChildAttribute(const char * aChildAttribute) { name = aChildAttribute; return NS_OK; -}; +} NS_IMETHODIMP xpcTestChild3 ::ChildMethod(char **_retval) @@ -331,7 +331,7 @@ xpcTestChild3 ::ChildMethod(char **_retval) *_retval = (char*) nsMemory::Clone((const char *)aString, sizeof(char)*(strlen((const char *)aString)+1)); return **_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY; -}; +} NS_IMETHODIMP @@ -341,14 +341,14 @@ xpcTestChild3 :: GetParentOneAttribute(char * *_retval) *_retval = (char*) nsMemory::Clone(aString, sizeof(char)*(strlen(aString)+1)); return **_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY; -}; +} NS_IMETHODIMP xpcTestChild3:: SetParentOneAttribute(const char * aParentOneAttribute) { name = aParentOneAttribute; return NS_OK; -}; +} NS_IMETHODIMP xpcTestChild3 :: ParentOneMethod(char * *_retval) @@ -357,7 +357,7 @@ xpcTestChild3 :: ParentOneMethod(char * *_retval) *_retval = (char*) nsMemory::Clone(aString, sizeof(char)*(strlen(aString)+1)); return **_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY; -}; +} NS_IMETHODIMP xpctest::ConstructXPCTestChild3(nsISupports *aOuter, REFNSIID aIID, void **aResult) @@ -379,7 +379,7 @@ xpctest::ConstructXPCTestChild3(nsISupports *aOuter, REFNSIID aIID, void **aResu } return rv; -}; +} /*****************************************************************************/ @@ -397,12 +397,12 @@ private: const char *name; }; -NS_IMPL_ISUPPORTS3(xpcTestChild4,nsIXPCTestChild4,nsIXPCTestParentOne,nsIXPCTestParentTwo); +NS_IMPL_ISUPPORTS3(xpcTestChild4,nsIXPCTestChild4,nsIXPCTestParentOne,nsIXPCTestParentTwo) xpcTestChild4 :: xpcTestChild4() { NS_ADDREF_THIS(); -}; +} NS_IMETHODIMP xpcTestChild4:: GetChildAttribute(char * *_retval) @@ -411,14 +411,14 @@ xpcTestChild4:: GetChildAttribute(char * *_retval) *_retval = (char*) nsMemory::Clone(aString, sizeof(char)*(strlen(aString)+1)); return **_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY; -}; +} NS_IMETHODIMP xpcTestChild4:: SetChildAttribute(const char * aChildAttribute) { name = aChildAttribute; return NS_OK; -}; +} NS_IMETHODIMP xpcTestChild4 ::ChildMethod(char **_retval) @@ -427,7 +427,7 @@ xpcTestChild4 ::ChildMethod(char **_retval) *_retval = (char*) nsMemory::Clone(aString, sizeof(char)*(strlen(aString)+1)); return **_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY; -}; +} NS_IMETHODIMP xpctest::ConstructXPCTestChild4(nsISupports *aOuter, REFNSIID aIID, void **aResult) @@ -449,7 +449,7 @@ xpctest::ConstructXPCTestChild4(nsISupports *aOuter, REFNSIID aIID, void **aResu } return rv; -}; +} /*****************************************************************************/ /** @@ -467,12 +467,12 @@ private: const char *name; }; -NS_IMPL_ISUPPORTS3(xpcTestChild5,nsIXPCTestChild5,nsIXPCTestParentOne,nsIXPCTestParentTwo); +NS_IMPL_ISUPPORTS3(xpcTestChild5,nsIXPCTestChild5,nsIXPCTestParentOne,nsIXPCTestParentTwo) xpcTestChild5 :: xpcTestChild5() { NS_ADDREF_THIS(); -}; +} NS_IMETHODIMP xpcTestChild5:: GetChildAttribute(char * *_retval) @@ -481,14 +481,14 @@ xpcTestChild5:: GetChildAttribute(char * *_retval) *_retval = (char*) nsMemory::Clone(aString, sizeof(char)*(strlen(aString)+1)); return **_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY; -}; +} NS_IMETHODIMP xpcTestChild5:: SetChildAttribute(const char * aChildAttribute) { name = aChildAttribute; return NS_OK; -}; +} NS_IMETHODIMP xpcTestChild5 ::ChildMethod(char **_retval) @@ -497,7 +497,7 @@ xpcTestChild5 ::ChildMethod(char **_retval) *_retval = (char*) nsMemory::Clone(aString, sizeof(char)*(strlen(aString)+1)); return **_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY; -}; +} NS_IMETHODIMP @@ -507,14 +507,14 @@ xpcTestChild5 :: GetParentOneAttribute(char * *_retval) *_retval = (char*) nsMemory::Clone(aString, sizeof(char)*(strlen(aString)+1)); return **_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY; -}; +} NS_IMETHODIMP xpcTestChild5:: SetParentOneAttribute(const char * aParentOneAttribute) { name = aParentOneAttribute; return NS_OK; -}; +} NS_IMETHODIMP xpcTestChild5 :: ParentOneMethod(char * *_retval) @@ -523,7 +523,7 @@ xpcTestChild5 :: ParentOneMethod(char * *_retval) *_retval = (char*) nsMemory::Clone(aString, sizeof(char)*(strlen(aString)+1)); return **_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY; -}; +} NS_IMETHODIMP xpctest::ConstructXPCTestChild5(nsISupports *aOuter, REFNSIID aIID, void **aResult) @@ -545,4 +545,4 @@ xpctest::ConstructXPCTestChild5(nsISupports *aOuter, REFNSIID aIID, void **aResu } return rv; -}; +} diff --git a/mozilla/js/src/xpconnect/tests/components/xpctest_out.cpp b/mozilla/js/src/xpconnect/tests/components/xpctest_out.cpp index 37ae84ab033..f06f2527ab9 100644 --- a/mozilla/js/src/xpconnect/tests/components/xpctest_out.cpp +++ b/mozilla/js/src/xpconnect/tests/components/xpctest_out.cpp @@ -73,100 +73,100 @@ private: }; -NS_IMPL_ISUPPORTS1(xpcTestOut, nsIXPCTestOut); +NS_IMPL_ISUPPORTS1(xpcTestOut, nsIXPCTestOut) xpcTestOut :: xpcTestOut() { NS_ADDREF_THIS(); -}; +} NS_IMETHODIMP xpcTestOut :: GetLong(PRInt32 *l){ *l = longProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetLong(PRInt32 l){ longProperty = l; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: GetShort(PRInt16 *s){ *s = shortProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetShort(PRInt16 s){ shortProperty = s; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetChar(char c){ charProperty = c; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: GetChar(char *c){ *c = charProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: GetBoolean(PRBool *b){ *b = booleanProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetBoolean(PRBool b){ booleanProperty = b; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: GetOctet(PRUint8 *o){ *o = octetProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetOctet(PRUint8 o){ octetProperty = o; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: GetLongLong(PRInt64 *ll){ *ll = longLongProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetLongLong(PRInt64 ll){ longLongProperty = ll; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: GetUnsignedShort(PRUint16 *us){ *us = unsignedShortProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetUnsignedShort(PRUint16 us){ unsignedShortProperty = us; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: GetUnsignedLong(PRUint32 *ul){ *ul = unsignedLongProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetUnsignedLong(PRUint32 ul){ unsignedLongProperty = ul; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: GetFloat(float *f){ *f = floatProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetFloat(float f){ floatProperty = f; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: GetDouble(double *d){ *d = doubleProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetDouble(double d){ doubleProperty = d; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: GetWchar(PRUnichar *wc){ *wc = wcharProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetWchar(PRUnichar wc){ wcharProperty = wc; return NS_OK; -}; +} /* NS_IMETHODIMP xpcTestOut :: GetString(PRUnichar **ws){ **ws = *stringProperty; @@ -178,135 +178,135 @@ NS_IMETHODIMP xpcTestOut :: GetString(PRUnichar **ws){ return **ws? NS_OK : NS_ERROR_OUT_OF_MEMORY; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetString(const PRUnichar *ws){ //stringProperty = ws; return NS_OK; -}; +} */ NS_IMETHODIMP xpcTestOut :: GetPRBool(PRBool *b){ *b = PRBoolProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetPRBool(PRBool b){ PRBoolProperty = b; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: GetPRInt32(PRInt32 *l){ *l = PRInt32Property; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetPRInt32(PRInt32 l){ PRInt32Property = l; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: GetPRInt16(PRInt16 *l){ *l = PRInt16Property; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetPRInt16(PRInt16 l){ PRInt16Property = l; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: GetPRInt64(PRInt64 *i){ *i = PRInt64Property; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetPRInt64(PRInt64 i){ PRInt64Property = i; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: GetPRUint8(PRUint8 *i){ *i = PRUint8Property; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetPRUint8(PRUint8 i){ PRUint8Property = i; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: GetPRUint16(PRUint16 *i){ *i = PRUint16Property; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetPRUint16(PRUint16 i){ PRUint16Property = i; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: GetPRUint32(PRUint32 *i){ *i = PRUint32Property; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetPRUint32(PRUint32 i){ PRUint32Property = i; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: GetPRUint64(PRUint64 *i){ *i = PRUint64Property; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetPRUint64(PRUint64 i){ PRUint64Property = i; return NS_OK; -}; +} /* NS_IMETHODIMP xpcTestOut :: GetVoidStar(void * *vs){ **vs = voidStarProperty; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetVoidStar(void * vs){ voidStarProperty = vs; return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: GetCharStar(char * *cs){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetCharStar(char * cs){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: GetNsIDRef(nsID & *r){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetNsIDRef(const nsID & r){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: GetNsCIDRef(nsCID & *r){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetNsCIDRef(const nsCID & r){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: GetNsIDPtr(nsID * *p){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetNsIDPtr(const nsID * p){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: GetNsIIDPtr(nsIID * *p){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetNsIIDPtr(const nsIID * p){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: GetNsCIDPtr(nsCID * *p){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetNsCIDPtr(const nsCID * p){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: GetNsQIResult(void * *r){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetNsQIResult(void * r){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: GetVoid(void){ return NS_OK; -}; +} NS_IMETHODIMP xpcTestOut :: SetVoid(void){ return NS_OK; -}; +} */ NS_IMETHODIMP xpctest::ConstructXPCTestOut(nsISupports *aOuter, REFNSIID aIID, void **aResult) @@ -327,4 +327,4 @@ xpctest::ConstructXPCTestOut(nsISupports *aOuter, REFNSIID aIID, void **aResult) rv = NS_ERROR_OUT_OF_MEMORY; } return rv; -}; +} diff --git a/mozilla/js/src/xpconnect/tests/components/xpctest_overloaded.cpp b/mozilla/js/src/xpconnect/tests/components/xpctest_overloaded.cpp index f2edadef573..8eea42f0876 100644 --- a/mozilla/js/src/xpconnect/tests/components/xpctest_overloaded.cpp +++ b/mozilla/js/src/xpconnect/tests/components/xpctest_overloaded.cpp @@ -110,7 +110,7 @@ xpcoverloaded::~xpcoverloaded() // empty } -NS_IMPL_ISUPPORTS2(xpcoverloaded, nsIXPCTestOverloaded, nsIXPCScriptable); +NS_IMPL_ISUPPORTS2(xpcoverloaded, nsIXPCTestOverloaded, nsIXPCScriptable) /* void Foo1 (in PRInt32 p1); */ NS_IMETHODIMP diff --git a/mozilla/js/src/xpconnect/tests/components/xpctest_string.cpp b/mozilla/js/src/xpconnect/tests/components/xpctest_string.cpp index b2a2a9be042..19abcebcbd5 100644 --- a/mozilla/js/src/xpconnect/tests/components/xpctest_string.cpp +++ b/mozilla/js/src/xpconnect/tests/components/xpctest_string.cpp @@ -56,7 +56,7 @@ xpcstringtest::~xpcstringtest() { } -NS_IMPL_ISUPPORTS1(xpcstringtest, nsIXPCTestString); +NS_IMPL_ISUPPORTS1(xpcstringtest, nsIXPCTestString) /* string GetStringA (); */ NS_IMETHODIMP diff --git a/mozilla/layout/base/bidicattable.h b/mozilla/layout/base/bidicattable.h index f97939ba079..424958bc501 100644 --- a/mozilla/layout/base/bidicattable.h +++ b/mozilla/layout/base/bidicattable.h @@ -17,7 +17,7 @@ */ /* DO NOT EDIT THIS DOCUMENT !!! THIS DOCUMENT IS GENERATED BY - mozilla/intl/unicharutil/tools/genbidicattable.pl + mozilla/layout/tools/genbidicattable.pl */ @@ -1941,5 +1941,5 @@ static eBidiCategory GetBidiCat(PRUnichar u) } return eBidiCat_L; /* UNDEFINE = L */ -}; +} /* total data size = 2252 */ diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index 572e4c3bb5b..1516bfbd83b 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -1317,7 +1317,7 @@ nsCSSFrameConstructor::~nsCSSFrameConstructor(void) { } -NS_IMPL_ISUPPORTS2(nsCSSFrameConstructor, nsIStyleFrameConstruction,nsICSSFrameConstructor); +NS_IMPL_ISUPPORTS2(nsCSSFrameConstructor, nsIStyleFrameConstruction,nsICSSFrameConstructor) NS_IMETHODIMP nsCSSFrameConstructor::Init(nsIDocument* aDocument) diff --git a/mozilla/layout/base/nsCaret.cpp b/mozilla/layout/base/nsCaret.cpp index 1329650a9cb..efc5b4b3add 100644 --- a/mozilla/layout/base/nsCaret.cpp +++ b/mozilla/layout/base/nsCaret.cpp @@ -201,7 +201,7 @@ NS_IMETHODIMP nsCaret::Terminate() //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS2(nsCaret, nsICaret, nsISelectionListener); +NS_IMPL_ISUPPORTS2(nsCaret, nsICaret, nsISelectionListener) //----------------------------------------------------------------------------- NS_IMETHODIMP nsCaret::GetCaretDOMSelection(nsISelection **aDOMSel) diff --git a/mozilla/layout/base/nsFrameContentIterator.cpp b/mozilla/layout/base/nsFrameContentIterator.cpp index 07887003ff4..4471b2deeda 100644 --- a/mozilla/layout/base/nsFrameContentIterator.cpp +++ b/mozilla/layout/base/nsFrameContentIterator.cpp @@ -60,7 +60,7 @@ nsFrameContentIterator::nsFrameContentIterator(nsIPresContext* aPresContext, First(); } -NS_IMPL_ISUPPORTS1(nsFrameContentIterator, nsIContentIterator); +NS_IMPL_ISUPPORTS1(nsFrameContentIterator, nsIContentIterator) nsFrameContentIterator::~nsFrameContentIterator() { diff --git a/mozilla/layout/base/nsFrameTraversal.cpp b/mozilla/layout/base/nsFrameTraversal.cpp index 10069b2c4cf..565babc4e76 100644 --- a/mozilla/layout/base/nsFrameTraversal.cpp +++ b/mozilla/layout/base/nsFrameTraversal.cpp @@ -254,7 +254,7 @@ nsFrameTraversal::~nsFrameTraversal() { } -NS_IMPL_ISUPPORTS1(nsFrameTraversal,nsIFrameTraversal); +NS_IMPL_ISUPPORTS1(nsFrameTraversal,nsIFrameTraversal) NS_IMETHODIMP nsFrameTraversal::NewFrameTraversal(nsIBidirectionalEnumerator **aEnumerator, diff --git a/mozilla/layout/base/nsLayoutHistoryState.cpp b/mozilla/layout/base/nsLayoutHistoryState.cpp index 88ac1be3598..de26a3b3438 100644 --- a/mozilla/layout/base/nsLayoutHistoryState.cpp +++ b/mozilla/layout/base/nsLayoutHistoryState.cpp @@ -87,7 +87,7 @@ nsLayoutHistoryState::~nsLayoutHistoryState() NS_IMPL_ISUPPORTS2(nsLayoutHistoryState, nsILayoutHistoryState, - nsISupportsWeakReference); + nsISupportsWeakReference) NS_IMETHODIMP nsLayoutHistoryState::AddState(const nsCString& aStateKey, diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp index f31501faba7..154d0b58c72 100644 --- a/mozilla/layout/base/nsPresShell.cpp +++ b/mozilla/layout/base/nsPresShell.cpp @@ -773,9 +773,9 @@ struct nsCallbackEventRequest PRInt32 nsDummyLayoutRequest::gRefCnt; nsIURI* nsDummyLayoutRequest::gURI; -NS_IMPL_ADDREF(nsDummyLayoutRequest); -NS_IMPL_RELEASE(nsDummyLayoutRequest); -NS_IMPL_QUERY_INTERFACE2(nsDummyLayoutRequest, nsIRequest, nsIChannel); +NS_IMPL_ADDREF(nsDummyLayoutRequest) +NS_IMPL_RELEASE(nsDummyLayoutRequest) +NS_IMPL_QUERY_INTERFACE2(nsDummyLayoutRequest, nsIRequest, nsIChannel) nsresult nsDummyLayoutRequest::Create(nsIRequest** aResult, nsIPresShell* aPresShell) diff --git a/mozilla/layout/base/src/bidicattable.h b/mozilla/layout/base/src/bidicattable.h index f97939ba079..424958bc501 100644 --- a/mozilla/layout/base/src/bidicattable.h +++ b/mozilla/layout/base/src/bidicattable.h @@ -17,7 +17,7 @@ */ /* DO NOT EDIT THIS DOCUMENT !!! THIS DOCUMENT IS GENERATED BY - mozilla/intl/unicharutil/tools/genbidicattable.pl + mozilla/layout/tools/genbidicattable.pl */ @@ -1941,5 +1941,5 @@ static eBidiCategory GetBidiCat(PRUnichar u) } return eBidiCat_L; /* UNDEFINE = L */ -}; +} /* total data size = 2252 */ diff --git a/mozilla/layout/base/src/nsCaret.cpp b/mozilla/layout/base/src/nsCaret.cpp index 1329650a9cb..efc5b4b3add 100644 --- a/mozilla/layout/base/src/nsCaret.cpp +++ b/mozilla/layout/base/src/nsCaret.cpp @@ -201,7 +201,7 @@ NS_IMETHODIMP nsCaret::Terminate() //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS2(nsCaret, nsICaret, nsISelectionListener); +NS_IMPL_ISUPPORTS2(nsCaret, nsICaret, nsISelectionListener) //----------------------------------------------------------------------------- NS_IMETHODIMP nsCaret::GetCaretDOMSelection(nsISelection **aDOMSel) diff --git a/mozilla/layout/base/src/nsFrameTraversal.cpp b/mozilla/layout/base/src/nsFrameTraversal.cpp index 10069b2c4cf..565babc4e76 100644 --- a/mozilla/layout/base/src/nsFrameTraversal.cpp +++ b/mozilla/layout/base/src/nsFrameTraversal.cpp @@ -254,7 +254,7 @@ nsFrameTraversal::~nsFrameTraversal() { } -NS_IMPL_ISUPPORTS1(nsFrameTraversal,nsIFrameTraversal); +NS_IMPL_ISUPPORTS1(nsFrameTraversal,nsIFrameTraversal) NS_IMETHODIMP nsFrameTraversal::NewFrameTraversal(nsIBidirectionalEnumerator **aEnumerator, diff --git a/mozilla/layout/base/src/nsLayoutHistoryState.cpp b/mozilla/layout/base/src/nsLayoutHistoryState.cpp index 88ac1be3598..de26a3b3438 100644 --- a/mozilla/layout/base/src/nsLayoutHistoryState.cpp +++ b/mozilla/layout/base/src/nsLayoutHistoryState.cpp @@ -87,7 +87,7 @@ nsLayoutHistoryState::~nsLayoutHistoryState() NS_IMPL_ISUPPORTS2(nsLayoutHistoryState, nsILayoutHistoryState, - nsISupportsWeakReference); + nsISupportsWeakReference) NS_IMETHODIMP nsLayoutHistoryState::AddState(const nsCString& aStateKey, diff --git a/mozilla/layout/build/nsContentDLF.cpp b/mozilla/layout/build/nsContentDLF.cpp index caea8bac89a..8d998c96f25 100644 --- a/mozilla/layout/build/nsContentDLF.cpp +++ b/mozilla/layout/build/nsContentDLF.cpp @@ -149,7 +149,7 @@ nsContentDLF::~nsContentDLF() NS_IMPL_ISUPPORTS2(nsContentDLF, nsIDocumentLoaderFactory, - nsIDocStreamLoaderFactory); + nsIDocStreamLoaderFactory) NS_IMETHODIMP nsContentDLF::CreateInstance(const char* aCommand, diff --git a/mozilla/layout/forms/nsTextControlFrame.cpp b/mozilla/layout/forms/nsTextControlFrame.cpp index a7d05bec4b4..630ccf74077 100644 --- a/mozilla/layout/forms/nsTextControlFrame.cpp +++ b/mozilla/layout/forms/nsTextControlFrame.cpp @@ -1117,8 +1117,8 @@ NS_NewTextControlFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) return NS_OK; } -NS_IMPL_ADDREF_INHERITED(nsTextControlFrame, nsBoxFrame); -NS_IMPL_RELEASE_INHERITED(nsTextControlFrame, nsBoxFrame); +NS_IMPL_ADDREF_INHERITED(nsTextControlFrame, nsBoxFrame) +NS_IMPL_RELEASE_INHERITED(nsTextControlFrame, nsBoxFrame) NS_IMETHODIMP diff --git a/mozilla/layout/generic/nsImageMap.cpp b/mozilla/layout/generic/nsImageMap.cpp index 7a2b8cc62a3..88e9bc71c24 100644 --- a/mozilla/layout/generic/nsImageMap.cpp +++ b/mozilla/layout/generic/nsImageMap.cpp @@ -771,7 +771,7 @@ NS_IMPL_ISUPPORTS4(nsImageMap, nsIDocumentObserver, nsIDOMFocusListener, nsIDOMEventListener, - nsIImageMap); + nsIImageMap) NS_IMETHODIMP nsImageMap::GetBoundsForAreaContent(nsIContent *aContent, diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp index 7d48c2a1050..9e490618d66 100644 --- a/mozilla/layout/generic/nsObjectFrame.cpp +++ b/mozilla/layout/generic/nsObjectFrame.cpp @@ -2068,7 +2068,7 @@ nsPluginDOMContextMenuListener::~nsPluginDOMContextMenuListener() { } -NS_IMPL_ISUPPORTS2(nsPluginDOMContextMenuListener, nsIDOMContextMenuListener, nsIEventListener); +NS_IMPL_ISUPPORTS2(nsPluginDOMContextMenuListener, nsIDOMContextMenuListener, nsIEventListener) nsresult nsPluginDOMContextMenuListener::Init(nsObjectFrame *aFrame) { diff --git a/mozilla/layout/html/base/src/nsImageMap.cpp b/mozilla/layout/html/base/src/nsImageMap.cpp index 7a2b8cc62a3..88e9bc71c24 100644 --- a/mozilla/layout/html/base/src/nsImageMap.cpp +++ b/mozilla/layout/html/base/src/nsImageMap.cpp @@ -771,7 +771,7 @@ NS_IMPL_ISUPPORTS4(nsImageMap, nsIDocumentObserver, nsIDOMFocusListener, nsIDOMEventListener, - nsIImageMap); + nsIImageMap) NS_IMETHODIMP nsImageMap::GetBoundsForAreaContent(nsIContent *aContent, diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp index 7d48c2a1050..9e490618d66 100644 --- a/mozilla/layout/html/base/src/nsObjectFrame.cpp +++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp @@ -2068,7 +2068,7 @@ nsPluginDOMContextMenuListener::~nsPluginDOMContextMenuListener() { } -NS_IMPL_ISUPPORTS2(nsPluginDOMContextMenuListener, nsIDOMContextMenuListener, nsIEventListener); +NS_IMPL_ISUPPORTS2(nsPluginDOMContextMenuListener, nsIDOMContextMenuListener, nsIEventListener) nsresult nsPluginDOMContextMenuListener::Init(nsObjectFrame *aFrame) { diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp index f31501faba7..154d0b58c72 100644 --- a/mozilla/layout/html/base/src/nsPresShell.cpp +++ b/mozilla/layout/html/base/src/nsPresShell.cpp @@ -773,9 +773,9 @@ struct nsCallbackEventRequest PRInt32 nsDummyLayoutRequest::gRefCnt; nsIURI* nsDummyLayoutRequest::gURI; -NS_IMPL_ADDREF(nsDummyLayoutRequest); -NS_IMPL_RELEASE(nsDummyLayoutRequest); -NS_IMPL_QUERY_INTERFACE2(nsDummyLayoutRequest, nsIRequest, nsIChannel); +NS_IMPL_ADDREF(nsDummyLayoutRequest) +NS_IMPL_RELEASE(nsDummyLayoutRequest) +NS_IMPL_QUERY_INTERFACE2(nsDummyLayoutRequest, nsIRequest, nsIChannel) nsresult nsDummyLayoutRequest::Create(nsIRequest** aResult, nsIPresShell* aPresShell) diff --git a/mozilla/layout/html/forms/src/nsTextControlFrame.cpp b/mozilla/layout/html/forms/src/nsTextControlFrame.cpp index a7d05bec4b4..630ccf74077 100644 --- a/mozilla/layout/html/forms/src/nsTextControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsTextControlFrame.cpp @@ -1117,8 +1117,8 @@ NS_NewTextControlFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) return NS_OK; } -NS_IMPL_ADDREF_INHERITED(nsTextControlFrame, nsBoxFrame); -NS_IMPL_RELEASE_INHERITED(nsTextControlFrame, nsBoxFrame); +NS_IMPL_ADDREF_INHERITED(nsTextControlFrame, nsBoxFrame) +NS_IMPL_RELEASE_INHERITED(nsTextControlFrame, nsBoxFrame) NS_IMETHODIMP diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp index 572e4c3bb5b..1516bfbd83b 100644 --- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp @@ -1317,7 +1317,7 @@ nsCSSFrameConstructor::~nsCSSFrameConstructor(void) { } -NS_IMPL_ISUPPORTS2(nsCSSFrameConstructor, nsIStyleFrameConstruction,nsICSSFrameConstructor); +NS_IMPL_ISUPPORTS2(nsCSSFrameConstructor, nsIStyleFrameConstruction,nsICSSFrameConstructor) NS_IMETHODIMP nsCSSFrameConstructor::Init(nsIDocument* aDocument) diff --git a/mozilla/layout/html/style/src/nsFrameContentIterator.cpp b/mozilla/layout/html/style/src/nsFrameContentIterator.cpp index 07887003ff4..4471b2deeda 100644 --- a/mozilla/layout/html/style/src/nsFrameContentIterator.cpp +++ b/mozilla/layout/html/style/src/nsFrameContentIterator.cpp @@ -60,7 +60,7 @@ nsFrameContentIterator::nsFrameContentIterator(nsIPresContext* aPresContext, First(); } -NS_IMPL_ISUPPORTS1(nsFrameContentIterator, nsIContentIterator); +NS_IMPL_ISUPPORTS1(nsFrameContentIterator, nsIContentIterator) nsFrameContentIterator::~nsFrameContentIterator() { diff --git a/mozilla/layout/mathml/base/src/nsMathMLChar.cpp b/mozilla/layout/mathml/base/src/nsMathMLChar.cpp index f431fefd1d2..d44dda03c0f 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLChar.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLChar.cpp @@ -753,7 +753,7 @@ private: nsVoidArray mAdditionalTableList; }; -NS_IMPL_ISUPPORTS1(nsGlyphTableList, nsIObserver); +NS_IMPL_ISUPPORTS1(nsGlyphTableList, nsIObserver) // ----------------------------------------------------------------------------------- // Here is the global list of applicable glyph tables that we will be using diff --git a/mozilla/layout/tools/genbidicattable.pl b/mozilla/layout/tools/genbidicattable.pl index 9638e75bab2..d8ccf1eafd7 100644 --- a/mozilla/layout/tools/genbidicattable.pl +++ b/mozilla/layout/tools/genbidicattable.pl @@ -94,7 +94,7 @@ $npl = <