summaryrefslogtreecommitdiffstats
path: root/qt-init.cpp
diff options
context:
space:
mode:
authorGravatar Tomaz Canabrava <tomaz.canabrava@intel.com>2015-09-02 20:52:34 -0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-10-30 10:36:48 -0700
commit4c0156e3d51b389db8eccc3fa3da4b8f248f9b13 (patch)
tree966868d29150fdba13a5a56fb4305bc432ec7a72 /qt-init.cpp
parenta0798214231c652ac6142228f5ddfc4b65c921f8 (diff)
downloadsubsurface-4c0156e3d51b389db8eccc3fa3da4b8f248f9b13.tar.gz
Move all core-functionality to subsurface-core
And adapt a new CMakeLists.txt file for it. On the way I've also found out that we where double-compilling a few files. I've also set the subsurface-core as a include_path but that was just to reduce the noise on this commit, since I plan to remove it from the include path to make it obligatory to specify something like include "subsurface-core/dive.h" for the header files. Since the app is growing quite a bit we ended up having a few different files with almost same name that did similar things, I want to kill that (for instance Dive.h, dive.h, PrintDive.h and such). Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-init.cpp')
-rw-r--r--qt-init.cpp48
1 files changed, 0 insertions, 48 deletions
diff --git a/qt-init.cpp b/qt-init.cpp
deleted file mode 100644
index b52dfd970..000000000
--- a/qt-init.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#include <QApplication>
-#include <QNetworkProxy>
-#include <QLibraryInfo>
-#include <QTextCodec>
-#include "helpers.h"
-
-void init_qt_late()
-{
- QApplication *application = qApp;
- // tell Qt to use system proxies
- // note: on Linux, "system" == "environment variables"
- QNetworkProxyFactory::setUseSystemConfiguration(true);
-
- // 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
-
- QCoreApplication::setOrganizationName("Subsurface");
- QCoreApplication::setOrganizationDomain("subsurface.hohndel.org");
- QCoreApplication::setApplicationName("Subsurface");
- // find plugins installed in the application directory (without this SVGs don't work on Windows)
- QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath());
- QLocale loc;
- QString uiLang = uiLanguage(&loc);
- QLocale::setDefault(loc);
-
- // we don't have translations for English - if we don't check for this
- // Qt will proceed to load the second language in preference order - not what we want
- // on Linux this tends to be en-US, but on the Mac it's just en
- if (!uiLang.startsWith("en") || uiLang.startsWith("en-GB")) {
- qtTranslator = new QTranslator;
- if (qtTranslator->load(loc, "qt", "_", QLibraryInfo::location(QLibraryInfo::TranslationsPath))) {
- application->installTranslator(qtTranslator);
- } else {
- qDebug() << "can't find Qt localization for locale" << uiLang << "searching in" << QLibraryInfo::location(QLibraryInfo::TranslationsPath);
- }
- ssrfTranslator = new QTranslator;
- if (ssrfTranslator->load(loc, "subsurface", "_") ||
- ssrfTranslator->load(loc, "subsurface", "_", getSubsurfaceDataPath("translations")) ||
- ssrfTranslator->load(loc, "subsurface", "_", getSubsurfaceDataPath("../translations"))) {
- application->installTranslator(ssrfTranslator);
- } else {
- qDebug() << "can't find Subsurface localization for locale" << uiLang;
- }
- }
-}