aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstonedDiscord <stoned@derpymail.org>2019-07-28 19:17:47 +0200
committerstonedDiscord <stoned@derpymail.org>2019-07-28 19:17:47 +0200
commit69e4da4c43982205d8b94e182a25746ca72340d4 (patch)
treefe2577c7e05d7dd51f8764e632ea649887e26854
parent9145d20093705694e3d669ddf9d41356a4b7d1c4 (diff)
it didn't like doing that with a pointer
-rw-r--r--src/main.cpp22
1 files changed, 9 insertions, 13 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 8b7cb50f..26b97bf0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -8,18 +8,7 @@
#include <QPluginLoader>
#include <QDebug>
#include <QTranslator>
-
-static void install_translators(QtApplication &app)
-{
- QTranslator qtTranslator;
- qtTranslator.load("qt_" + QLocale::system().name(),
- QLibraryInfo::location(QLibraryInfo::TranslationsPath));
- app.installTranslator(&qtTranslator);
-
- QTranslator appTranslator;
- appTranslator.load("ao_" + QLocale::system().name());
- app.installTranslator(&appTranslator);
-}
+#include <QLibraryInfo>
int main(int argc, char *argv[])
{
@@ -32,7 +21,14 @@ int main(int argc, char *argv[])
AOApplication main_app(argc, argv);
- install_translators(&main_app);
+ QTranslator qtTranslator;
+ qtTranslator.load("qt_" + QLocale::system().name(),
+ QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+ main_app.installTranslator(&qtTranslator);
+
+ QTranslator appTranslator;
+ appTranslator.load("ao_" + QLocale::system().name());
+ main_app.installTranslator(&appTranslator);
main_app.construct_lobby();
main_app.net_manager->connect_to_master();