From 2c1c194ed4e2c8ea8bfabb1ad74862721d5b9432 Mon Sep 17 00:00:00 2001
From: "locka%iol.ie" <locka%iol.ie@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 13 Sep 1999 13:11:40 +0000
Subject: [PATCH] Replace the hand-crafted QueryInterface with a macro one

git-svn-id: svn://10.0.0.236/trunk@47123 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../embed/ActiveX/WebShellContainer.cpp       | 56 ++-----------------
 1 file changed, 6 insertions(+), 50 deletions(-)

diff --git a/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp b/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp
index 6e30387f2bb..404517ec9a0 100644
--- a/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp
+++ b/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp
@@ -42,56 +42,12 @@ CWebShellContainer::~CWebShellContainer()
 
 NS_IMPL_ADDREF(CWebShellContainer)
 NS_IMPL_RELEASE(CWebShellContainer)
-
-
-nsresult CWebShellContainer::QueryInterface(const nsIID& aIID, void** aInstancePtrResult)
-{
-	NS_PRECONDITION(nsnull != aInstancePtrResult, "null pointer");
-	if (nsnull == aInstancePtrResult)
-	{
-		return NS_ERROR_NULL_POINTER;
-	}
-
-	*aInstancePtrResult = NULL;
-
-	if (aIID.Equals(kIBrowserWindowIID))
-	{
-		*aInstancePtrResult = (void*) ((nsIBrowserWindow*)this);
-		AddRef();
-		return NS_OK;
-	}
-
-	if (aIID.Equals(kIStreamObserverIID))
-	{
-		*aInstancePtrResult = (void*) ((nsIStreamObserver*)this);
-		AddRef();
-		return NS_OK;
-	}
-
-	if (aIID.Equals(kIDocumentLoaderObserverIID))
-	{
-		*aInstancePtrResult = (void*) ((nsIDocumentLoaderObserver*)this);
-		AddRef();
-		return NS_OK;
-	}
-
-	if (aIID.Equals(kIWebShellContainerIID))
-	{
-		*aInstancePtrResult = (void*) ((nsIWebShellContainer*)this);
-		AddRef();
-		return NS_OK;
-	}
-
-	if (aIID.Equals(kISupportsIID))
-	{
-		*aInstancePtrResult = (void*) ((nsIStreamObserver*)this);
-		AddRef();
-		return NS_OK;
-	}
-
-	return NS_NOINTERFACE;
-}
-
+NS_IMPL_QUERY_HEAD(CWebShellContainer)
+	NS_IMPL_QUERY_BODY(nsIBrowserWindow)
+	NS_IMPL_QUERY_BODY(nsIStreamObserver)
+	NS_IMPL_QUERY_BODY(nsIDocumentLoaderObserver)
+	NS_IMPL_QUERY_BODY(nsIWebShellContainer)
+NS_IMPL_QUERY_TAIL(nsIStreamObserver)
 
 ///////////////////////////////////////////////////////////////////////////////
 // nsIBrowserWindow implementation