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

remove a bunch of dead code, and remove NS_COM from a bunch of concrete classes that weren't being used previously

Browse Source 
r=jag, sr=shaver


git-svn-id: svn://10.0.0.236/trunk@114820 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alecf%netscape.com
2002-02-18 22:57:47 +00:00
parent c0e0ef41ce
commit 057eaef9e2
20 changed files with 12 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/xpcom/build/dlldeps.cpp
View File

@@ -39,7 +39,6 @@
// the dll that are located in the .lib files we link with
#include "nsVoidArray.h"
#include "nsVoidBTree.h"
#include "nsValueArray.h"
#include "nsIAtom.h"
#include "nsFileSpec.h"
@@ -115,7 +114,6 @@ void XXXNeverCalled()
dummyComparitor dummy;
nsVoidArray();
nsSmallVoidArray();
nsVoidBTree();
nsValueArray(0);
nsAVLTree(dummy, nsnull);
nsSupportsArray();

2
mozilla/xpcom/components/nsComponentManagerUtils.h
View File

@@ -78,7 +78,7 @@ private:
nsresult* mErrorPtr;
};
class NS_COM nsCreateInstanceFromCategory : public nsCOMPtr_helper
class nsCreateInstanceFromCategory : public nsCOMPtr_helper
{
public:
nsCreateInstanceFromCategory(const char *aCategory, const char *aEntry,

2
mozilla/xpcom/components/nsIServiceManagerUtils.h
View File

@@ -113,7 +113,7 @@ do_GetService( const char* aContractID, nsISupports* aServiceManager, nsresult*
return nsGetServiceByContractID(aContractID, aServiceManager, error);
}
class NS_COM nsGetServiceFromCategory : public nsCOMPtr_helper
class nsGetServiceFromCategory : public nsCOMPtr_helper
{
public:
nsGetServiceFromCategory(const char* aCategory, const char* aEntry,

1
mozilla/xpcom/ds/MANIFEST
View File

@@ -24,7 +24,6 @@ nsValueArray.h
nsVariant.h
nsVector.h
nsVoidArray.h
nsVoidBTree.h
pldhash.h
plvector.h
nsTextFormatter.h

2
mozilla/xpcom/ds/Makefile.in
View File

@@ -68,7 +68,6 @@ CPPSRCS = \
nsUnicharBuffer.cpp \
nsVariant.cpp \
nsVoidArray.cpp \
nsVoidBTree.cpp \
nsTextFormatter.cpp \
nsTimelineService.cpp \
nsValueArray.cpp \
@@ -101,7 +100,6 @@ EXPORTS = \
nsVariant.h \
nsVector.h \
nsVoidArray.h \
nsVoidBTree.h \
pldhash.h \
plvector.h \
nsTextFormatter.h \

2
mozilla/xpcom/ds/makefile.win
View File

@@ -56,7 +56,6 @@ EXPORTS = \
nsVariant.h \
nsVector.h \
nsVoidArray.h \
nsVoidBTree.h \
nsValueArray.h \
pldhash.h \
plvector.h \
@@ -122,7 +121,6 @@ CPP_OBJS = \
.\$(OBJDIR)\nsUnicharBuffer.obj \
.\$(OBJDIR)\nsVariant.obj \
.\$(OBJDIR)\nsVoidArray.obj \
.\$(OBJDIR)\nsVoidBTree.obj \
.\$(OBJDIR)\nsValueArray.obj \
.\$(OBJDIR)\pldhash.obj \
.\$(OBJDIR)\plvector.obj \

2
mozilla/xpcom/ds/nsSupportsArrayEnumerator.h
View File

@@ -42,7 +42,7 @@
class nsISupportsArray;
class NS_COM nsSupportsArrayEnumerator : public nsIBidirectionalEnumerator {
class nsSupportsArrayEnumerator : public nsIBidirectionalEnumerator {
public:
NS_DECL_ISUPPORTS

2
mozilla/xpcom/glue/nsComponentManagerUtils.h
View File

@@ -78,7 +78,7 @@ private:
nsresult* mErrorPtr;
};
class NS_COM nsCreateInstanceFromCategory : public nsCOMPtr_helper
class nsCreateInstanceFromCategory : public nsCOMPtr_helper
{
public:
nsCreateInstanceFromCategory(const char *aCategory, const char *aEntry,

2
mozilla/xpcom/glue/nsServiceManagerUtils.h
View File

@@ -113,7 +113,7 @@ do_GetService( const char* aContractID, nsISupports* aServiceManager, nsresult*
return nsGetServiceByContractID(aContractID, aServiceManager, error);
}
class NS_COM nsGetServiceFromCategory : public nsCOMPtr_helper
class nsGetServiceFromCategory : public nsCOMPtr_helper
{
public:
nsGetServiceFromCategory(const char* aCategory, const char* aEntry,

1
mozilla/xpcom/io/MANIFEST
View File

@@ -5,7 +5,6 @@ nsFileStream.h
nsIFileStream.h
nsIUnicharInputStream.h
nsSpecialSystemDirectory.h
nsStorageStream.h
nsLocalFile.h
nsLocalFileMac.h
nsDirectoryService.h

2
mozilla/xpcom/io/makefile.win
View File

@@ -42,7 +42,6 @@ EXPORTS = \
nsLinebreakConverter.h \
nsScriptableInputStream.h \
nsSpecialSystemDirectory.h \
nsStorageStream.h \
nsStringIO.h \
$(NULL)
@@ -103,7 +102,6 @@ CPP_OBJS = \
.\$(OBJDIR)\nsScriptableInputStream.obj \
.\$(OBJDIR)\nsSegmentedBuffer.obj \
.\$(OBJDIR)\nsSpecialSystemDirectory.obj \
.\$(OBJDIR)\nsStorageStream.obj \
.\$(OBJDIR)\nsUnicharInputStream.obj \
$(NULL)

4
mozilla/xpcom/io/nsBinaryStream.h
View File

@@ -29,7 +29,7 @@
// Derive from nsIObjectOutputStream so this class can be used as a superclass
// by nsObjectOutputStream.
class NS_COM nsBinaryOutputStream : public nsIObjectOutputStream
class nsBinaryOutputStream : public nsIObjectOutputStream
{
public:
nsBinaryOutputStream(nsIOutputStream *aStream);
@@ -57,7 +57,7 @@ protected:
// Derive from nsIObjectInputStream so this class can be used as a superclass
// by nsObjectInputStream.
class NS_COM nsBinaryInputStream : public nsIObjectInputStream
class nsBinaryInputStream : public nsIObjectInputStream
{
public:
nsBinaryInputStream(nsIInputStream *aStream);

6
mozilla/xpcom/io/nsFastLoadFile.h
View File

@@ -239,7 +239,7 @@ struct nsIFastLoadFileReader : public nsISupports {
* Though the names are not as clear as I'd like, this seems to be the best
* way to share nsBinaryStream.cpp code.
*/
class NS_COM nsFastLoadFileReader
class nsFastLoadFileReader
: public nsBinaryInputStream,
public nsIFastLoadReadControl,
public nsISeekableStream,
@@ -380,7 +380,7 @@ NS_NewFastLoadFileReader(nsIObjectInputStream* *aResult,
* Though the names are not as clear as I'd like, this seems to be the best
* way to share nsBinaryStream.cpp code.
*/
class NS_COM nsFastLoadFileWriter
class nsFastLoadFileWriter
: public nsBinaryOutputStream,
public nsIFastLoadWriteControl,
public nsISeekableStream
@@ -500,7 +500,7 @@ NS_NewFastLoadFileWriter(nsIObjectOutputStream* *aResult,
* the updater writes new data over the old footer, then writes a new footer
* that maps all data on Close.
*/
class NS_COM nsFastLoadFileUpdater
class nsFastLoadFileUpdater
: public nsFastLoadFileWriter,
nsIFastLoadFileIO
{

2
mozilla/xpcom/io/nsFastLoadService.h
View File

@@ -46,7 +46,7 @@
class nsFastLoadFileReader;
class nsFastLoadFileWriter;
class NS_COM nsFastLoadService : public nsIFastLoadService
class nsFastLoadService : public nsIFastLoadService
{
public:
nsFastLoadService();

47
mozilla/xpcom/io/nsFileStream.cpp
View File

@@ -392,53 +392,6 @@ void nsOutputFileStream::abort()
close();
}
//========================================================================================
// nsSaveViaTempStream
//========================================================================================
//----------------------------------------------------------------------------------------
nsSaveViaTempStream::nsSaveViaTempStream(const nsFileSpec& inFileToSave)
//----------------------------------------------------------------------------------------
: mFileToSave(inFileToSave)
, mTempFileSpec(new nsFileSpec(inFileToSave))
{
// Make sure the temp file's unique (in particular, different from the target file)
mTempFileSpec->MakeUnique();
open(*mTempFileSpec, (PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE), 0666);
} // nsSaveViaTempStream::nsSaveViaTempStream
//----------------------------------------------------------------------------------------
void nsSaveViaTempStream::close()
//----------------------------------------------------------------------------------------
{
if (!mTempFileSpec)
return;
nsresult currentResult = mResult;
Inherited::close();
mResult = currentResult;
if (error())
{
mTempFileSpec->Delete(PR_FALSE);
}
else
{
nsFileSpec thirdSpec(mFileToSave);
thirdSpec.MakeUnique();
nsSimpleCharString originalName(mFileToSave.GetLeafName());
((nsFileSpec&)mFileToSave).Rename(nsSimpleCharString(thirdSpec.GetLeafName()));
if (NS_SUCCEEDED(mTempFileSpec->Rename(originalName)) && mTempFileSpec->Valid())
mFileToSave.Delete(PR_FALSE);
}
delete mTempFileSpec;
} // nsSaveViaTempStream::~nsSaveViaTempStream
//----------------------------------------------------------------------------------------
nsSaveViaTempStream::~nsSaveViaTempStream()
//----------------------------------------------------------------------------------------
{
delete mTempFileSpec;
} // nsSaveViaTempStream::~nsSaveViaTempStream
//========================================================================================
// Manipulators
//========================================================================================

48
mozilla/xpcom/io/nsFileStream.h
View File

@@ -854,52 +854,4 @@ protected:
NS_COM nsOutputStream& nsEndl(nsOutputStream& os); // outputs and FLUSHES.
//========================================================================================
class NS_COM nsSaveViaTempStream
// The interface looks like a stream class, but in fact it streams to a temp file, and
// finally renames if the output succeeded.
//========================================================================================
: public nsOutputFileStream
{
private:
typedef nsOutputFileStream Inherited;
public:
nsSaveViaTempStream(const nsFileSpec& inFileToSave);
~nsSaveViaTempStream();
virtual void close();
// Output streamers. Unfortunately, they don't inherit!
nsOutputStream& operator << (const char* buf)
{ return nsOutputStream::operator << (buf); }
nsOutputStream& operator << (char ch)
{ return nsOutputStream::operator << (ch); }
nsOutputStream& operator << (short val)
{ return nsOutputStream::operator << (val); }
nsOutputStream& operator << (unsigned short val)
{ return nsOutputStream::operator << (val); }
nsOutputStream& operator << (long val)
{ return nsOutputStream::operator << (val); }
nsOutputStream& operator << (unsigned long val)
{ return nsOutputStream::operator << (val); }
nsOutputStream& operator << (int val)
{ return nsOutputStream::operator << (val); }
nsOutputStream& operator << (unsigned int val)
{ return nsOutputStream::operator << (val); }
nsOutputStream& operator << (nsOutputStream& (*pf)(nsOutputStream&))
{ return nsOutputStream::operator << (pf); }
private:
// private and unimplemented to disallow copies and assigns
nsSaveViaTempStream(const nsSaveViaTempStream& rhs);
nsSaveViaTempStream& operator=(const nsSaveViaTempStream& rhs);
protected:
const nsFileSpec& mFileToSave;
nsFileSpec* mTempFileSpec;
}; // class nsSaveViaTempStream
#endif /* _FILESTREAM_H_ */

2
mozilla/xpcom/io/nsStorageStream.h
View File

@@ -36,7 +36,7 @@
class nsSegmentedBuffer;
class NS_COM nsStorageStream : public nsIStorageStream,
class nsStorageStream : public nsIStorageStream,
public nsIOutputStream
{
public:

60
mozilla/xpcom/macbuild/xpcomPPC.xml
View File

@@ -1520,13 +1520,6 @@
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsStorageStream.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsBinaryStream.cpp</PATH>
@@ -1723,13 +1716,6 @@
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsVoidBTree.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsStatistics.cpp</PATH>
@@ -2248,11 +2234,6 @@
<PATH>nsLeakDetector.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsStorageStream.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsBinaryStream.cpp</PATH>
@@ -2388,11 +2369,6 @@
<PATH>nsMemoryImpl.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsVoidBTree.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsStatistics.cpp</PATH>
@@ -3984,13 +3960,6 @@
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsStorageStream.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsBinaryStream.cpp</PATH>
@@ -4187,13 +4156,6 @@
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsVoidBTree.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsStatistics.cpp</PATH>
@@ -4717,11 +4679,6 @@
<PATH>nsLeakDetector.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsStorageStream.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsBinaryStream.cpp</PATH>
@@ -4857,11 +4814,6 @@
<PATH>nsMemoryImpl.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsVoidBTree.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsStatistics.cpp</PATH>
@@ -5314,12 +5266,6 @@
<PATH>nsValueArray.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>xpcom.shlb</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsVoidBTree.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>xpcom.shlb</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
@@ -5454,12 +5400,6 @@
<PATH>nsUnicharInputStream.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>xpcom.shlb</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsStorageStream.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>xpcom.shlb</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>

1
mozilla/xpcom/tests/Makefile.in
View File

@@ -54,7 +54,6 @@ CPPSRCS = \
TestPipes.cpp \
TestServMgr.cpp \
TestThreads.cpp \
TestVoidBTree.cpp \
TestXPIDLString.cpp \
$(NULL)

3
mozilla/xpcom/tests/makefile.win
View File

@@ -47,7 +47,6 @@ PROG14 = .\$(OBJDIR)\TestObserverService.exe
PROG16 = .\$(OBJDIR)\TestPipes.exe
PROG17 = .\$(OBJDIR)\TestShutdown.exe
PROG18 = .\$(OBJDIR)\TestStackCrawl.exe
PROG19 = .\$(OBJDIR)\TestVoidBTree.exe
PROG20 = .\$(OBJDIR)\nsIFileEnumerator.exe
PROG21 = .\$(OBJDIR)\TestCOMPtrEq.exe
PROG22 = .\$(OBJDIR)\TestCallTemplates.exe
@@ -71,7 +70,6 @@ PROGRAMS = $(PROG1) \
$(PROG16) \
$(PROG17) \
$(PROG18) \
$(PROG19) \
$(PROG20) \
$(PROG21) \
$(PROG22) \
@@ -114,7 +112,6 @@ $(PROG14): $(OBJDIR) TestObserverService.cpp
$(PROG16): $(OBJDIR) TestPipes.cpp
$(PROG17): $(OBJDIR) TestShutdown.cpp
$(PROG18): $(OBJDIR) TestStackCrawl.cpp
$(PROG19): $(OBJDIR) TestVoidBTree.cpp
$(PROG20): $(OBJDIR) nsIFileEnumerator.cpp
$(PROG21): $(OBJDIR) TestCOMPtrEq.cpp
$(PROG22): $(OBJDIR) TestCallTemplates.cpp