From 6929a449e06209409cc8b92486fd7c21b786cb64 Mon Sep 17 00:00:00 2001 From: "law%netscape.com" Date: Sat, 13 Nov 1999 08:20:53 +0000 Subject: [PATCH] Fix bustage by backing out some CallQueryInterface calls (for Travis); r=travis@netscape.com git-svn-id: svn://10.0.0.236/trunk@53423 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsDocumentViewer.cpp | 2 +- mozilla/layout/base/nsDocumentViewer.cpp | 2 +- mozilla/layout/base/src/nsDocumentViewer.cpp | 2 +- mozilla/layout/base/src/nsPluginViewer.cpp | 2 +- mozilla/modules/plugin/base/src/nsPluginViewer.cpp | 2 +- mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mozilla/content/base/src/nsDocumentViewer.cpp b/mozilla/content/base/src/nsDocumentViewer.cpp index e3ceccc054f..8d3ccfa45b0 100644 --- a/mozilla/content/base/src/nsDocumentViewer.cpp +++ b/mozilla/content/base/src/nsDocumentViewer.cpp @@ -311,7 +311,7 @@ NS_IMETHODIMP DocumentViewerImpl::GetContainer(nsIContentViewerContainer*& aResult) { if(mContainer) - return CallQueryInterface(mContainer, &aResult); + return mContainer->QueryInterface( nsIContentViewerContainer::GetIID(), (void**)&aResult ); else aResult = nsnull; return NS_OK; diff --git a/mozilla/layout/base/nsDocumentViewer.cpp b/mozilla/layout/base/nsDocumentViewer.cpp index e3ceccc054f..8d3ccfa45b0 100644 --- a/mozilla/layout/base/nsDocumentViewer.cpp +++ b/mozilla/layout/base/nsDocumentViewer.cpp @@ -311,7 +311,7 @@ NS_IMETHODIMP DocumentViewerImpl::GetContainer(nsIContentViewerContainer*& aResult) { if(mContainer) - return CallQueryInterface(mContainer, &aResult); + return mContainer->QueryInterface( nsIContentViewerContainer::GetIID(), (void**)&aResult ); else aResult = nsnull; return NS_OK; diff --git a/mozilla/layout/base/src/nsDocumentViewer.cpp b/mozilla/layout/base/src/nsDocumentViewer.cpp index e3ceccc054f..8d3ccfa45b0 100644 --- a/mozilla/layout/base/src/nsDocumentViewer.cpp +++ b/mozilla/layout/base/src/nsDocumentViewer.cpp @@ -311,7 +311,7 @@ NS_IMETHODIMP DocumentViewerImpl::GetContainer(nsIContentViewerContainer*& aResult) { if(mContainer) - return CallQueryInterface(mContainer, &aResult); + return mContainer->QueryInterface( nsIContentViewerContainer::GetIID(), (void**)&aResult ); else aResult = nsnull; return NS_OK; diff --git a/mozilla/layout/base/src/nsPluginViewer.cpp b/mozilla/layout/base/src/nsPluginViewer.cpp index 04c27f93e4c..9d9494e0525 100644 --- a/mozilla/layout/base/src/nsPluginViewer.cpp +++ b/mozilla/layout/base/src/nsPluginViewer.cpp @@ -267,7 +267,7 @@ NS_IMETHODIMP PluginViewerImpl::GetContainer(nsIContentViewerContainer*& aResult) { if(mContainer) - return CallQueryInterface(mContainer, &aResult); + return mContainer->QueryInterface( nsIContentViewerContainer::GetIID(), (void**)&aResult ); else aResult = nsnull; return NS_OK; diff --git a/mozilla/modules/plugin/base/src/nsPluginViewer.cpp b/mozilla/modules/plugin/base/src/nsPluginViewer.cpp index 04c27f93e4c..9d9494e0525 100644 --- a/mozilla/modules/plugin/base/src/nsPluginViewer.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginViewer.cpp @@ -267,7 +267,7 @@ NS_IMETHODIMP PluginViewerImpl::GetContainer(nsIContentViewerContainer*& aResult) { if(mContainer) - return CallQueryInterface(mContainer, &aResult); + return mContainer->QueryInterface( nsIContentViewerContainer::GetIID(), (void**)&aResult ); else aResult = nsnull; return NS_OK; diff --git a/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp b/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp index 04c27f93e4c..9d9494e0525 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp @@ -267,7 +267,7 @@ NS_IMETHODIMP PluginViewerImpl::GetContainer(nsIContentViewerContainer*& aResult) { if(mContainer) - return CallQueryInterface(mContainer, &aResult); + return mContainer->QueryInterface( nsIContentViewerContainer::GetIID(), (void**)&aResult ); else aResult = nsnull; return NS_OK;