[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kde4/kdelibs/kdecore
From:       Mickael Marchand <marchand () kde ! org>
Date:       2005-05-12 18:19:59
Message-ID: 1115921999.736131.28496.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 412813 by marchand:

ok, this one is really a brain killer ;)

I am disabling the functionality of loading a QTextCodec from a charmap (if Qt does \
not know anything about this charmap) I leave that to Lars who probably knows a lot \
more than me here ;)

now we have to drop the Q3AsciiDict that prevents compilation apparently (because it \
wants to delete QTextCodecs which can't be deleted apparently) ...



 M  +8 -1      branches/work/kde4/kdelibs/kdecore/kcharsets.cpp  


--- branches/work/kde4/kdelibs/kdecore/kcharsets.cpp #412812:412813
@@ -307,6 +307,7 @@
     { "mac", "apple roman" },
     { 0, 0 }};
 
+#if 0
 // some different names for the encodings defined in the charmaps files.
 // even though the charmap file names are all uppercase, the names are all lowercase \
here.  static struct Aliases
@@ -334,8 +335,8 @@
     { "koi8-r", "iso-8859-5" },
     { "koi8-u", "koi8-r" },
     { 0, 0 }};
+#endif
 
-
 // search an array of items index/data, index is const char*, data is T, find first \
matching index  // and return data, or return 0
 template< typename T, typename Data >
@@ -602,6 +603,11 @@
         return codec;
     }
 
+#warning is it still usefull with Qt4 ?
+	//dont forget to remove the #if 0 on the 2 structs at the top also if you reenable \
that;) +	//from what I understood, one needs to create a QTextCodecPlugin in order to \
be able to support a new Codec, but I do not  +	//know how to convert a charmap to a \
QTextCodec and the real big question is whether we need that at all ...  (mikmak) \
+#if 0  // ### TODO: charmaps have changed a little since this code was written. The \
default dir should be changed and KFilterDev should be used for reading gzipped \
files.  QString dir;
     {
@@ -637,6 +643,7 @@
         d->codecForNameDict.replace(key, codec);
         return codec;
     }
+#endif
 
     // could not assign a codec, let's return Latin1
     ok = false;


[prev in list] [next in list] [prev in thread] [next in thread]