From 5822a94835336425e9fc8d4f84fa4e16493b598b Mon Sep 17 00:00:00 2001 From: "pavlov%netscape.com" Date: Tue, 20 Feb 2001 22:55:15 +0000 Subject: [PATCH] changing nsIImageRequest2.idl to lpIImageRequest.idl --- modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp | 8 ++++---- modules/libpr0n/decoders/gif/nsGIFDecoder2.h | 4 ++-- modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp | 8 ++++---- modules/libpr0n/decoders/jpeg/nsJPEGDecoder.h | 4 ++-- modules/libpr0n/decoders/png/nsPNGDecoder.cpp | 8 ++++---- modules/libpr0n/decoders/png/nsPNGDecoder.h | 4 ++-- modules/libpr0n/decoders/ppm/nsPPMDecoder.cpp | 8 ++++---- modules/libpr0n/decoders/ppm/nsPPMDecoder.h | 4 ++-- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp b/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp index 55a978a7a145..8a8973a6f227 100644 --- a/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp +++ b/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp @@ -56,8 +56,8 @@ nsGIFDecoder2::~nsGIFDecoder2(void) //****************************************************************************** //****************************************************************************** -/* void init (in nsIImageRequest aRequest); */ -NS_IMETHODIMP nsGIFDecoder2::Init(nsIImageRequest *aRequest) +/* void init (in lpIImageRequest aRequest); */ +NS_IMETHODIMP nsGIFDecoder2::Init(lpIImageRequest *aRequest) { mImageRequest = aRequest; mObserver = do_QueryInterface(aRequest); // we're holding 2 strong refs to the request. @@ -87,8 +87,8 @@ NS_IMETHODIMP nsGIFDecoder2::Init(nsIImageRequest *aRequest) } //****************************************************************************** -/* readonly attribute nsIImageRequest request; */ -NS_IMETHODIMP nsGIFDecoder2::GetRequest(nsIImageRequest * *aRequest) +/* readonly attribute lpIImageRequest request; */ +NS_IMETHODIMP nsGIFDecoder2::GetRequest(lpIImageRequest * *aRequest) { *aRequest = mImageRequest; NS_IF_ADDREF(*aRequest); diff --git a/modules/libpr0n/decoders/gif/nsGIFDecoder2.h b/modules/libpr0n/decoders/gif/nsGIFDecoder2.h index 3041aa720792..e183b1466b22 100644 --- a/modules/libpr0n/decoders/gif/nsGIFDecoder2.h +++ b/modules/libpr0n/decoders/gif/nsGIFDecoder2.h @@ -29,7 +29,7 @@ #include "nsIImageContainer.h" #include "nsIImageDecoderObserver.h" #include "nsIImageFrame.h" -#include "nsIImageRequest2.h" +#include "lpIImageRequest.h" #include "GIF2.h" @@ -60,7 +60,7 @@ public: nsCOMPtr mImageContainer; nsCOMPtr mImageFrame; - nsCOMPtr mImageRequest; + nsCOMPtr mImageRequest; nsCOMPtr mObserver; // this is just qi'd from mRequest for speed gif_struct mGIFStruct; diff --git a/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp b/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp index 77f4f40f40b2..74bf995499a9 100644 --- a/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp +++ b/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp @@ -80,8 +80,8 @@ nsJPEGDecoder::~nsJPEGDecoder() /** nsIImageDecoder methods **/ -/* void init (in nsIImageRequest aRequest); */ -NS_IMETHODIMP nsJPEGDecoder::Init(nsIImageRequest *aRequest) +/* void init (in lpIImageRequest aRequest); */ +NS_IMETHODIMP nsJPEGDecoder::Init(lpIImageRequest *aRequest) { mRequest = aRequest; mObserver = do_QueryInterface(mRequest); @@ -144,8 +144,8 @@ NS_IMETHODIMP nsJPEGDecoder::Init(nsIImageRequest *aRequest) return NS_OK; } -/* readonly attribute nsIImageRequest request; */ -NS_IMETHODIMP nsJPEGDecoder::GetRequest(nsIImageRequest * *aRequest) +/* readonly attribute lpIImageRequest request; */ +NS_IMETHODIMP nsJPEGDecoder::GetRequest(lpIImageRequest * *aRequest) { *aRequest = mRequest; NS_ADDREF(*aRequest); diff --git a/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.h b/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.h index a9ece19a84c4..d6f482d622d5 100644 --- a/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.h +++ b/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.h @@ -31,7 +31,7 @@ #include "nsIImageContainer.h" #include "nsIImageFrame.h" #include "nsIImageDecoderObserver.h" -#include "nsIImageRequest2.h" +#include "lpIImageRequest.h" #include "nsIInputStream.h" #include "nsIPipe.h" @@ -85,7 +85,7 @@ protected: public: nsCOMPtr mImage; nsCOMPtr mFrame; - nsCOMPtr mRequest; + nsCOMPtr mRequest; nsCOMPtr mObserver; diff --git a/modules/libpr0n/decoders/png/nsPNGDecoder.cpp b/modules/libpr0n/decoders/png/nsPNGDecoder.cpp index 34942e6171b9..eb2a9fc3cbb1 100644 --- a/modules/libpr0n/decoders/png/nsPNGDecoder.cpp +++ b/modules/libpr0n/decoders/png/nsPNGDecoder.cpp @@ -70,8 +70,8 @@ nsPNGDecoder::~nsPNGDecoder() /** nsIImageDecoder methods **/ -/* void init (in nsIImageRequest aRequest); */ -NS_IMETHODIMP nsPNGDecoder::Init(nsIImageRequest *aRequest) +/* void init (in lpIImageRequest aRequest); */ +NS_IMETHODIMP nsPNGDecoder::Init(lpIImageRequest *aRequest) { mRequest = aRequest; mObserver = do_QueryInterface(aRequest); // we're holding 2 strong refs to the request. @@ -104,8 +104,8 @@ NS_IMETHODIMP nsPNGDecoder::Init(nsIImageRequest *aRequest) } -/* readonly attribute nsIImageRequest request; */ -NS_IMETHODIMP nsPNGDecoder::GetRequest(nsIImageRequest * *aRequest) +/* readonly attribute lpIImageRequest request; */ +NS_IMETHODIMP nsPNGDecoder::GetRequest(lpIImageRequest * *aRequest) { *aRequest = mRequest; NS_ADDREF(*aRequest); diff --git a/modules/libpr0n/decoders/png/nsPNGDecoder.h b/modules/libpr0n/decoders/png/nsPNGDecoder.h index 01a1012cc507..757666cc587c 100644 --- a/modules/libpr0n/decoders/png/nsPNGDecoder.h +++ b/modules/libpr0n/decoders/png/nsPNGDecoder.h @@ -29,7 +29,7 @@ #include "nsIImageContainer.h" #include "nsIImageDecoderObserver.h" #include "nsIImageFrame.h" -#include "nsIImageRequest2.h" +#include "lpIImageRequest.h" #include "nsCOMPtr.h" @@ -69,7 +69,7 @@ end_callback(png_structp png_ptr, png_infop info_ptr); public: nsCOMPtr mImage; nsCOMPtr mFrame; - nsCOMPtr mRequest; + nsCOMPtr mRequest; nsCOMPtr mObserver; // this is just qi'd from mRequest for speed png_structp mPNG; diff --git a/modules/libpr0n/decoders/ppm/nsPPMDecoder.cpp b/modules/libpr0n/decoders/ppm/nsPPMDecoder.cpp index 80132e066896..5b94b1becfcd 100644 --- a/modules/libpr0n/decoders/ppm/nsPPMDecoder.cpp +++ b/modules/libpr0n/decoders/ppm/nsPPMDecoder.cpp @@ -55,8 +55,8 @@ nsPPMDecoder::~nsPPMDecoder() /** nsIImageDecoder methods **/ -/* void init (in nsIImageRequest aRequest); */ -NS_IMETHODIMP nsPPMDecoder::Init(nsIImageRequest *aRequest) +/* void init (in lpIImageRequest aRequest); */ +NS_IMETHODIMP nsPPMDecoder::Init(lpIImageRequest *aRequest) { mRequest = aRequest; @@ -71,8 +71,8 @@ NS_IMETHODIMP nsPPMDecoder::Init(nsIImageRequest *aRequest) return NS_OK; } -/* readonly attribute nsIImageRequest request; */ -NS_IMETHODIMP nsPPMDecoder::GetRequest(nsIImageRequest * *aRequest) +/* readonly attribute lpIImageRequest request; */ +NS_IMETHODIMP nsPPMDecoder::GetRequest(lpIImageRequest * *aRequest) { *aRequest = mRequest; NS_ADDREF(*aRequest); diff --git a/modules/libpr0n/decoders/ppm/nsPPMDecoder.h b/modules/libpr0n/decoders/ppm/nsPPMDecoder.h index f14c2d8897f3..d35f51a24a7a 100644 --- a/modules/libpr0n/decoders/ppm/nsPPMDecoder.h +++ b/modules/libpr0n/decoders/ppm/nsPPMDecoder.h @@ -31,7 +31,7 @@ #include "nsIImageContainer.h" #include "nsIImageDecoderObserver.h" #include "nsIImageFrame.h" -#include "nsIImageRequest2.h" +#include "lpIImageRequest.h" #define NS_PPMDECODER_CID \ { /* e90bfa06-1dd1-11b2-8217-f38fe5d431a2 */ \ @@ -54,7 +54,7 @@ public: private: nsCOMPtr mImage; nsCOMPtr mFrame; - nsCOMPtr mRequest; + nsCOMPtr mRequest; nsCOMPtr mObserver; // this is just qi'd from mRequest for speed PRUint32 mDataReceived;