mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-09 08:48:07 +00:00
NS_NewComposer and NS_NewComposerBootstrap take interface IDs.
This commit is contained in:
parent
8a3ebc24ab
commit
221e1adbb7
@ -118,7 +118,7 @@ nsComposerBootstrap::Initialize()
|
||||
|
||||
|
||||
nsresult
|
||||
NS_NewComposerBootstrap(nsIAppShellService **msgboot,
|
||||
NS_NewComposerBootstrap(const nsIID &aIID, void **msgboot,
|
||||
nsIServiceManager *serviceManager)
|
||||
{
|
||||
if (!msgboot) return NS_ERROR_NULL_POINTER;
|
||||
@ -130,8 +130,7 @@ NS_NewComposerBootstrap(nsIAppShellService **msgboot,
|
||||
if (!bootstrap) return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
|
||||
return bootstrap->QueryInterface(nsIAppShellService::GetIID(),
|
||||
(void **)msgboot);
|
||||
return bootstrap->QueryInterface(aIID, msgboot);
|
||||
|
||||
}
|
||||
|
||||
@ -147,13 +146,12 @@ NS_IMPL_ISUPPORTS(nsComposer, nsIComposer::GetIID())
|
||||
|
||||
|
||||
nsresult
|
||||
NS_NewComposer(nsIComposer **msg)
|
||||
NS_NewComposer(const nsIID &aIID, void **msg)
|
||||
{
|
||||
if (!msg) return NS_ERROR_NULL_POINTER;
|
||||
nsComposer *composer =
|
||||
new nsComposer();
|
||||
if (!composer) return NS_ERROR_OUT_OF_MEMORY;
|
||||
return composer->QueryInterface(nsIComposer::GetIID(),
|
||||
(void**)&msg);
|
||||
return composer->QueryInterface(aIID, msg);
|
||||
}
|
||||
|
||||
|
@ -39,11 +39,9 @@
|
||||
NS_BEGIN_EXTERN_C
|
||||
|
||||
nsresult
|
||||
NS_NewComposer(nsIComposer **inst);
|
||||
NS_NewComposer(const nsIID &aIID, void **inst);
|
||||
|
||||
nsresult
|
||||
NS_NewComposerBootstrap(nsIAppShellService** inst,
|
||||
nsIServiceManager* serviceManager);
|
||||
nsresult NS_NewComposerBootstrap(const nsIID &aIID, void ** inst, nsIServiceManager* serviceManager);
|
||||
|
||||
NS_END_EXTERN_C
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user