Bug 313309 part 2 - change the NS_DEFINE_STATIC_IID_ACCESSOR macro to NS_DECLARE, and make a NS_DEFINE_ macro that's outside the class declaration, r=shaver

git-svn-id: svn://10.0.0.236/trunk@184456 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bsmedberg%covad.net
2005-11-11 14:36:26 +00:00
parent 839b06abc4
commit 0217e2f9a9
365 changed files with 1332 additions and 454 deletions

View File

@@ -119,11 +119,13 @@ public:
// a non-scriptable interface, output |nsISupports| instead of the
// interface name.
nsCOMPtr<nsIInterfaceInfo> info;
nsCOMPtr<nsIInterfaceInfoManager> iim =
getter_AddRefs(XPTI_GetInterfaceInfoManager());
NS_ASSERTION(iim, "could not get interface info manager");
nsCOMPtr<nsIInterfaceInfoManager>
iim(do_GetService(NS_INTERFACEINFOMANAGER_SERVICE_CONTRACTID, &rv));
NS_ENSURE_SUCCESS(rv, rv);
rv = iim->GetInfoForIID(iid, getter_AddRefs(info));
NS_ENSURE_SUCCESS(rv, rv);
PRBool scriptable;
if (NS_SUCCEEDED(rv)) {
info->IsScriptable(&scriptable);
@@ -210,9 +212,10 @@ public:
{
nsresult rv;
nsCOMPtr<nsIInterfaceInfoManager> iim =
getter_AddRefs(XPTI_GetInterfaceInfoManager());
NS_ASSERTION(iim, "could not get interface info manager");
nsCOMPtr<nsIInterfaceInfoManager>
iim(do_GetService(NS_INTERFACEINFOMANAGER_SERVICE_CONTRACTID, &rv));
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIEnumerator> etor;
rv = iim->EnumerateInterfaces(getter_AddRefs(etor));
NS_ENSURE_SUCCESS(rv, rv);