diff --git a/intl/chardet/public/Makefile.in b/intl/chardet/public/Makefile.in index 49b6042ad001..49d187f72c32 100644 --- a/intl/chardet/public/Makefile.in +++ b/intl/chardet/public/Makefile.in @@ -58,7 +58,6 @@ EXPORTS = \ nsICharsetDetectionObserver.h \ nsICharsetDetector.h \ nsIStringCharsetDetector.h \ - nsMetaCharsetCID.h \ nsXMLEncodingCID.h \ $(NULL) diff --git a/intl/chardet/public/nsMetaCharsetCID.h b/intl/chardet/public/nsMetaCharsetCID.h deleted file mode 100644 index 5af8a9a10cf3..000000000000 --- a/intl/chardet/public/nsMetaCharsetCID.h +++ /dev/null @@ -1,49 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla 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/MPL/ - * - * 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.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1999 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either of the GNU General Public License Version 2 or later (the "GPL"), - * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#ifndef nsMetaCharsetCID_h__ -#define nsMetaCharsetCID_h__ - -#include "nscore.h" - -#define NS_META_CHARSET_CONTRACTID "@mozilla.org/intl/metacharset;1" - -// {218F2AC0-0A48-11d3-B3BA-00805F8A6670} -#define NS_META_CHARSET_CID \ -{ 0x218f2ac0, 0xa48, 0x11d3, { 0xb3, 0xba, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70 } } - -#endif // nsMetaCharsetCID_h__ diff --git a/intl/chardet/src/nsCharDetConstructors.h b/intl/chardet/src/nsCharDetConstructors.h index 0228aeb72654..722a9fb14f28 100644 --- a/intl/chardet/src/nsCharDetConstructors.h +++ b/intl/chardet/src/nsCharDetConstructors.h @@ -46,7 +46,6 @@ // chardet #include "nsISupports.h" -#include "nsMetaCharsetCID.h" #include "nsICharsetDetector.h" #include "nsICharsetAlias.h" #include "nsDocumentCharsetInfo.h" diff --git a/intl/chardet/src/nsChardetModule.cpp b/intl/chardet/src/nsChardetModule.cpp index 7d1bcd3250f6..ba1f60509d22 100644 --- a/intl/chardet/src/nsChardetModule.cpp +++ b/intl/chardet/src/nsChardetModule.cpp @@ -82,7 +82,6 @@ static const mozilla::Module::ContractIDEntry kChardetContracts[] = { }; static const mozilla::Module::CategoryEntry kChardetCategories[] = { - { "parser-service-category", "Meta Charset Service", NS_META_CHARSET_CONTRACTID }, { NS_CHARSET_DETECTOR_CATEGORY, "off", "off" }, { NS_CHARSET_DETECTOR_CATEGORY, "ruprob", NS_CHARSET_DETECTOR_CONTRACTID_BASE "ruprob" }, { NS_CHARSET_DETECTOR_CATEGORY, "ukprob", NS_CHARSET_DETECTOR_CONTRACTID_BASE "ukprob" },