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

Remove the many forms of NS_SetupRegistry since the classes registered are all now part of proper components. r=dougt, jag sr=rpotts b=81527

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@110840 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%fas.harvard.edu
2001-12-20 02:09:49 +00:00
parent a7cda7ca4d
commit 1604f09dd2
46 changed files with 52 additions and 1513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/parser/htmlparser/tests/outsinks/Convert.cpp
View File

@@ -22,6 +22,7 @@
#include <ctype.h> // for isdigit()
#include "nsXPCOM.h"
#include "nsParserCIID.h"
#include "nsIParser.h"
#include "nsIHTMLContentSink.h"
@@ -31,17 +32,6 @@
#include "nsIComponentManager.h"
#include "nsReadableUtils.h"
extern "C" void NS_SetupRegistry();
#ifdef XP_PC
#define PARSER_DLL "gkparser.dll"
#endif
#ifdef XP_MAC
#endif
#if defined(XP_UNIX) || defined(XP_BEOS)
#define PARSER_DLL "libhtmlpars"MOZ_DLL_SUFFIX
#endif
static NS_DEFINE_IID(kIParserIID, NS_IPARSER_IID);
static NS_DEFINE_CID(kParserCID, NS_PARSER_CID);
@@ -298,8 +288,8 @@ Usage: %s [-i intype] [-o outtype] [-f flags] [-w wrapcol] [-c comparison_file]
}
else file = stdin;
NS_InitXPCOM2(nsnull, nsnull, nsnull);
nsComponentManager::AutoRegister(nsIComponentManagerObsolete::NS_Startup, 0);
NS_SetupRegistry();
// Read in the string: very inefficient, but who cares?
nsString inString;

1
mozilla/parser/htmlparser/tests/outsinks/Makefile.in
View File

@@ -38,7 +38,6 @@ REQUIRES = xpcom \
CPPSRCS = \
Convert.cpp \
nsSetupRegistry.cpp \
$(NULL)
LIBS = \

1
mozilla/parser/htmlparser/tests/outsinks/makefile.win
View File

@@ -36,7 +36,6 @@ BATCHSCRIPT = TestOutSinks.pl
OBJS = \
.\$(OBJDIR)\Convert.obj \
.\$(OBJDIR)\nsSetupRegistry.obj \
$(NULL)
TEST_FILES = \

63
mozilla/parser/htmlparser/tests/outsinks/nsSetupRegistry.cpp
View File

@@ -1,63 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
* The contents of this file are subject to the Netscape Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is Mozilla Communicator client code, released
* March 31, 1998.
*
* The Initial Developer of the Original Code is Netscape
* Communications Corporation. Portions created by Netscape are
* Copyright (C) 1998-1999 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
*/
#define NS_IMPL_IDS
#include "nsParserCIID.h"
#include "nsDOMCID.h"
#ifdef XP_PC
#define PARSER_DLL "gkparser.dll"
#define DOM_DLL "jsdom.dll"
#elif defined(XP_MAC)
#define PARSER_DLL "PARSER_DLL"
#define DOM_DLL "DOM_DLL"
#else /* XP_UNIX etc. */
#define PARSER_DLL "libhtmlpars"MOZ_DLL_SUFFIX
#define DOM_DLL "libjsdom"MOZ_DLL_SUFFIX
#endif
// Class ID's
// PARSER
static NS_DEFINE_CID(kCParserCID, NS_PARSER_CID);
static NS_DEFINE_CID(kCWellFormedDTDCID, NS_WELLFORMEDDTD_CID);
static NS_DEFINE_CID(kCNavDTDCID, NS_CNAVDTD_CID);
// DOM
static NS_DEFINE_IID(kCDOMScriptObjectFactory, NS_DOM_SCRIPT_OBJECT_FACTORY_CID);
static NS_DEFINE_IID(kCScriptNameSetRegistry, NS_SCRIPT_NAMESET_REGISTRY_CID);
extern "C" void
NS_SetupRegistry()
{
nsComponentManager::RegisterComponentLib(kCParserCID, NULL, NULL, PARSER_DLL, PR_FALSE, PR_FALSE);
nsComponentManager::RegisterComponentLib(kCWellFormedDTDCID, NULL, NULL, PARSER_DLL, PR_FALSE, PR_FALSE);
nsComponentManager::RegisterComponentLib(kCNavDTDCID, NULL, NULL, PARSER_DLL, PR_FALSE, PR_FALSE);
// DOM
nsComponentManager::RegisterComponentLib(kCDOMScriptObjectFactory, NULL, NULL, DOM_DLL, PR_FALSE, PR_FALSE);
nsComponentManager::RegisterComponentLib(kCScriptNameSetRegistry, NULL, NULL, DOM_DLL, PR_FALSE, PR_FALSE);
}