From 0b86f3b7936e38b23e4c02c6f59932f889bc985d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be> Date: Mon, 14 Feb 2011 22:45:07 +0100 Subject: Set default codec for strings. diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp index d4c306f..bb40da8 100644 --- a/Swift/QtUI/QtSwift.cpp +++ b/Swift/QtUI/QtSwift.cpp @@ -8,6 +8,7 @@ #include <string> #include <QSplitter> +#include <QTextCodec> #include <boost/bind.hpp> #include "QtLoginWindow.h" @@ -71,6 +72,8 @@ po::options_description QtSwift::getOptionsDescription() { QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMainThreadCaller_), autoUpdater_(NULL) { + QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); + if (options.count("netbook-mode")) { splitter_ = new QSplitter(); } else { diff --git a/Swift/QtUI/QtSwiftUtil.h b/Swift/QtUI/QtSwiftUtil.h index 60a9f18..2d0f970 100644 --- a/Swift/QtUI/QtSwiftUtil.h +++ b/Swift/QtUI/QtSwiftUtil.h @@ -4,12 +4,9 @@ * See Documentation/Licenses/GPLv3.txt for more information. */ -#ifndef SWIFT_QtSwiftUtil_H -#define SWIFT_QtSwiftUtil_H +#pragma once #define P2QSTRING(a) QString::fromUtf8(a.c_str()) #define Q2PSTRING(a) std::string(a.toUtf8()) #define B2QDATE(a) QDateTime::fromTime_t((a - boost::posix_time::from_time_t(0)).total_seconds()) - -#endif -- cgit v0.10.2-6-g49f6