浏览代码

Fix incorrect view selection in LogbookWidget

Closes #100 - the problem was caused by using a QHash instead of a QMap where ordering mattered.

From the [docs](https://doc.qt.io/qt-5/qhash.html#details): QHash is unordered, so an iterator's sequence cannot be assumed to be predictable. If ordering by key is required, use a QMap.
Felix 2 年之前
父节点
当前提交
bd88cee28b
共有 2 个文件被更改,包括 0 次插入51 次删除
  1. 二进制
      assets/database/logbook.db
  2. 0 51
      src/opl.h

二进制
assets/database/logbook.db


+ 0 - 51
src/opl.h

@@ -157,56 +157,6 @@ public:
 
 private:
     Q_OBJECT
-
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
-    const static inline QHash<Translation, QString> L10N_FilePaths {
-        {Translation::English, QStringLiteral("l10n/openpilotlog_en")},
-        {Translation::German,  QStringLiteral("l10n/openpilotlog_de")},
-        {Translation::Spanish, QStringLiteral("l10n/openpilotlog_es")},
-    };
-    const static inline QHash<Translation, QString> L10N_DisplayNames {
-        {Translation::English, QStringLiteral("English")},
-        {Translation::German,  QStringLiteral("Deutsch")},
-        {Translation::Spanish, QStringLiteral("Español")},
-    };
-    const static inline QHash<DbViewName, QString> DATABASE_VIEWS = {
-        {DbViewName::Default,        QStringLiteral("viewDefault")},
-        {DbViewName::DefaultWithSim, QStringLiteral("viewDefaultSim")},
-        {DbViewName::Easa,           QStringLiteral("viewEasa")},
-        {DbViewName::EasaWithSim,    QStringLiteral("viewEasaSim")},
-        {DbViewName::SimulatorOnly,  QStringLiteral("viewSimulators")},
-    };
-    const QHash<DbViewName, QString> DATABASE_VIEW_DISPLAY_NAMES = {
-        {DbViewName::Default,        tr("Default")},
-        {DbViewName::DefaultWithSim, tr("Default with Simulator")},
-        {DbViewName::Easa,           tr("EASA-FCL")},
-        {DbViewName::EasaWithSim,    tr("EASA-FCL with Simulator")},
-        {DbViewName::SimulatorOnly,  tr("Simulator Sessions Only")},
-    };
-    const static inline QHash<PilotFunction, QString> PILOT_FUNCTIONS = {
-        {PilotFunction::PIC,   QStringLiteral("PIC")},
-        {PilotFunction::PICUS, QStringLiteral("PICUS")},
-        {PilotFunction::SIC,   QStringLiteral("SIC")},
-        {PilotFunction::DUAL,  QStringLiteral("DUAL")},
-        {PilotFunction::FI,    QStringLiteral("FI")},
-    };
-    const static inline QHash<SimulatorType, QString> SIMULATOR_TYPES = {
-        {SimulatorType::FNPTI,  QStringLiteral("FNPT I")},
-        {SimulatorType::FNPTII, QStringLiteral("FNPT II")},
-        {SimulatorType::FSTD,   QStringLiteral("FSTD")},
-    };
-    const static inline QHash<DbTable, QString> DB_TABLES = {
-        //Flights, Simulators, Pilots, Tails, Aircraft, Airports
-        {DbTable::Flights,      QStringLiteral("flights")},
-        {DbTable::Simulators,   QStringLiteral("simulators")},
-        {DbTable::Pilots,       QStringLiteral("pilots")},
-        {DbTable::Tails,        QStringLiteral("tails")},
-        {DbTable::Aircraft,     QStringLiteral("aircraft")},
-        {DbTable::Airports,     QStringLiteral("airports")},
-        {DbTable::Currencies,   QStringLiteral("currencies")},
-        {DbTable::Changelog,    QStringLiteral("changelog")},
-    };
-#else
     const static inline QMap<Translation, QString> L10N_FilePaths {
         {Translation::English, QStringLiteral("l10n/openpilotlog_en")},
         {Translation::German,  QStringLiteral("l10n/openpilotlog_de")},
@@ -253,7 +203,6 @@ private:
         {DbTable::Currencies,   QStringLiteral("currencies")},
         {DbTable::Changelog,    QStringLiteral("changelog")},
     };
-#endif
 
     const static inline QStringList APPROACH_TYPES = {
             QStringLiteral("VISUAL"),