From 7f57a456510270eb7e46beb19a2f7dcacd8bc952 Mon Sep 17 00:00:00 2001 From: "timeless@mozdev.org" Date: Wed, 13 Oct 2010 09:54:10 +0300 Subject: [PATCH] Bug 588719 remove nsVIQRToUnicode, nsVNIToUnicode, nsUnicodeToVIQR, nsUnicodeToVNI, and nsUnicodeToISO2022KR r=smontagu --- intl/uconv/src/charsetalias.properties | 5 ---- intl/uconv/src/nsUConvModule.cpp | 6 ---- intl/uconv/ucvko/Makefile.in | 1 - intl/uconv/ucvko/nsUnicodeToISO2022KR.cpp | 36 ----------------------- intl/uconv/ucvko/nsUnicodeToISO2022KR.h | 36 ----------------------- intl/uconv/ucvlatin/Makefile.in | 4 --- intl/uconv/ucvlatin/nsUCvLatinCID.h | 24 --------------- intl/uconv/ucvlatin/nsUnicodeToVIQR.cpp | 36 ----------------------- intl/uconv/ucvlatin/nsUnicodeToVIQR.h | 36 ----------------------- intl/uconv/ucvlatin/nsUnicodeToVNI.cpp | 36 ----------------------- intl/uconv/ucvlatin/nsUnicodeToVNI.h | 36 ----------------------- intl/uconv/ucvlatin/nsVIQRToUnicode.cpp | 36 ----------------------- intl/uconv/ucvlatin/nsVIQRToUnicode.h | 36 ----------------------- intl/uconv/ucvlatin/nsVNIToUnicode.cpp | 36 ----------------------- intl/uconv/ucvlatin/nsVNIToUnicode.h | 36 ----------------------- 15 files changed, 400 deletions(-) delete mode 100644 intl/uconv/ucvko/nsUnicodeToISO2022KR.cpp delete mode 100644 intl/uconv/ucvko/nsUnicodeToISO2022KR.h delete mode 100644 intl/uconv/ucvlatin/nsUnicodeToVIQR.cpp delete mode 100644 intl/uconv/ucvlatin/nsUnicodeToVIQR.h delete mode 100644 intl/uconv/ucvlatin/nsUnicodeToVNI.cpp delete mode 100644 intl/uconv/ucvlatin/nsUnicodeToVNI.h delete mode 100644 intl/uconv/ucvlatin/nsVIQRToUnicode.cpp delete mode 100644 intl/uconv/ucvlatin/nsVIQRToUnicode.h delete mode 100644 intl/uconv/ucvlatin/nsVNIToUnicode.cpp delete mode 100644 intl/uconv/ucvlatin/nsVNIToUnicode.h diff --git a/intl/uconv/src/charsetalias.properties b/intl/uconv/src/charsetalias.properties index bfb7bcf9396..3ade6b15975 100644 --- a/intl/uconv/src/charsetalias.properties +++ b/intl/uconv/src/charsetalias.properties @@ -147,7 +147,6 @@ geostd8=GEOSTD8 armscii-8=armscii-8 x-viet-tcvn5712=x-viet-tcvn5712 x-viet-vps=x-viet-vps -x-viet-vni=x-viet-vni iso-10646-ucs-2=UTF-16BE x-iso-10646-ucs-2-be=UTF-16BE x-iso-10646-ucs-2-le=UTF-16LE @@ -474,10 +473,6 @@ csiso2022kr=ISO-2022-KR # csviscii=VISCII # -# Aliases for VIQR -# -csviqr=VIQR -# # Aliases for x-euc-tw # zh_tw-euc=x-euc-tw diff --git a/intl/uconv/src/nsUConvModule.cpp b/intl/uconv/src/nsUConvModule.cpp index 0dd735523c1..1abe4f71d93 100644 --- a/intl/uconv/src/nsUConvModule.cpp +++ b/intl/uconv/src/nsUConvModule.cpp @@ -279,9 +279,6 @@ #include "nsUnicodeToISO2022CN.h" #include "gbku.h" -#define DECODER_NAME_BASE "Unicode Decoder-" -#define ENCODER_NAME_BASE "Unicode Encoder-" - NS_CONVERTER_REGISTRY_START NS_UCONV_REG_UNREG("ISO-8859-1", NS_ISO88591TOUNICODE_CID, NS_UNICODETOISO88591_CID) NS_UCONV_REG_UNREG("windows-1252", NS_CP1252TOUNICODE_CID, NS_UNICODETOCP1252_CID) @@ -460,9 +457,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO2022CNToUnicode) //---------------------------------------------------------------------------- // Global functions and data [declaration] -#define DECODER_NAME_BASE "Unicode Decoder-" -#define ENCODER_NAME_BASE "Unicode Encoder-" - // ucvja const PRUint16 g_uf0201Mapping[] = { #include "jis0201.uf" diff --git a/intl/uconv/ucvko/Makefile.in b/intl/uconv/ucvko/Makefile.in index 024befdada7..c3a720e6360 100644 --- a/intl/uconv/ucvko/Makefile.in +++ b/intl/uconv/ucvko/Makefile.in @@ -52,7 +52,6 @@ CPPSRCS = \ nsEUCKRToUnicode.cpp \ nsUnicodeToEUCKR.cpp \ nsISO2022KRToUnicode.cpp \ - nsUnicodeToISO2022KR.cpp \ nsCP949ToUnicode.cpp \ nsUnicodeToCP949.cpp \ nsUnicodeToJohab.cpp \ diff --git a/intl/uconv/ucvko/nsUnicodeToISO2022KR.cpp b/intl/uconv/ucvko/nsUnicodeToISO2022KR.cpp deleted file mode 100644 index 9fa3fd829b1..00000000000 --- a/intl/uconv/ucvko/nsUnicodeToISO2022KR.cpp +++ /dev/null @@ -1,36 +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) 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 ***** */ diff --git a/intl/uconv/ucvko/nsUnicodeToISO2022KR.h b/intl/uconv/ucvko/nsUnicodeToISO2022KR.h deleted file mode 100644 index 9fa3fd829b1..00000000000 --- a/intl/uconv/ucvko/nsUnicodeToISO2022KR.h +++ /dev/null @@ -1,36 +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) 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 ***** */ diff --git a/intl/uconv/ucvlatin/Makefile.in b/intl/uconv/ucvlatin/Makefile.in index a0a9614a22c..427ff065c5a 100644 --- a/intl/uconv/ucvlatin/Makefile.in +++ b/intl/uconv/ucvlatin/Makefile.in @@ -100,8 +100,6 @@ CPPSRCS = \ nsTCVN5712ToUnicode.cpp \ nsVISCIIToUnicode.cpp \ nsVPSToUnicode.cpp \ - nsVIQRToUnicode.cpp \ - nsVNIToUnicode.cpp \ nsUTF7ToUnicode.cpp \ nsMUTF7ToUnicode.cpp \ nsUCS2BEToUnicode.cpp \ @@ -159,8 +157,6 @@ CPPSRCS = \ nsUnicodeToTCVN5712.cpp \ nsUnicodeToVISCII.cpp \ nsUnicodeToVPS.cpp \ - nsUnicodeToVIQR.cpp \ - nsUnicodeToVNI.cpp \ nsUnicodeToUTF7.cpp \ nsUnicodeToMUTF7.cpp \ nsUnicodeToUCS2BE.cpp \ diff --git a/intl/uconv/ucvlatin/nsUCvLatinCID.h b/intl/uconv/ucvlatin/nsUCvLatinCID.h index c69a2fe848a..a78ddc533b5 100644 --- a/intl/uconv/ucvlatin/nsUCvLatinCID.h +++ b/intl/uconv/ucvlatin/nsUCvLatinCID.h @@ -452,26 +452,6 @@ #define NS_UNICODETOCP1256_CID \ { 0xba6151a4, 0x1dfa, 0x11d3, {0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}} -// Class ID for our UnicodeToVIQR charset converter -// {BA6151A5-1DFA-11d3-B3BF-00805F8A6670} -#define NS_UNICODETOVIQR_CID \ - { 0xba6151a5, 0x1dfa, 0x11d3, {0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}} - -// Class ID for our VIQRToUnicode charset converter -// {BA6151A6-1DFA-11d3-B3BF-00805F8A6670} -#define NS_VIQRTOUNICODE_CID \ - { 0xba6151a6, 0x1dfa, 0x11d3, {0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}} - -// Class ID for our UnicodeToVNI charset converter -// {BA6151A7-1DFA-11d3-B3BF-00805F8A6670} -#define NS_UNICODETOVNI_CID \ - { 0xba6151a7, 0x1dfa, 0x11d3, {0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}} - -// Class ID for our VNIToUnicode charset converter -// {BA6151A8-1DFA-11d3-B3BF-00805F8A6670} -#define NS_VNITOUNICODE_CID \ - { 0xba6151a8, 0x1dfa, 0x11d3, {0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}} - // Class ID for our CP866ToUnicode charset converter // {BA6151A9-1DFA-11d3-B3BF-00805F8A6670} #define NS_CP866TOUNICODE_CID \ @@ -608,10 +588,6 @@ #define NS_UNICODETOADOBEEURO_CID \ { 0x822cb9ae, 0x6421, 0x4484, {0xb3, 0xc3, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}} -// {4F26B731-46CB-11d3-B3C3-00805F8A6670} -#define NS_UNICODETOTIS620WIN_CID \ - { 0x4f26b731, 0x46cb, 0x11d3, {0xb3, 0xc3, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}} - // {49B38F12-6193-11d3-B3C5-00805F8A6670} #define NS_UNICODETOUTF16_CID \ { 0x49b38f12, 0x6193, 0x11d3, {0xb3, 0xc5, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}} diff --git a/intl/uconv/ucvlatin/nsUnicodeToVIQR.cpp b/intl/uconv/ucvlatin/nsUnicodeToVIQR.cpp deleted file mode 100644 index 9fa3fd829b1..00000000000 --- a/intl/uconv/ucvlatin/nsUnicodeToVIQR.cpp +++ /dev/null @@ -1,36 +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) 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 ***** */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToVIQR.h b/intl/uconv/ucvlatin/nsUnicodeToVIQR.h deleted file mode 100644 index 9fa3fd829b1..00000000000 --- a/intl/uconv/ucvlatin/nsUnicodeToVIQR.h +++ /dev/null @@ -1,36 +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) 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 ***** */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToVNI.cpp b/intl/uconv/ucvlatin/nsUnicodeToVNI.cpp deleted file mode 100644 index 9fa3fd829b1..00000000000 --- a/intl/uconv/ucvlatin/nsUnicodeToVNI.cpp +++ /dev/null @@ -1,36 +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) 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 ***** */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToVNI.h b/intl/uconv/ucvlatin/nsUnicodeToVNI.h deleted file mode 100644 index 9fa3fd829b1..00000000000 --- a/intl/uconv/ucvlatin/nsUnicodeToVNI.h +++ /dev/null @@ -1,36 +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) 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 ***** */ diff --git a/intl/uconv/ucvlatin/nsVIQRToUnicode.cpp b/intl/uconv/ucvlatin/nsVIQRToUnicode.cpp deleted file mode 100644 index 9fa3fd829b1..00000000000 --- a/intl/uconv/ucvlatin/nsVIQRToUnicode.cpp +++ /dev/null @@ -1,36 +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) 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 ***** */ diff --git a/intl/uconv/ucvlatin/nsVIQRToUnicode.h b/intl/uconv/ucvlatin/nsVIQRToUnicode.h deleted file mode 100644 index 9fa3fd829b1..00000000000 --- a/intl/uconv/ucvlatin/nsVIQRToUnicode.h +++ /dev/null @@ -1,36 +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) 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 ***** */ diff --git a/intl/uconv/ucvlatin/nsVNIToUnicode.cpp b/intl/uconv/ucvlatin/nsVNIToUnicode.cpp deleted file mode 100644 index 9fa3fd829b1..00000000000 --- a/intl/uconv/ucvlatin/nsVNIToUnicode.cpp +++ /dev/null @@ -1,36 +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) 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 ***** */ diff --git a/intl/uconv/ucvlatin/nsVNIToUnicode.h b/intl/uconv/ucvlatin/nsVNIToUnicode.h deleted file mode 100644 index 9fa3fd829b1..00000000000 --- a/intl/uconv/ucvlatin/nsVNIToUnicode.h +++ /dev/null @@ -1,36 +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) 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 ***** */