Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move kISupportsIID declaration local. pnunn.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@33340 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pnunn%netscape.com
1999-06-01 21:53:12 +00:00
parent e9f6f7321b
commit 519ddef8c6
5 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/modules/libimg/gifcom/nsGIFCallback.cpp
View File

@@ -37,7 +37,9 @@ NS_IMETHODIMP GIFCallbk::QueryInterface(const nsIID& aIID, void** aResult)
if (NULL == aResult) {
return NS_ERROR_NULL_POINTER;
}
NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
if ( aIID.Equals(kGIFCallbkIID) ||
aIID.Equals(kImgDCallbkIID)||
aIID.Equals(kISupportsIID)) {

12
mozilla/modules/libimg/gifcom/nsGIFDecoder.cpp
View File

@@ -83,6 +83,7 @@ GIFDecoder::~GIFDecoder(void)
NS_ASSERTION(mRefCnt == 0, "non-zero refcnt at destruction");
};
NS_IMPL_ADDREF(GIFDecoder)
NS_IMPL_RELEASE(GIFDecoder)
@@ -93,6 +94,8 @@ GIFDecoder::QueryInterface(const nsIID& aIID, void** aInstPtr)
return NS_ERROR_NULL_POINTER;
}
NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
if (aIID.Equals(kGIFDecoderIID) ||
aIID.Equals(kImgDecoderIID) ||
aIID.Equals(kISupportsIID)) {
@@ -129,9 +132,9 @@ private:
nsGIFDecFactory* gFactory = NULL;
NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
NS_IMPL_ISUPPORTS(nsGIFDecFactory, kIFactoryIID)
nsGIFDecFactory::nsGIFDecFactory(const nsCID &aClass)
{
NS_INIT_REFCNT();
@@ -140,8 +143,11 @@ nsGIFDecFactory::nsGIFDecFactory(const nsCID &aClass)
nsGIFDecFactory::~nsGIFDecFactory(void)
{
NS_ASSERTION(mRefCnt == 0, "non-zero refcnt at destruction");
}
/*----------------------------------for autoregistration ----*/
static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
@@ -198,7 +204,9 @@ nsGIFDecFactory::CreateInstance(nsISupports *aOuter,
GIFDecoder *gifdec = NULL;
*ppv = NULL;
il_container* ic = NULL;
NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
if (aOuter && !aIID.Equals(kISupportsIID))
return NS_NOINTERFACE;
ic = new il_container();

10
mozilla/modules/libimg/jpgcom/nsJPGDecoder.cpp
View File

@@ -93,7 +93,9 @@ JPGDecoder::QueryInterface(const nsIID& aIID, void** aInstPtr)
if (NULL == aInstPtr) {
return NS_ERROR_NULL_POINTER;
}
NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
if (aIID.Equals(kJPGDecoderIID) ||
aIID.Equals(kImgDecoderIID) ||
aIID.Equals(kISupportsIID)) {
@@ -177,6 +179,8 @@ private:
/*-----------------------------------------*/
nsJPGDecFactory* gFactory = NULL;
NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
NS_IMPL_ISUPPORTS(nsJPGDecFactory, kIFactoryIID);
@@ -200,7 +204,9 @@ nsJPGDecFactory::CreateInstance(nsISupports *aOuter,
JPGDecoder *jpgdec = NULL;
*ppv = NULL;
il_container* ic = NULL;
NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
if (aOuter && !aIID.Equals(kISupportsIID))
return NS_NOINTERFACE;
ic = new il_container();

10
mozilla/modules/libimg/pngcom/nsPNGDecoder.cpp
View File

@@ -90,7 +90,9 @@ PNGDecoder::QueryInterface(const nsIID& aIID, void** aInstPtr)
if (NULL == aInstPtr) {
return NS_ERROR_NULL_POINTER;
}
NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
if (aIID.Equals(kPNGDecoderIID) ||
aIID.Equals(kImgDecoderIID) ||
aIID.Equals(kISupportsIID)) {
@@ -130,7 +132,7 @@ private:
nsPNGDecFactory* gFactory = NULL;
NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
NS_IMPL_ISUPPORTS(nsPNGDecFactory, kIFactoryIID)
@@ -200,7 +202,9 @@ nsPNGDecFactory::CreateInstance(nsISupports *aOuter,
PNGDecoder *pngdec = NULL;
*ppv = NULL;
il_container* ic = NULL;
NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
if (aOuter && !aIID.Equals(kISupportsIID))
return NS_NOINTERFACE;
ic = new il_container();

5
mozilla/modules/libimg/public_com/nsImgDecCID.h
View File

@@ -44,11 +44,6 @@ NS_DEFINE_IID(kImgDecoderCID, NS_IMGDECODER_CID);
/***************************************************/
NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
/***************************************************/
/* e41ac650-cd9f-11d2-802c-0060088f91a3 */
#define NS_IMGDCALLBK_CID \
{ 0xe41ac650, 0xcd9f, 0x11d2, \