Rename some codecs to be in line with ICU
authorLars Knoll <lars.knoll@nokia.com>
Sat, 21 Jul 2012 21:34:07 +0000 (23:34 +0200)
committerQt by Nokia <qt-info@nokia.com>
Tue, 31 Jul 2012 09:12:11 +0000 (11:12 +0200)
Change-Id: If523d2a12ef64c79e3860da1f430f128d24ff600
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
src/corelib/codecs/qsimplecodec.cpp

index 2f1ef30..c3d2968 100644 (file)
@@ -515,7 +515,7 @@ static const struct {
         0x0111, 0x00F1, 0x0323, 0x00F3, 0x00F4, 0x01A1, 0x00F6, 0x00F7,
         0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x01B0, 0x20AB, 0x00FF} },
 
-    { "Apple Roman", { "macintosh", "MacRoman", 0 }, -168,
+    { "macintosh", { "Apple Roman", "MacRoman", 0 }, -168,
       { 0x00C4, 0x00C5, 0x00C7, 0x00C9, 0x00D1, 0x00D6, 0x00DC, 0x00E1,
         0x00E0, 0x00E2, 0x00E4, 0x00E3, 0x00E5, 0x00E7, 0x00E9, 0x00E8,
         0x00EA, 0x00EB, 0x00ED, 0x00EC, 0x00EE, 0x00EF, 0x00F1, 0x00F3,
@@ -586,7 +586,7 @@ static const struct {
       Alias: r8
       Alias: csHPRoman8
     */
-    { "roman8", { "hp-roman8", "csHPRoman8", 0 }, 2004,
+    { "hp-roman8", { "roman8", "csHPRoman8", 0 }, 2004,
       { 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD,
         0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD,
         0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD,