From 2304987bcf84eb8304a1982cb67d61415f3de4e7 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 5 Sep 2018 15:35:21 +0200 Subject: [PATCH] Make the QTranslator members of KiwixApp. If we pass their address to `installTranslator` we have to be sure they exist after we quit the constructor. --- src/kiwixapp.cpp | 13 +++++-------- src/kiwixapp.h | 2 ++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/kiwixapp.cpp b/src/kiwixapp.cpp index 956addc..2b91178 100644 --- a/src/kiwixapp.cpp +++ b/src/kiwixapp.cpp @@ -2,7 +2,6 @@ #include "zim/error.h" #include -#include #include #include #include @@ -16,14 +15,12 @@ KiwixApp::KiwixApp(int& argc, char *argv[]) : QApplication(argc, argv) { - QTranslator qtTranslator; - qtTranslator.load("qt_" + QLocale::system().name(), - QLibraryInfo::location(QLibraryInfo::TranslationsPath)); - installTranslator(&qtTranslator); + m_qtTranslator.load("qt_" + QLocale::system().name(), + QLibraryInfo::location(QLibraryInfo::TranslationsPath)); + installTranslator(&m_qtTranslator); - QTranslator myappTranslator; - myappTranslator.load(":/i18n/kiwix-desktop.qm"); - installTranslator(&myappTranslator); + m_appTranslator.load(":/i18n/kiwix-desktop.qm"); + installTranslator(&m_appTranslator); auto icon = QIcon(); icon.addFile(":/icons/kiwix/app_icon.svg"); diff --git a/src/kiwixapp.h b/src/kiwixapp.h index 8b12b70..b53c9cf 100644 --- a/src/kiwixapp.h +++ b/src/kiwixapp.h @@ -10,6 +10,7 @@ #include #include +#include class KiwixApp : public QApplication @@ -72,6 +73,7 @@ protected: void postInit(); private: + QTranslator m_qtTranslator, m_appTranslator; Library m_library; MainWindow* mp_mainWindow; TabWidget* mp_tabWidget;