From ac9fa347e031dae1e6acbc26f2e0e7fb091b1cf2 Mon Sep 17 00:00:00 2001 From: "bryner%netscape.com" Date: Wed, 24 Jul 2002 08:23:52 +0000 Subject: [PATCH] Fixing static build bustage from sfraser's checkin for bug 145800: - add all new source files to static build target - rename nsDownloader to CHDownloader to avoid symbol name conflicts with necko. --- camino/Chimera.pbproj/project.pbxproj | 49 +++++++++++++++++++ camino/DownloadProgressDisplay.h | 12 ++--- camino/DownloadProgressDisplay.mm | 8 +-- camino/ProgressDlgController.h | 2 +- camino/ProgressDlgController.mm | 2 +- camino/nsDownloadListener.h | 2 +- camino/nsDownloadListener.mm | 4 +- .../projects/Chimera.pbproj/project.pbxproj | 49 +++++++++++++++++++ camino/src/download/ProgressDlgController.h | 2 +- camino/src/download/ProgressDlgController.mm | 2 +- camino/src/download/nsDownloadListener.h | 2 +- camino/src/download/nsDownloadListener.mm | 4 +- .../src/embedding/CHDownloadProgressDisplay.h | 12 ++--- .../embedding/CHDownloadProgressDisplay.mm | 8 +-- chimera/Chimera.pbproj/project.pbxproj | 49 +++++++++++++++++++ chimera/DownloadProgressDisplay.h | 12 ++--- chimera/DownloadProgressDisplay.mm | 8 +-- chimera/ProgressDlgController.h | 2 +- chimera/ProgressDlgController.mm | 2 +- chimera/nsDownloadListener.h | 2 +- chimera/nsDownloadListener.mm | 4 +- .../projects/Chimera.pbproj/project.pbxproj | 49 +++++++++++++++++++ chimera/src/download/ProgressDlgController.h | 2 +- chimera/src/download/ProgressDlgController.mm | 2 +- chimera/src/download/nsDownloadListener.h | 2 +- chimera/src/download/nsDownloadListener.mm | 4 +- .../src/embedding/CHDownloadProgressDisplay.h | 12 ++--- .../embedding/CHDownloadProgressDisplay.mm | 8 +-- 28 files changed, 256 insertions(+), 60 deletions(-) diff --git a/camino/Chimera.pbproj/project.pbxproj b/camino/Chimera.pbproj/project.pbxproj index bbbb2535f6b0..f4d5d7719f60 100644 --- a/camino/Chimera.pbproj/project.pbxproj +++ b/camino/Chimera.pbproj/project.pbxproj @@ -5109,6 +5109,10 @@ F5A3669A02CCFB7A01DC3354, F50D9DE702ECC36201BB4219, F50D9DE802ECC36201BB4219, + F5E37B0C02EE959601A967F3, + F5E37B0D02EE95E201A967F3, + F5E37B0E02EE95E201A967F3, + F5E37B0F02EE95E201A967F3, ); isa = PBXHeadersBuildPhase; name = Headers; @@ -5225,6 +5229,9 @@ F5A3669B02CCFB7A01DC3354, F5A3669C02CCFB7A01DC3354, F50D9DE902ECC36201BB4219, + F5E37B1002EE95E201A967F3, + F5E37B1102EE95E201A967F3, + F5E37B1202EE95E201A967F3, ); isa = PBXSourcesBuildPhase; name = Sources; @@ -7205,6 +7212,48 @@ name = "Gray Images"; refType = 4; }; + F5E37B0C02EE959601A967F3 = { + fileRef = F55C4DD302D2864D0130B065; + isa = PBXBuildFile; + settings = { + }; + }; + F5E37B0D02EE95E201A967F3 = { + fileRef = F50D9DF102EE194001BB4219; + isa = PBXBuildFile; + settings = { + }; + }; + F5E37B0E02EE95E201A967F3 = { + fileRef = F50D9DED02EE0AB101BB4219; + isa = PBXBuildFile; + settings = { + }; + }; + F5E37B0F02EE95E201A967F3 = { + fileRef = F50D9DF502EE2B9A01BB4219; + isa = PBXBuildFile; + settings = { + }; + }; + F5E37B1002EE95E201A967F3 = { + fileRef = F50D9DF202EE194001BB4219; + isa = PBXBuildFile; + settings = { + }; + }; + F5E37B1102EE95E201A967F3 = { + fileRef = F50D9DEE02EE0AB101BB4219; + isa = PBXBuildFile; + settings = { + }; + }; + F5E37B1202EE95E201A967F3 = { + fileRef = F50D9DF602EE2B9A01BB4219; + isa = PBXBuildFile; + settings = { + }; + }; F5F14E9602A5A43A01A967F3 = { isa = PBXFileReference; name = libwidget.rsrc; diff --git a/camino/DownloadProgressDisplay.h b/camino/DownloadProgressDisplay.h index 7e0ccf4268cb..be769e8423c4 100644 --- a/camino/DownloadProgressDisplay.h +++ b/camino/DownloadProgressDisplay.h @@ -58,7 +58,7 @@ The underlying C++ classes use this factory to create the progress window controller. - 3. The nsDownloader C++ class + 3. The CHDownloader C++ class This base class exists to hide the complextity of the download listener classes (which deal with Gecko callbacks) from the @@ -103,7 +103,7 @@ #include "nsISupports.h" -class nsDownloader; +class CHDownloader; // a formal protocol for something that implements progress display // Embedders can make a window controller that conforms to this @@ -115,7 +115,7 @@ class nsDownloader; - (void)setProgressTo:(long)aCurProgress ofMax:(long)aMaxProgress; -- (void)setDownloadListener:(nsDownloader*)aDownloader; +- (void)setDownloadListener:(CHDownloader*)aDownloader; - (void)setSourceURL:(NSString*)aSourceURL; - (void)setDestinationPath:(NSString*)aDestPath; @@ -137,11 +137,11 @@ class nsDownloader; // UI code from having to know too much about the nsIDownloadListener. // It is responsible for creating the download UI, via the DownloadControllerFactory // that it owns. -class nsDownloader : public nsISupports +class CHDownloader : public nsISupports { public: - nsDownloader(DownloadControllerFactory* inControllerFactory); - virtual ~nsDownloader(); + CHDownloader(DownloadControllerFactory* inControllerFactory); + virtual ~CHDownloader(); NS_DECL_ISUPPORTS diff --git a/camino/DownloadProgressDisplay.mm b/camino/DownloadProgressDisplay.mm index 47d1416a7aec..1b0f7030b237 100644 --- a/camino/DownloadProgressDisplay.mm +++ b/camino/DownloadProgressDisplay.mm @@ -52,7 +52,7 @@ #pragma mark - // see the header file for comments -nsDownloader::nsDownloader(DownloadControllerFactory* inControllerFactory) +CHDownloader::CHDownloader(DownloadControllerFactory* inControllerFactory) : mControllerFactory(inControllerFactory) , mDownloadDisplay(nil) { @@ -60,15 +60,15 @@ nsDownloader::nsDownloader(DownloadControllerFactory* inControllerFactory) [mControllerFactory retain]; } -nsDownloader::~nsDownloader() +CHDownloader::~CHDownloader() { [mControllerFactory release]; } -NS_IMPL_ISUPPORTS1(nsDownloader, nsISupports); +NS_IMPL_ISUPPORTS1(CHDownloader, nsISupports); void -nsDownloader::CreateDownloadDisplay() +CHDownloader::CreateDownloadDisplay() { mDownloadDisplay = [mControllerFactory createDownloadController]; [mDownloadDisplay setDownloadListener:this]; diff --git a/camino/ProgressDlgController.h b/camino/ProgressDlgController.h index 44690836b994..a607b0753ca1 100644 --- a/camino/ProgressDlgController.h +++ b/camino/ProgressDlgController.h @@ -68,7 +68,7 @@ class nsDownloadListener; BOOL mDownloadIsComplete; long mCurrentProgress; // if progress bar is indeterminate, can still calc stats. - nsDownloader *mDownloader; // we hold a ref to this + CHDownloader *mDownloader; // we hold a ref to this NSTimer *mDownloadTimer; } diff --git a/camino/ProgressDlgController.mm b/camino/ProgressDlgController.mm index d2812e79d79b..d68ef0593986 100644 --- a/camino/ProgressDlgController.mm +++ b/camino/ProgressDlgController.mm @@ -492,7 +492,7 @@ static NSString *LeaveOpenToolbarItemIdentifier = @"Leave Open Toggle Toolbar } // if neither case was true, it's barber pole city. } --(void) setDownloadListener: (nsDownloader*)aDownloader +-(void) setDownloadListener: (CHDownloader*)aDownloader { if (mDownloader != aDownloader) NS_IF_RELEASE(mDownloader); diff --git a/camino/nsDownloadListener.h b/camino/nsDownloadListener.h index 4800161fae43..a2e7b249f2e5 100644 --- a/camino/nsDownloadListener.h +++ b/camino/nsDownloadListener.h @@ -53,7 +53,7 @@ // maybe this should replace nsHeaderSniffer too? -class nsDownloadListener : public nsDownloader, +class nsDownloadListener : public CHDownloader, public nsIDownload, public nsIWebProgressListener { diff --git a/camino/nsDownloadListener.mm b/camino/nsDownloadListener.mm index 3413ddc43abc..52edc19185b0 100644 --- a/camino/nsDownloadListener.mm +++ b/camino/nsDownloadListener.mm @@ -45,7 +45,7 @@ #include "netCore.h" nsDownloadListener::nsDownloadListener(DownloadControllerFactory* inControllerFactory) -: nsDownloader(inControllerFactory) +: CHDownloader(inControllerFactory) , mBypassCache(PR_FALSE) , mNetworkTransfer(PR_FALSE) , mGotFirstStateChange(PR_FALSE) @@ -57,7 +57,7 @@ nsDownloadListener::~nsDownloadListener() { } -NS_IMPL_ISUPPORTS_INHERITED2(nsDownloadListener, nsDownloader, nsIDownload, nsIWebProgressListener) +NS_IMPL_ISUPPORTS_INHERITED2(nsDownloadListener, CHDownloader, nsIDownload, nsIWebProgressListener) #pragma mark - diff --git a/camino/projects/Chimera.pbproj/project.pbxproj b/camino/projects/Chimera.pbproj/project.pbxproj index bbbb2535f6b0..f4d5d7719f60 100644 --- a/camino/projects/Chimera.pbproj/project.pbxproj +++ b/camino/projects/Chimera.pbproj/project.pbxproj @@ -5109,6 +5109,10 @@ F5A3669A02CCFB7A01DC3354, F50D9DE702ECC36201BB4219, F50D9DE802ECC36201BB4219, + F5E37B0C02EE959601A967F3, + F5E37B0D02EE95E201A967F3, + F5E37B0E02EE95E201A967F3, + F5E37B0F02EE95E201A967F3, ); isa = PBXHeadersBuildPhase; name = Headers; @@ -5225,6 +5229,9 @@ F5A3669B02CCFB7A01DC3354, F5A3669C02CCFB7A01DC3354, F50D9DE902ECC36201BB4219, + F5E37B1002EE95E201A967F3, + F5E37B1102EE95E201A967F3, + F5E37B1202EE95E201A967F3, ); isa = PBXSourcesBuildPhase; name = Sources; @@ -7205,6 +7212,48 @@ name = "Gray Images"; refType = 4; }; + F5E37B0C02EE959601A967F3 = { + fileRef = F55C4DD302D2864D0130B065; + isa = PBXBuildFile; + settings = { + }; + }; + F5E37B0D02EE95E201A967F3 = { + fileRef = F50D9DF102EE194001BB4219; + isa = PBXBuildFile; + settings = { + }; + }; + F5E37B0E02EE95E201A967F3 = { + fileRef = F50D9DED02EE0AB101BB4219; + isa = PBXBuildFile; + settings = { + }; + }; + F5E37B0F02EE95E201A967F3 = { + fileRef = F50D9DF502EE2B9A01BB4219; + isa = PBXBuildFile; + settings = { + }; + }; + F5E37B1002EE95E201A967F3 = { + fileRef = F50D9DF202EE194001BB4219; + isa = PBXBuildFile; + settings = { + }; + }; + F5E37B1102EE95E201A967F3 = { + fileRef = F50D9DEE02EE0AB101BB4219; + isa = PBXBuildFile; + settings = { + }; + }; + F5E37B1202EE95E201A967F3 = { + fileRef = F50D9DF602EE2B9A01BB4219; + isa = PBXBuildFile; + settings = { + }; + }; F5F14E9602A5A43A01A967F3 = { isa = PBXFileReference; name = libwidget.rsrc; diff --git a/camino/src/download/ProgressDlgController.h b/camino/src/download/ProgressDlgController.h index 44690836b994..a607b0753ca1 100644 --- a/camino/src/download/ProgressDlgController.h +++ b/camino/src/download/ProgressDlgController.h @@ -68,7 +68,7 @@ class nsDownloadListener; BOOL mDownloadIsComplete; long mCurrentProgress; // if progress bar is indeterminate, can still calc stats. - nsDownloader *mDownloader; // we hold a ref to this + CHDownloader *mDownloader; // we hold a ref to this NSTimer *mDownloadTimer; } diff --git a/camino/src/download/ProgressDlgController.mm b/camino/src/download/ProgressDlgController.mm index d2812e79d79b..d68ef0593986 100644 --- a/camino/src/download/ProgressDlgController.mm +++ b/camino/src/download/ProgressDlgController.mm @@ -492,7 +492,7 @@ static NSString *LeaveOpenToolbarItemIdentifier = @"Leave Open Toggle Toolbar } // if neither case was true, it's barber pole city. } --(void) setDownloadListener: (nsDownloader*)aDownloader +-(void) setDownloadListener: (CHDownloader*)aDownloader { if (mDownloader != aDownloader) NS_IF_RELEASE(mDownloader); diff --git a/camino/src/download/nsDownloadListener.h b/camino/src/download/nsDownloadListener.h index 4800161fae43..a2e7b249f2e5 100644 --- a/camino/src/download/nsDownloadListener.h +++ b/camino/src/download/nsDownloadListener.h @@ -53,7 +53,7 @@ // maybe this should replace nsHeaderSniffer too? -class nsDownloadListener : public nsDownloader, +class nsDownloadListener : public CHDownloader, public nsIDownload, public nsIWebProgressListener { diff --git a/camino/src/download/nsDownloadListener.mm b/camino/src/download/nsDownloadListener.mm index 3413ddc43abc..52edc19185b0 100644 --- a/camino/src/download/nsDownloadListener.mm +++ b/camino/src/download/nsDownloadListener.mm @@ -45,7 +45,7 @@ #include "netCore.h" nsDownloadListener::nsDownloadListener(DownloadControllerFactory* inControllerFactory) -: nsDownloader(inControllerFactory) +: CHDownloader(inControllerFactory) , mBypassCache(PR_FALSE) , mNetworkTransfer(PR_FALSE) , mGotFirstStateChange(PR_FALSE) @@ -57,7 +57,7 @@ nsDownloadListener::~nsDownloadListener() { } -NS_IMPL_ISUPPORTS_INHERITED2(nsDownloadListener, nsDownloader, nsIDownload, nsIWebProgressListener) +NS_IMPL_ISUPPORTS_INHERITED2(nsDownloadListener, CHDownloader, nsIDownload, nsIWebProgressListener) #pragma mark - diff --git a/camino/src/embedding/CHDownloadProgressDisplay.h b/camino/src/embedding/CHDownloadProgressDisplay.h index 7e0ccf4268cb..be769e8423c4 100644 --- a/camino/src/embedding/CHDownloadProgressDisplay.h +++ b/camino/src/embedding/CHDownloadProgressDisplay.h @@ -58,7 +58,7 @@ The underlying C++ classes use this factory to create the progress window controller. - 3. The nsDownloader C++ class + 3. The CHDownloader C++ class This base class exists to hide the complextity of the download listener classes (which deal with Gecko callbacks) from the @@ -103,7 +103,7 @@ #include "nsISupports.h" -class nsDownloader; +class CHDownloader; // a formal protocol for something that implements progress display // Embedders can make a window controller that conforms to this @@ -115,7 +115,7 @@ class nsDownloader; - (void)setProgressTo:(long)aCurProgress ofMax:(long)aMaxProgress; -- (void)setDownloadListener:(nsDownloader*)aDownloader; +- (void)setDownloadListener:(CHDownloader*)aDownloader; - (void)setSourceURL:(NSString*)aSourceURL; - (void)setDestinationPath:(NSString*)aDestPath; @@ -137,11 +137,11 @@ class nsDownloader; // UI code from having to know too much about the nsIDownloadListener. // It is responsible for creating the download UI, via the DownloadControllerFactory // that it owns. -class nsDownloader : public nsISupports +class CHDownloader : public nsISupports { public: - nsDownloader(DownloadControllerFactory* inControllerFactory); - virtual ~nsDownloader(); + CHDownloader(DownloadControllerFactory* inControllerFactory); + virtual ~CHDownloader(); NS_DECL_ISUPPORTS diff --git a/camino/src/embedding/CHDownloadProgressDisplay.mm b/camino/src/embedding/CHDownloadProgressDisplay.mm index 47d1416a7aec..1b0f7030b237 100644 --- a/camino/src/embedding/CHDownloadProgressDisplay.mm +++ b/camino/src/embedding/CHDownloadProgressDisplay.mm @@ -52,7 +52,7 @@ #pragma mark - // see the header file for comments -nsDownloader::nsDownloader(DownloadControllerFactory* inControllerFactory) +CHDownloader::CHDownloader(DownloadControllerFactory* inControllerFactory) : mControllerFactory(inControllerFactory) , mDownloadDisplay(nil) { @@ -60,15 +60,15 @@ nsDownloader::nsDownloader(DownloadControllerFactory* inControllerFactory) [mControllerFactory retain]; } -nsDownloader::~nsDownloader() +CHDownloader::~CHDownloader() { [mControllerFactory release]; } -NS_IMPL_ISUPPORTS1(nsDownloader, nsISupports); +NS_IMPL_ISUPPORTS1(CHDownloader, nsISupports); void -nsDownloader::CreateDownloadDisplay() +CHDownloader::CreateDownloadDisplay() { mDownloadDisplay = [mControllerFactory createDownloadController]; [mDownloadDisplay setDownloadListener:this]; diff --git a/chimera/Chimera.pbproj/project.pbxproj b/chimera/Chimera.pbproj/project.pbxproj index bbbb2535f6b0..f4d5d7719f60 100644 --- a/chimera/Chimera.pbproj/project.pbxproj +++ b/chimera/Chimera.pbproj/project.pbxproj @@ -5109,6 +5109,10 @@ F5A3669A02CCFB7A01DC3354, F50D9DE702ECC36201BB4219, F50D9DE802ECC36201BB4219, + F5E37B0C02EE959601A967F3, + F5E37B0D02EE95E201A967F3, + F5E37B0E02EE95E201A967F3, + F5E37B0F02EE95E201A967F3, ); isa = PBXHeadersBuildPhase; name = Headers; @@ -5225,6 +5229,9 @@ F5A3669B02CCFB7A01DC3354, F5A3669C02CCFB7A01DC3354, F50D9DE902ECC36201BB4219, + F5E37B1002EE95E201A967F3, + F5E37B1102EE95E201A967F3, + F5E37B1202EE95E201A967F3, ); isa = PBXSourcesBuildPhase; name = Sources; @@ -7205,6 +7212,48 @@ name = "Gray Images"; refType = 4; }; + F5E37B0C02EE959601A967F3 = { + fileRef = F55C4DD302D2864D0130B065; + isa = PBXBuildFile; + settings = { + }; + }; + F5E37B0D02EE95E201A967F3 = { + fileRef = F50D9DF102EE194001BB4219; + isa = PBXBuildFile; + settings = { + }; + }; + F5E37B0E02EE95E201A967F3 = { + fileRef = F50D9DED02EE0AB101BB4219; + isa = PBXBuildFile; + settings = { + }; + }; + F5E37B0F02EE95E201A967F3 = { + fileRef = F50D9DF502EE2B9A01BB4219; + isa = PBXBuildFile; + settings = { + }; + }; + F5E37B1002EE95E201A967F3 = { + fileRef = F50D9DF202EE194001BB4219; + isa = PBXBuildFile; + settings = { + }; + }; + F5E37B1102EE95E201A967F3 = { + fileRef = F50D9DEE02EE0AB101BB4219; + isa = PBXBuildFile; + settings = { + }; + }; + F5E37B1202EE95E201A967F3 = { + fileRef = F50D9DF602EE2B9A01BB4219; + isa = PBXBuildFile; + settings = { + }; + }; F5F14E9602A5A43A01A967F3 = { isa = PBXFileReference; name = libwidget.rsrc; diff --git a/chimera/DownloadProgressDisplay.h b/chimera/DownloadProgressDisplay.h index 7e0ccf4268cb..be769e8423c4 100644 --- a/chimera/DownloadProgressDisplay.h +++ b/chimera/DownloadProgressDisplay.h @@ -58,7 +58,7 @@ The underlying C++ classes use this factory to create the progress window controller. - 3. The nsDownloader C++ class + 3. The CHDownloader C++ class This base class exists to hide the complextity of the download listener classes (which deal with Gecko callbacks) from the @@ -103,7 +103,7 @@ #include "nsISupports.h" -class nsDownloader; +class CHDownloader; // a formal protocol for something that implements progress display // Embedders can make a window controller that conforms to this @@ -115,7 +115,7 @@ class nsDownloader; - (void)setProgressTo:(long)aCurProgress ofMax:(long)aMaxProgress; -- (void)setDownloadListener:(nsDownloader*)aDownloader; +- (void)setDownloadListener:(CHDownloader*)aDownloader; - (void)setSourceURL:(NSString*)aSourceURL; - (void)setDestinationPath:(NSString*)aDestPath; @@ -137,11 +137,11 @@ class nsDownloader; // UI code from having to know too much about the nsIDownloadListener. // It is responsible for creating the download UI, via the DownloadControllerFactory // that it owns. -class nsDownloader : public nsISupports +class CHDownloader : public nsISupports { public: - nsDownloader(DownloadControllerFactory* inControllerFactory); - virtual ~nsDownloader(); + CHDownloader(DownloadControllerFactory* inControllerFactory); + virtual ~CHDownloader(); NS_DECL_ISUPPORTS diff --git a/chimera/DownloadProgressDisplay.mm b/chimera/DownloadProgressDisplay.mm index 47d1416a7aec..1b0f7030b237 100644 --- a/chimera/DownloadProgressDisplay.mm +++ b/chimera/DownloadProgressDisplay.mm @@ -52,7 +52,7 @@ #pragma mark - // see the header file for comments -nsDownloader::nsDownloader(DownloadControllerFactory* inControllerFactory) +CHDownloader::CHDownloader(DownloadControllerFactory* inControllerFactory) : mControllerFactory(inControllerFactory) , mDownloadDisplay(nil) { @@ -60,15 +60,15 @@ nsDownloader::nsDownloader(DownloadControllerFactory* inControllerFactory) [mControllerFactory retain]; } -nsDownloader::~nsDownloader() +CHDownloader::~CHDownloader() { [mControllerFactory release]; } -NS_IMPL_ISUPPORTS1(nsDownloader, nsISupports); +NS_IMPL_ISUPPORTS1(CHDownloader, nsISupports); void -nsDownloader::CreateDownloadDisplay() +CHDownloader::CreateDownloadDisplay() { mDownloadDisplay = [mControllerFactory createDownloadController]; [mDownloadDisplay setDownloadListener:this]; diff --git a/chimera/ProgressDlgController.h b/chimera/ProgressDlgController.h index 44690836b994..a607b0753ca1 100644 --- a/chimera/ProgressDlgController.h +++ b/chimera/ProgressDlgController.h @@ -68,7 +68,7 @@ class nsDownloadListener; BOOL mDownloadIsComplete; long mCurrentProgress; // if progress bar is indeterminate, can still calc stats. - nsDownloader *mDownloader; // we hold a ref to this + CHDownloader *mDownloader; // we hold a ref to this NSTimer *mDownloadTimer; } diff --git a/chimera/ProgressDlgController.mm b/chimera/ProgressDlgController.mm index d2812e79d79b..d68ef0593986 100644 --- a/chimera/ProgressDlgController.mm +++ b/chimera/ProgressDlgController.mm @@ -492,7 +492,7 @@ static NSString *LeaveOpenToolbarItemIdentifier = @"Leave Open Toggle Toolbar } // if neither case was true, it's barber pole city. } --(void) setDownloadListener: (nsDownloader*)aDownloader +-(void) setDownloadListener: (CHDownloader*)aDownloader { if (mDownloader != aDownloader) NS_IF_RELEASE(mDownloader); diff --git a/chimera/nsDownloadListener.h b/chimera/nsDownloadListener.h index 4800161fae43..a2e7b249f2e5 100644 --- a/chimera/nsDownloadListener.h +++ b/chimera/nsDownloadListener.h @@ -53,7 +53,7 @@ // maybe this should replace nsHeaderSniffer too? -class nsDownloadListener : public nsDownloader, +class nsDownloadListener : public CHDownloader, public nsIDownload, public nsIWebProgressListener { diff --git a/chimera/nsDownloadListener.mm b/chimera/nsDownloadListener.mm index 3413ddc43abc..52edc19185b0 100644 --- a/chimera/nsDownloadListener.mm +++ b/chimera/nsDownloadListener.mm @@ -45,7 +45,7 @@ #include "netCore.h" nsDownloadListener::nsDownloadListener(DownloadControllerFactory* inControllerFactory) -: nsDownloader(inControllerFactory) +: CHDownloader(inControllerFactory) , mBypassCache(PR_FALSE) , mNetworkTransfer(PR_FALSE) , mGotFirstStateChange(PR_FALSE) @@ -57,7 +57,7 @@ nsDownloadListener::~nsDownloadListener() { } -NS_IMPL_ISUPPORTS_INHERITED2(nsDownloadListener, nsDownloader, nsIDownload, nsIWebProgressListener) +NS_IMPL_ISUPPORTS_INHERITED2(nsDownloadListener, CHDownloader, nsIDownload, nsIWebProgressListener) #pragma mark - diff --git a/chimera/projects/Chimera.pbproj/project.pbxproj b/chimera/projects/Chimera.pbproj/project.pbxproj index bbbb2535f6b0..f4d5d7719f60 100644 --- a/chimera/projects/Chimera.pbproj/project.pbxproj +++ b/chimera/projects/Chimera.pbproj/project.pbxproj @@ -5109,6 +5109,10 @@ F5A3669A02CCFB7A01DC3354, F50D9DE702ECC36201BB4219, F50D9DE802ECC36201BB4219, + F5E37B0C02EE959601A967F3, + F5E37B0D02EE95E201A967F3, + F5E37B0E02EE95E201A967F3, + F5E37B0F02EE95E201A967F3, ); isa = PBXHeadersBuildPhase; name = Headers; @@ -5225,6 +5229,9 @@ F5A3669B02CCFB7A01DC3354, F5A3669C02CCFB7A01DC3354, F50D9DE902ECC36201BB4219, + F5E37B1002EE95E201A967F3, + F5E37B1102EE95E201A967F3, + F5E37B1202EE95E201A967F3, ); isa = PBXSourcesBuildPhase; name = Sources; @@ -7205,6 +7212,48 @@ name = "Gray Images"; refType = 4; }; + F5E37B0C02EE959601A967F3 = { + fileRef = F55C4DD302D2864D0130B065; + isa = PBXBuildFile; + settings = { + }; + }; + F5E37B0D02EE95E201A967F3 = { + fileRef = F50D9DF102EE194001BB4219; + isa = PBXBuildFile; + settings = { + }; + }; + F5E37B0E02EE95E201A967F3 = { + fileRef = F50D9DED02EE0AB101BB4219; + isa = PBXBuildFile; + settings = { + }; + }; + F5E37B0F02EE95E201A967F3 = { + fileRef = F50D9DF502EE2B9A01BB4219; + isa = PBXBuildFile; + settings = { + }; + }; + F5E37B1002EE95E201A967F3 = { + fileRef = F50D9DF202EE194001BB4219; + isa = PBXBuildFile; + settings = { + }; + }; + F5E37B1102EE95E201A967F3 = { + fileRef = F50D9DEE02EE0AB101BB4219; + isa = PBXBuildFile; + settings = { + }; + }; + F5E37B1202EE95E201A967F3 = { + fileRef = F50D9DF602EE2B9A01BB4219; + isa = PBXBuildFile; + settings = { + }; + }; F5F14E9602A5A43A01A967F3 = { isa = PBXFileReference; name = libwidget.rsrc; diff --git a/chimera/src/download/ProgressDlgController.h b/chimera/src/download/ProgressDlgController.h index 44690836b994..a607b0753ca1 100644 --- a/chimera/src/download/ProgressDlgController.h +++ b/chimera/src/download/ProgressDlgController.h @@ -68,7 +68,7 @@ class nsDownloadListener; BOOL mDownloadIsComplete; long mCurrentProgress; // if progress bar is indeterminate, can still calc stats. - nsDownloader *mDownloader; // we hold a ref to this + CHDownloader *mDownloader; // we hold a ref to this NSTimer *mDownloadTimer; } diff --git a/chimera/src/download/ProgressDlgController.mm b/chimera/src/download/ProgressDlgController.mm index d2812e79d79b..d68ef0593986 100644 --- a/chimera/src/download/ProgressDlgController.mm +++ b/chimera/src/download/ProgressDlgController.mm @@ -492,7 +492,7 @@ static NSString *LeaveOpenToolbarItemIdentifier = @"Leave Open Toggle Toolbar } // if neither case was true, it's barber pole city. } --(void) setDownloadListener: (nsDownloader*)aDownloader +-(void) setDownloadListener: (CHDownloader*)aDownloader { if (mDownloader != aDownloader) NS_IF_RELEASE(mDownloader); diff --git a/chimera/src/download/nsDownloadListener.h b/chimera/src/download/nsDownloadListener.h index 4800161fae43..a2e7b249f2e5 100644 --- a/chimera/src/download/nsDownloadListener.h +++ b/chimera/src/download/nsDownloadListener.h @@ -53,7 +53,7 @@ // maybe this should replace nsHeaderSniffer too? -class nsDownloadListener : public nsDownloader, +class nsDownloadListener : public CHDownloader, public nsIDownload, public nsIWebProgressListener { diff --git a/chimera/src/download/nsDownloadListener.mm b/chimera/src/download/nsDownloadListener.mm index 3413ddc43abc..52edc19185b0 100644 --- a/chimera/src/download/nsDownloadListener.mm +++ b/chimera/src/download/nsDownloadListener.mm @@ -45,7 +45,7 @@ #include "netCore.h" nsDownloadListener::nsDownloadListener(DownloadControllerFactory* inControllerFactory) -: nsDownloader(inControllerFactory) +: CHDownloader(inControllerFactory) , mBypassCache(PR_FALSE) , mNetworkTransfer(PR_FALSE) , mGotFirstStateChange(PR_FALSE) @@ -57,7 +57,7 @@ nsDownloadListener::~nsDownloadListener() { } -NS_IMPL_ISUPPORTS_INHERITED2(nsDownloadListener, nsDownloader, nsIDownload, nsIWebProgressListener) +NS_IMPL_ISUPPORTS_INHERITED2(nsDownloadListener, CHDownloader, nsIDownload, nsIWebProgressListener) #pragma mark - diff --git a/chimera/src/embedding/CHDownloadProgressDisplay.h b/chimera/src/embedding/CHDownloadProgressDisplay.h index 7e0ccf4268cb..be769e8423c4 100644 --- a/chimera/src/embedding/CHDownloadProgressDisplay.h +++ b/chimera/src/embedding/CHDownloadProgressDisplay.h @@ -58,7 +58,7 @@ The underlying C++ classes use this factory to create the progress window controller. - 3. The nsDownloader C++ class + 3. The CHDownloader C++ class This base class exists to hide the complextity of the download listener classes (which deal with Gecko callbacks) from the @@ -103,7 +103,7 @@ #include "nsISupports.h" -class nsDownloader; +class CHDownloader; // a formal protocol for something that implements progress display // Embedders can make a window controller that conforms to this @@ -115,7 +115,7 @@ class nsDownloader; - (void)setProgressTo:(long)aCurProgress ofMax:(long)aMaxProgress; -- (void)setDownloadListener:(nsDownloader*)aDownloader; +- (void)setDownloadListener:(CHDownloader*)aDownloader; - (void)setSourceURL:(NSString*)aSourceURL; - (void)setDestinationPath:(NSString*)aDestPath; @@ -137,11 +137,11 @@ class nsDownloader; // UI code from having to know too much about the nsIDownloadListener. // It is responsible for creating the download UI, via the DownloadControllerFactory // that it owns. -class nsDownloader : public nsISupports +class CHDownloader : public nsISupports { public: - nsDownloader(DownloadControllerFactory* inControllerFactory); - virtual ~nsDownloader(); + CHDownloader(DownloadControllerFactory* inControllerFactory); + virtual ~CHDownloader(); NS_DECL_ISUPPORTS diff --git a/chimera/src/embedding/CHDownloadProgressDisplay.mm b/chimera/src/embedding/CHDownloadProgressDisplay.mm index 47d1416a7aec..1b0f7030b237 100644 --- a/chimera/src/embedding/CHDownloadProgressDisplay.mm +++ b/chimera/src/embedding/CHDownloadProgressDisplay.mm @@ -52,7 +52,7 @@ #pragma mark - // see the header file for comments -nsDownloader::nsDownloader(DownloadControllerFactory* inControllerFactory) +CHDownloader::CHDownloader(DownloadControllerFactory* inControllerFactory) : mControllerFactory(inControllerFactory) , mDownloadDisplay(nil) { @@ -60,15 +60,15 @@ nsDownloader::nsDownloader(DownloadControllerFactory* inControllerFactory) [mControllerFactory retain]; } -nsDownloader::~nsDownloader() +CHDownloader::~CHDownloader() { [mControllerFactory release]; } -NS_IMPL_ISUPPORTS1(nsDownloader, nsISupports); +NS_IMPL_ISUPPORTS1(CHDownloader, nsISupports); void -nsDownloader::CreateDownloadDisplay() +CHDownloader::CreateDownloadDisplay() { mDownloadDisplay = [mControllerFactory createDownloadController]; [mDownloadDisplay setDownloadListener:this];