зеркало из https://github.com/mozilla/gecko-dev.git
Switched to newer style NS_IMPL_* macros. Fixed some warnings.
This commit is contained in:
jband%netscape.com
Родитель
eb6cb3f04d
Коммит
465726be68
|
|
@ -26,8 +26,7 @@
|
|||
#define JS_CLASS_MAP_SIZE 256
|
||||
#define NATIVE_CLASS_MAP_SIZE 256
|
||||
|
||||
static NS_DEFINE_IID(kXPConnectIID, NS_IXPCONNECT_IID);
|
||||
NS_IMPL_ISUPPORTS(nsXPConnect, kXPConnectIID)
|
||||
NS_IMPL_ISUPPORTS1(nsXPConnect, nsIXPConnect)
|
||||
|
||||
const char XPC_COMPONENTS_STR[] = "Components";
|
||||
|
||||
|
|
|
|||
|
|
@ -22,8 +22,7 @@
|
|||
|
||||
extern "C" JS_IMPORT_DATA(JSObjectOps) js_ObjectOps;
|
||||
|
||||
static NS_DEFINE_IID(kArbitraryScriptableIID, NS_IXPCSCRIPTABLE_IID);
|
||||
NS_IMPL_ISUPPORTS(nsXPCArbitraryScriptable, kArbitraryScriptableIID)
|
||||
NS_IMPL_ISUPPORTS1(nsXPCArbitraryScriptable, nsIXPCScriptable)
|
||||
|
||||
#define REAL_WRAPPER(w) ((nsXPCWrappedNative*)(w))
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ static void ThrowBadResultException(uintN errNum, JSContext* cx, nsresult rv)
|
|||
/***************************************************************************/
|
||||
// nsJSID
|
||||
|
||||
NS_IMPL_ISUPPORTS(nsJSID, NS_GET_IID(nsIJSID))
|
||||
NS_IMPL_ISUPPORTS1(nsJSID, nsIJSID)
|
||||
|
||||
char nsJSID::gNoString[] = "";
|
||||
|
||||
|
|
@ -224,25 +224,7 @@ nsJSID::NewID(const char* str)
|
|||
/***************************************************************************/
|
||||
/***************************************************************************/
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsJSIID::QueryInterface(REFNSIID aIID, void** aInstancePtr)
|
||||
{
|
||||
if (nsnull == aInstancePtr) {
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
}
|
||||
if (aIID.Equals(NS_GET_IID(nsISupports)) ||
|
||||
aIID.Equals(NS_GET_IID(nsIJSID)) ||
|
||||
aIID.Equals(NS_GET_IID(nsIJSIID))) {
|
||||
*aInstancePtr = (void*) this;
|
||||
NS_ADDREF_THIS();
|
||||
return NS_OK;
|
||||
}
|
||||
*aInstancePtr = nsnull;
|
||||
return NS_NOINTERFACE;
|
||||
}
|
||||
|
||||
NS_IMPL_ADDREF(nsJSIID)
|
||||
NS_IMPL_RELEASE(nsJSIID)
|
||||
NS_IMPL_ISUPPORTS2(nsJSIID, nsIJSID, nsIJSIID)
|
||||
|
||||
nsJSIID::nsJSIID() {NS_INIT_ISUPPORTS();}
|
||||
nsJSIID::~nsJSIID() {}
|
||||
|
|
@ -367,11 +349,7 @@ private:
|
|||
|
||||
/*********************************************/
|
||||
|
||||
NS_IMPL_QUERY_INTERFACE_SCRIPTABLE(CIDCreateInstance, \
|
||||
NS_GET_IID(CIDCreateInstance), \
|
||||
this)
|
||||
NS_IMPL_ADDREF(CIDCreateInstance)
|
||||
NS_IMPL_RELEASE(CIDCreateInstance)
|
||||
NS_IMPL_ISUPPORTS2(CIDCreateInstance, CIDCreateInstance, nsIXPCScriptable)
|
||||
|
||||
CIDCreateInstance::CIDCreateInstance(nsJSCID *aCID)
|
||||
: mCID(aCID)
|
||||
|
|
@ -522,13 +500,13 @@ public:
|
|||
NS_IMETHOD AboutToRelease(nsISupports* aObj);
|
||||
ServiceReleaser(const nsCID& aCID);
|
||||
|
||||
virtual ~ServiceReleaser();
|
||||
private:
|
||||
ServiceReleaser(); // not implemented
|
||||
virtual ~ServiceReleaser();
|
||||
nsCID mCID;
|
||||
};
|
||||
|
||||
NS_IMPL_ISUPPORTS(ServiceReleaser, NS_GET_IID(ServiceReleaser));
|
||||
NS_IMPL_ISUPPORTS2(ServiceReleaser, ServiceReleaser, nsIXPConnectFinalizeListener)
|
||||
|
||||
ServiceReleaser::ServiceReleaser(const nsCID& aCID)
|
||||
: mCID(aCID)
|
||||
|
|
@ -571,11 +549,7 @@ private:
|
|||
|
||||
/*********************************************/
|
||||
|
||||
NS_IMPL_QUERY_INTERFACE_SCRIPTABLE(CIDGetService, \
|
||||
NS_GET_IID(CIDGetService), \
|
||||
this)
|
||||
NS_IMPL_ADDREF(CIDGetService)
|
||||
NS_IMPL_RELEASE(CIDGetService)
|
||||
NS_IMPL_ISUPPORTS2(CIDGetService, CIDGetService, nsIXPCScriptable)
|
||||
|
||||
CIDGetService::CIDGetService(nsJSCID *aCID)
|
||||
: mCID(aCID)
|
||||
|
|
@ -730,25 +704,7 @@ CIDGetService::Call(JSContext *cx, JSObject *obj,
|
|||
/***************************************************************************/
|
||||
/***************************************************************************/
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsJSCID::QueryInterface(REFNSIID aIID, void** aInstancePtr)
|
||||
{
|
||||
if (nsnull == aInstancePtr) {
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
}
|
||||
if (aIID.Equals(NS_GET_IID(nsISupports)) ||
|
||||
aIID.Equals(NS_GET_IID(nsIJSID)) ||
|
||||
aIID.Equals(NS_GET_IID(nsIJSCID))) {
|
||||
*aInstancePtr = (void*) this;
|
||||
NS_ADDREF_THIS();
|
||||
return NS_OK;
|
||||
}
|
||||
*aInstancePtr = nsnull;
|
||||
return NS_NOINTERFACE;
|
||||
}
|
||||
|
||||
NS_IMPL_ADDREF(nsJSCID)
|
||||
NS_IMPL_RELEASE(nsJSCID)
|
||||
NS_IMPL_ISUPPORTS2(nsJSCID, nsIJSID, nsIJSCID)
|
||||
|
||||
nsJSCID::nsJSCID() {NS_INIT_ISUPPORTS();}
|
||||
nsJSCID::~nsJSCID() {}
|
||||
|
|
@ -897,7 +853,7 @@ xpc_JSObjectToID(JSContext *cx, JSObject* obj)
|
|||
((nsIJSID*)wrapper->GetNative())->GetId(&id);
|
||||
}
|
||||
}
|
||||
// XXX it would be nice to try to construct one from an object that can be
|
||||
// XXX it might be nice to try to construct one from an object that can be
|
||||
// converted into a string.
|
||||
return id;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -745,7 +745,7 @@ public:
|
|||
static nsJSID* NewID(const char* str);
|
||||
|
||||
nsJSID();
|
||||
~nsJSID();
|
||||
virtual ~nsJSID();
|
||||
protected:
|
||||
|
||||
void reset();
|
||||
|
|
@ -861,11 +861,8 @@ public:
|
|||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIJSCONTEXTSTACK
|
||||
|
||||
public:
|
||||
static nsXPCThreadJSContextStackImpl* GetSingleton();
|
||||
|
||||
private:
|
||||
// hide ctor and dtor
|
||||
nsXPCThreadJSContextStackImpl();
|
||||
virtual ~nsXPCThreadJSContextStackImpl();
|
||||
};
|
||||
|
|
|
|||
|
|
@ -52,10 +52,11 @@ public:
|
|||
const char* aFunctionName,
|
||||
PRInt32 aLineNumber,
|
||||
nsIJSStackFrameLocation* aCaller);
|
||||
private:
|
||||
|
||||
XPCJSStackFrame();
|
||||
virtual ~XPCJSStackFrame();
|
||||
|
||||
private:
|
||||
XPCJSStack* mStack;
|
||||
nsIJSStackFrameLocation* mCaller;
|
||||
|
||||
|
|
@ -155,8 +156,7 @@ XPCJSStackFrame::~XPCJSStackFrame()
|
|||
}
|
||||
|
||||
|
||||
static NS_DEFINE_IID(kFrameIID, NS_IJSSTACKFRAMELOCATION_IID);
|
||||
NS_IMPL_QUERY_INTERFACE(XPCJSStackFrame, kFrameIID)
|
||||
NS_IMPL_QUERY_INTERFACE1(XPCJSStackFrame, nsIJSStackFrameLocation)
|
||||
|
||||
// do chained ref counting
|
||||
|
||||
|
|
|
|||
|
|
@ -82,8 +82,7 @@ nsXPCThreadJSContextStackImpl::nsXPCThreadJSContextStackImpl()
|
|||
|
||||
nsXPCThreadJSContextStackImpl::~nsXPCThreadJSContextStackImpl() {}
|
||||
|
||||
static NS_DEFINE_IID(knsXPCThreadJSContextStackImplIID, NS_IJSCONTEXTSTACK_IID);
|
||||
NS_IMPL_ISUPPORTS(nsXPCThreadJSContextStackImpl, knsXPCThreadJSContextStackImplIID);
|
||||
NS_IMPL_ISUPPORTS1(nsXPCThreadJSContextStackImpl, nsIJSContextStack)
|
||||
|
||||
//static
|
||||
nsXPCThreadJSContextStackImpl*
|
||||
|
|
@ -91,9 +90,11 @@ nsXPCThreadJSContextStackImpl::GetSingleton()
|
|||
{
|
||||
static nsXPCThreadJSContextStackImpl* singleton = nsnull;
|
||||
if(!singleton)
|
||||
singleton = new nsXPCThreadJSContextStackImpl();
|
||||
if(singleton)
|
||||
NS_ADDREF(singleton);
|
||||
{
|
||||
if(nsnull != (singleton = new nsXPCThreadJSContextStackImpl()))
|
||||
NS_ADDREF(singleton);
|
||||
}
|
||||
NS_IF_ADDREF(singleton);
|
||||
return singleton;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -22,9 +22,9 @@
|
|||
|
||||
static const char* XPC_QUERY_INTERFACE_STR = "QueryInterface";
|
||||
|
||||
static NS_DEFINE_IID(kWrappedJSClassIID, NS_IXPCONNECT_WRAPPED_JS_CLASS_IID);
|
||||
NS_IMPL_ISUPPORTS(nsXPCWrappedJSClass, kWrappedJSClassIID)
|
||||
NS_IMPL_ISUPPORTS1(nsXPCWrappedJSClass, nsIXPCWrappedJSClass)
|
||||
|
||||
// the value of this variable is never used - we use its address as a sentinel
|
||||
static uint32 zero_methods_descriptor;
|
||||
|
||||
// static
|
||||
|
|
|
|||
|
|
@ -20,8 +20,7 @@
|
|||
|
||||
#include "xpcprivate.h"
|
||||
|
||||
static NS_DEFINE_IID(kWrappedNativeIID, NS_IXPCONNECT_WRAPPED_NATIVE_IID);
|
||||
NS_IMPL_QUERY_INTERFACE(nsXPCWrappedNative, kWrappedNativeIID)
|
||||
NS_IMPL_QUERY_INTERFACE1(nsXPCWrappedNative, nsIXPConnectWrappedNative)
|
||||
|
||||
// do chained ref counting
|
||||
|
||||
|
|
|
|||
|
|
@ -29,8 +29,7 @@ const char XPC_VAL_STR[] = "value";
|
|||
|
||||
extern "C" JS_IMPORT_DATA(JSObjectOps) js_ObjectOps;
|
||||
|
||||
static NS_DEFINE_IID(kWrappedNativeClassIID, NS_IXPCONNECT_WRAPPED_NATIVE_CLASS_IID);
|
||||
NS_IMPL_ISUPPORTS(nsXPCWrappedNativeClass, kWrappedNativeClassIID)
|
||||
NS_IMPL_ISUPPORTS1(nsXPCWrappedNativeClass, nsIXPCWrappedNativeClass)
|
||||
|
||||
// static
|
||||
nsXPCWrappedNativeClass*
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче