diff --git a/qad/CMakeLists.txt b/qad/CMakeLists.txt index d9575a8..464dc12 100644 --- a/qad/CMakeLists.txt +++ b/qad/CMakeLists.txt @@ -3,8 +3,8 @@ cmake_policy(SET CMP0017 NEW) # need include() with .cmake project(qad) set(_QAD_MAJOR 1) set(_QAD_MINOR 3) -set(_QAD_REVISION 0) -set(_QAD_SUFFIX alpha) +set(_QAD_REVISION 1) +set(_QAD_SUFFIX beta) set(_QAD_COMPANY SHS) set(_QAD_DOMAIN org.SHS) diff --git a/qad/utils/qad_locations.cpp b/qad/utils/qad_locations.cpp index 8a9407f..bcc9d6e 100644 --- a/qad/utils/qad_locations.cpp +++ b/qad/utils/qad_locations.cpp @@ -16,11 +16,11 @@ class __QADTranslators__ { public: - static QMap translators; + static QList translators; private: }; -QMap __QADTranslators__::translators = QMap(); +QList __QADTranslators__::translators = QList(); QString QAD::userPath(QAD::LocationType loc, QString name) { @@ -67,11 +67,9 @@ QStringList QAD::resourcePaths(QString type) { void QAD::loadTranslations(QString lang) { - QMapIterator i(__QADTranslators__::translators); - while (i.hasNext()) { - i.next(); - qApp->removeTranslator(i.value()); - delete i.value(); + foreach (QTranslator * t, __QADTranslators__::translators) { + qApp->removeTranslator(t); + delete t; } __QADTranslators__::translators.clear(); if (lang.isEmpty()) @@ -88,7 +86,7 @@ void QAD::loadTranslations(QString lang) { QTranslator * tr = new QTranslator(); if (tr->load(dit.filePath())) { qApp->installTranslator(tr); - __QADTranslators__::translators[dit.filePath()] = tr; + __QADTranslators__::translators << tr; qDebug() << "Add tr" << dit.fileName(); } else { qDebug() << "Can`t load translation" << dit.fileName();