[Chinese-commits] [fqterm] 66/76: QCoreApplication::UnicodeUTF8 in Qt4

[Boyuan Yang]

This is an automated email from the git hooks/post-receive script.

hosiet-guest pushed a commit to branch master
in repository fqterm.

commit 622c9cd9f37cedca336affa40067edb768516732
Author: Iru Cai <mytbk920423 at gmail.com>
Date:   Sun Feb 8 13:35:16 2015 +0800

    QCoreApplication::UnicodeUTF8 in Qt4
---
 src/ui/iplookup.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/ui/iplookup.cpp b/src/ui/iplookup.cpp
index c3e8675..cc81ce5 100644
--- a/src/ui/iplookup.cpp
+++ b/src/ui/iplookup.cpp
@@ -21,6 +21,13 @@
 #include "iplookup.h"
 #include "fqterm_ip_location.h"
 #include "fqterm.h"
+
+#if QT_VERSION >= 0x050000
+#define FQ_UTF8 0
+#else
+#define FQ_UTF8 QCoreApplication::UnicodeUTF8
+#endif
+
 namespace FQTerm {
 
 
@@ -41,10 +48,10 @@ void IPLookupDialog::onLookup() {
   FQTermIPLocation *ipLocation = FQTermIPLocation::getInstance();
   if (ipLocation == NULL) {
     ui_.addressLineEdit->setText(
-        QApplication::translate("IPLookupDialog", "IP database file does NOT exist", 0, 0));
+        QApplication::translate("IPLookupDialog", "IP database file does NOT exist", 0, FQ_UTF8));
   } else if (!ipLocation->getLocation(ip, country, city)) {
     ui_.addressLineEdit->setText(
-        QApplication::translate("IPLookupDialog", "Invalid IP", 0, 0));
+        QApplication::translate("IPLookupDialog", "Invalid IP", 0, FQ_UTF8));
   } else {
     ui_.addressLineEdit->setText(country + " " + city);
   }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/chinese/fqterm.git