Cleaning up Opl Namespace

changed Opl to OPL and some enums to enum class

main.cpp

@@ -64,7 +64,7 @@ void init()
     AStyle::setup();
     // Translations to be done at a later stage
     //LOG << "Installing translator...";
-    //ATranslator::installTranslator(Opl::Translations::English);
+    //ATranslator::installTranslator(OPL::Translations::English);
 }
 
 bool firstRun()
@@ -104,9 +104,9 @@ int main(int argc, char *argv[])
     // Create Main Window and set Window Icon acc. to Platform
     MainWindow w;
 #ifdef __linux__
-    w.setWindowIcon(QIcon(Opl::Assets::ICON_APPICON_LINUX));
+    w.setWindowIcon(QIcon(OPL::Assets::ICON_APPICON_LINUX));
 #elif defined(_WIN32) || defined(_WIN64)
-    w.setWindowIcon(QIcon(Opl::Assets::ICON_APPICON_WIN));
+    w.setWindowIcon(QIcon(OPL::Assets::ICON_APPICON_WIN));
 #elif __APPLE__
     #include <TargetConditionals.h>
     #if TARGET_IPHONE_SIMULATOR
@@ -114,7 +114,7 @@ int main(int argc, char *argv[])
     #elif TARGET_OS_IPHONE
         // iOS device
     #elif TARGET_OS_MAC
-    w.setWindowIcon(QIcon(Opl::Assets::ICON_APPICON_IOS));
+    w.setWindowIcon(QIcon(OPL::Assets::ICON_APPICON_IOS));
     #else
     #   error "Unknown Apple platform"
     #endif

mainwindow.cpp

@@ -87,21 +87,21 @@ MainWindow::MainWindow(QWidget *parent)
     // Create and set up the toolbar
     auto *toolBar = new QToolBar(this);
 
-    ui->actionHome->setIcon(QIcon(Opl::Assets::ICON_TOOLBAR_HOME));
+    ui->actionHome->setIcon(QIcon(OPL::Assets::ICON_TOOLBAR_HOME));
     toolBar->addAction(ui->actionHome);
-    ui->actionNewFlight->setIcon(QIcon(Opl::Assets::ICON_TOOLBAR_NEW_FLIGHT));
+    ui->actionNewFlight->setIcon(QIcon(OPL::Assets::ICON_TOOLBAR_NEW_FLIGHT));
     toolBar->addAction(ui->actionNewFlight);
-    ui->actionLogbook->setIcon(QIcon(Opl::Assets::ICON_TOOLBAR_LOGBOOK));
+    ui->actionLogbook->setIcon(QIcon(OPL::Assets::ICON_TOOLBAR_LOGBOOK));
     toolBar->addAction(ui->actionLogbook);
-    ui->actionAircraft->setIcon(QIcon(Opl::Assets::ICON_TOOLBAR_AIRCRAFT));
+    ui->actionAircraft->setIcon(QIcon(OPL::Assets::ICON_TOOLBAR_AIRCRAFT));
     toolBar->addAction(ui->actionAircraft);
-    ui->actionPilots->setIcon(QIcon(Opl::Assets::ICON_TOOLBAR_PILOT));
+    ui->actionPilots->setIcon(QIcon(OPL::Assets::ICON_TOOLBAR_PILOT));
     toolBar->addAction(ui->actionPilots);
-    ui->actionBackup->setIcon(QIcon(Opl::Assets::ICON_TOOLBAR_BACKUP));
+    ui->actionBackup->setIcon(QIcon(OPL::Assets::ICON_TOOLBAR_BACKUP));
     toolBar->addAction(ui->actionBackup);
-    ui->actionSettings->setIcon(QIcon(Opl::Assets::ICON_TOOLBAR_SETTINGS));
+    ui->actionSettings->setIcon(QIcon(OPL::Assets::ICON_TOOLBAR_SETTINGS));
     toolBar->addAction(ui->actionSettings);
-    ui->actionQuit->setIcon(QIcon(Opl::Assets::ICON_TOOLBAR_QUIT));
+    ui->actionQuit->setIcon(QIcon(OPL::Assets::ICON_TOOLBAR_QUIT));
     toolBar->addAction(ui->actionQuit);
     toolBar->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
     toolBar->setMovable(false);

src/classes/aaircraftentry.cpp

@@ -19,13 +19,13 @@
 #include "src/opl.h"
 
 AAircraftEntry::AAircraftEntry()
-    : AEntry::AEntry(DataPosition(Opl::Db::TABLE_AIRCRAFT, 0))
+    : AEntry::AEntry(DataPosition(OPL::Db::TABLE_AIRCRAFT, 0))
 {}
 
 AAircraftEntry::AAircraftEntry(RowId_T row_id)
-    : AEntry::AEntry(DataPosition(Opl::Db::TABLE_AIRCRAFT, row_id))
+    : AEntry::AEntry(DataPosition(OPL::Db::TABLE_AIRCRAFT, row_id))
 {}
 
 AAircraftEntry::AAircraftEntry(RowData_T table_data)
-    : AEntry::AEntry(DataPosition(Opl::Db::TABLE_AIRCRAFT, 0), table_data)
+    : AEntry::AEntry(DataPosition(OPL::Db::TABLE_AIRCRAFT, 0), table_data)
 {}

src/classes/acurrencyentry.cpp

@@ -12,14 +12,14 @@
  * CurrencyName, which maps to the static row id for the currency.
  */
 ACurrencyEntry::ACurrencyEntry(ACurrencyEntry::CurrencyName currency_name)
-    : AEntry::AEntry(DataPosition(Opl::Db::TABLE_CURRENCIES, static_cast<int>(currency_name)))
+    : AEntry::AEntry(DataPosition(OPL::Db::TABLE_CURRENCIES, static_cast<int>(currency_name)))
 {}
 
 ACurrencyEntry::ACurrencyEntry(ACurrencyEntry::CurrencyName currency_name, QDate expiration_date)
