aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp46
1 files changed, 13 insertions, 33 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 1b105c34..80ea93bb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,44 +1,24 @@
+
#include "aoapplication.h"
-#include "courtroom.h"
#include "datatypes.h"
-#include "lobby.h"
#include "networkmanager.h"
-#include <QDebug>
-#include <QLibraryInfo>
+#include "lobby.h"
+#include "courtroom.h"
#include <QPluginLoader>
-#include <QTranslator>
-
+#include <QDebug>
int main(int argc, char *argv[])
{
#if QT_VERSION > QT_VERSION_CHECK(5, 6, 0)
- // High-DPI support is for Qt version >=5.6.
- // However, many Linux distros still haven't brought their stable/LTS
- // packages up to Qt 5.6, so this is conditional.
- AOApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+ // High-DPI support is for Qt version >=5.6.
+ // However, many Linux distros still haven't brought their stable/LTS
+ // packages up to Qt 5.6, so this is conditional.
+ AOApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
#endif
- AOApplication main_app(argc, argv);
-
- QSettings *configini = main_app.configini;
-
- QString p_language =
- configini->value("language", QLocale::system().name()).toString();
- if (p_language == " " || p_language == "")
- p_language = QLocale::system().name();
-
- QTranslator qtTranslator;
- qtTranslator.load("qt_" + p_language,
- QLibraryInfo::location(QLibraryInfo::TranslationsPath));
- main_app.installTranslator(&qtTranslator);
-
- QTranslator appTranslator;
- qDebug() << ":/resource/translations/ao_" + p_language;
- appTranslator.load("ao_" + p_language, ":/resource/translations/");
- main_app.installTranslator(&appTranslator);
-
- main_app.construct_lobby();
- main_app.w_lobby->show();
- main_app.net_manager->connect_to_master();
- return main_app.exec();
+ AOApplication main_app(argc, argv);
+ main_app.construct_lobby();
+ main_app.net_manager->connect_to_master();
+ main_app.w_lobby->show();
+ return main_app.exec();
}