Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing static build bustage from sfraser's checkin for bug 145800:

Browse Source 
- add all new source files to static build target
 - rename nsDownloader to CHDownloader to avoid symbol name conflicts with necko.
This commit is contained in:
bryner%netscape.com 2002-07-24 08:23:52 +00:00
parent 20434ec841
commit ac9fa347e0
28 changed files with 256 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
camino/Chimera.pbproj/project.pbxproj
View File

@ -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;

12
camino/DownloadProgressDisplay.h
View File

@ -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

8
camino/DownloadProgressDisplay.mm
View File

@ -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];

2
camino/ProgressDlgController.h
View File

@ -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;
}

2
camino/ProgressDlgController.mm
View File

@ -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);

2
camino/nsDownloadListener.h
View File

@ -53,7 +53,7 @@
// maybe this should replace nsHeaderSniffer too?
class nsDownloadListener : public nsDownloader,
class nsDownloadListener : public CHDownloader,
public nsIDownload,
public nsIWebProgressListener
{

4
camino/nsDownloadListener.mm
View File

@ -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 -

49
camino/projects/Chimera.pbproj/project.pbxproj
View File

@ -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;

2
camino/src/download/ProgressDlgController.h
View File

@ -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;
}

2
camino/src/download/ProgressDlgController.mm
View File

@ -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);

2
camino/src/download/nsDownloadListener.h
View File

@ -53,7 +53,7 @@
// maybe this should replace nsHeaderSniffer too?
class nsDownloadListener : public nsDownloader,
class nsDownloadListener : public CHDownloader,
public nsIDownload,
public nsIWebProgressListener
{

4
camino/src/download/nsDownloadListener.mm
View File

@ -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 -

12
camino/src/embedding/CHDownloadProgressDisplay.h
View File

@ -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

8
camino/src/embedding/CHDownloadProgressDisplay.mm
View File

@ -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];

49
chimera/Chimera.pbproj/project.pbxproj
View File

@ -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;

12
chimera/DownloadProgressDisplay.h
View File

@ -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

8
chimera/DownloadProgressDisplay.mm
View File

@ -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];

2
chimera/ProgressDlgController.h
View File

@ -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;
}

2
chimera/ProgressDlgController.mm
View File

@ -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);

2
chimera/nsDownloadListener.h
View File

@ -53,7 +53,7 @@
// maybe this should replace nsHeaderSniffer too?
class nsDownloadListener : public nsDownloader,
class nsDownloadListener : public CHDownloader,
public nsIDownload,
public nsIWebProgressListener
{

4
chimera/nsDownloadListener.mm
View File

@ -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 -

49
chimera/projects/Chimera.pbproj/project.pbxproj
View File

@ -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;

2
chimera/src/download/ProgressDlgController.h
View File

@ -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;
}

2
chimera/src/download/ProgressDlgController.mm
View File

@ -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);

2
chimera/src/download/nsDownloadListener.h
View File

@ -53,7 +53,7 @@
// maybe this should replace nsHeaderSniffer too?
class nsDownloadListener : public nsDownloader,
class nsDownloadListener : public CHDownloader,
public nsIDownload,
public nsIWebProgressListener
{

4
chimera/src/download/nsDownloadListener.mm
View File

@ -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 -

12
chimera/src/embedding/CHDownloadProgressDisplay.h
View File

@ -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

8
chimera/src/embedding/CHDownloadProgressDisplay.mm
View File

@ -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];