- ascii() is obsoleted, using toLatin1() which returns QByteArray which has a convers...

Changed files:
    qt4-locale.patch -> 1.6

diff --git a/qt4-locale.patch b/qt4-locale.patch
index f6b96654f511620bf49d4729ed799e55c4403226..05fa86b23599877b67d5b5cf5dd65491ca4228b6 100644 (file)
--- a/qt4-locale.patch
+++ b/qt4-locale.patch
@@ -1,6 +1,32 @@
---- qt-copy/src/corelib/codecs/qtextcodec.cpp.orig     2005-05-13 16:34:37.000000000 +0200
-+++ qt-copy/src/corelib/codecs/qtextcodec.cpp  2005-05-13 19:55:18.876291072 +0200
-@@ -359,6 +359,26 @@
+--- qt-copy/tools/assistant/main.cpp.orig      2005-05-13 16:39:06.000000000 +0200
++++ qt-copy/tools/assistant/main.cpp   2005-05-13 19:58:41.956418200 +0200
+@@ -272,11 +272,11 @@
+         resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+ 
+     QTranslator translator( 0 );
+-    translator.load( QLatin1String("assistant_") + QLocale::system().name().toLower(), resourceDir );
++    translator.load( QLatin1String("assistant"), resourceDir + QLatin1String("/") + QLatin1String(QTextCodec::locale()) + QLatin1String("/LC_MESSAGES") );
+     a.installTranslator( &translator );
+ 
+     QTranslator qtTranslator( 0 );
+-    qtTranslator.load( QLatin1String("qt_") + QLocale::system().name().toLower(), resourceDir );
++    qtTranslator.load( QLatin1String("qt"), resourceDir + QLatin1String("/") + QLatin1String(QTextCodec::locale()) + QLatin1String("/LC_MESSAGES") );
+     a.installTranslator( &qtTranslator );
+ 
+     Config *conf = Config::loadConfig( profileName );
+--- qt-copy/src/corelib/codecs/qtextcodec.cpp.niedakh  2005-05-13 16:34:37.000000000 +0200
++++ qt-copy/src/corelib/codecs/qtextcodec.cpp  2005-05-13 22:31:48.036921696 +0200
+@@ -63,6 +63,9 @@
+ #include <langinfo.h>
+ #endif
+ 
++#include <qfile.h>
++#include <qtextstream.h>
++
+ 
+ #ifndef QT_NO_COMPONENT
+ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
+@@ -359,6 +362,26 @@
              lang = qstrdup(qgetenv("LANG"));
          }
  
@@ -16,7 +42,7 @@
 +                         if (!line.startsWith("#") && ( line.left(line.indexOf(QChar('t'))) == lang_s.toLower() ) )
 +                         {
 +                               if (lang) delete [] lang;
-+                                lang = qstrdup((line.mid(line.lastIndexOf(QChar('t')))).ascii());
++                                lang = qstrdup((line.mid(line.lastIndexOf(QChar('t')))).toLatin1());
 +                         }
 +                }
 +              plik->close();
@@ -27,19 +53,3 @@
          // Now try these in order:
          // 1. CODESET from ctype if it contains a .CODESET part (e.g. en_US.ISO8859-15)
          // 2. CODESET from lang if it contains a .CODESET part
---- qt-copy/tools/assistant/main.cpp.orig      2005-05-13 16:39:06.000000000 +0200
-+++ qt-copy/tools/assistant/main.cpp   2005-05-13 19:58:41.956418200 +0200
-@@ -272,11 +272,11 @@
-         resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
- 
-     QTranslator translator( 0 );
--    translator.load( QLatin1String("assistant_") + QLocale::system().name().toLower(), resourceDir );
-+    translator.load( QLatin1String("assistant"), resourceDir + QLatin1String("/") + QLatin1String(QTextCodec::locale()) + QLatin1String("/LC_MESSAGES") );
-     a.installTranslator( &translator );
- 
-     QTranslator qtTranslator( 0 );
--    qtTranslator.load( QLatin1String("qt_") + QLocale::system().name().toLower(), resourceDir );
-+    qtTranslator.load( QLatin1String("qt"), resourceDir + QLatin1String("/") + QLatin1String(QTextCodec::locale()) + QLatin1String("/LC_MESSAGES") );
-     a.installTranslator( &qtTranslator );
- 
-     Config *conf = Config::loadConfig( profileName );