From 8e89cb6ec87b4b46fe1df3ba8169453799b740d9 Mon Sep 17 00:00:00 2001 From: Makoto Kato Date: Mon, 18 Apr 2011 17:31:01 +0900 Subject: [PATCH] Bug 638408 - Remove unused nsUConvDll.*. r=smontagu --- intl/uconv/src/nsCharsetConverterManager.cpp | 1 - intl/uconv/src/nsTextToSubURI.cpp | 1 - intl/uconv/src/nsUConvDll.cpp | 54 -------------------- intl/uconv/src/nsUConvDll.h | 46 ----------------- intl/uconv/src/nsUConvModule.cpp | 1 - intl/uconv/src/nsUCvMinDll.h | 43 ---------------- intl/uconv/src/nsUTF8ConverterService.cpp | 1 - 7 files changed, 147 deletions(-) delete mode 100644 intl/uconv/src/nsUConvDll.cpp delete mode 100644 intl/uconv/src/nsUConvDll.h delete mode 100644 intl/uconv/src/nsUCvMinDll.h diff --git a/intl/uconv/src/nsCharsetConverterManager.cpp b/intl/uconv/src/nsCharsetConverterManager.cpp index bf951c2ca62c..a0419555814c 100644 --- a/intl/uconv/src/nsCharsetConverterManager.cpp +++ b/intl/uconv/src/nsCharsetConverterManager.cpp @@ -46,7 +46,6 @@ #include "nsICharsetConverterManager.h" #include "nsEncoderDecoderUtils.h" #include "nsIStringBundle.h" -#include "nsUConvDll.h" #include "prmem.h" #include "nsCRT.h" #include "nsTArray.h" diff --git a/intl/uconv/src/nsTextToSubURI.cpp b/intl/uconv/src/nsTextToSubURI.cpp index f3f75b5fbec5..715ffca02c4a 100644 --- a/intl/uconv/src/nsTextToSubURI.cpp +++ b/intl/uconv/src/nsTextToSubURI.cpp @@ -41,7 +41,6 @@ #include "nsReadableUtils.h" #include "nsITextToSubURI.h" #include "nsIServiceManager.h" -#include "nsUConvDll.h" #include "nsEscape.h" #include "prmem.h" #include "nsTextToSubURI.h" diff --git a/intl/uconv/src/nsUConvDll.cpp b/intl/uconv/src/nsUConvDll.cpp deleted file mode 100644 index 6f97030142f8..000000000000 --- a/intl/uconv/src/nsUConvDll.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; 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 Communicator client code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Pierre Phaneuf - * - * 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 ***** */ - -#include "nsIComponentManager.h" -#include "nsCOMPtr.h" -#include "nsICharsetConverterManager.h" -#include "nsIPlatformCharset.h" -#include "nsPlatformCharsetFactory.h" -#include "nsICharsetAlias.h" -#include "nsCharsetAliasFactory.h" -#include "nsITextToSubURI.h" -#include "nsTextToSubURI.h" -#include "nsIServiceManager.h" -#include "rdf.h" -#include "nsUConvDll.h" - -//---------------------------------------------------------------------- -// Global functions and data [declaration] - diff --git a/intl/uconv/src/nsUConvDll.h b/intl/uconv/src/nsUConvDll.h deleted file mode 100644 index 356e17f39c18..000000000000 --- a/intl/uconv/src/nsUConvDll.h +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; 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 Communicator client code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * 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 nsUConvDll_h___ -#define nsUConvDll_h___ - -#include "nsISupports.h" -class nsIComponentManager; -class nsIFile; -struct nsModuleComponentInfo; - -#endif /* nsUConvDll_h___ */ diff --git a/intl/uconv/src/nsUConvModule.cpp b/intl/uconv/src/nsUConvModule.cpp index 2a26a0522ae6..3aaa9db79f2c 100644 --- a/intl/uconv/src/nsUConvModule.cpp +++ b/intl/uconv/src/nsUConvModule.cpp @@ -58,7 +58,6 @@ #include "nsITextToSubURI.h" -#include "nsUConvDll.h" #include "nsIFile.h" #include "nsCRT.h" diff --git a/intl/uconv/src/nsUCvMinDll.h b/intl/uconv/src/nsUCvMinDll.h deleted file mode 100644 index 13a9cec6458b..000000000000 --- a/intl/uconv/src/nsUCvMinDll.h +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; 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 Communicator client code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * 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 nsUCvMinDll_h___ -#define nsUCvMinDll_h___ - -#include "prtypes.h" - -#endif /* nsUCvMinDll_h___ */ diff --git a/intl/uconv/src/nsUTF8ConverterService.cpp b/intl/uconv/src/nsUTF8ConverterService.cpp index 0cb916d3e42e..ab85dd6a8d7e 100644 --- a/intl/uconv/src/nsUTF8ConverterService.cpp +++ b/intl/uconv/src/nsUTF8ConverterService.cpp @@ -41,7 +41,6 @@ #include "nsICharsetConverterManager.h" #include "nsReadableUtils.h" #include "nsIServiceManager.h" -#include "nsUConvDll.h" #include "prmem.h" #include "nsUTF8ConverterService.h" #include "nsEscape.h"