[uim] r6849 committed - * Merge r6848 from trunk.

[codesite-noreply]

Revision: 6849
Author: ek.kato
Date: Mon Dec 27 21:15:01 2010
Log: * Merge r6848 from trunk.
http://code.google.com/p/uim/source/detail?r=6849

Modified:
 /branches/1.6/qt4/qtgettext.h
 /branches/1.6/qt4/toolbar/common-quimhelpertoolbar.cpp

=======================================
--- /branches/1.6/qt4/qtgettext.h       Fri Jul 23 17:12:33 2010
+++ /branches/1.6/qt4/qtgettext.h       Mon Dec 27 21:15:01 2010
@@ -61,6 +61,11 @@
 #else /* ENABLE_NLS */

 #define mygettext(String) QString::fromLocal8Bit(String)
+/* undef original _(String) macro to use QString */
+#ifdef _
+#undef _
+#endif
+#define _(String) mygettext(String)
 #define UIC_(String, dummy) (String)
 #endif /* ENABLE_NLS */

=======================================
--- /branches/1.6/qt4/toolbar/common-quimhelpertoolbar.cpp	Sat Dec 18  
05:40:52 2010
+++ /branches/1.6/qt4/toolbar/common-quimhelpertoolbar.cpp	Mon Dec 27  
21:15:01 2010
@@ -52,7 +52,7 @@
 {
     if ( !command.isEmpty() && !QProcess::startDetached( command ) ) {
         QMessageBox::warning( 0, "uim",
-            mygettext( "Cannot launch '%1'." ).arg( command ) );
+            _( "Cannot launch '%1'." ).arg( command ) );
     }
 }