-    : AEntry::AEntry(DataPosition(Opl::Db::TABLE_CURRENCIES, static_cast<int>(currency_name)))
+    : AEntry::AEntry(DataPosition(OPL::Db::TABLE_CURRENCIES, static_cast<int>(currency_name)))
 {
     if (expiration_date.isValid()) {
-        tableData.insert(Opl::Db::CURRENCIES_EXPIRYDATE, expiration_date.toString(Qt::ISODate));
+        tableData.insert(OPL::Db::CURRENCIES_EXPIRYDATE, expiration_date.toString(Qt::ISODate));
     } else {
         DEB << "Invalid Date.";
     }
@@ -34,6 +34,6 @@ ACurrencyEntry::ACurrencyEntry(ACurrencyEntry::CurrencyName currency_name, QDate
 bool ACurrencyEntry::isValid() const
 {
     return QDate::fromString(
-                tableData.value(Opl::Db::CURRENCIES_EXPIRYDATE).toString(), Qt::ISODate
+                tableData.value(OPL::Db::CURRENCIES_EXPIRYDATE).toString(), Qt::ISODate
                 ).isValid();
 }

src/classes/aflightentry.cpp

@@ -22,15 +22,15 @@
 #include "src/classes/asettings.h"
 
 AFlightEntry::AFlightEntry()
-    : AEntry::AEntry(DataPosition(Opl::Db::TABLE_FLIGHTS, 0))
+    : AEntry::AEntry(DataPosition(OPL::Db::TABLE_FLIGHTS, 0))
 {}
 
 AFlightEntry::AFlightEntry(RowId_T row_id)
-    : AEntry::AEntry(DataPosition(Opl::Db::TABLE_FLIGHTS, row_id))
+    : AEntry::AEntry(DataPosition(OPL::Db::TABLE_FLIGHTS, row_id))
 {}
 
 AFlightEntry::AFlightEntry(RowData_T table_data)
-    : AEntry::AEntry(DataPosition(Opl::Db::TABLE_FLIGHTS, 0), table_data)
+    : AEntry::AEntry(DataPosition(OPL::Db::TABLE_FLIGHTS, 0), table_data)
 {}
 
 const QString AFlightEntry::summary()
@@ -40,20 +40,20 @@ const QString AFlightEntry::summary()
 
     QString flight_summary;
     auto space = QStringLiteral(" ");
-    flight_summary.append(tableData.value(Opl::Db::FLIGHTS_DOFT).toString() + space);
-    flight_summary.append(tableData.value(Opl::Db::FLIGHTS_DEPT).toString() + space);
-    flight_summary.append(ATime::toString(tableData.value(Opl::Db::FLIGHTS_TOFB).toInt())
+    flight_summary.append(tableData.value(OPL::Db::FLIGHTS_DOFT).toString() + space);
+    flight_summary.append(tableData.value(OPL::Db::FLIGHTS_DEPT).toString() + space);
+    flight_summary.append(ATime::toString(tableData.value(OPL::Db::FLIGHTS_TOFB).toInt())
                           + space);
-    flight_summary.append(ATime::toString(tableData.value(Opl::Db::FLIGHTS_TONB).toInt())
+    flight_summary.append(ATime::toString(tableData.value(OPL::Db::FLIGHTS_TONB).toInt())
                           + space);
-    flight_summary.append(tableData.value(Opl::Db::FLIGHTS_DEST).toString());
+    flight_summary.append(tableData.value(OPL::Db::FLIGHTS_DEST).toString());
 
     return flight_summary;
 }
 
 const QString AFlightEntry::getRegistration()
 {
-    ATailEntry acft = aDB->resolveForeignTail(tableData.value(Opl::Db::FLIGHTS_ACFT).toInt());
+    ATailEntry acft = aDB->resolveForeignTail(tableData.value(OPL::Db::FLIGHTS_ACFT).toInt());
     return acft.registration();
 }
 
@@ -61,16 +61,16 @@ const QString AFlightEntry::getPilotName(pilotPosition pilot_)
 {
     switch (pilot_) {
     case pilotPosition::pic: {
-        auto foreign_pilot = aDB->resolveForeignPilot(tableData.value(Opl::Db::FLIGHTS_PIC).toInt());
+        auto foreign_pilot = aDB->resolveForeignPilot(tableData.value(OPL::Db::FLIGHTS_PIC).toInt());
         return foreign_pilot.name();
         break;
     }
     case pilotPosition::secondPilot: {
-        auto foreign_pilot = aDB->resolveForeignPilot(tableData.value(Opl::Db::FLIGHTS_SECONDPILOT).toInt());
+        auto foreign_pilot = aDB->resolveForeignPilot(tableData.value(OPL::Db::FLIGHTS_SECONDPILOT).toInt());
         return foreign_pilot.name();
     }
     case pilotPosition::thirdPilot: {
-        auto foreign_pilot = aDB->resolveForeignPilot(tableData.value(Opl::Db::FLIGHTS_THIRDPILOT).toInt());
+        auto foreign_pilot = aDB->resolveForeignPilot(tableData.value(OPL::Db::FLIGHTS_THIRDPILOT).toInt());
         return foreign_pilot.name();
         break;
     } // case scope

src/classes/ajson.cpp

@@ -19,10 +19,10 @@
 #include "src/database/adbsetup.h"
 
 const QList<QPair<TableName_T, ADatabaseTable>> AJson::tables {
-    qMakePair(Opl::Db::TABLE_TAILS, ADatabaseTable::tails),
-    qMakePair(Opl::Db::TABLE_PILOTS, ADatabaseTable::pilots),
-    qMakePair(Opl::Db::TABLE_CURRENCIES, ADatabaseTable::currencies),
-    qMakePair(Opl::Db::TABLE_FLIGHTS, ADatabaseTable::flights),
+    qMakePair(OPL::Db::TABLE_TAILS, ADatabaseTable::tails),
+    qMakePair(OPL::Db::TABLE_PILOTS, ADatabaseTable::pilots),
+    qMakePair(OPL::Db::TABLE_CURRENCIES, ADatabaseTable::currencies),
+    qMakePair(OPL::Db::TABLE_FLIGHTS, ADatabaseTable::flights),
 };
 
 void AJson::exportDatabase()

src/classes/apilotentry.cpp

@@ -19,15 +19,15 @@
 #include "src/opl.h"
 
 APilotEntry::APilotEntry()
-    : AEntry::AEntry(DataPosition(Opl::Db::TABLE_PILOTS, 0))
+    : AEntry::AEntry(DataPosition(OPL::Db::TABLE_PILOTS, 0))
 {}
 
 APilotEntry::APilotEntry(RowId_T row_id)
-    : AEntry::AEntry(DataPosition(Opl::Db::TABLE_PILOTS, row_id))
+    : AEntry::AEntry(DataPosition(OPL::Db::TABLE_PILOTS, row_id))
 {}
 
 APilotEntry::APilotEntry(RowData_T table_data)
-    : AEntry::AEntry(DataPosition(Opl::Db::TABLE_PILOTS, 0), table_data)
+    : AEntry::AEntry(DataPosition(OPL::Db::TABLE_PILOTS, 0), table_data)
 {}
 
 const QString APilotEntry::name()
@@ -35,7 +35,7 @@ const QString APilotEntry::name()
     if (tableData.isEmpty())
         return QString();
 
-    return tableData.value(Opl::Db::PILOTS_LASTNAME).toString() + ", "
-           //+tableData.value(Opl::Db::PILOTS_FIRSTNAME).toString().left(1) + '.';
-           +tableData.value(Opl::Db::PILOTS_FIRSTNAME).toString();
+    return tableData.value(OPL::Db::PILOTS_LASTNAME).toString() + ", "
+           //+tableData.value(OPL::Db::PILOTS_FIRSTNAME).toString().left(1) + '.';
+           +tableData.value(OPL::Db::PILOTS_FIRSTNAME).toString();
 }

src/classes/asimulatorentry.h

@@ -25,11 +25,11 @@ class ASimulatorEntry : public AEntry
 {
 public:
     ASimulatorEntry()
-        : AEntry::AEntry(DataPosition(Opl::Db::TABLE_SIMULATORS, 0)){};
+        : AEntry::AEntry(DataPosition(OPL::Db::TABLE_SIMULATORS, 0)){};
     ASimulatorEntry(RowId_T row_id)
-        : AEntry::AEntry(DataPosition(Opl::Db::TABLE_SIMULATORS, row_id)){};
+        : AEntry::AEntry(DataPosition(OPL::Db::TABLE_SIMULATORS, row_id)){};
     ASimulatorEntry(RowData_T table_data)
-        : AEntry::AEntry(DataPosition(Opl::Db::TABLE_SIMULATORS, 0), table_data){};
+        : AEntry::AEntry(DataPosition(OPL::Db::TABLE_SIMULATORS, 0), table_data){};
 
     ASimulatorEntry(const ASimulatorEntry& pe) = default;
     ASimulatorEntry& operator=(const ASimulatorEntry& pe) = default;

src/classes/atailentry.cpp

@@ -19,31 +19,31 @@
 #include "src/opl.h"
 
 ATailEntry::ATailEntry()
-    : AEntry::AEntry(DataPosition(Opl::Db::TABLE_TAILS, 0))
+    : AEntry::AEntry(DataPosition(OPL::Db::TABLE_TAILS, 0))
 {}
 
 ATailEntry::ATailEntry(RowId_T row_id)
-    : AEntry::AEntry(DataPosition(Opl::Db::TABLE_TAILS, row_id))
+    : AEntry::AEntry(DataPosition(OPL::Db::TABLE_TAILS, row_id))
 {}
 
 ATailEntry::ATailEntry(RowData_T table_data)
-    : AEntry::AEntry(DataPosition(Opl::Db::TABLE_TAILS, 0), table_data)
+    : AEntry::AEntry(DataPosition(OPL::Db::TABLE_TAILS, 0), table_data)
 {}
 
 const QString ATailEntry::registration()
 {
-    return getData().value(Opl::Db::TAILS_REGISTRATION).toString();
+    return getData().value(OPL::Db::TAILS_REGISTRATION).toString();
 }
 
 const QString ATailEntry::type()
 {
     QString type_string;
-    if (!tableData.value(Opl::Db::TAILS_MAKE).toString().isEmpty())
-        type_string.append(getData().value(Opl::Db::TAILS_MAKE).toString() + ' ');
-    if (!tableData.value(Opl::Db::TAILS_MODEL).toString().isEmpty())
-        type_string.append(getData().value(Opl::Db::TAILS_MODEL).toString());
-    if (!tableData.value(Opl::Db::TAILS_VARIANT).toString().isEmpty())
-        type_string.append('-' + getData().value(Opl::Db::TAILS_VARIANT).toString());
+    if (!tableData.value(OPL::Db::TAILS_MAKE).toString().isEmpty())
+        type_string.append(getData().value(OPL::Db::TAILS_MAKE).toString() + ' ');
+    if (!tableData.value(OPL::Db::TAILS_MODEL).toString().isEmpty())
+        type_string.append(getData().value(OPL::Db::TAILS_MODEL).toString());
+    if (!tableData.value(OPL::Db::TAILS_VARIANT).toString().isEmpty())
+        type_string.append('-' + getData().value(OPL::Db::TAILS_VARIANT).toString());
 
     return type_string;
 }

src/classes/atranslator.cpp

@@ -2,13 +2,13 @@
 
 QTranslator* ATranslator::translator;
 
-void ATranslator::installTranslator(Opl::Translation language)
+void ATranslator::installTranslator(OPL::Translation language)
 {
     translator = new QTranslator();
-    if (translator->load(Opl::GLOBALS->getLanguageFilePath(language)))
-        LOG << "Translations loaded. Selected language: " << Opl::GLOBALS->getLanguageFilePath(language);
+    if (translator->load(OPL::GLOBALS->getLanguageFilePath(language)))
+        LOG << "Translations loaded. Selected language: " << OPL::GLOBALS->getLanguageFilePath(language);
     else
-        LOG << "Loading translations has failed. Selected language: " << Opl::GLOBALS->getLanguageFilePath(language);
+        LOG << "Loading translations has failed. Selected language: " << OPL::GLOBALS->getLanguageFilePath(language);
 
 
     if (qApp->installTranslator(translator))

src/classes/atranslator.h

@@ -10,7 +10,7 @@
  * Long story short, make sure to use a version of CMake that is 3.16 or earlier, or 3.19.2 or later.
  *
  * The translation source files (.ts) are located at /l10n and once compiled, the translation binaries
- * are at `$BINDIR/l10n/` and can be accessed via `Opl::L10N_FILES`.
+ * are at `$BINDIR/l10n/` and can be accessed via `OPL::L10N_FILES`.
  *
  * When a QTranslator is installed, the UI is updated through [QWidget::changeEvent()](https://doc.qt.io/qt-5/qwidget.html#changeEvent).
  *
@@ -21,7 +21,7 @@ public:
     /*!
      * \brief Installs a QTranslator with the selected language. Defaults to English. Call this function before constructing the Main Window.
      */
-    static void installTranslator(Opl::Translation language = Opl::Translation::English);
+    static void installTranslator(OPL::Translation language = OPL::Translation::English);
 
 private:
     static QTranslator *translator;

src/database/adatabase.cpp

@@ -603,13 +603,13 @@ RowId_T ADatabase::getLastEntry(ADatabaseTable table)
 
     switch (table) {
     case ADatabaseTable::pilots:
-        statement.append(Opl::Db::TABLE_PILOTS);
+        statement.append(OPL::Db::TABLE_PILOTS);
         break;
     case ADatabaseTable::aircraft:
-        statement.append(Opl::Db::TABLE_AIRCRAFT);
+        statement.append(OPL::Db::TABLE_AIRCRAFT);
         break;
     case ADatabaseTable::tails:
-        statement.append(Opl::Db::TABLE_TAILS);
+        statement.append(OPL::Db::TABLE_TAILS);
         break;
     default:
         DEB << "Not a valid completer target for this function.";
@@ -801,16 +801,16 @@ QVector<RowData_T> ADatabase::getTable(ADatabaseTable table_name)
     auto query_str = QStringLiteral("SELECT * FROM ");
     switch (table_name) {
     case ADatabaseTable::pilots:
-        query_str.append(Opl::Db::TABLE_PILOTS);
+        query_str.append(OPL::Db::TABLE_PILOTS);
         break;
     case ADatabaseTable::tails:
-        query_str.append(Opl::Db::TABLE_TAILS);
+        query_str.append(OPL::Db::TABLE_TAILS);
         break;
     case ADatabaseTable::flights:
-        query_str.append(Opl::Db::TABLE_FLIGHTS);
+        query_str.append(OPL::Db::TABLE_FLIGHTS);
         break;
     case ADatabaseTable::currencies:
-        query_str.append(Opl::Db::TABLE_CURRENCIES);
+        query_str.append(OPL::Db::TABLE_CURRENCIES);
     default:
         break;
     }

src/functions/acalc.cpp

@@ -319,23 +319,23 @@ void ACalc::updateAutoTimes(int acft_id)
         auto flight = aDB->getFlightEntry(item.toInt());
         auto flight_data = flight.getData();
 
-        if(acft_data.value(Opl::Db::TAILS_MULTIPILOT).toInt() == 0
-                && acft_data.value(Opl::Db::TAILS_MULTIENGINE) == 0) {
+        if(acft_data.value(OPL::Db::TAILS_MULTIPILOT).toInt() == 0
+                && acft_data.value(OPL::Db::TAILS_MULTIENGINE) == 0) {
             DEB << "SPSE";
-            flight_data.insert(Opl::Db::FLIGHTS_TSPSE, flight_data.value(Opl::Db::FLIGHTS_TBLK));
-            flight_data.insert(Opl::Db::FLIGHTS_TSPME, QString());
-            flight_data.insert(Opl::Db::FLIGHTS_TMP, QString());
-        } else if ((acft_data.value(Opl::Db::TAILS_MULTIPILOT) == 0
-                    && acft.getData().value(Opl::Db::TAILS_MULTIENGINE) == 1)) {
+            flight_data.insert(OPL::Db::FLIGHTS_TSPSE, flight_data.value(OPL::Db::FLIGHTS_TBLK));
+            flight_data.insert(OPL::Db::FLIGHTS_TSPME, QString());
+            flight_data.insert(OPL::Db::FLIGHTS_TMP, QString());
+        } else if ((acft_data.value(OPL::Db::TAILS_MULTIPILOT) == 0
+                    && acft.getData().value(OPL::Db::TAILS_MULTIENGINE) == 1)) {
             DEB << "SPME";
-            flight_data.insert(Opl::Db::FLIGHTS_TSPME, flight_data.value(Opl::Db::FLIGHTS_TBLK));
-            flight_data.insert(Opl::Db::FLIGHTS_TSPSE, QString());
-            flight_data.insert(Opl::Db::FLIGHTS_TMP, QString());
-        } else if ((acft_data.value(Opl::Db::TAILS_MULTIPILOT) == 1)) {
+            flight_data.insert(OPL::Db::FLIGHTS_TSPME, flight_data.value(OPL::Db::FLIGHTS_TBLK));
+            flight_data.insert(OPL::Db::FLIGHTS_TSPSE, QString());
+            flight_data.insert(OPL::Db::FLIGHTS_TMP, QString());
+        } else if ((acft_data.value(OPL::Db::TAILS_MULTIPILOT) == 1)) {
             DEB << "MPME";
-            flight_data.insert(Opl::Db::FLIGHTS_TMP, flight_data.value(Opl::Db::FLIGHTS_TBLK));
-            flight_data.insert(Opl::Db::FLIGHTS_TSPSE, QString());
-            flight_data.insert(Opl::Db::FLIGHTS_TSPME, QString());
+            flight_data.insert(OPL::Db::FLIGHTS_TMP, flight_data.value(OPL::Db::FLIGHTS_TBLK));
+            flight_data.insert(OPL::Db::FLIGHTS_TSPSE, QString());
+            flight_data.insert(OPL::Db::FLIGHTS_TSPME, QString());
         }
         flight.setData(flight_data);
         aDB->commit(flight);
@@ -363,14 +363,14 @@ void ACalc::updateNightTimes()
 
         auto flt = aDB->getFlightEntry(item.toInt());
         auto data = flt.getData();
-        auto dateTime = QDateTime(QDate::fromString(data.value(Opl::Db::FLIGHTS_DOFT).toString(), Qt::ISODate),
-                                  QTime().addSecs(data.value(Opl::Db::FLIGHTS_TOFB).toInt() * 60),
+        auto dateTime = QDateTime(QDate::fromString(data.value(OPL::Db::FLIGHTS_DOFT).toString(), Qt::ISODate),
+                                  QTime().addSecs(data.value(OPL::Db::FLIGHTS_TOFB).toInt() * 60),
                                   Qt::UTC);
-        data.insert(Opl::Db::FLIGHTS_TNIGHT,
-                    calculateNightTime(data.value(Opl::Db::FLIGHTS_DEPT).toString(),
-                                       data.value(Opl::Db::FLIGHTS_DEST).toString(),
+        data.insert(OPL::Db::FLIGHTS_TNIGHT,
+                    calculateNightTime(data.value(OPL::Db::FLIGHTS_DEPT).toString(),
+                                       data.value(OPL::Db::FLIGHTS_DEST).toString(),
                                        dateTime,
-                                       data.value(Opl::Db::FLIGHTS_TBLK).toInt(),
+                                       data.value(OPL::Db::FLIGHTS_TBLK).toInt(),
                                        night_angle));
         flt.setData(data);
         aDB->commit(flt);

src/functions/adate.cpp

@@ -1,6 +1,6 @@
 #include "adate.h"
 
-QDate ADate::parseInput(QString &io_user_input, Opl::Date::ADateFormat format)
+QDate ADate::parseInput(QString &io_user_input, OPL::DateFormat format)
 {
     // Try input string
     const QString &format_string = ADATEFORMATSMAP.value(format);
@@ -14,7 +14,7 @@ QDate ADate::parseInput(QString &io_user_input, Opl::Date::ADateFormat format)
     return  QDate::fromString(io_user_input, format_string);
 }
 
-void ADate::tryToFix(QString &io_user_input, Opl::Date::ADateFormat format)
+void ADate::tryToFix(QString &io_user_input, OPL::DateFormat format)
 {
 
     if (io_user_input.length() < 10) {
@@ -33,10 +33,10 @@ void ADate::tryToFix(QString &io_user_input, Opl::Date::ADateFormat format)
 }
 
 // Input contains seperators and is of length 8
-void ADate::padCentury(QString &io_user_input, Opl::Date::ADateFormat format)
+void ADate::padCentury(QString &io_user_input, OPL::DateFormat format)
 {
     switch (format) {
-    case Opl::Date::ADateFormat::ISODate: {
+    case OPL::DateFormat::ISODate: {
         int year = io_user_input.left(2).toInt();
         if (year > 50)
             io_user_input.prepend(QStringLiteral("19"));
@@ -44,7 +44,7 @@ void ADate::padCentury(QString &io_user_input, Opl::Date::ADateFormat format)
             io_user_input.prepend(QStringLiteral("20"));
         break;
     }
-    case Opl::Date::ADateFormat::DE: {
+    case OPL::DateFormat::DE: {
         int year = io_user_input.right(2).toInt();
         if (year > 50)
             io_user_input.insert(6, QStringLiteral("19"));
@@ -52,7 +52,7 @@ void ADate::padCentury(QString &io_user_input, Opl::Date::ADateFormat format)
             io_user_input.insert(6, QStringLiteral("20"));
         break;
     }
-    case Opl::Date::ADateFormat::EN: {
+    case OPL::DateFormat::EN: {
         int year = io_user_input.right(2).toInt();
         if (year > 50)
             io_user_input.insert(6, QStringLiteral("19"));
@@ -84,10 +84,10 @@ void ADate::padZeroes(QString &io_user_input)
     DEB << "Padded zeroes: " << io_user_input;
 }
 // 10.10.2020
-void ADate::addSeperators(QString &io_user_input, const Opl::Date::ADateFormat &format)
+void ADate::addSeperators(QString &io_user_input, const OPL::DateFormat &format)
 {
     switch (format) {
-    case Opl::Date::ADateFormat::ISODate:
+    case OPL::DateFormat::ISODate:
         if (io_user_input.length() > 7) {
             io_user_input.insert(4, QLatin1Char('-'));
             io_user_input.insert(7, QLatin1Char('-'));
@@ -96,11 +96,11 @@ void ADate::addSeperators(QString &io_user_input, const Opl::Date::ADateFormat &
             io_user_input.insert(5, QLatin1Char('-'));
         }
         break;
-    case Opl::Date::ADateFormat::DE:
+    case OPL::DateFormat::DE:
             io_user_input.insert(2, QLatin1Char('.'));
             io_user_input.insert(5, QLatin1Char('.'));
         break;
-    case Opl::Date::ADateFormat::EN:
+    case OPL::DateFormat::EN:
             io_user_input.insert(2, QLatin1Char('/'));
             io_user_input.insert(5, QLatin1Char('/'));
         break;
@@ -127,7 +127,7 @@ const QStringList& ADate::getDisplayNames()
     return DISPLAY_NAMES;
 }
 
-const QString ADate::getFormatString(Opl::Date::ADateFormat format)
+const QString ADate::getFormatString(OPL::DateFormat format)
 {
     return ADATEFORMATSMAP.value(format);
 }

src/functions/adate.h

@@ -6,10 +6,10 @@ const static auto ISO = QStringLiteral("yyyy-MM-dd");
 const static auto DE = QStringLiteral("dd.MM.yyyy");
 const static auto EN = QStringLiteral("MM/dd/yyyy");
 
-const static QHash<Opl::Date::ADateFormat, QString> ADATEFORMATSMAP = {
-    {Opl::Date::ADateFormat::ISODate, ISO},
-    {Opl::Date::ADateFormat::DE,      DE },
-    {Opl::Date::ADateFormat::EN,      EN },
+const static QHash<OPL::DateFormat, QString> ADATEFORMATSMAP = {
+    {OPL::DateFormat::ISODate, ISO},
+    {OPL::DateFormat::DE,      DE },
+    {OPL::DateFormat::EN,      EN },
 
 };
 
@@ -30,35 +30,35 @@ public:
      * \brief takes a user-provided input and tries to convert it to a (valid) QDate.
      * \return QDate (invalid if input not recognized)
      */
-    static QDate parseInput(QString &io_user_input, Opl::Date::ADateFormat format);
+    static QDate parseInput(QString &io_user_input, OPL::DateFormat format);
 
-    static void tryToFix(QString &io_user_input, Opl::Date::ADateFormat format);
+    static void tryToFix(QString &io_user_input, OPL::DateFormat format);
 
     /*!
      * \brief padCentury adds the century to a date where it was omitted
      */
-    static void padCentury(QString &io_user_input, Opl::Date::ADateFormat format);
+    static void padCentury(QString &io_user_input, OPL::DateFormat format);
 
     /*!
      * \brief pads a user-provided date string with 0s to facilitate conversion to QDate
      */
     static void padZeroes(QString &io_user_input);
 
-    static void addSeperators(QString &io_user_input, const Opl::Date::ADateFormat &format);
+    static void addSeperators(QString &io_user_input, const OPL::DateFormat &format);
 
     static bool containsSeperator(const QString &user_input);
 
     /*!
-     * \brief Reimplements QDate::toString to accept Opl::Date::ADateFormat enums
+     * \brief Reimplements QDate::toString to accept OPL::Date::ADateFormat enums
      */
-    inline static QString toString(const QDate &date, Opl::Date::ADateFormat format = Opl::Date::ADateFormat::ISODate)
+    inline static QString toString(const QDate &date, OPL::DateFormat format = OPL::DateFormat::ISODate)
     {
         return date.toString(ADATEFORMATSMAP.value(format));
     };
 
     static const QStringList& getDisplayNames();
 
-    static const QString getFormatString(Opl::Date::ADateFormat format);
+    static const QString getFormatString(OPL::DateFormat format);
 
     /*!
      * \brief today Returns a string containing the current date in ISO format

src/functions/adatetime.h

@@ -26,11 +26,11 @@ namespace ADateTime {
  * \brief toString formats a QDateTime object into a string in a uniform way.
  * \return
  */
-inline const QString toString (const QDateTime& date_time, Opl::Datetime::DateTimeFormat format) {
+inline const QString toString (const QDateTime& date_time, OPL::DateTimeFormat format) {
     switch (format) {
-    case Opl::Datetime::Default:
+    case OPL::DateTimeFormat::Default:
         return date_time.toString(Qt::ISODate);
-    case Opl::Datetime::Backup:
+    case OPL::DateTimeFormat::Backup:
         return date_time.toString(QStringLiteral("yyyy_MM_dd_T_hh_mm"));
     default:
         return QString();

src/functions/atime.h

@@ -28,13 +28,13 @@ namespace ATime {
 /*!
  * \brief Converts a QTime to a String to be used in the UI
  */
-inline const QString toString(const QTime &time, Opl::Time::FlightTimeFormat format = Opl::Time::Default)
+inline const QString toString(const QTime &time, OPL::FlightTimeFormat format = OPL::FlightTimeFormat::Default)
 {
     switch (format) {
-    case Opl::Time::Default:
+    case OPL::FlightTimeFormat::Default:
         return time.toString(QStringLiteral("hh:mm"));
         break;
-    case Opl::Time::Decimal:
+    case OPL::FlightTimeFormat::Decimal:
         return QString::number(((time.hour() * 60 + time.minute() )/60.0), 'f', 2);
         break;
     default:
@@ -45,10 +45,10 @@ inline const QString toString(const QTime &time, Opl::Time::FlightTimeFormat for
 /*!
  * \brief Converts an integer of minutes as received from the Datbase to a String
  */
-inline const QString toString(int minutes_in, Opl::Time::FlightTimeFormat format = Opl::Time::Default)
+inline const QString toString(int minutes_in, OPL::FlightTimeFormat format = OPL::FlightTimeFormat::Default)
 {
     switch (format) {
-    case Opl::Time::Default:
+    case OPL::FlightTimeFormat::Default:
     {
         QString hour = QString::number(minutes_in / 60);
         if (hour.size() < 2) {
@@ -60,7 +60,7 @@ inline const QString toString(int minutes_in, Opl::Time::FlightTimeFormat format
         }
         return hour + ':' + minute;
     }
-    case Opl::Time::Decimal:
+    case OPL::FlightTimeFormat::Decimal:
     {
         int hour = minutes_in / 60;
         double minute = (minutes_in % 60) / 60.0;
@@ -84,13 +84,13 @@ inline QTime qTimefromMinutes(int total_minutes)
     return QTime(hour, minute, 0);
 }
 
-inline const QTime fromString(QString time_string, Opl::Time::FlightTimeFormat format = Opl::Time::Default)
+inline const QTime fromString(QString time_string, OPL::FlightTimeFormat format = OPL::FlightTimeFormat::Default)
 {
     switch (format) {
-    case Opl::Time::Default:
+    case OPL::FlightTimeFormat::Default:
         return QTime::fromString(time_string, QStringLiteral("hh:mm"));
         break;
-    case Opl::Time::Decimal:
+    case OPL::FlightTimeFormat::Decimal:
     {
         double decimal_time = time_string.toDouble();
         int hour = decimal_time;
@@ -103,13 +103,13 @@ inline const QTime fromString(QString time_string, Opl::Time::FlightTimeFormat f
     }
 }
 
-inline const QTime fromString(const char* time_string, Opl::Time::FlightTimeFormat format = Opl::Time::Default)
+inline const QTime fromString(const char* time_string, OPL::FlightTimeFormat format = OPL::FlightTimeFormat::Default)
 {
     switch (format) {
-    case Opl::Time::Default:
+    case OPL::FlightTimeFormat::Default:
         return QTime::fromString(time_string, QStringLiteral("hh:mm"));
         break;
-    case Opl::Time::Decimal:
+    case OPL::FlightTimeFormat::Decimal:
     {
         double decimal_time = QString(time_string).toDouble();
         int hour = decimal_time;

src/gui/dialogues/firstrundialog.cpp

@@ -41,12 +41,12 @@ FirstRunDialog::FirstRunDialog(QWidget *parent) :
     ui->stackedWidget->setCurrentIndex(0);
     ui->lastnameLineEdit->setFocus();
     ui->previousPushButton->setEnabled(false);
-    ui->logoLabel->setPixmap(QPixmap(Opl::Assets::LOGO));
+    ui->logoLabel->setPixmap(QPixmap(OPL::Assets::LOGO));
 
     // Approach Combo Box and Function Combo Box
-    Opl::GLOBALS->loadApproachTypes(ui->approachComboBox);
-    Opl::GLOBALS->loadPilotFunctios(ui->functionComboBox);
-    Opl::GLOBALS->fillViewNamesComboBox(ui->logbookViewComboBox);
+    OPL::GLOBALS->loadApproachTypes(ui->approachComboBox);
+    OPL::GLOBALS->loadPilotFunctios(ui->functionComboBox);
+    OPL::GLOBALS->fillViewNamesComboBox(ui->logbookViewComboBox);
 
 
     // Style combo box
@@ -57,7 +57,7 @@ FirstRunDialog::FirstRunDialog(QWidget *parent) :
     // Prepare Date Edits
     const auto date_edits = this->findChildren<QDateEdit *>();
     for (const auto &date_edit : date_edits) {
-        date_edit->setDisplayFormat(ADate::getFormatString(Opl::Date::ADateFormat::ISODate));
+        date_edit->setDisplayFormat(ADate::getFormatString(OPL::DateFormat::ISODate));
         date_edit->setDate(QDate::currentDate());
     }
     // Debug - use ctrl + t to enable branchLineEdit to select from which git branch the templates are pulled
@@ -319,12 +319,12 @@ bool FirstRunDialog::setupDatabase()
 bool FirstRunDialog::createUserEntry()
 {
     QHash<QString, QVariant> data;
-    data.insert(Opl::Db::PILOTS_LASTNAME,   ui->lastnameLineEdit->text());
-    data.insert(Opl::Db::PILOTS_FIRSTNAME,  ui->firstnameLineEdit->text());
-    data.insert(Opl::Db::PILOTS_ALIAS,      QStringLiteral("self"));
-    data.insert(Opl::Db::PILOTS_EMPLOYEEID, ui->employeeidLineEdit->text());
-    data.insert(Opl::Db::PILOTS_PHONE,      ui->phoneLineEdit->text());
-    data.insert(Opl::Db::PILOTS_EMAIL,      ui->emailLineEdit->text());
+    data.insert(OPL::Db::PILOTS_LASTNAME,   ui->lastnameLineEdit->text());
+    data.insert(OPL::Db::PILOTS_FIRSTNAME,  ui->firstnameLineEdit->text());
+    data.insert(OPL::Db::PILOTS_ALIAS,      QStringLiteral("self"));
+    data.insert(OPL::Db::PILOTS_EMPLOYEEID, ui->employeeidLineEdit->text());
+    data.insert(OPL::Db::PILOTS_PHONE,      ui->phoneLineEdit->text());
+    data.insert(OPL::Db::PILOTS_EMAIL,      ui->emailLineEdit->text());
 
     auto pilot = APilotEntry(1);
     pilot.setData(data);

src/gui/dialogues/newflightdialog.cpp

@@ -39,12 +39,12 @@ NewFlightDialog::NewFlightDialog(ACompletionData &completion_data,
     flightEntry = AFlightEntry();
     // Set up UI (New Flight)
     LOG << ASettings::read(ASettings::FlightLogging::Function);
-    if(ASettings::read(ASettings::FlightLogging::Function).toInt() == Opl::PIC){
+    if(ASettings::read(ASettings::FlightLogging::Function).toInt() == OPL::PIC){
         ui->picNameLineEdit->setText(self);
         ui->functionComboBox->setCurrentIndex(0);
         emit ui->picNameLineEdit->editingFinished();
     }
-    if (ASettings::read(ASettings::FlightLogging::Function).toInt() == Opl::SIC) {
+    if (ASettings::read(ASettings::FlightLogging::Function).toInt() == OPL::SIC) {
         ui->sicNameLineEdit->setText(self);
         ui->functionComboBox->setCurrentIndex(2);
         emit ui->sicNameLineEdit->editingFinished();
@@ -89,8 +89,8 @@ void NewFlightDialog::init()
     for (const auto& line_edit : *mandatoryLineEdits)
         line_edit->installEventFilter(this);
     // Approach Combo Box and Function Combo Box
-    Opl::GLOBALS->loadApproachTypes(ui->approachComboBox);
-    Opl::GLOBALS->loadPilotFunctios(ui->functionComboBox);
+    OPL::GLOBALS->loadApproachTypes(ui->approachComboBox);
+    OPL::GLOBALS->loadPilotFunctios(ui->functionComboBox);
 
     setupRawInputValidation();
     setupSignalsAndSlots();
@@ -197,55 +197,55 @@ void NewFlightDialog::fillWithEntryData()
     DEB << flightEntry;
 
     // Date of Flight
-    ui->doftLineEdit->setText(flightEntry.getData().value(Opl::Db::FLIGHTS_DOFT).toString());
+    ui->doftLineEdit->setText(flightEntry.getData().value(OPL::Db::FLIGHTS_DOFT).toString());
     // Location
-    ui->deptLocationLineEdit->setText(flightEntry.getData().value(Opl::Db::FLIGHTS_DEPT).toString());
-    ui->destLocationLineEdit->setText(flightEntry.getData().value(Opl::Db::FLIGHTS_DEST).toString());
+    ui->deptLocationLineEdit->setText(flightEntry.getData().value(OPL::Db::FLIGHTS_DEPT).toString());
+    ui->destLocationLineEdit->setText(flightEntry.getData().value(OPL::Db::FLIGHTS_DEST).toString());
     // Times
-    ui->tofbTimeLineEdit->setText(ATime::toString(flightEntry.getData().value(Opl::Db::FLIGHTS_TOFB).toInt()));
-    ui->tonbTimeLineEdit->setText(ATime::toString(flightEntry.getData().value(Opl::Db::FLIGHTS_TONB).toInt()));
-    ui->acftLineEdit->setText(completionData.tailsIdMap.value(flightEntry.getData().value(Opl::Db::FLIGHTS_ACFT).toInt()));
-    ui->picNameLineEdit->setText(completionData.pilotsIdMap.value(flightEntry.getData().value(Opl::Db::FLIGHTS_PIC).toInt()));
-    ui->sicNameLineEdit->setText(completionData.pilotsIdMap.value(flightEntry.getData().value(Opl::Db::FLIGHTS_SECONDPILOT).toInt()));
-    ui->thirdPilotNameLineEdit->setText(completionData.pilotsIdMap.value(flightEntry.getData().value(Opl::Db::FLIGHTS_THIRDPILOT).toInt()));
+    ui->tofbTimeLineEdit->setText(ATime::toString(flightEntry.getData().value(OPL::Db::FLIGHTS_TOFB).toInt()));
+    ui->tonbTimeLineEdit->setText(ATime::toString(flightEntry.getData().value(OPL::Db::FLIGHTS_TONB).toInt()));
+    ui->acftLineEdit->setText(completionData.tailsIdMap.value(flightEntry.getData().value(OPL::Db::FLIGHTS_ACFT).toInt()));
+    ui->picNameLineEdit->setText(completionData.pilotsIdMap.value(flightEntry.getData().value(OPL::Db::FLIGHTS_PIC).toInt()));
+    ui->sicNameLineEdit->setText(completionData.pilotsIdMap.value(flightEntry.getData().value(OPL::Db::FLIGHTS_SECONDPILOT).toInt()));
+    ui->thirdPilotNameLineEdit->setText(completionData.pilotsIdMap.value(flightEntry.getData().value(OPL::Db::FLIGHTS_THIRDPILOT).toInt()));
 
     for (const auto& le : *mandatoryLineEdits)
         emit le->editingFinished();
 
     //Function
     const QHash<int, QString> functions = {
-        {0, Opl::Db::FLIGHTS_TPIC},
-        {1, Opl::Db::FLIGHTS_TPICUS},
-        {2, Opl::Db::FLIGHTS_TSIC},
-        {3, Opl::Db::FLIGHTS_TDUAL},
-        {4, Opl::Db::FLIGHTS_TFI},
+        {0, OPL::Db::FLIGHTS_TPIC},
+        {1, OPL::Db::FLIGHTS_TPICUS},
+        {2, OPL::Db::FLIGHTS_TSIC},
+        {3, OPL::Db::FLIGHTS_TDUAL},
+        {4, OPL::Db::FLIGHTS_TFI},
     };
     for (int i = 0; i < 5; i++) { // QHash::iterator not guarenteed to be in ordetr
         if(flightEntry.getData().value(functions.value(i)).toInt() != 0)
             ui->functionComboBox->setCurrentIndex(i);
     }
     // Approach ComboBox
-    const QString& app = flightEntry.getData().value(Opl::Db::FLIGHTS_APPROACHTYPE).toString();
+    const QString& app = flightEntry.getData().value(OPL::Db::FLIGHTS_APPROACHTYPE).toString();
     if(app != QString()){
         ui->approachComboBox->setCurrentText(app);
     }
     // Task
-    bool PF = flightEntry.getData().value(Opl::Db::FLIGHTS_PILOTFLYING).toBool();
+    bool PF = flightEntry.getData().value(OPL::Db::FLIGHTS_PILOTFLYING).toBool();
     ui->pilotFlyingCheckBox->setChecked(PF);
     // Flight Rules
-    bool time_ifr = flightEntry.getData().value(Opl::Db::FLIGHTS_TIFR).toBool();
+    bool time_ifr = flightEntry.getData().value(OPL::Db::FLIGHTS_TIFR).toBool();
     ui->ifrCheckBox->setChecked(time_ifr);
     // Take-Off and Landing
-    int TO = flightEntry.getData().value(Opl::Db::FLIGHTS_TODAY).toInt()
-            + flightEntry.getData().value(Opl::Db::FLIGHTS_TONIGHT).toInt();
-    int LDG = flightEntry.getData().value(Opl::Db::FLIGHTS_LDGDAY).toInt()
-            + flightEntry.getData().value(Opl::Db::FLIGHTS_LDGNIGHT).toInt();
+    int TO = flightEntry.getData().value(OPL::Db::FLIGHTS_TODAY).toInt()
+            + flightEntry.getData().value(OPL::Db::FLIGHTS_TONIGHT).toInt();
+    int LDG = flightEntry.getData().value(OPL::Db::FLIGHTS_LDGDAY).toInt()
+            + flightEntry.getData().value(OPL::Db::FLIGHTS_LDGNIGHT).toInt();
     ui->takeOffSpinBox->setValue(TO);
     ui->landingSpinBox->setValue(LDG);
     // Remarks
-    ui->remarksLineEdit->setText(flightEntry.getData().value(Opl::Db::FLIGHTS_REMARKS).toString());
+    ui->remarksLineEdit->setText(flightEntry.getData().value(OPL::Db::FLIGHTS_REMARKS).toString());
     // Flight Number
-    ui->flightNumberLineEdit->setText(flightEntry.getData().value(Opl::Db::FLIGHTS_FLIGHTNUMBER).toString());
+    ui->flightNumberLineEdit->setText(flightEntry.getData().value(OPL::Db::FLIGHTS_FLIGHTNUMBER).toString());
 
     for(const auto &line_edit : *mandatoryLineEdits)
         emit line_edit->editingFinished();
@@ -270,7 +270,7 @@ void NewFlightDialog::onGoodInputReceived(QLineEdit *line_edit)
 void NewFlightDialog::onBadInputReceived(QLineEdit *line_edit)
 {
     DEB << line_edit->objectName() << " - Bad input received - " << line_edit->text();
-    line_edit->setStyleSheet(Opl::Styles::RED_BORDER);
+    line_edit->setStyleSheet(OPL::Styles::RED_BORDER);
     line_edit->setText(QString());
 
     if (mandatoryLineEdits->contains(line_edit))
@@ -377,51 +377,51 @@ RowData_T NewFlightDialog::prepareFlightEntryData()
     const auto night_time_data = ACalc::NightTimeValues(ui->deptLocationLineEdit->text(), ui->destLocationLineEdit->text(),
                            departure_date_time, block_minutes, ASettings::read(ASettings::FlightLogging::NightAngle).toInt());
     // Mandatory data
-    new_data.insert(Opl::Db::FLIGHTS_DOFT, ui->doftLineEdit->text());
-    new_data.insert(Opl::Db::FLIGHTS_DEPT, ui->deptLocationLineEdit->text());
-    new_data.insert(Opl::Db::FLIGHTS_TOFB, ATime::toMinutes(ui->tofbTimeLineEdit->text()));
-    new_data.insert(Opl::Db::FLIGHTS_DEST, ui->destLocationLineEdit->text());
-    new_data.insert(Opl::Db::FLIGHTS_TONB, ATime::toMinutes(ui->tonbTimeLineEdit->text()));
-    new_data.insert(Opl::Db::FLIGHTS_TBLK, block_minutes);
+    new_data.insert(OPL::Db::FLIGHTS_DOFT, ui->doftLineEdit->text());
+    new_data.insert(OPL::Db::FLIGHTS_DEPT, ui->deptLocationLineEdit->text());
+    new_data.insert(OPL::Db::FLIGHTS_TOFB, ATime::toMinutes(ui->tofbTimeLineEdit->text()));
+    new_data.insert(OPL::Db::FLIGHTS_DEST, ui->destLocationLineEdit->text());
+    new_data.insert(OPL::Db::FLIGHTS_TONB, ATime::toMinutes(ui->tonbTimeLineEdit->text()));
+    new_data.insert(OPL::Db::FLIGHTS_TBLK, block_minutes);
     // Night
-    new_data.insert(Opl::Db::FLIGHTS_TNIGHT, night_time_data.nightMinutes);
+    new_data.insert(OPL::Db::FLIGHTS_TNIGHT, night_time_data.nightMinutes);
     // Aircraft
     int acft_id = completionData.tailsIdMap.key(ui->acftLineEdit->text());
-    new_data.insert(Opl::Db::FLIGHTS_ACFT, acft_id);
+    new_data.insert(OPL::Db::FLIGHTS_ACFT, acft_id);
     const ATailEntry acft_data = aDB->getTailEntry(acft_id);
-    bool multi_pilot = acft_data.getData().value(Opl::Db::TAILS_MULTIPILOT).toBool();
-    bool multi_engine = acft_data.getData().value(Opl::Db::TAILS_MULTIENGINE).toBool();
+    bool multi_pilot = acft_data.getData().value(OPL::Db::TAILS_MULTIPILOT).toBool();
+    bool multi_engine = acft_data.getData().value(OPL::Db::TAILS_MULTIENGINE).toBool();
 
     if (multi_pilot) {
-        new_data.insert(Opl::Db::FLIGHTS_TMP, block_minutes);
-        new_data.insert(Opl::Db::FLIGHTS_TSPSE, QString());
-        new_data.insert(Opl::Db::FLIGHTS_TSPME, QString());
+        new_data.insert(OPL::Db::FLIGHTS_TMP, block_minutes);
+        new_data.insert(OPL::Db::FLIGHTS_TSPSE, QString());
+        new_data.insert(OPL::Db::FLIGHTS_TSPME, QString());
     } else if (!multi_pilot && !multi_engine) {
-        new_data.insert(Opl::Db::FLIGHTS_TMP, QString());
-        new_data.insert(Opl::Db::FLIGHTS_TSPSE, block_minutes);
-        new_data.insert(Opl::Db::FLIGHTS_TSPME, QString());
+        new_data.insert(OPL::Db::FLIGHTS_TMP, QString());
+        new_data.insert(OPL::Db::FLIGHTS_TSPSE, block_minutes);
+        new_data.insert(OPL::Db::FLIGHTS_TSPME, QString());
     } else if (!multi_pilot && multi_engine) {
-        new_data.insert(Opl::Db::FLIGHTS_TMP, QString());
-        new_data.insert(Opl::Db::FLIGHTS_TSPSE, QString());
-        new_data.insert(Opl::Db::FLIGHTS_TSPME, block_minutes);
+        new_data.insert(OPL::Db::FLIGHTS_TMP, QString());
+        new_data.insert(OPL::Db::FLIGHTS_TSPSE, QString());
+        new_data.insert(OPL::Db::FLIGHTS_TSPME, block_minutes);
     }
     // Pilots
-    new_data.insert(Opl::Db::FLIGHTS_PIC, completionData.pilotsIdMap.key(ui->picNameLineEdit->text()));
-    new_data.insert(Opl::Db::FLIGHTS_SECONDPILOT, completionData.pilotsIdMap.key(ui->sicNameLineEdit->text()));
-    new_data.insert(Opl::Db::FLIGHTS_THIRDPILOT, completionData.pilotsIdMap.key(ui->thirdPilotNameLineEdit->text()));
+    new_data.insert(OPL::Db::FLIGHTS_PIC, completionData.pilotsIdMap.key(ui->picNameLineEdit->text()));
+    new_data.insert(OPL::Db::FLIGHTS_SECONDPILOT, completionData.pilotsIdMap.key(ui->sicNameLineEdit->text()));
+    new_data.insert(OPL::Db::FLIGHTS_THIRDPILOT, completionData.pilotsIdMap.key(ui->thirdPilotNameLineEdit->text()));
     // IFR time
     if (ui->ifrCheckBox->isChecked()) {
-        new_data.insert(Opl::Db::FLIGHTS_TIFR, block_minutes);
+        new_data.insert(OPL::Db::FLIGHTS_TIFR, block_minutes);
     } else {
-        new_data.insert(Opl::Db::FLIGHTS_TIFR, QString());
+        new_data.insert(OPL::Db::FLIGHTS_TIFR, QString());
     }
     // Function Times
     QStringList function_times = {
-        Opl::Db::FLIGHTS_TPIC,
-        Opl::Db::FLIGHTS_TPICUS,
-        Opl::Db::FLIGHTS_TSIC,
-        Opl::Db::FLIGHTS_TDUAL,
-        Opl::Db::FLIGHTS_TFI,
+        OPL::Db::FLIGHTS_TPIC,
+        OPL::Db::FLIGHTS_TPICUS,
+        OPL::Db::FLIGHTS_TSIC,
+        OPL::Db::FLIGHTS_TDUAL,
+        OPL::Db::FLIGHTS_TFI,
     };
 
     // Determine function times, zero out all values except one
@@ -446,29 +446,29 @@ RowData_T NewFlightDialog::prepareFlightEntryData()
         break;
     }
     // Pilot flying / Pilot monitoring
-    new_data.insert(Opl::Db::FLIGHTS_PILOTFLYING, ui->pilotFlyingCheckBox->isChecked());
+    new_data.insert(OPL::Db::FLIGHTS_PILOTFLYING, ui->pilotFlyingCheckBox->isChecked());
     // Take-Off and Landing
     if (ui->toNightCheckBox->isChecked()) {
-        new_data.insert(Opl::Db::FLIGHTS_TONIGHT, ui->takeOffSpinBox->value());
-        new_data.insert(Opl::Db::FLIGHTS_TODAY, 0);
+        new_data.insert(OPL::Db::FLIGHTS_TONIGHT, ui->takeOffSpinBox->value());
+        new_data.insert(OPL::Db::FLIGHTS_TODAY, 0);
     } else {
-        new_data.insert(Opl::Db::FLIGHTS_TONIGHT, 0);
-        new_data.insert(Opl::Db::FLIGHTS_TODAY, ui->takeOffSpinBox->value());
+        new_data.insert(OPL::Db::FLIGHTS_TONIGHT, 0);
+        new_data.insert(OPL::Db::FLIGHTS_TODAY, ui->takeOffSpinBox->value());
     }
     if (ui->ldgNightCheckBox->isChecked()) {
-        new_data.insert(Opl::Db::FLIGHTS_LDGNIGHT, ui->landingSpinBox->value());
-        new_data.insert(Opl::Db::FLIGHTS_LDGDAY, 0);
+        new_data.insert(OPL::Db::FLIGHTS_LDGNIGHT, ui->landingSpinBox->value());
+        new_data.insert(OPL::Db::FLIGHTS_LDGDAY, 0);
     } else {
-        new_data.insert(Opl::Db::FLIGHTS_LDGNIGHT, 0);
-        new_data.insert(Opl::Db::FLIGHTS_LDGDAY, ui->landingSpinBox->value());
+        new_data.insert(OPL::Db::FLIGHTS_LDGNIGHT, 0);
+        new_data.insert(OPL::Db::FLIGHTS_LDGDAY, ui->landingSpinBox->value());
     }
-    if (ui->approachComboBox->currentText() == Opl::GLOBALS->getApproachTypes()[3]) // ILS CAT III
-        new_data.insert(Opl::Db::FLIGHTS_AUTOLAND, ui->landingSpinBox->value());
+    if (ui->approachComboBox->currentText() == OPL::GLOBALS->getApproachTypes()[3]) // ILS CAT III
+        new_data.insert(OPL::Db::FLIGHTS_AUTOLAND, ui->landingSpinBox->value());
 
     // Additional Data
-    new_data.insert(Opl::Db::FLIGHTS_APPROACHTYPE, ui->approachComboBox->currentText());
-    new_data.insert(Opl::Db::FLIGHTS_FLIGHTNUMBER, ui->flightNumberLineEdit->text());
-    new_data.insert(Opl::Db::FLIGHTS_REMARKS, ui->remarksLineEdit->text());
+    new_data.insert(OPL::Db::FLIGHTS_APPROACHTYPE, ui->approachComboBox->currentText());
+    new_data.insert(OPL::Db::FLIGHTS_FLIGHTNUMBER, ui->flightNumberLineEdit->text());
+    new_data.insert(OPL::Db::FLIGHTS_REMARKS, ui->remarksLineEdit->text());
     return new_data;
 }
 
@@ -638,7 +638,7 @@ void NewFlightDialog::on_doftLineEdit_editingFinished()
     auto label = ui->doftDisplayLabel;
 
     TODO << "Non-default Date formats not implemented yet.";
-    Opl::Date::ADateFormat date_format = Opl::Date::ADateFormat::ISODate;
+    OPL::DateFormat date_format = OPL::DateFormat::ISODate;
     auto date = ADate::parseInput(text, date_format);
     if (date.isValid()) {
         label->setText(date.toString(Qt::TextDate));

src/gui/dialogues/newsimdialog.cpp

@@ -11,7 +11,7 @@ NewSimDialog::NewSimDialog(QWidget *parent) :
 {
     ui->setupUi(this);
     ui->dateLineEdit->setText(ADate::currentDate());
-    Opl::GLOBALS->loadSimulatorTypes(ui->typeComboBox);
+    OPL::GLOBALS->loadSimulatorTypes(ui->typeComboBox);
 
     const QStringList aircraft_list = aDB->getCompletionList(ADatabaseTarget::aircraft);
     auto completer = new QCompleter(aircraft_list, ui->acftLineEdit);
@@ -30,7 +30,7 @@ void NewSimDialog::on_dateLineEdit_editingFinished()
 {
     auto text = ui->dateLineEdit->text();
 
-    Opl::Date::ADateFormat date_format = Opl::Date::ADateFormat::ISODate;
+    OPL::DateFormat date_format = OPL::DateFormat::ISODate;
     auto date = ADate::parseInput(text, date_format);
     if (date.isValid()) {
         ui->dateLineEdit->setText(ADate::toString(date, date_format));
@@ -38,7 +38,7 @@ void NewSimDialog::on_dateLineEdit_editingFinished()
         return;
     } else {
         ui->dateLineEdit->setText(QString());
-        ui->dateLineEdit->setStyleSheet(Opl::Styles::RED_BORDER);
+        ui->dateLineEdit->setStyleSheet(OPL::Styles::RED_BORDER);
     }
 }
 
@@ -53,7 +53,7 @@ void NewSimDialog::on_timeLineEdit_editingFinished()
         ui->timeLineEdit->setStyleSheet(QString());
     } else {
         ui->timeLineEdit->setText(QString());
-        ui->timeLineEdit->setStyleSheet(Opl::Styles::RED_BORDER);
+        ui->timeLineEdit->setStyleSheet(OPL::Styles::RED_BORDER);
     }
 }
 
@@ -78,11 +78,11 @@ bool NewSimDialog::verifyInput(QString& error_msg)
 {
     // Date
     auto text = ui->dateLineEdit->text();
-    Opl::Date::ADateFormat date_format = Opl::Date::ADateFormat::ISODate;
+    OPL::DateFormat date_format = OPL::DateFormat::ISODate;
     const auto date = ADate::parseInput(text, date_format);
 
     if (!date.isValid()) {
-        ui->dateLineEdit->setStyleSheet(Opl::Styles::RED_BORDER);
+        ui->dateLineEdit->setStyleSheet(OPL::Styles::RED_BORDER);
         ui->dateLineEdit->setText(QString());
         error_msg = tr("Invalid Date");
         return false;
@@ -92,14 +92,14 @@ bool NewSimDialog::verifyInput(QString& error_msg)
     const QTime time = ATime::fromString(time_string);
 
     if (!time.isValid()) {
-        ui->timeLineEdit->setStyleSheet(Opl::Styles::RED_BORDER);
+        ui->timeLineEdit->setStyleSheet(OPL::Styles::RED_BORDER);
         ui->timeLineEdit->setText(QString());
         error_msg = tr("Invalid time");
         return false;
     }
 
     // Device Type - for FSTD, aircraft info is required
-    if (ui->typeComboBox->currentIndex() == Opl::SimulatorTypes::FSTD
+    if (ui->typeComboBox->currentIndex() == OPL::SimulatorType::FSTD
             && ui->acftLineEdit->text() == QString()) {
         error_msg = tr("For FSTD, please enter the aircraft type.");
         return false;
@@ -112,19 +112,19 @@ RowData_T NewSimDialog::collectInput()
 {
     RowData_T new_entry;
     // Date
-    new_entry.insert(Opl::Db::SIMULATORS_DATE, ui->dateLineEdit->text());
+    new_entry.insert(OPL::Db::SIMULATORS_DATE, ui->dateLineEdit->text());
     // Time
-    new_entry.insert(Opl::Db::SIMULATORS_TIME, ATime::toMinutes(ui->timeLineEdit->text()));
+    new_entry.insert(OPL::Db::SIMULATORS_TIME, ATime::toMinutes(ui->timeLineEdit->text()));
     // Device Type
-    new_entry.insert(Opl::Db::SIMULATORS_TYPE, ui->typeComboBox->currentText());
+    new_entry.insert(OPL::Db::SIMULATORS_TYPE, ui->typeComboBox->currentText());
     // Aircraft Type
-    new_entry.insert(Opl::Db::SIMULATORS_ACFT, ui->acftLineEdit->text());
+    new_entry.insert(OPL::Db::SIMULATORS_ACFT, ui->acftLineEdit->text());
     // Registration
     if (!ui->registrationLineEdit->text().isEmpty())
-        new_entry.insert(Opl::Db::SIMULATORS_REG, ui->registrationLineEdit->text());
+        new_entry.insert(OPL::Db::SIMULATORS_REG, ui->registrationLineEdit->text());
     // Remarks
     if (!ui->remarksLineEdit->text().isEmpty())
-        new_entry.insert(Opl::Db::FLIGHTS_REMARKS, ui->remarksLineEdit->text());
+        new_entry.insert(OPL::Db::FLIGHTS_REMARKS, ui->remarksLineEdit->text());
 
     return new_entry;
 }

src/gui/dialogues/newtaildialog.cpp

@@ -123,10 +123,10 @@ void NewTailDialog::fillForm(AEntry entry, bool is_template)
         le->setText(data.value(key).toString());
     }
 
-    ui->operationComboBox->setCurrentIndex(data.value(Opl::Db::TAILS_MULTIPILOT).toInt() + 1);
-    ui->ppNumberComboBox ->setCurrentIndex(data.value(Opl::Db::TAILS_MULTIENGINE).toInt() + 1);
-    ui->ppTypeComboBox->setCurrentIndex(data.value(Opl::Db::TAILS_ENGINETYPE).toInt() + 1);
-    ui->weightComboBox->setCurrentIndex(data.value(Opl::Db::TAILS_WEIGHTCLASS).toInt() + 1);
+    ui->operationComboBox->setCurrentIndex(data.value(OPL::Db::TAILS_MULTIPILOT).toInt() + 1);
+    ui->ppNumberComboBox ->setCurrentIndex(data.value(OPL::Db::TAILS_MULTIENGINE).toInt() + 1);
+    ui->ppTypeComboBox->setCurrentIndex(data.value(OPL::Db::TAILS_ENGINETYPE).toInt() + 1);
+    ui->weightComboBox->setCurrentIndex(data.value(OPL::Db::TAILS_WEIGHTCLASS).toInt() + 1);
 }
 
 /*!
@@ -188,16 +188,16 @@ void NewTailDialog::submitForm()
     }
 
     if (ui->operationComboBox->currentIndex() != 0) { // bool Multipilot
-        new_data.insert(Opl::Db::TAILS_MULTIPILOT, ui->operationComboBox->currentIndex() - 1);
+        new_data.insert(OPL::Db::TAILS_MULTIPILOT, ui->operationComboBox->currentIndex() - 1);
     }
     if (ui->ppNumberComboBox->currentIndex() != 0) { // bool MultiEngine
-        new_data.insert(Opl::Db::TAILS_MULTIENGINE, ui->ppNumberComboBox->currentIndex() - 1);
+        new_data.insert(OPL::Db::TAILS_MULTIENGINE, ui->ppNumberComboBox->currentIndex() - 1);
     }
     if (ui->ppTypeComboBox->currentIndex() != 0) { // int 0=unpowered,....4=jet
-        new_data.insert(Opl::Db::TAILS_ENGINETYPE, ui->ppTypeComboBox->currentIndex() - 1);
+        new_data.insert(OPL::Db::TAILS_ENGINETYPE, ui->ppTypeComboBox->currentIndex() - 1);
     }
     if (ui->weightComboBox->currentIndex() != 0) { // int 0=light...3=super
-        new_data.insert(Opl::Db::TAILS_WEIGHTCLASS, ui->weightComboBox->currentIndex() - 1);
+        new_data.insert(OPL::Db::TAILS_WEIGHTCLASS, ui->weightComboBox->currentIndex() - 1);
     }
 
     //create db object

src/gui/widgets/backupwidget.cpp

@@ -80,7 +80,7 @@ void BackupWidget::refresh()
 const QString BackupWidget::absoluteBackupPath()
 {
     const QString backup_name = QLatin1String("logbook_backup_")
-            + ADateTime::toString(QDateTime::currentDateTime(), Opl::Datetime::Backup)
+            + ADateTime::toString(QDateTime::currentDateTime(), OPL::DateTimeFormat::Backup)
             + QLatin1String(".db");
     return AStandardPaths::asChildOfDir(AStandardPaths::Backup, backup_name);
 }
@@ -88,7 +88,7 @@ const QString BackupWidget::absoluteBackupPath()
 const QString BackupWidget::backupName()
 {
     return  QLatin1String("logbook_backup_")
-            + ADateTime::toString(QDateTime::currentDateTime(), Opl::Datetime::Backup)
+            + ADateTime::toString(QDateTime::currentDateTime(), OPL::DateTimeFormat::Backup)
             + QLatin1String(".db");
 }
 

src/gui/widgets/homewidget.cpp

@@ -39,7 +39,7 @@ HomeWidget::HomeWidget(QWidget *parent) :
     today = QDate::currentDate();
     ftlWarningThreshold = ASettings::read(ASettings::UserData::FtlWarningThreshold).toDouble();
     currWarningThreshold = ASettings::read(ASettings::UserData::CurrWarningThreshold).toInt();
-    auto logo = QPixmap(Opl::Assets::LOGO);
+    auto logo = QPixmap(OPL::Assets::LOGO);
     ui->logoLabel->setPixmap(logo);
     ui->welcomeLabel->setText(tr("Welcome to openPilotLog, %1!").arg(userName()));
 
@@ -100,7 +100,7 @@ void HomeWidget::fillCurrency(ACurrencyEntry::CurrencyName currency_name, QLabel
     auto currency_entry = aDB->getCurrencyEntry(currency_name);
     if (currency_entry.isValid()) {
         auto currency_date = QDate::fromString(currency_entry.tableData.value(
-                                                   Opl::Db::CURRENCIES_EXPIRYDATE).toString(),
+                                                   OPL::Db::CURRENCIES_EXPIRYDATE).toString(),
                                                Qt::ISODate);
         display_label->setText(currency_date.toString(Qt::TextDate));
         setLabelColour(display_label, Colour::None);

src/gui/widgets/logbookwidget.cpp

@@ -41,7 +41,7 @@ LogbookWidget::LogbookWidget(ACompletionData& completion_data, QWidget *parent)
 {
     ui->setupUi(this);
 
-    Opl::GLOBALS->fillViewNamesComboBox(ui->viewsComboBox);
+    OPL::GLOBALS->fillViewNamesComboBox(ui->viewsComboBox);
 
     //customContextMenu for tablewidget
     menu  = new QMenu(this);
@@ -73,7 +73,7 @@ LogbookWidget::~LogbookWidget()
  */
 void LogbookWidget::setupModelAndView(int view_id)
 {
-    displayModel->setTable(Opl::GLOBALS->getViewIdentifier(Opl::DbViewName(view_id)));
+    displayModel->setTable(OPL::GLOBALS->getViewIdentifier(OPL::DbViewName(view_id)));
     displayModel->select();
 
     view->setModel(displayModel);

src/gui/widgets/settingswidget.cpp

@@ -55,10 +55,10 @@ void SettingsWidget::setupComboBoxes(){
     {
         // Set up Combo Boxes
         AStyle::loadStylesComboBox(ui->styleComboBox);
-        Opl::GLOBALS->loadApproachTypes(ui->approachComboBox);
-        Opl::GLOBALS->loadPilotFunctios(ui->functionComboBox);
-        Opl::GLOBALS->fillViewNamesComboBox(ui->logbookViewComboBox);
-        Opl::GLOBALS->fillLanguageComboBox(ui->languageComboBox);
+        OPL::GLOBALS->loadApproachTypes(ui->approachComboBox);
+        OPL::GLOBALS->loadPilotFunctios(ui->functionComboBox);
+        OPL::GLOBALS->fillViewNamesComboBox(ui->logbookViewComboBox);
+        OPL::GLOBALS->fillLanguageComboBox(ui->languageComboBox);
     }
 }
 
@@ -68,7 +68,7 @@ void SettingsWidget::setupDateEdits()
     // Read Display Format Setting
     int date_format_index = ASettings::read(ASettings::Main::DateFormat).toInt();
     const QString date_format_string = ADate::getFormatString(
-                static_cast<Opl::Date::ADateFormat>(date_format_index));
+                static_cast<OPL::DateFormat>(date_format_index));
     const auto date_edits = this->findChildren<QDateEdit*>();
     for (const auto &date_edit : date_edits) {
         date_edit->setDisplayFormat(date_format_string);
@@ -87,7 +87,7 @@ void SettingsWidget::setupDateEdits()
         const auto entry = aDB->getCurrencyEntry(pair.first);
         if (entry.isValid()) { // set date
             const auto date = QDate::fromString(
-                        entry.tableData.value(Opl::Db::CURRENCIES_EXPIRYDATE).toString(),
+                        entry.tableData.value(OPL::Db::CURRENCIES_EXPIRYDATE).toString(),
                         Qt::ISODate);
             pair.second->setDate(date);
         } else { // set current date
@@ -105,12 +105,12 @@ void SettingsWidget::readSettings()
 
     // Personal Data Tab
     auto user_data = aDB->getPilotEntry(1).getData();
-    ui->lastnameLineEdit->setText(user_data.value(Opl::Db::PILOTS_LASTNAME).toString());
-    ui->firstnameLineEdit->setText(user_data.value(Opl::Db::PILOTS_FIRSTNAME).toString());
-    ui->companyLineEdit->setText(user_data.value(Opl::Db::PILOTS_COMPANY).toString());
-    ui->employeeidLineEdit->setText(user_data.value(Opl::Db::PILOTS_EMPLOYEEID).toString());
-    ui->phoneLineEdit->setText(user_data.value(Opl::Db::PILOTS_PHONE).toString());
-    ui->emailLineEdit->setText(user_data.value(Opl::Db::PILOTS_EMAIL).toString());
+    ui->lastnameLineEdit->setText(user_data.value(OPL::Db::PILOTS_LASTNAME).toString());
+    ui->firstnameLineEdit->setText(user_data.value(OPL::Db::PILOTS_FIRSTNAME).toString());
+    ui->companyLineEdit->setText(user_data.value(OPL::Db::PILOTS_COMPANY).toString());
+    ui->employeeidLineEdit->setText(user_data.value(OPL::Db::PILOTS_EMPLOYEEID).toString());
+    ui->phoneLineEdit->setText(user_data.value(OPL::Db::PILOTS_PHONE).toString());
+    ui->emailLineEdit->setText(user_data.value(OPL::Db::PILOTS_EMAIL).toString());
 
     // FLight Logging Tab
     ui->functionComboBox->setCurrentIndex(ASettings::read(ASettings::FlightLogging::Function).toInt());
@@ -182,10 +182,10 @@ void SettingsWidget::updatePersonalDetails()
     RowData_T user_data;
     switch (ui->aliasComboBox->currentIndex()) {
     case 0:
-        user_data.insert(Opl::Db::PILOTS_ALIAS, QStringLiteral("self"));
+        user_data.insert(OPL::Db::PILOTS_ALIAS, QStringLiteral("self"));
         break;
     case 1:
-        user_data.insert(Opl::Db::PILOTS_ALIAS, QStringLiteral("SELF"));
+        user_data.insert(OPL::Db::PILOTS_ALIAS, QStringLiteral("SELF"));
         break;
     case 2:{
         QString name;
@@ -193,18 +193,18 @@ void SettingsWidget::updatePersonalDetails()
         name.append(QLatin1String(", "));
         name.append(ui->firstnameLineEdit->text().left(1));
         name.append(QLatin1Char('.'));
-        user_data.insert(Opl::Db::PILOTS_ALIAS, name);
+        user_data.insert(OPL::Db::PILOTS_ALIAS, name);
     }
         break;
     default:
         break;
     }
-    user_data.insert(Opl::Db::PILOTS_LASTNAME, ui->lastnameLineEdit->text());
-    user_data.insert(Opl::Db::PILOTS_FIRSTNAME, ui->firstnameLineEdit->text());
-    user_data.insert(Opl::Db::PILOTS_COMPANY, ui->companyLineEdit->text());
-    user_data.insert(Opl::Db::PILOTS_EMPLOYEEID, ui->employeeidLineEdit->text());
-    user_data.insert(Opl::Db::PILOTS_PHONE, ui->phoneLineEdit->text());
-    user_data.insert(Opl::Db::PILOTS_EMAIL, ui->emailLineEdit->text());
+    user_data.insert(OPL::Db::PILOTS_LASTNAME, ui->lastnameLineEdit->text());
+    user_data.insert(OPL::Db::PILOTS_FIRSTNAME, ui->firstnameLineEdit->text());
+    user_data.insert(OPL::Db::PILOTS_COMPANY, ui->companyLineEdit->text());
+    user_data.insert(OPL::Db::PILOTS_EMPLOYEEID, ui->employeeidLineEdit->text());
+    user_data.insert(OPL::Db::PILOTS_PHONE, ui->phoneLineEdit->text());
+    user_data.insert(OPL::Db::PILOTS_EMAIL, ui->emailLineEdit->text());
 
     auto user = APilotEntry(1);
     user.setData(user_data);
@@ -323,7 +323,7 @@ void SettingsWidget::on_acftSortComboBox_currentIndexChanged(int index)
 void SettingsWidget::on_aboutPushButton_clicked()
 {
     QMessageBox message_box(this);
-    QPixmap icon = QPixmap(Opl::Assets::ICON_MAIN);
+    QPixmap icon = QPixmap(OPL::Assets::ICON_MAIN);
     message_box.setIconPixmap(icon.scaledToWidth(64, Qt::TransformationMode::SmoothTransformation));
     QString SQLITE_VERSION = aDB->sqliteVersion();
     QString text = QMessageBox::tr(

src/opl.cpp

@@ -1,6 +1,6 @@
 #include "opl.h"
 
-namespace Opl {
+namespace OPL {
 
 void OplGlobals::fillLanguageComboBox(QComboBox *combo_box) const
 {
@@ -12,7 +12,7 @@ void OplGlobals::fillLanguageComboBox(QComboBox *combo_box) const
 void OplGlobals::fillViewNamesComboBox(QComboBox *combo_box) const
 {
     const QSignalBlocker blocker(combo_box);
-    for (int i = 0; i < DATABASE_VIEW_DISPLAY_NAMES.size(); i++)
+    for (int i = DbViewName::Default; i < DATABASE_VIEW_DISPLAY_NAMES.size(); i++)
         combo_box->addItem(DATABASE_VIEW_DISPLAY_NAMES.value(DbViewName(i)));
 }
 
@@ -26,8 +26,8 @@ void OplGlobals::loadPilotFunctios(QComboBox *combo_box) const
 void OplGlobals::loadSimulatorTypes(QComboBox *combo_box) const
 {
     const QSignalBlocker blocker(combo_box);
-    for (int i = 0; i < SIMULATOR_TYPES.size(); i++)
-        combo_box->addItem(SIMULATOR_TYPES.value(SimulatorTypes(i)));
+    for (int i = SimulatorType::FNPTI; i < SIMULATOR_TYPES.size(); i++)
+        combo_box->addItem(SIMULATOR_TYPES.value(SimulatorType(i)));
 }
 
 void OplGlobals::loadApproachTypes(QComboBox *combo_box) const

src/opl.h

@@ -37,7 +37,7 @@
  *  The db namespace contains constants for programatically accessing the database in a fast
  *  and uniform manner.
  */
-namespace Opl {
+namespace OPL {
 
 #define OPL_VERSION 0
 #define OPL_SUBVERSION 1
@@ -55,9 +55,9 @@ namespace Opl {
 #define LOG qInfo()                             // Use for logging milestones (silently, will be written to log file and console out only)
 #define TODO qCritical() << "TO DO:\t"
 
-#define INFO(msg) Opl::ANotificationHandler::info(msg, this)  // Use for messages of interest to the user (will be displayed in GUI)
-#define WARN(msg) Opl::ANotificationHandler::warn(msg, this)  // Use for warnings (will be displayed in GUI)
-#define CRIT(msg) Opl::ANotificationHandler::crit(msg, this)  // Use for critical warnings (will be displayed in GUI)
+#define INFO(msg) OPL::ANotificationHandler::info(msg, this)  // Use for messages of interest to the user (will be displayed in GUI)
+#define WARN(msg) OPL::ANotificationHandler::warn(msg, this)  // Use for warnings (will be displayed in GUI)
+#define CRIT(msg) OPL::ANotificationHandler::crit(msg, this)  // Use for critical warnings (will be displayed in GUI)
 
 /*!
  * \brief The ANotificationHandler class handles displaying of user-directed messages. It displays
@@ -84,6 +84,16 @@ public:
     };
 }; // class ANotificationHandler
 
+/*!
+ * \brief ADateFormats enumerates the accepted date formats for QDateEdits
+ * \todo At the moment, only ISODate is accepet as a valid date format.
+ */
+enum class DateFormat {ISODate, DE, EN };
+
+enum class FlightTimeFormat {Default, Decimal};
+
+enum class DateTimeFormat {Default, Backup};
+
 /*!
  * \brief PilotFunction
  * Pilot in Command, Pilot in Command under Supervision, Second in Command (Co-Pilot), Dual, Flight Instructor
@@ -103,11 +113,11 @@ enum DbViewName {Default, DefaultWithSim, Easa, EasaWithSim};
 /*!
  * \brief Enumerates the Simulator Types: Flight and Navigation Procedures Trainer 1/2, Flight Simulation Training Device
  */
-enum SimulatorTypes {FNPTI = 0, FNPTII = 1, FSTD = 2};
+enum SimulatorType {FNPTI = 0, FNPTII = 1, FSTD = 2};
 
 /*!
  * \brief The OplGlobals class encapsulates non-POD globals to avoid making them static. It is available
- * as a global static object via the Opl::GLOBAL makro and may be used as if it were a pointer, guaranteed to be initialized exactly once.
+ * as a global static object via the OPL::GLOBAL makro and may be used as if it were a pointer, guaranteed to be initialized exactly once.
  * For more information, see (Q_GLOBAL_STATIC)[https://doc.qt.io/qt-5/qglobalstatic.html#details]
  */
 class OplGlobals : public QObject {
@@ -127,7 +137,7 @@ public:
 private:
     Q_OBJECT
 
-    const QMap<Opl::Translation, QString> L10N_FilePaths {
+    const QMap<Translation, QString> L10N_FilePaths {
         {Translation::English, QStringLiteral("l10n/openpilotlog_en")},
         {Translation::German,  QStringLiteral("l10n/openpilotlog_de")},
         {Translation::Spanish, QStringLiteral("l10n/openpilotlog_es")},
@@ -156,7 +166,7 @@ private:
         {PilotFunction::DUAL,  QLatin1String("DUAL")},
         {PilotFunction::FI,    QLatin1String("FI")},
     };
-    const QMap<SimulatorTypes, QString> SIMULATOR_TYPES = {
+    const QMap<SimulatorType, QString> SIMULATOR_TYPES = {
         {FNPTI,  QStringLiteral("FNPT I")},
         {FNPTII, QStringLiteral("FNPT II")},
         {FSTD,   QStringLiteral("FSTD")},
@@ -189,34 +199,12 @@ private:
 //Make available as a global static
 Q_GLOBAL_STATIC(OplGlobals, GLOBALS)
 
-namespace Date {
-
 /*!
- * \brief ADateFormats enumerates the accepted date formats for QDateEdits
- * \todo At the moment, only ISODate is accepet as a valid date format.
- */
-enum ADateFormat {ISODate, DE, EN };
-
-} // namespace opl::date
-
-namespace Time {
-
-enum FlightTimeFormat {Default, Decimal};
-
-} // namespace opl::time
-
-namespace Datetime {
-
-enum DateTimeFormat {Default, Backup};
-
-} // namespace opl::datetime
-
-/*!
- *  The opl::db namespace provides string literals to programatically access the database
+ *  The OPL::db namespace provides string literals to programatically access the database
  *
  *  Example usage, do:
- *  newData.insert(opl::db::FLIGHTS_DEP, ui->deptLocLineEdit->text());
- *  newData.value(opl::db::AIRCRAFT_MULTIPILOT);
+ *  newData.insert(OPL::db::FLIGHTS_DEP, ui->deptLocLineEdit->text());
+ *  newData.value(OPL::db::AIRCRAFT_MULTIPILOT);
  *
  *  instead of:
  *  newData.insert("dept", ui->deptLocLineEdit->text());
@@ -312,12 +300,7 @@ static const auto SIMULATORS_REMARKS     = QStringLiteral("remarks");
 static const auto ROWID                  = QStringLiteral("rowid");
 static const auto NULL_TIME_hhmm         = QStringLiteral("00:00");
 
-//static const auto DEFAULT_FLIGHT_POSITION   = DataPosition(TABLE_FLIGHTS, 0);
-//static const auto DEFAULT_PILOT_POSITION    = DataPosition(TABLE_PILOTS, 0);
-//static const auto DEFAULT_TAIL_POSITION     = DataPosition(TABLE_TAILS, 0);
-//static const auto DEFAULT_AIRCRAFT_POSITION = DataPosition(TABLE_AIRCRAFT, 0);
-
-} // namespace opl::db
+} // namespace OPL::db
 
 namespace Assets {
 
@@ -352,7 +335,7 @@ static const auto ICON_TOOLBAR_BACKUP_DARK      = QStringLiteral(":/icons/opl-ic
 namespace Styles {
 
 static const auto RED_BORDER = QStringLiteral("border: 1px solid red");
-} // namespace ui
+} // namespace Styles
 
 } // namespace opl
 

src/testing/importCrewlounge/importcrewlounge.cpp

@@ -30,7 +30,7 @@ void exec(const QString &csv_file_path)
 
     for (const auto & pilot : p_maps) {
         APilotEntry pe(pilot);
-        pe.setPosition(DataPosition(Opl::Db::TABLE_PILOTS, pilot.value(Opl::Db::PILOTS_ROWID).toInt()));
+        pe.setPosition(DataPosition(OPL::Db::TABLE_PILOTS, pilot.value(OPL::Db::PILOTS_ROWID).toInt()));
         aDB->commit(pe);
     }
 
@@ -41,7 +41,7 @@ void exec(const QString &csv_file_path)
 
     for (const auto& tail : t_maps) {
         ATailEntry te(tail);
-        te.setPosition(DataPosition(Opl::Db::TABLE_TAILS, tail.value(Opl::Db::PILOTS_ROWID).toInt()));
+        te.setPosition(DataPosition(OPL::Db::TABLE_TAILS, tail.value(OPL::Db::PILOTS_ROWID).toInt()));
         aDB->commit(te);
     }
 

src/testing/importCrewlounge/processaircraft.cpp

@@ -23,31 +23,31 @@ void ProcessAircraft::processParsedData()
 
     QHash<QString, QVariant> new_tail_data;
     for (const auto &list : qAsConst(unique_tails)) {
-        new_tail_data.insert(Opl::Db::TAILS_REGISTRATION, list[0]);
-        new_tail_data.insert(Opl::Db::TAILS_COMPANY, list[1]);
-        new_tail_data.insert(Opl::Db::TAILS_MAKE, list[2]);
-        new_tail_data.insert(Opl::Db::TAILS_MODEL, list[3]);
-        new_tail_data.insert(Opl::Db::TAILS_VARIANT, list[4]);
+        new_tail_data.insert(OPL::Db::TAILS_REGISTRATION, list[0]);
+        new_tail_data.insert(OPL::Db::TAILS_COMPANY, list[1]);
+        new_tail_data.insert(OPL::Db::TAILS_MAKE, list[2]);
+        new_tail_data.insert(OPL::Db::TAILS_MODEL, list[3]);
+        new_tail_data.insert(OPL::Db::TAILS_VARIANT, list[4]);
 
         if (list[5] == "TRUE")
-            new_tail_data.insert(Opl::Db::TAILS_MULTIPILOT, 1);
+            new_tail_data.insert(OPL::Db::TAILS_MULTIPILOT, 1);
         else
-            new_tail_data.insert(Opl::Db::TAILS_MULTIPILOT, 0);
+            new_tail_data.insert(OPL::Db::TAILS_MULTIPILOT, 0);
 
         if (list[6] == "TRUE")
-            new_tail_data.insert(Opl::Db::TAILS_MULTIENGINE, 1);
+            new_tail_data.insert(OPL::Db::TAILS_MULTIENGINE, 1);
         else
-            new_tail_data.insert(Opl::Db::TAILS_MULTIENGINE, 0);
+            new_tail_data.insert(OPL::Db::TAILS_MULTIENGINE, 0);
 
         if (list[7] == "Piston") // other values need to be added as needed, do later
-            new_tail_data.insert(Opl::Db::TAILS_ENGINETYPE, 1);
+            new_tail_data.insert(OPL::Db::TAILS_ENGINETYPE, 1);
         else if (list[7] == "Turbine (jet-fan)")
-            new_tail_data.insert(Opl::Db::TAILS_ENGINETYPE, 3);
+            new_tail_data.insert(OPL::Db::TAILS_ENGINETYPE, 3);
 
         if (list[8] == "TRUE") // this is a above 7.5t switch in MCC, so default to medium for now
-            new_tail_data.insert(Opl::Db::TAILS_WEIGHTCLASS, 1);
+            new_tail_data.insert(OPL::Db::TAILS_WEIGHTCLASS, 1);
         else
-            new_tail_data.insert(Opl::Db::TAILS_WEIGHTCLASS, 0);
+            new_tail_data.insert(OPL::Db::TAILS_WEIGHTCLASS, 0);
 
         new_tail_data.insert(QStringLiteral("tail_id"), unique_tail_id);
 

src/testing/importCrewlounge/processflights.cpp

@@ -23,57 +23,57 @@ void ProcessFlights::processParsedData()
 
     for (const auto &row : qAsConst(rawFlightData)) {
         // insert values that don't require editing
-        new_flight_data.insert(Opl::Db::FLIGHTS_FLIGHTNUMBER, row[1]);
-        new_flight_data.insert(Opl::Db::FLIGHTS_DEPT, row[2]);
-        new_flight_data.insert(Opl::Db::FLIGHTS_DEST, row[3]);
-        new_flight_data.insert(Opl::Db::FLIGHTS_TBLK, row[6]);
-        new_flight_data.insert(Opl::Db::FLIGHTS_TPIC, row[7]);
-        new_flight_data.insert(Opl::Db::FLIGHTS_TSIC, row[8]);
-        new_flight_data.insert(Opl::Db::FLIGHTS_TDUAL, row[9]);
-        new_flight_data.insert(Opl::Db::FLIGHTS_TPICUS, row[10]);
-        new_flight_data.insert(Opl::Db::FLIGHTS_TFI, row[11]);
-        new_flight_data.insert(Opl::Db::FLIGHTS_TNIGHT, row[12]);
-        new_flight_data.insert(Opl::Db::FLIGHTS_TODAY, row[16]);
-        new_flight_data.insert(Opl::Db::FLIGHTS_TONIGHT, row[17]);
-        new_flight_data.insert(Opl::Db::FLIGHTS_LDGDAY, row[18]);
-        new_flight_data.insert(Opl::Db::FLIGHTS_LDGNIGHT, row[19]);
-        new_flight_data.insert(Opl::Db::FLIGHTS_APPROACHTYPE, row[21]);
-        new_flight_data.insert(Opl::Db::FLIGHTS_REMARKS, row[22]);
+        new_flight_data.insert(OPL::Db::FLIGHTS_FLIGHTNUMBER, row[1]);
+        new_flight_data.insert(OPL::Db::FLIGHTS_DEPT, row[2]);
+        new_flight_data.insert(OPL::Db::FLIGHTS_DEST, row[3]);
+        new_flight_data.insert(OPL::Db::FLIGHTS_TBLK, row[6]);
+        new_flight_data.insert(OPL::Db::FLIGHTS_TPIC, row[7]);
+        new_flight_data.insert(OPL::Db::FLIGHTS_TSIC, row[8]);
+        new_flight_data.insert(OPL::Db::FLIGHTS_TDUAL, row[9]);
+        new_flight_data.insert(OPL::Db::FLIGHTS_TPICUS, row[10]);
+        new_flight_data.insert(OPL::Db::FLIGHTS_TFI, row[11]);
+        new_flight_data.insert(OPL::Db::FLIGHTS_TNIGHT, row[12]);
+        new_flight_data.insert(OPL::Db::FLIGHTS_TODAY, row[16]);
+        new_flight_data.insert(OPL::Db::FLIGHTS_TONIGHT, row[17]);
+        new_flight_data.insert(OPL::Db::FLIGHTS_LDGDAY, row[18]);
+        new_flight_data.insert(OPL::Db::FLIGHTS_LDGNIGHT, row[19]);
+        new_flight_data.insert(OPL::Db::FLIGHTS_APPROACHTYPE, row[21]);
+        new_flight_data.insert(OPL::Db::FLIGHTS_REMARKS, row[22]);
 
         // PF
         if (row[20] == QLatin1String("TRUE"))
-            new_flight_data.insert(Opl::Db::FLIGHTS_PILOTFLYING, 1);
+            new_flight_data.insert(OPL::Db::FLIGHTS_PILOTFLYING, 1);
         else
-            new_flight_data.insert(Opl::Db::FLIGHTS_PILOTFLYING, 0);
+            new_flight_data.insert(OPL::Db::FLIGHTS_PILOTFLYING, 0);
 
         // Convert Date and Time
         const QDate doft = QDate::fromString(row[0],QStringLiteral("dd/MM/yyyy"));
-        new_flight_data.insert(Opl::Db::FLIGHTS_DOFT, doft.toString(Qt::ISODate));
+        new_flight_data.insert(OPL::Db::FLIGHTS_DOFT, doft.toString(Qt::ISODate));
 
         auto time_off = QTime::fromString(row[4], QStringLiteral("hh:mm"));
         if (!time_off.isValid())
             time_off = QTime::fromString(row[4], QStringLiteral("h:mm"));
         int tofb = ATime::toMinutes(time_off);
-        new_flight_data.insert(Opl::Db::FLIGHTS_TOFB, tofb);
+        new_flight_data.insert(OPL::Db::FLIGHTS_TOFB, tofb);
 
         auto time_on = QTime::fromString(row[5], QStringLiteral("hh:mm"));
         if (!time_on.isValid())
             time_on = QTime::fromString(row[5], QStringLiteral("h:mm"));
 
         int tonb = ATime::toMinutes(time_on);
-        new_flight_data.insert(Opl::Db::FLIGHTS_TONB, tonb);
+        new_flight_data.insert(OPL::Db::FLIGHTS_TONB, tonb);
 
         // map pilots
         int pic = processedPilotsIds.value(row[13]);
-        new_flight_data.insert(Opl::Db::FLIGHTS_PIC, pic);
+        new_flight_data.insert(OPL::Db::FLIGHTS_PIC, pic);
         int second_pilot = processedPilotsIds.value(row[14]);
-        new_flight_data.insert(Opl::Db::FLIGHTS_SECONDPILOT, second_pilot);
+        new_flight_data.insert(OPL::Db::FLIGHTS_SECONDPILOT, second_pilot);
         int third_pilot = processedPilotsIds.value(row[15]);
-        new_flight_data.insert(Opl::Db::FLIGHTS_THIRDPILOT, third_pilot);
+        new_flight_data.insert(OPL::Db::FLIGHTS_THIRDPILOT, third_pilot);
 
         // map tail
         int acft = processedTailsIds.value(row[23]);
-        new_flight_data.insert(Opl::Db::FLIGHTS_ACFT, acft);
+        new_flight_data.insert(OPL::Db::FLIGHTS_ACFT, acft);
 
         // set id, fix opl to include alias
         new_flight_data.insert(QStringLiteral("flight_id"), flight_id);

src/testing/importCrewlounge/processpilots.cpp

@@ -51,21 +51,21 @@ void ProcessPilots::processParsedData()
         // process name [1]
         auto temp_list = pair.first[1].split(QLatin1Char(' '));
         if (!temp_list.isEmpty()) {
-            new_pilot_data.insert(Opl::Db::PILOTS_LASTNAME, temp_list.first());
+            new_pilot_data.insert(OPL::Db::PILOTS_LASTNAME, temp_list.first());
             temp_list.pop_front();
 
             if (!temp_list.isEmpty())
-                new_pilot_data.insert(Opl::Db::PILOTS_FIRSTNAME, temp_list.join(QLatin1Char(' ')));
+                new_pilot_data.insert(OPL::Db::PILOTS_FIRSTNAME, temp_list.join(QLatin1Char(' ')));
         } else {
-            new_pilot_data.insert(Opl::Db::PILOTS_LASTNAME, QStringLiteral("UNKNOWN"));
+            new_pilot_data.insert(OPL::Db::PILOTS_LASTNAME, QStringLiteral("UNKNOWN"));
         }
 
         // add additional data
-        new_pilot_data.insert(Opl::Db::PILOTS_EMPLOYEEID, pair.first[0]);
-        new_pilot_data.insert(Opl::Db::PILOTS_PHONE, pair.first[2]);
-        new_pilot_data.insert(Opl::Db::PILOTS_EMAIL, pair.first[3]);
+        new_pilot_data.insert(OPL::Db::PILOTS_EMPLOYEEID, pair.first[0]);
+        new_pilot_data.insert(OPL::Db::PILOTS_PHONE, pair.first[2]);
+        new_pilot_data.insert(OPL::Db::PILOTS_EMAIL, pair.first[3]);
 
-        // add pilot_id (workaround with literal until Opl::Db is updated)
+        // add pilot_id (workaround with literal until OPL::Db is updated)
         new_pilot_data.insert(QStringLiteral("pilot_id"), pair.second);
 
         processedPilotHashes.insert(pair.first[1], new_pilot_data);