Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

changed our nsISupports::GetIID() calls over to nsCOMTypeInfo<foo>::GetIID().

Browse Source
This commit is contained in:
valeski%netscape.com 1999-06-30 20:00:19 +00:00
parent 0370e7c3fd
commit 578e858da5
19 changed files with 20 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
netwerk/base/public/nsIRequest.idl
View File

@ -18,6 +18,7 @@
#include "nsISupports.idl"
[scriptable, uuid(F2CAABA0-2F25-11d3-A164-0050041CAF44)]
interface nsIRequest : nsISupports
{
/**

3
netwerk/base/src/nsFileTransport.cpp
View File

@ -28,7 +28,6 @@
#include "nsIEventQueueService.h"
static NS_DEFINE_CID(kEventQueueService, NS_EVENTQUEUESERVICE_CID);
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
////////////////////////////////////////////////////////////////////////////////
// nsFileTransport methods:
@ -106,7 +105,7 @@ nsFileTransport::QueryInterface(const nsIID& aIID, void* *aInstancePtr)
return NS_ERROR_NULL_POINTER;
}
if (aIID.Equals(nsIChannel::GetIID()) ||
aIID.Equals(kISupportsIID)) {
aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID())) {
*aInstancePtr = NS_STATIC_CAST(nsIChannel*, this);
NS_ADDREF_THIS();
return NS_OK;

4
netwerk/base/src/nsLoadGroup.cpp
View File

@ -59,8 +59,8 @@ nsLoadGroup::AggregatedQueryInterface(const nsIID& aIID, void** aInstancePtr)
{
NS_ASSERTION(aInstancePtr, "no instance pointer");
if (aIID.Equals(nsILoadGroup::GetIID()) ||
aIID.Equals(nsIRequest::GetIID()) ||
aIID.Equals(nsISupports::GetIID())) {
aIID.Equals(nsCOMTypeInfo<nsIRequest>::GetIID()) ||
aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID())) {
*aInstancePtr = NS_STATIC_CAST(nsILoadGroup*, this);
NS_ADDREF_THIS();
return NS_OK;

5
netwerk/base/src/nsSocketTransport.cpp
View File

@ -119,9 +119,6 @@ PRLogModuleInfo* gSocketLog = nsnull;
#endif /* PR_LOGGING */
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
nsSocketTransport::nsSocketTransport()
{
NS_INIT_REFCNT();
@ -895,7 +892,7 @@ nsSocketTransport::QueryInterface(const nsIID& aIID, void* *aInstancePtr)
return NS_ERROR_NULL_POINTER;
}
if (aIID.Equals(nsIChannel::GetIID()) ||
aIID.Equals(kISupportsIID)) {
aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID())) {
*aInstancePtr = NS_STATIC_CAST(nsIChannel*, this);
NS_ADDREF_THIS();
return NS_OK;

5
netwerk/base/src/nsSocketTransportService.cpp
View File

@ -24,9 +24,6 @@
#define MAX_OPEN_CONNECTIONS 50
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
nsSocketTransportService::nsSocketTransportService()
{
NS_INIT_REFCNT();
@ -323,7 +320,7 @@ nsSocketTransportService::QueryInterface(const nsIID& aIID, void* *aInstancePtr)
return NS_ERROR_NULL_POINTER;
}
if (aIID.Equals(nsISocketTransportService::GetIID()) ||
aIID.Equals(kISupportsIID)) {
aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID())) {
*aInstancePtr = NS_STATIC_CAST(nsISocketTransportService*, this);
NS_ADDREF_THIS();
return NS_OK;

4
netwerk/base/src/nsStandardUrl.cpp
View File

@ -27,8 +27,6 @@ static NS_DEFINE_CID(kStandardUrlCID, NS_STANDARDURL_CID);
static NS_DEFINE_CID(kThisStandardUrlImplementationCID,
NS_THIS_STANDARDURL_IMPLEMENTATION_CID);
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
////////////////////////////////////////////////////////////////////////////////
// nsStandardURL methods:
@ -64,7 +62,7 @@ nsStandardURL::AggregatedQueryInterface(const nsIID& aIID, void** aInstancePtr)
if (aIID.Equals(kThisStandardUrlImplementationCID) || // used by Equals
aIID.Equals(nsIURL::GetIID()) ||
aIID.Equals(nsIURI::GetIID()) ||
aIID.Equals(kISupportsIID)) {
aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID())) {
*aInstancePtr = NS_STATIC_CAST(nsIURI*, this);
NS_ADDREF_THIS();
return NS_OK;

2
netwerk/base/src/nsSyncStreamListener.cpp
View File

@ -93,7 +93,7 @@ nsSyncStreamListener::QueryInterface(const nsIID& aIID, void** aInstancePtr)
NS_ASSERTION(aInstancePtr, "no instance pointer");
if (aIID.Equals(nsIStreamListener::GetIID()) ||
aIID.Equals(nsIStreamObserver::GetIID()) ||
aIID.Equals(nsISupports::GetIID())) {
aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID())) {
*aInstancePtr = NS_STATIC_CAST(nsIStreamListener*, this);
NS_ADDREF_THIS();
return NS_OK;

3
netwerk/protocol/file/src/nsFileChannel.cpp
View File

@ -37,7 +37,6 @@
#include "prmem.h" // XXX can be removed when we start doing real content-type discovery
static NS_DEFINE_CID(kEventQueueService, NS_EVENTQUEUESERVICE_CID);
NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
////////////////////////////////////////////////////////////////////////////////
@ -113,7 +112,7 @@ nsFileChannel::QueryInterface(const nsIID& aIID, void** aInstancePtr)
NS_ASSERTION(aInstancePtr, "no instance pointer");
if (aIID.Equals(nsIFileChannel::GetIID()) ||
aIID.Equals(nsIChannel::GetIID()) ||
aIID.Equals(kISupportsIID)) {
aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID())) {
*aInstancePtr = NS_STATIC_CAST(nsIFileChannel*, this);
NS_ADDREF_THIS();
return NS_OK;

3
netwerk/protocol/ftp/src/nsFTPChannel.cpp
View File

@ -29,7 +29,6 @@
#include "prprf.h" // PR_sscanf
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_CID(kEventQueueService, NS_EVENTQUEUESERVICE_CID);
// There are actually two transport connections established for an
@ -71,7 +70,7 @@ nsFTPChannel::QueryInterface(const nsIID& aIID, void** aInstancePtr) {
NS_ASSERTION(aInstancePtr, "no instance pointer");
if (aIID.Equals(nsIFTPChannel::GetIID()) ||
aIID.Equals(nsIChannel::GetIID()) ||
aIID.Equals(kISupportsIID) ) {
aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID()) ) {
*aInstancePtr = NS_STATIC_CAST(nsIFTPChannel*, this);
NS_ADDREF_THIS();
return NS_OK;

3
netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp
View File

@ -30,7 +30,6 @@
#include "netCore.h"
#include "ftpCore.h"
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID);
@ -41,7 +40,7 @@ NS_IMETHODIMP
nsFtpConnectionThread::QueryInterface(const nsIID& aIID, void** aInstancePtr) {
NS_ASSERTION(aInstancePtr, "no instance pointer");
if (aIID.Equals(nsIRunnable::GetIID()) ||
aIID.Equals(kISupportsIID) ) {
aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID()) ) {
*aInstancePtr = NS_STATIC_CAST(nsFtpConnectionThread*, this);
NS_ADDREF_THIS();
return NS_OK;

4
netwerk/protocol/http/src/nsHTTPChannel.cpp
View File

@ -74,11 +74,9 @@ nsHTTPChannel::QueryInterface(REFNSIID aIID, void** aInstancePtr)
*aInstancePtr = NULL;
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
if (aIID.Equals(nsIHTTPChannel::GetIID()) ||
aIID.Equals(nsIChannel::GetIID()) ||
aIID.Equals(kISupportsIID)) {
aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID())) {
*aInstancePtr = NS_STATIC_CAST(nsIHTTPChannel*, this);
NS_ADDREF_THIS();
return NS_OK;

4
netwerk/protocol/http/src/nsHTTPHandler.cpp
View File

@ -172,8 +172,6 @@ nsHTTPHandler::QueryInterface(REFNSIID aIID, void** aInstancePtr)
*aInstancePtr = NULL;
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
if (aIID.Equals(nsIProtocolHandler::GetIID())) {
*aInstancePtr = (void*) ((nsIProtocolHandler*)this);
NS_ADDREF_THIS();
@ -189,7 +187,7 @@ nsHTTPHandler::QueryInterface(REFNSIID aIID, void** aInstancePtr)
NS_ADDREF_THIS();
return NS_OK;
}
if (aIID.Equals(kISupportsIID)) {
if (aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID())) {
*aInstancePtr = (void*) ((nsISupports*)(nsIProtocolHandler*)this);
NS_ADDREF_THIS();
return NS_OK;

3
netwerk/protocol/http/src/nsHTTPHandlerFactory.cpp
View File

@ -36,7 +36,6 @@
#include "nsXPComFactory.h"
#include "nsIProtocolHandler.h" // for NS_NETWORK_PROTOCOL_PROGID_PREFIX
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
static NS_DEFINE_CID(kHTTPHandlerCID, NS_HTTP_HANDLER_FACTORY_CID);
@ -65,7 +64,7 @@ nsHTTPHandlerFactory::QueryInterface(const nsIID &aIID, void **aResult)
// Always NULL result, in case of failure
*aResult = nsnull;
if (aIID.Equals(kISupportsIID)) {
if (aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID())) {
*aResult = NS_STATIC_CAST(nsISupports*, this);
AddRef();
return NS_OK;

2
netwerk/protocol/http/src/nsHTTPRequest.cpp
View File

@ -202,8 +202,6 @@ nsHTTPRequest::QueryInterface(REFNSIID aIID, void** aInstancePtr)
*aInstancePtr = NULL;
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
if (aIID.Equals(nsIHTTPRequest::GetIID())) {
*aInstancePtr = (void*) ((nsIHTTPRequest*)this);
NS_ADDREF_THIS();

2
netwerk/protocol/http/src/nsHTTPResponse.cpp
View File

@ -71,8 +71,6 @@ nsHTTPResponse::QueryInterface(REFNSIID aIID, void** aInstancePtr)
*aInstancePtr = NULL;
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
if (aIID.Equals(nsIHTTPResponse::GetIID())) {
*aInstancePtr = (void*) ((nsIHTTPResponse*)this);
NS_ADDREF_THIS();

2
netwerk/protocol/http/src/nsHeaderArray.cpp
View File

@ -45,7 +45,7 @@ nsHeaderArray::QueryInterface(REFNSIID iid, void** result)
return NS_ERROR_NULL_POINTER;
*result = nsnull;
if (iid.Equals(nsISupports::GetIID())) {
if (iid.Equals(nsCOMTypeInfo<nsISupports>::GetIID())) {
*result = NS_STATIC_CAST(nsISupports*, this);
NS_ADDREF_THIS();
return NS_OK;

3
netwerk/test/TestFileInput.cpp
View File

@ -36,7 +36,6 @@
#include "nsIChannel.h"
#include <stdio.h>
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_CID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID);
static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
@ -175,7 +174,7 @@ nsReader::QueryInterface(const nsIID& aIID, void* *aInstancePtr)
return NS_ERROR_NULL_POINTER;
}
if (aIID.Equals(nsIRunnable::GetIID()) ||
aIID.Equals(kISupportsIID)) {
aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID())) {
*aInstancePtr = NS_STATIC_CAST(nsIRunnable*, this);
NS_ADDREF_THIS();
return NS_OK;

6
netwerk/test/TestProtocols.cpp
View File

@ -45,7 +45,7 @@
#include "nsIHttpEventSink.h"
#include "nsIEventSinkGetter.h"
#if 0
#if 1
// this test app handles cookies.
#include "nsICookieService.h"
static NS_DEFINE_CID(nsCookieServiceCID, NS_COOKIESERVICE_CID);
@ -89,7 +89,7 @@ URLLoadInfo::~URLLoadInfo()
}
NS_IMPL_ISUPPORTS(URLLoadInfo,nsISupports::GetIID());
NS_IMPL_ISUPPORTS(URLLoadInfo,nsCOMTypeInfo<nsISupports>::GetIID());
class TestHTTPEventSink : public nsIHTTPEventSink
@ -510,7 +510,7 @@ main(int argc, char* argv[])
eventQService->GetThreadEventQueue(PR_CurrentThread(), &gEventQ);
#if 0
#if 1
// fire up an instance of the cookie manager.
// I'm doing this using the serviceManager for convenience's sake.
// Presumably an application will init it's own cookie service a

3
netwerk/util/src/nsNetStreamLoader.cpp
View File

@ -26,7 +26,6 @@
#include "nsNeckoUtil.h"
#include "nsIBufferInputStream.h"
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID);
static NS_DEFINE_IID(kIUnicharStreamLoaderIID, NS_IUNICHARSTREAMLOADER_IID);
@ -114,7 +113,7 @@ nsUnicharStreamLoader::QueryInterface(const nsIID &aIID, void** aInstancePtr)
AddRef();
return NS_OK;
}
if (aIID.Equals(kISupportsIID)) {
if (aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID())) {
nsIUnicharStreamLoader* tmp = this;
nsISupports* tmp2 = tmp;
*aInstancePtr = (void*) tmp2;