Fix encoding of version string

diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp
index 79ff7b35d6d22d537c3a1efb923b374b1d902a1b..4055ab1b3cbb5d4dc280dc9fa46c24434d564066 100644 (file)
--- a/src/cmd/cmd.cpp
+++ b/src/cmd/cmd.cpp
@@ -196,7 +196,7 @@ void help()
 
 void showVersion()
 {
-    std::cout << qPrintableUtf8(Theme::instance()->versionSwitchOutput());
+    std::cout << qUtf8Printable(Theme::instance()->versionSwitchOutput());
     exit(0);
 }
 

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index 6896857ec16bf91084dee5b64a8663c334f0fdb3..934e23ecb11608259ad75d3d6f55c0d23c987002 100644 (file)
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -460,7 +460,7 @@ static void displayHelpText(QString t) // No console on Windows.
 
 static void displayHelpText(const QString &t)
 {
-    std::cout << qPrintable(t);
+    std::cout << qUtf8Printable(t);
 }
 #endif
 
@@ -469,9 +469,9 @@ void Application::showHelp()
     setHelp();
     QString helpText;
     QTextStream stream(&helpText);
-    stream << _theme->appName().toLatin1().constData()
+    stream << _theme->appName()
            << QLatin1String(" version ")
-           << _theme->version().toLatin1().constData() << endl;
+           << _theme->version() << endl;
 
     stream << QLatin1String("File synchronisation desktop utility.") << endl
            << endl

diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp
index 032a6c7617b0bd06a7725a500702c38a50119f5d..eba7f8cd6ef17bd3dbae48f32d3c1e574bc95d01 100644 (file)
--- a/src/libsync/theme.cpp
+++ b/src/libsync/theme.cpp
@@ -92,17 +92,17 @@ QString Theme::statusHeaderText(SyncResult::Status status) const
 
 QString Theme::appNameGUI() const
 {
-    return QLatin1String(APPLICATION_NAME);
+    return APPLICATION_NAME;
 }
 
 QString Theme::appName() const
 {
-    return QLatin1String(APPLICATION_SHORTNAME);
+    return APPLICATION_SHORTNAME;
 }
 
 QString Theme::version() const
 {
-    return QString::fromLocal8Bit(MIRALL_VERSION_STRING);
+    return MIRALL_VERSION_STRING;
 }
 
 #ifndef TOKEN_AUTH_ONLY
@@ -509,9 +509,9 @@ QString Theme::versionSwitchOutput() const
 {
     QString helpText;
     QTextStream stream(&helpText);
-    stream << appName().toLatin1().constData()
+    stream << appName()
            << QLatin1String(" version ")
-           << version().toLatin1().constData() << endl;
+           << version() << endl;
 #ifdef GIT_SHA1
     stream << "Git revision " << GIT_SHA1 << endl;
 #endif