On Wed, 15 Jul 2009, Sebastian Moors wrote: >> The text_encodings branch fixes several issues having to do with non-latin >> characters in files names and in H2's various file formats. It's almost >> ready to be merge, just needs a couple things[1]. Some of the changes are >> similar to, and possibly conflict with, the qtxml branch.[2] >> > Hm, does qtxml fix all issues which are addressed by the encodings > branch? If it does, i'm not sure if it is worth to do the work of > merging (and testing) the enc. branch now if we already have a solution.
No, it doesn't. text_encodings was mostly doing things like this: diff --git a/gui/src/HelpBrowser.cpp b/gui/src/HelpBrowser.cpp index e98a9af..b8a56a6 100644 --- a/gui/src/HelpBrowser.cpp +++ b/gui/src/HelpBrowser.cpp @@ -85 +85 @@ SimpleHTMLBrowser::SimpleHTMLBrowser( QWidget *pParent, const QStr - QFile file( m_sFilename.toAscii() ); // Read the text from a file + QFile file( m_sFilename.toLocal8Bit() ); // Read the text from a file So... there will still need to be some merging between the two branches (qtxml and text_encodings). > i would vote for not merging this and instead releasing 0.9.5 very early > (like some month after 0.9.4) with qtxml . I respect this. I only brought it up because the issue (non-ascii file names) was even mentioned on this list recently. Also, since jack_zombies is such an invasive patch that will likely require a little time for testing, I thought it might be apropos to slide in the more benign text_encodings patch now and get them tested together. FWIW, I'm moderately uncomfortable about merging text_encodings now... so I'm not campaigning. Just bringing it up for discussion. Peace, Gabriel ------------------------------------------------------------------------------ Enter the BlackBerry Developer Challenge This is your chance to win up to $100,000 in prizes! For a limited time, vendors submitting new applications to BlackBerry App World(TM) will have the opportunity to enter the BlackBerry Developer Challenge. See full prize details at: http://p.sf.net/sfu/Challenge _______________________________________________ Hydrogen-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/hydrogen-devel
