diff --git a/intl/uconv/src/nsUConvModule.cpp b/intl/uconv/src/nsUConvModule.cpp index f15879ce8fa53..d1ecf48877638 100644 --- a/intl/uconv/src/nsUConvModule.cpp +++ b/intl/uconv/src/nsUConvModule.cpp @@ -87,7 +87,7 @@ #include "nsVPSToUnicode.h" #include "nsUTF7ToUnicode.h" #include "nsMUTF7ToUnicode.h" -#include "nsUCS2BEToUnicode.h" +#include "nsUTF16ToUnicode.h" #include "nsT61ToUnicode.h" #include "nsUserDefinedToUnicode.h" #include "nsUnicodeToAscii.h" @@ -136,7 +136,7 @@ #include "nsUnicodeToVPS.h" #include "nsUnicodeToUTF7.h" #include "nsUnicodeToMUTF7.h" -#include "nsUnicodeToUCS2BE.h" +#include "nsUnicodeToUTF16.h" #include "nsUnicodeToT61.h" #include "nsUnicodeToUserDefined.h" #include "nsUnicodeToSymbol.h" diff --git a/intl/uconv/ucvlatin/Makefile.in b/intl/uconv/ucvlatin/Makefile.in index d7d3738428044..b67e8d2522ec1 100644 --- a/intl/uconv/ucvlatin/Makefile.in +++ b/intl/uconv/ucvlatin/Makefile.in @@ -69,7 +69,7 @@ CPPSRCS = \ nsVPSToUnicode.cpp \ nsUTF7ToUnicode.cpp \ nsMUTF7ToUnicode.cpp \ - nsUCS2BEToUnicode.cpp \ + nsUTF16ToUnicode.cpp \ nsT61ToUnicode.cpp \ nsUserDefinedToUnicode.cpp \ nsUnicodeToAscii.cpp \ @@ -124,7 +124,7 @@ CPPSRCS = \ nsUnicodeToVPS.cpp \ nsUnicodeToUTF7.cpp \ nsUnicodeToMUTF7.cpp \ - nsUnicodeToUCS2BE.cpp \ + nsUnicodeToUTF16.cpp \ nsUnicodeToT61.cpp \ nsUnicodeToUserDefined.cpp \ nsUnicodeToSymbol.cpp \ diff --git a/intl/uconv/ucvlatin/nsUCS2BEToUnicode.cpp b/intl/uconv/ucvlatin/nsUTF16ToUnicode.cpp similarity index 99% rename from intl/uconv/ucvlatin/nsUCS2BEToUnicode.cpp rename to intl/uconv/ucvlatin/nsUTF16ToUnicode.cpp index 7542b10ceef9e..2db37d097d22f 100644 --- a/intl/uconv/ucvlatin/nsUCS2BEToUnicode.cpp +++ b/intl/uconv/ucvlatin/nsUTF16ToUnicode.cpp @@ -4,7 +4,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nsUCConstructors.h" -#include "nsUCS2BEToUnicode.h" +#include "nsUTF16ToUnicode.h" #include "nsUCvLatinDll.h" #include "nsCharTraits.h" #include <string.h> diff --git a/intl/uconv/ucvlatin/nsUCS2BEToUnicode.h b/intl/uconv/ucvlatin/nsUTF16ToUnicode.h similarity index 94% rename from intl/uconv/ucvlatin/nsUCS2BEToUnicode.h rename to intl/uconv/ucvlatin/nsUTF16ToUnicode.h index 42829b16baf0c..76ce0edcaf8bb 100644 --- a/intl/uconv/ucvlatin/nsUCS2BEToUnicode.h +++ b/intl/uconv/ucvlatin/nsUTF16ToUnicode.h @@ -3,8 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef nsUCS2BEToUnicode_h___ -#define nsUCS2BEToUnicode_h___ +#ifndef nsUTF16ToUnicode_h_ +#define nsUTF16ToUnicode_h_ #include "nsISupports.h" #include "nsUCSupport.h" @@ -70,4 +70,4 @@ class nsUTF16ToUnicode : public nsUTF16ToUnicodeBase bool mFoundBOM; }; -#endif /* nsUCS2BEToUnicode_h___ */ +#endif /* nsUTF16ToUnicode_h_ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToUCS2BE.cpp b/intl/uconv/ucvlatin/nsUnicodeToUTF16.cpp similarity index 99% rename from intl/uconv/ucvlatin/nsUnicodeToUCS2BE.cpp rename to intl/uconv/ucvlatin/nsUnicodeToUTF16.cpp index 7cbf8a86841ed..402df09db6091 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToUCS2BE.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToUTF16.cpp @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "nsUnicodeToUCS2BE.h" +#include "nsUnicodeToUTF16.h" #include <string.h> inline static void SwapBytes(char *aDest, const PRUnichar* aSrc, int32_t aLen); diff --git a/intl/uconv/ucvlatin/nsUnicodeToUCS2BE.h b/intl/uconv/ucvlatin/nsUnicodeToUTF16.h similarity index 94% rename from intl/uconv/ucvlatin/nsUnicodeToUCS2BE.h rename to intl/uconv/ucvlatin/nsUnicodeToUTF16.h index 4369193363517..6ed0825858ff1 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToUCS2BE.h +++ b/intl/uconv/ucvlatin/nsUnicodeToUTF16.h @@ -3,8 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef nsUnicodeToUCS2BE_h___ -#define nsUnicodeToUCS2BE_h___ +#ifndef nsUnicodeToUTF16_h_ +#define nsUnicodeToUTF16_h_ #include "nsUCSupport.h" @@ -53,4 +53,4 @@ class nsUnicodeToUTF16: public nsUnicodeToUTF16BE nsUnicodeToUTF16() { mBOM = 0xFEFF;} }; -#endif /* nsUnicodeToUCS2BE_h___ */ +#endif /* nsUnicodeToUTF16_h_ */