From 82165498538dde0ebe210d3540b0320a326db7c7 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Sun, 24 May 2015 13:20:13 -0300 Subject: [PATCH 7/8] More qt4 removal. Signed-off-by: Tomaz Canabrava --- qt-gui.cpp | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/qt-gui.cpp b/qt-gui.cpp index 474622e..445602b 100644 --- a/qt-gui.cpp +++ b/qt-gui.cpp @@ -25,26 +25,12 @@ void init_ui(void) // note: on Linux, "system" == "environment variables" QNetworkProxyFactory::setUseSystemConfiguration(true); -#if QT_VERSION < 0x050000 - // ask QString in Qt 4 to interpret all char* as UTF-8, - // like Qt 5 does. - // 106 is "UTF-8", this is faster than lookup by name - // [http://www.iana.org/assignments/character-sets/character-sets.xml] - QTextCodec::setCodecForCStrings(QTextCodec::codecForMib(106)); - // and for reasons I can't understand, I need to do the same again for tr - // even though that clearly uses C strings as well... - QTextCodec::setCodecForTr(QTextCodec::codecForMib(106)); -#ifdef Q_OS_WIN - QFile::setDecodingFunction(decodeUtf8); - QFile::setEncodingFunction(encodeUtf8); -#endif -#else // for Win32 and Qt5 we try to set the locale codec to UTF-8. // this makes QFile::encodeName() work. #ifdef Q_OS_WIN QTextCodec::setCodecForLocale(QTextCodec::codecForMib(106)); #endif -#endif + QCoreApplication::setOrganizationName("Subsurface"); QCoreApplication::setOrganizationDomain("subsurface.hohndel.org"); QCoreApplication::setApplicationName("Subsurface"); -- 2.3.2 (Apple Git-55)