Release-1.4.2-20050410

1 files changed, 26 insertions, 49 deletions

diff --git a/src/translator.cpp b/src/translator.cpp
index 2ecbad9..10dfa9b 100644
--- a/src/translator.cpp
+++ b/src/translator.cpp
@@ -54,47 +54,30 @@ const char Translator::ISO88592ToWin1250Tab[] = {
 
 
 /*! The translation table used by Koi8RToWindows1251() method. */
-Q_UINT16 Translator::Koi8RToWindows1251Tab[128] = 
-{ 0x2500, 0x2502, 0x250C, 0x2510, 0x2514, 0x2518, 0x251C, 0x2524,
-  0x252C, 0x2534, 0x253C, 0x2580, 0x2584, 0x2588, 0x258C, 0x2590,
-  0x2591, 0x2592, 0x2593, 0x2320, 0x25A0, 0x2219/**/, 0x221A, 0x2248,
-  0x2264, 0x2265, 0x00A0, 0x2321, 0x00B0, 0x00B2, 0x00B7, 0x00F7,
-  0x2550, 0x2551, 0x2552, 0x0451, 0x2553, 0x2554, 0x2555, 0x2556,
-  0x2557, 0x2558, 0x2559, 0x255A, 0x255B, 0x255C, 0x255D, 0x255E,
-  0x255F, 0x2560, 0x2561, 0x0401, 0x2562, 0x2563, 0x2564, 0x2565,
-  0x2566, 0x2567, 0x2568, 0x2569, 0x256A, 0x256B, 0x256C, 0x00A9,
-  0x044E, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433,
-  0x0445, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E,
-  0x043F, 0x044F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432,
-  0x044C, 0x044B, 0x0437, 0x0448, 0x044D, 0x0449, 0x0447, 0x044A,
-  0x042E, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413,
-  0x0425, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E,
-  0x041F, 0x042F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412,
-  0x042C, 0x042B, 0x0417, 0x0428, 0x042D, 0x0429, 0x0427, 0x042A 
+const unsigned char Translator::Koi8RToWindows1251Tab[128] =
+{ 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+  144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+  160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
+  176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+  254,224,225,246,228,229,244,227,245,232,233,234,235,236,237,238,
+  239,255,240,241,242,243,230,226,252,251,231,248,253,249,247,250,
+  222,192,193,214,196,197,212,195,213,200,201,202,203,204,205,206,
+  207,223,208,209,210,211,198,194,220,219,199,216,221,217,215,218 
 };
 
 
 /*! The translation table used by Windows1251ToKoi8R() method. */
-Q_UINT16 Translator::Windows1251ToKoi8RTab[128] = 
-{ 0x0402, 0x0403, 0x201A, 0x0453, 0x201E, 0x2026, 0x2020, 0x2021,
-  0x20AC, 0x2030, 0x0409, 0x2039, 0x040A, 0x040C, 0x040B, 0x040F,
-  0x0452, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-  0xFFFD, 0x2122, 0x0459, 0x203A, 0x045A, 0x045C, 0x045B, 0x045F,
-  0x00A0, 0x040E, 0x045E, 0x0408, 0x00A4, 0x0490, 0x00A6, 0x00A7,
-  0x0401, 0x00A9, 0x0404, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x0407,
-  0x00B0, 0x00B1, 0x0406, 0x0456, 0x0491, 0x00B5, 0x00B6, 0x00B7,
-  0x0451, 0x2116, 0x0454, 0x00BB, 0x0458, 0x0405, 0x0455, 0x0457,
-  0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
-  0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,
-  0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
-  0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F,
-  0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
-  0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
-  0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
-  0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F
+const unsigned char Translator::Windows1251ToKoi8RTab[128] =
+{ 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+  144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+  160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
+  176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+  225,226,247,231,228,229,246,250,233,234,235,236,237,238,239,240,
+  242,243,244,245,230,232,227,254,251,253,255,249,248,252,224,241,
+  193,194,215,199,196,197,214,218,201,202,203,204,205,206,207,208,
+  210,211,212,213,198,200,195,222,219,221,223,217,216,220,192,209
 };
 
-
 /*! Returns the string converted from windows-1250 to iso-8859-2. */
 /* The method was designed initially for translator_cz.h. 
  * It is used for on-line encoding conversion related to
@@ -155,19 +138,16 @@ QCString Translator::ISO88592ToWin1250(const QCString & sInput)
 QCString Translator::Koi8RToWindows1251( const QCString & sInput )
 {
 
-  QString result;
+  QCString result(sInput);
   int len = sInput.length();
 
-  result.setUnicode(0, len);
-  QChar* uc = (QChar*)result.unicode(); // const_cast
   const unsigned char * c = (const unsigned char *)(const char*)sInput;
+  unsigned char *dc = (unsigned char*)(const char*)result;
   for( int i=0; i<len; i++ ) {
     if ( c[i] > 127 )
-      uc[i] = Koi8RToWindows1251Tab[c[i]-128];
-    else
-      uc[i] = c[i];
+      dc[i] = Koi8RToWindows1251Tab[c[i]-128];
   }
-  return result.local8Bit();
+  return result;
 }
 
 
@@ -176,19 +156,16 @@ QCString Translator::Koi8RToWindows1251( const QCString & sInput )
    Encoding table got from QT:qtextcodec.cpp */
 QCString Translator::Windows1251ToKoi8R( const QCString & sInput )
 {
-  QString result;
+  QCString result(sInput);
   int len = sInput.length();
 
-  result.setUnicode(0, len);
-  QChar* uc = (QChar*)result.unicode(); // const_cast
   const unsigned char * c = (const unsigned char *)(const char*)sInput;
+  unsigned char *dc = (unsigned char*)(const char*)result;
   for( int i=0; i<len; i++ ) {
     if ( c[i] > 127 )
-      uc[i] = Windows1251ToKoi8RTab[c[i]-128];
-    else
-      uc[i] = c[i];
+      dc[i] = Windows1251ToKoi8RTab[c[i]-128];
   }
-  return result.local8Bit();
+  return result;
 }
 
 /*! returns the caracter converted from hankaku-kana to zenkakukana.