diff --git a/htmlparser/macbuild/htmlparser.mcp b/htmlparser/macbuild/htmlparser.mcp index 9d10143f268..6f60e66be7c 100644 Binary files a/htmlparser/macbuild/htmlparser.mcp and b/htmlparser/macbuild/htmlparser.mcp differ diff --git a/htmlparser/src/MANIFEST b/htmlparser/src/MANIFEST index ce7b04be86e..f48f7a12200 100644 --- a/htmlparser/src/MANIFEST +++ b/htmlparser/src/MANIFEST @@ -21,7 +21,6 @@ nsParserCIID.h nsHTMLEntities.h nsHTMLEntityList.h nsWellFormedDTD.h -nsExpatDTD.h nsIExpatTokenizer.h nsParserError.h nsIElementObserver.h diff --git a/htmlparser/src/Makefile.in b/htmlparser/src/Makefile.in index 01e466575ad..898eb8869da 100644 --- a/htmlparser/src/Makefile.in +++ b/htmlparser/src/Makefile.in @@ -77,7 +77,6 @@ CPPSRCS = \ nsValidDTD.cpp \ nsWellFormedDTD.cpp \ nsViewSourceHTML.cpp \ - nsExpatDTD.cpp \ $(NULL) # @@ -114,7 +113,6 @@ EXPORTS = \ nsWellFormedDTD.h \ nsValidDTD.h \ nsParserCIID.h \ - nsExpatDTD.h \ nsParserError.h \ nsIElementObserver.h \ nsIParserService.h \ diff --git a/htmlparser/src/makefile.win b/htmlparser/src/makefile.win index 700d0eec712..a9c7ec788a6 100644 --- a/htmlparser/src/makefile.win +++ b/htmlparser/src/makefile.win @@ -53,7 +53,6 @@ CPPSRCS= \ nsValidDTD.cpp \ nsWellFormedDTD.cpp \ nsViewSourceHTML.cpp \ - nsExpatDTD.cpp \ nsParserModule.cpp \ $(NULL) @@ -80,7 +79,6 @@ CPP_OBJS= \ .\$(OBJDIR)\nsValidDTD.obj \ .\$(OBJDIR)\nsWellFormedDTD.obj \ .\$(OBJDIR)\nsViewSourceHTML.obj \ - .\$(OBJDIR)\nsExpatDTD.obj \ .\$(OBJDIR)\nsParserModule.obj \ $(NULL) @@ -108,7 +106,6 @@ EXPORTS= \ nsValidDTD.h \ COtherDTD.h \ nsIDTD.h \ - nsExpatDTD.h \ nsParserCIID.h \ nsParserError.h \ nsIElementObserver.h \ diff --git a/htmlparser/src/nsExpatDTD.cpp b/htmlparser/src/nsExpatDTD.cpp deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htmlparser/src/nsExpatDTD.h b/htmlparser/src/nsExpatDTD.h deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htmlparser/src/nsExpatTokenizer.cpp b/htmlparser/src/nsExpatTokenizer.cpp index 28e82aab178..617f565cb67 100644 --- a/htmlparser/src/nsExpatTokenizer.cpp +++ b/htmlparser/src/nsExpatTokenizer.cpp @@ -117,23 +117,6 @@ nsresult nsExpatTokenizer::QueryInterface(const nsIID& aIID, void** aInstancePtr return NS_OK; } -/** - * This method is defined in nsIParser. It is used to - * cause the COM-like construction of an nsParser. - * - * @update gess 4/8/98 - * @param nsIParser** ptr to newly instantiated parser - * @return NS_xxx error result - */ -NS_HTMLPARS nsresult NS_New_Expat_Tokenizer(nsITokenizer** aInstancePtrResult) { - nsExpatTokenizer* it = new nsExpatTokenizer(); - if (it == 0) { - return NS_ERROR_OUT_OF_MEMORY; - } - return it->QueryInterface(kClassIID, (void **) aInstancePtrResult); -} - - NS_IMPL_ADDREF(nsExpatTokenizer) NS_IMPL_RELEASE(nsExpatTokenizer) diff --git a/htmlparser/src/nsExpatTokenizer.h b/htmlparser/src/nsExpatTokenizer.h index d5047e28041..3bb488ccc22 100644 --- a/htmlparser/src/nsExpatTokenizer.h +++ b/htmlparser/src/nsExpatTokenizer.h @@ -190,7 +190,4 @@ protected: XMLParserState* mState; }; - -extern NS_HTMLPARS nsresult NS_New_Expat_Tokenizer(nsITokenizer** aInstancePtrResult); - #endif diff --git a/parser/htmlparser/macbuild/htmlparser.mcp b/parser/htmlparser/macbuild/htmlparser.mcp index 9d10143f268..6f60e66be7c 100644 Binary files a/parser/htmlparser/macbuild/htmlparser.mcp and b/parser/htmlparser/macbuild/htmlparser.mcp differ diff --git a/parser/htmlparser/src/MANIFEST b/parser/htmlparser/src/MANIFEST index ce7b04be86e..f48f7a12200 100644 --- a/parser/htmlparser/src/MANIFEST +++ b/parser/htmlparser/src/MANIFEST @@ -21,7 +21,6 @@ nsParserCIID.h nsHTMLEntities.h nsHTMLEntityList.h nsWellFormedDTD.h -nsExpatDTD.h nsIExpatTokenizer.h nsParserError.h nsIElementObserver.h diff --git a/parser/htmlparser/src/Makefile.in b/parser/htmlparser/src/Makefile.in index 01e466575ad..898eb8869da 100644 --- a/parser/htmlparser/src/Makefile.in +++ b/parser/htmlparser/src/Makefile.in @@ -77,7 +77,6 @@ CPPSRCS = \ nsValidDTD.cpp \ nsWellFormedDTD.cpp \ nsViewSourceHTML.cpp \ - nsExpatDTD.cpp \ $(NULL) # @@ -114,7 +113,6 @@ EXPORTS = \ nsWellFormedDTD.h \ nsValidDTD.h \ nsParserCIID.h \ - nsExpatDTD.h \ nsParserError.h \ nsIElementObserver.h \ nsIParserService.h \ diff --git a/parser/htmlparser/src/makefile.win b/parser/htmlparser/src/makefile.win index 700d0eec712..a9c7ec788a6 100644 --- a/parser/htmlparser/src/makefile.win +++ b/parser/htmlparser/src/makefile.win @@ -53,7 +53,6 @@ CPPSRCS= \ nsValidDTD.cpp \ nsWellFormedDTD.cpp \ nsViewSourceHTML.cpp \ - nsExpatDTD.cpp \ nsParserModule.cpp \ $(NULL) @@ -80,7 +79,6 @@ CPP_OBJS= \ .\$(OBJDIR)\nsValidDTD.obj \ .\$(OBJDIR)\nsWellFormedDTD.obj \ .\$(OBJDIR)\nsViewSourceHTML.obj \ - .\$(OBJDIR)\nsExpatDTD.obj \ .\$(OBJDIR)\nsParserModule.obj \ $(NULL) @@ -108,7 +106,6 @@ EXPORTS= \ nsValidDTD.h \ COtherDTD.h \ nsIDTD.h \ - nsExpatDTD.h \ nsParserCIID.h \ nsParserError.h \ nsIElementObserver.h \ diff --git a/parser/htmlparser/src/nsExpatDTD.cpp b/parser/htmlparser/src/nsExpatDTD.cpp deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/parser/htmlparser/src/nsExpatDTD.h b/parser/htmlparser/src/nsExpatDTD.h deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/parser/htmlparser/src/nsExpatTokenizer.cpp b/parser/htmlparser/src/nsExpatTokenizer.cpp index 28e82aab178..617f565cb67 100644 --- a/parser/htmlparser/src/nsExpatTokenizer.cpp +++ b/parser/htmlparser/src/nsExpatTokenizer.cpp @@ -117,23 +117,6 @@ nsresult nsExpatTokenizer::QueryInterface(const nsIID& aIID, void** aInstancePtr return NS_OK; } -/** - * This method is defined in nsIParser. It is used to - * cause the COM-like construction of an nsParser. - * - * @update gess 4/8/98 - * @param nsIParser** ptr to newly instantiated parser - * @return NS_xxx error result - */ -NS_HTMLPARS nsresult NS_New_Expat_Tokenizer(nsITokenizer** aInstancePtrResult) { - nsExpatTokenizer* it = new nsExpatTokenizer(); - if (it == 0) { - return NS_ERROR_OUT_OF_MEMORY; - } - return it->QueryInterface(kClassIID, (void **) aInstancePtrResult); -} - - NS_IMPL_ADDREF(nsExpatTokenizer) NS_IMPL_RELEASE(nsExpatTokenizer) diff --git a/parser/htmlparser/src/nsExpatTokenizer.h b/parser/htmlparser/src/nsExpatTokenizer.h index d5047e28041..3bb488ccc22 100644 --- a/parser/htmlparser/src/nsExpatTokenizer.h +++ b/parser/htmlparser/src/nsExpatTokenizer.h @@ -190,7 +190,4 @@ protected: XMLParserState* mState; }; - -extern NS_HTMLPARS nsresult NS_New_Expat_Tokenizer(nsITokenizer** aInstancePtrResult); - #endif