Removed namespace experimental

Namespace experimental removed, moved files into regular source structure and adjusted includes etc.

main.cpp

@@ -18,7 +18,7 @@
 #include "mainwindow.h"
 #include "src/gui/dialogues/firstrundialog.h"
 #include "src/classes/arunguard.h"
-#include "src/experimental/adatabase.h"
+#include "src/database/adatabase.h"
 #include "src/classes/asettings.h"
 #include <QApplication>
 #include <QProcess>
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
     QSettings::setDefaultFormat(QSettings::IniFormat);
     QSettings settings;
 
-    experimental::aDB()->connect();
+    aDB()->connect();
 
     QApplication openPilotLog(argc, argv);
     if(!setup()){

mainwindow.cpp

@@ -18,6 +18,7 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "src/testing/adebug.h"
+#include "src/database/adatabase.h"
 
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
@@ -76,7 +77,7 @@ MainWindow::MainWindow(QWidget *parent)
     /// [F] I understand how it is annoying to not have the database
     /// working when something has changed. Hopefully this check
     /// helps to avoid that in the future!
-    const int DATABASE_REVISION_NUMBER = 14;
+    const int DATABASE_REVISION_NUMBER = 15;
     QSqlQuery query;
     query.prepare("SELECT COUNT (*) FROM changelog");
     query.exec();
@@ -132,11 +133,11 @@ void MainWindow::on_actionDebug_triggered()
 
 void MainWindow::connectWidgets()
 {
-    QObject::connect(experimental::aDB(), &experimental::ADatabase::dataBaseUpdated,
+    QObject::connect(aDB(), &ADatabase::dataBaseUpdated,
                      logbookWidget, &LogbookWidget::onDisplayModel_dataBaseUpdated);
-    QObject::connect(experimental::aDB(), &experimental::ADatabase::dataBaseUpdated,
+    QObject::connect(aDB(), &ADatabase::dataBaseUpdated,
                      pilotsWidget, &PilotsWidget::onDisplayModel_dataBaseUpdated);
-    QObject::connect(experimental::aDB(), &experimental::ADatabase::dataBaseUpdated,
+    QObject::connect(aDB(), &ADatabase::dataBaseUpdated,
                      aircraftWidget, &AircraftWidget::onDisplayModel_dataBaseUpdated);
 
     QObject::connect(settingsWidget, &SettingsWidget::viewSelectionChanged,

mainwindow.h

@@ -36,7 +36,6 @@
 #include "src/gui/dialogues/newtaildialog.h"
 #include "src/gui/dialogues/newpilotdialog.h"
 #include "src/classes/arunguard.h"
-#include "src/experimental/adatabase.h"
 #include "src/testing/atimer.h"
 
 QT_BEGIN_NAMESPACE

openPilotLog.pro

@@ -18,16 +18,16 @@ DEFINES += QT_DEPRECATED_WARNINGS
 SOURCES += \
     main.cpp \
     mainwindow.cpp \
+    src/classes/aaircraftentry.cpp \
     src/classes/adownload.cpp \
+    src/classes/aentry.cpp \
+    src/classes/aflightentry.cpp \
+    src/classes/apilotentry.cpp \
     src/classes/arunguard.cpp \
     src/classes/asettings.cpp \
+    src/classes/atailentry.cpp \
+    src/database/adatabase.cpp \
     src/database/adatabasesetup.cpp \
-    src/experimental/aaircraftentry.cpp \
-    src/experimental/adatabase.cpp \
-    src/experimental/aentry.cpp \
-    src/experimental/aflightentry.cpp \
-    src/experimental/apilotentry.cpp \
-    src/experimental/atailentry.cpp \
     src/functions/acalc.cpp \
     src/functions/areadcsv.cpp \
     src/functions/astat.cpp \
@@ -47,19 +47,17 @@ SOURCES += \
 
 HEADERS += \
     mainwindow.h \
+    src/classes/aaircraftentry.h \
     src/classes/adownload.h \
+    src/classes/aentry.h \
+    src/classes/aflightentry.h \
+    src/classes/apilotentry.h \
     src/classes/arunguard.h \
     src/classes/asettings.h \
+    src/classes/atailentry.h \
+    src/database/adatabase.h \
     src/database/adatabasesetup.h \
-    src/database/tablecolumnliterals.h \
-    src/experimental/UserInput.h \
-    src/experimental/aaircraftentry.h \
-    src/experimental/adatabase.h \
-    src/experimental/aentry.h \
-    src/experimental/aflightentry.h \
-    src/experimental/apilotentry.h \
-    src/experimental/atailentry.h \
-    src/experimental/decl.h \
+    src/database/declarations.h \
     src/functions/acalc.h \
     src/functions/areadcsv.h \
     src/functions/astat.h \

src/experimental/aaircraftentry.cpp → src/classes/aaircraftentry.cpp

@@ -17,18 +17,14 @@
  */
 #include "aaircraftentry.h"
 
-namespace experimental {
-
 AAircraftEntry::AAircraftEntry()
     : AEntry::AEntry(DEFAULT_AIRCRAFT_POSITION)
 {}
 
 AAircraftEntry::AAircraftEntry(int row_id)
-    : AEntry::AEntry(DataPosition(QLatin1String("aircraft"), row_id))
+    : AEntry::AEntry(DataPosition(DB_TABLE_AIRCRAFT, row_id))
 {}
 
-AAircraftEntry::AAircraftEntry(TableData table_data)
+AAircraftEntry::AAircraftEntry(RowData table_data)
     : AEntry::AEntry(DEFAULT_AIRCRAFT_POSITION, table_data)
 {}
-
-} // namespace experimental

src/experimental/aaircraftentry.h → src/classes/aaircraftentry.h

@@ -1,10 +1,8 @@
 #ifndef AAIRCRAFTENTRY_H
 #define AAIRCRAFTENTRY_H
 
-#include "src/experimental/aentry.h"
-#include "src/experimental/decl.h"
-
-namespace experimental {
+#include "src/classes/aentry.h"
+#include "src/database/declarations.h"
 
 struct AAircraftEntry : public AEntry {
 public:
@@ -12,9 +10,7 @@ public:
     AAircraftEntry(const AAircraftEntry& te) = default;
     AAircraftEntry& operator=(const AAircraftEntry& te) = default;
     AAircraftEntry(int row_id);
-    AAircraftEntry(TableData table_data);
+    AAircraftEntry(RowData table_data);
 };
 
-} // namespace experimental
-
 #endif // AAIRCRAFTENTRY_H

src/experimental/aentry.cpp → src/classes/aentry.cpp

@@ -17,21 +17,19 @@
  */
 #include "aentry.h"
 
-namespace experimental {
-
 AEntry::AEntry(DataPosition position_)
     : position(position_)
 {}
 
-AEntry::AEntry(TableData table_data)
+AEntry::AEntry(RowData table_data)
     : tableData(table_data)
 {}
 
-AEntry::AEntry(DataPosition position_, TableData table_data)
+AEntry::AEntry(DataPosition position_, RowData table_data)
     : position(position_), tableData(table_data)
 {}
 
-void AEntry::setData(TableData table_data)
+void AEntry::setData(RowData table_data)
 {
     tableData = table_data;
 }
@@ -41,9 +39,7 @@ const DataPosition& AEntry::getPosition()
     return position;
 }
 
-const TableData& AEntry::getData()
+const RowData& AEntry::getData()
 {
     return tableData;
 }
-
-}  // namespace experimental

src/experimental/aentry.h → src/classes/aentry.h

@@ -24,9 +24,7 @@
 #include <QPair>
 #include <QVariant>
 
-#include "decl.h"
-
-namespace experimental {
+#include "src/database/declarations.h"
 
 // [G]: Define what data is public and what not. For objects such as
 // DataPosition which are consumable its no biggy. Are entries the same?
@@ -43,23 +41,21 @@ class AEntry {
 protected:
     DataPosition position;
 public:
-    TableData tableData;
+    RowData tableData;
 public:
     AEntry() = delete; // Demand specificity from default constructor
     AEntry(const AEntry&) = default;
     AEntry& operator=(const AEntry&) = default;
     AEntry(DataPosition position_);
-    AEntry(TableData table_data);
-    AEntry(DataPosition position_, TableData table_data);
+    AEntry(RowData table_data);
+    AEntry(DataPosition position_, RowData table_data);
 
-    void setData(TableData table_data);
+    void setData(RowData table_data);
     void setPosition(DataPosition position_);
 
     const DataPosition& getPosition();
-    const TableData& getData();
+    const RowData& getData();
 
 };
 
-}
-
 #endif // AENTRY_H

src/experimental/aflightentry.cpp → src/classes/aflightentry.cpp

@@ -16,10 +16,7 @@
  *along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "aflightentry.h"
-#include "src/experimental/adatabase.h"
-#include "src/database/tablecolumnliterals.h"
-
-namespace experimental {
+#include "src/database/adatabase.h"
 
 AFlightEntry::AFlightEntry()
     : AEntry::AEntry(DEFAULT_FLIGHT_POSITION)
@@ -29,7 +26,7 @@ AFlightEntry::AFlightEntry(int row_id)
     : AEntry::AEntry(DataPosition(DB_TABLE_FLIGHTS, row_id))
 {}
 
-AFlightEntry::AFlightEntry(TableData table_data)
+AFlightEntry::AFlightEntry(RowData table_data)
     : AEntry::AEntry(DEFAULT_FLIGHT_POSITION, table_data)
 {}
 
@@ -74,5 +71,3 @@ const QString AFlightEntry::getPilotName(pilot pilot_)
     } // switch (pilot_)
     return QString();
 }
-
-} // namespace experimental

src/experimental/aflightentry.h → src/classes/aflightentry.h

@@ -18,18 +18,16 @@
 #ifndef AFLIGHTENTRY_H
 #define AFLIGHTENTRY_H
 
-#include "src/experimental/aentry.h"
+#include "src/classes/aentry.h"
 #include "src/functions/acalc.h"
 
-namespace experimental {
-
 class AFlightEntry : public AEntry {
 public:
     AFlightEntry();
     AFlightEntry(const AFlightEntry& pe) = default;
     AFlightEntry& operator=(const AFlightEntry& pe) = default;
     AFlightEntry(int row_id);
-    AFlightEntry(TableData table_data);
+    AFlightEntry(RowData table_data);
 
     enum pilot { pic, sic, thirdPilot };
 
@@ -51,6 +49,4 @@ public:
     const QString getPilotName(pilot);
 };
 
-} // namespace experimental
-
 #endif // AFLIGHTENTRY_H

src/experimental/apilotentry.cpp → src/classes/apilotentry.cpp

@@ -16,9 +16,6 @@
  *along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "apilotentry.h"
-#include "src/database/tablecolumnliterals.h"
-
-namespace experimental {
 
 APilotEntry::APilotEntry()
     : AEntry::AEntry(DEFAULT_PILOT_POSITION)
@@ -28,7 +25,7 @@ APilotEntry::APilotEntry(int row_id)
     : AEntry::AEntry(DataPosition(DB_TABLE_PILOTS, row_id))
 {}
 
-APilotEntry::APilotEntry(TableData table_data)
+APilotEntry::APilotEntry(RowData table_data)
     : AEntry::AEntry(DEFAULT_PILOT_POSITION, table_data)
 {}
 
@@ -40,5 +37,3 @@ const QString APilotEntry::name()
     return tableData.value(DB_PILOTS_LASTNAME).toString() + ','
            +tableData.value(DB_PILOTS_FIRSTNAME).toString().left(1) + '.';
 }
-
-} // namespace experimental

src/experimental/apilotentry.h → src/classes/apilotentry.h

@@ -18,10 +18,8 @@
 #ifndef APILOTENTRY_H
 #define APILOTENTRY_H
 
-#include "src/experimental/aentry.h"
-#include "src/experimental/decl.h"
-
-namespace experimental {
+#include "src/classes/aentry.h"
+#include "src/database/declarations.h"
 
 struct APilotEntry : public AEntry {
 public:
@@ -29,11 +27,9 @@ public:
     APilotEntry(const APilotEntry& pe) = default;
     APilotEntry& operator=(const APilotEntry& pe) = default;
     APilotEntry(int row_id);
-    APilotEntry(TableData table_data);
+    APilotEntry(RowData table_data);
 
     const QString name();
 };
 
-} // namespace experimental
-
 #endif // APILOTENTRY_H

src/experimental/atailentry.cpp → src/classes/atailentry.cpp

@@ -16,9 +16,6 @@
  *along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "atailentry.h"
-#include "src/database/tablecolumnliterals.h"
-
-namespace experimental {
 
 ATailEntry::ATailEntry()
     : AEntry::AEntry(DEFAULT_TAIL_POSITION)
@@ -28,7 +25,7 @@ ATailEntry::ATailEntry(int row_id)
     : AEntry::AEntry(DataPosition(DB_TABLE_TAILS, row_id))
 {}
 
-ATailEntry::ATailEntry(TableData table_data)
+ATailEntry::ATailEntry(RowData table_data)
     : AEntry::AEntry(DEFAULT_TAIL_POSITION, table_data)
 {}
 
@@ -49,5 +46,3 @@ const QString ATailEntry::type()
 
     return type_string;
 }
-
-} // namespace experimental

src/experimental/atailentry.h → src/classes/atailentry.h

@@ -18,11 +18,8 @@
 #ifndef ATAILENTRY_H
 #define ATAILENTRY_H
 
-#include "src/experimental/aentry.h"
-#include "src/experimental/decl.h"
-#include <QVariant>
-
-namespace experimental {
+#include "src/classes/aentry.h"
+#include "src/database/declarations.h"
 
 struct ATailEntry : public AEntry {
 public:
@@ -30,13 +27,12 @@ public:
     ATailEntry(const ATailEntry& te) = default;
     ATailEntry& operator=(const ATailEntry& te) = default;
     ATailEntry(int row_id);
-    ATailEntry(TableData table_data);
+    ATailEntry(RowData table_data);
 
     const QString registration();
 
     const QString type();
 };
 
-} // namespace experimental
 
 #endif // ATAILENTRY_H

src/experimental/adatabase.cpp → src/database/adatabase.cpp

@@ -20,9 +20,6 @@
 
 const auto SQL_DRIVER = QStringLiteral("QSQLITE");
 
-
-namespace experimental {
-
 ADatabaseError::ADatabaseError(QString msg_)
     : QSqlError::QSqlError(msg_)
 {}
@@ -332,12 +329,12 @@ bool ADatabase::insert(AEntry new_entry)
 
 }
 
-TableData ADatabase::getEntryData(DataPosition data_position)
+RowData ADatabase::getEntryData(DataPosition data_position)
 {
     // check table exists
     if (!tableNames.contains(data_position.first)) {
         DEB(data_position.first << " not a table in the database. Unable to retreive Entry data.");
-        return TableData();
+        return RowData();
     }
 
     //Check Database for rowId
@@ -353,14 +350,14 @@ TableData ADatabase::getEntryData(DataPosition data_position)
         DEB("SQL error: " << check_query.lastError().text());
         DEB("Statement: " << statement);
         lastError = check_query.lastError().text();
-        return TableData();
+        return RowData();
     }
 
     check_query.next();
     if (check_query.value(0).toInt() == 0) {
         DEB("No Entry found for row id: " << data_position.second );
         lastError = ADatabaseError("Database entry not found.");
-        return TableData();
+        return RowData();
     }
 
     // Retreive TableData
@@ -377,11 +374,11 @@ TableData ADatabase::getEntryData(DataPosition data_position)
         DEB("SQL error: " << select_query.lastError().text());
         DEB("Statement: " << statement);
         lastError = select_query.lastError().text();
-        return TableData();
+        return RowData();
     }
 
     select_query.next();
-    TableData entry_data;
+    RowData entry_data;
 
     for (const auto &column : tableColumns.value(data_position.first)) {
         entry_data.insert(column, select_query.value(column));
@@ -621,5 +618,3 @@ QVector<QString> ADatabase::customQuery(QString statement, int return_values)
 }
 
 ADatabase* aDB() { return ADatabase::getInstance(); }
-
-}// namespace experimental

src/experimental/adatabase.h → src/database/adatabase.h

@@ -31,18 +31,13 @@
 #include <QSqlRecord>
 #include <QSqlField>
 
-#include "decl.h"
-#include "src/database/tablecolumnliterals.h"
-#include "aentry.h"
-#include "apilotentry.h"
-#include "atailentry.h"
-#include "aaircraftentry.h"
-#include "aflightentry.h"
+#include "src/database/declarations.h"
+#include "src/classes/aentry.h"
+#include "src/classes/apilotentry.h"
+#include "src/classes/atailentry.h"
+#include "src/classes/aaircraftentry.h"
+#include "src/classes/aflightentry.h"
 
-namespace experimental {
-
-
-// [G]: Suspicious documentation -,O
 /*!
  * \brief The DBTarget enum lists database items that are
  * used by completers, for content matching or need to be accessed programatically.
@@ -154,7 +149,7 @@ public:
     /*!
      * \brief retreive entry data from the database to create an entry object
      */
-    TableData getEntryData(DataPosition data_position);
+    RowData getEntryData(DataPosition data_position);
 
     /*!
      * \brief retreive an Entry from the database.
@@ -257,6 +252,4 @@ signals:
  */
 ADatabase* aDB();
 
-}  // namespace experimental
-
 #endif // ADATABASE_H

src/database/adatabasesetup.cpp

@@ -16,7 +16,9 @@
  *along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "adatabasesetup.h"
+#include "src/database/adatabase.h"
 #include "src/testing/adebug.h"
+#include "src/functions/areadcsv.h"
 
 
 // Statements for creation of database tables, Revision 15
@@ -271,7 +273,7 @@ bool ADataBaseSetup::createDatabase()
     }
 
     // call connect again to (re-)populate tableNames and columnNames
-    experimental::aDB()->connect();
+    aDB()->connect();
 
     DEB("Populating tables...");
     if (!importDefaultData()) {
@@ -383,9 +385,9 @@ bool ADataBaseSetup::createSchemata(const QStringList &statements)
  */
 bool ADataBaseSetup::commitData(QVector<QStringList> fromCSV, const QString &tableName)
 {
-    DEB("Table names: " << experimental::aDB()->getTableNames());
+    DEB("Table names: " << aDB()->getTableNames());
     DEB("Importing Data to" << tableName);
-    if (!experimental::aDB()->getTableNames().contains(tableName)){
+    if (!aDB()->getTableNames().contains(tableName)){
         DEB(tableName << "is not a table in the database. Aborting.");
         DEB("Please check input data.");
         return false;
@@ -394,7 +396,7 @@ bool ADataBaseSetup::commitData(QVector<QStringList> fromCSV, const QString &tab
     QString statement = "INSERT INTO " + tableName + " (";
     QString placeholder = ") VALUES (";
     for (auto& csvColumn : fromCSV) {
-        if(experimental::aDB()->getTableColumns().value(tableName).contains(csvColumn.first())) {
+        if(aDB()->getTableColumns().value(tableName).contains(csvColumn.first())) {
             statement += csvColumn.first() + ',';
             csvColumn.removeFirst();
             placeholder.append("?,");

src/database/adatabasesetup.h

@@ -19,8 +19,6 @@
 #define DBSETUP_H
 
 #include <QCoreApplication>
-#include "src/experimental/adatabase.h"
-#include "src/functions/areadcsv.h"
 
 /*!
  * \brief The ADataBaseSetup class is responsible for the inital setup of the database when

src/database/tablecolumnliterals.h → src/database/declarations.h

@@ -1,17 +1,56 @@
-#ifndef TABLECOLUMNLITERALS_H
-#define TABLECOLUMNLITERALS_H
+#ifndef DECLARATIONS_H
+#define DECLARATIONS_H
 
-#include <QString>
-#include <QStringLiteral>
+#include <QtCore>
 
-// [F]: These constants deviate slightly from const naming convention to reflect their sql column name.
+/*!
+ * \brief An alias for QString
+ *
+ * Very long description *with* **markdown?**
+ * - - -
+ * # Header
+ */
+using ColName = QString;
+using ColData = QVariant;
+using TableName = QString;
+using RowId = int;
+
+using TableNames = QStringList;
+// [G]: May lead to some confusion. TableData suggest data for the entire table.
+// but in reallity it is data per column *of single row* (unless i misunderstand)
+// [F]: That's correct. We could maybe call it EntryData or RowData?
+using RowData = QMap<ColName, ColData>;
+using ColumnData = QPair<ColName, ColData>;
+using ColumnNames = QStringList;
+using TableColumns = QMap<TableName, ColumnNames>;
+
+// [G]: Needs some work. Inheriting from QPair may be helpful but
+// may also be overkill. Lets determine the specific uses of DataPosition
+// and provide our own interface i would say.
+// [F]: Good idea! Implementing something similar to first and second methods
+// of QPair would be useful to carry over, or some other way of quickly and
+// unambiguously accessing the elements.
+struct DataPosition : QPair<TableName, RowId> {
+    TableName tableName;
+    RowId rowId;
+    DataPosition()
+        : tableName(first), rowId(second)
+    {}
+    DataPosition(TableName table_name, RowId row_id)
+        : QPair<TableName, RowId>::QPair(table_name, row_id),
+          tableName(first), rowId(second)
+    {}
+    DataPosition(const DataPosition& other) = default;
+    DataPosition& operator=(const DataPosition& other) = default;
+};
+
+// [F]:
 // In many places throughout the application, we have to programatically access or write data
 // to or from the database using column names as identifiers, doing something like this:
 //
 // newData.insert("dept", ui->deptLocLineEdit->text());
 // newData.value("multipilot") // do stuff
 //
-//
 // Declaring the literals here avoids memory allocation at runtime for construction of temporary qstrings
 // like ("dept"). See https://doc.qt.io/qt-5/qstring.html#QStringLiteral
 //
@@ -22,8 +61,12 @@ static const auto DB_TABLE_PILOTS   = QStringLiteral("pilots");
 static const auto DB_TABLE_TAILS    = QStringLiteral("tails");
 static const auto DB_TABLE_AIRCRAFT = QStringLiteral("aircraft");
 static const auto DB_TABLE_AIRPORTS = QStringLiteral("airports");
-
-// Flights table
+// Default Positions
+static auto const DEFAULT_FLIGHT_POSITION   = DataPosition(DB_TABLE_FLIGHTS, 0);
+static auto const DEFAULT_PILOT_POSITION    = DataPosition(DB_TABLE_PILOTS, 0);
+static auto const DEFAULT_TAIL_POSITION     = DataPosition(DB_TABLE_TAILS, 0);
+static auto const DEFAULT_AIRCRAFT_POSITION = DataPosition(DB_TABLE_AIRCRAFT, 0);
+// Flights table columns
 static const auto DB_FLIGHTS_DOFT           = QStringLiteral("doft");
 static const auto DB_FLIGHTS_DEPT           = QStringLiteral("dept");
 static const auto DB_FLIGHTS_DEST           = QStringLiteral("dest");
@@ -88,4 +131,5 @@ static const auto DB_               = QStringLiteral("");
 static const auto DB_               = QStringLiteral("");
 static const auto DB_               = QStringLiteral("");*/
 
-#endif // TABLECOLUMNLITERALS_H
+
+#endif // DECLARATIONS_H

src/experimental/UserInput.h

@@ -1,47 +0,0 @@
-#ifndef __USERINPUT_H__
-#define __USERINPUT_H__
-
-#include <QPair>
-#include <QString>
-#include <QBitArray>
-#include <QMap>
-#include <QStringList>
-#include <algorithm>
-
-namespace experimental {
-
-using EntryData = QMap<QString, QString>;
-
-/*!
- * \brief The EntryData struct. Contains ALL possible data.
- * However depending on who is constructing it, different types are initialised.
- * FUTURE: Would it be necessary to able to change data?
- * 	 George: I would say no because we dont want to fuck around with the entry.
- * Collect data from user -> Pack it up in the entry -> Consume it.
- * \todo Figure out exactly what the database would prefer as return value
- *   George: I would assume key: value pairs where the keys are what you would
- * put in the queries. This will affect data aswell (and propably simplify it)
- */
-class UserInput {
-private:
-    const EntryData data;
-public:
-    const enum class MetaTag {Pilot, Flight, Aircraft} meta_tag;
-
-public:
-    UserInput() = delete;
-    explicit
-    UserInput(EntryData new_data, MetaTag tag)
-        :  data(new_data), meta_tag(tag) {}
-
-    QString only(QString data_type) const { return data.value(data_type); }
-    const EntryData& all() const { return data; }
-};
-
-UserInput newPilotInput(EntryData ed) { return UserInput(ed, UserInput::MetaTag::Pilot); }
-UserInput newFlightInput(EntryData ed) { return UserInput(ed, UserInput::MetaTag::Flight); }
-UserInput newAircraftInput(EntryData ed) { return UserInput(ed, UserInput::MetaTag::Aircraft); }
-
-}
-
-#endif

src/experimental/decl.h

@@ -1,65 +0,0 @@
-#ifndef DECL_H
-#define DECL_H
-
-#include <QString>
-#include <QPair>
-#include <QMap>
-#include <QObject>
-
-/*!
- * \brief Temporary namespace for experimental features.
- * Will be removed in later versions.
- * \todo Remove this namespace (and learn about some nice \something of doxygen)
- * Decide documentation style. https://www.doxygen.nl/manual/docblocks.html#specialblock
- */
-namespace experimental {
-
-
-/*!
- * \brief An alias for QString
- *
- * Very long description *with* **markdown?**
- * - - -
- * # Header
- */
-using ColName = QString;
-using ColData = QVariant;
-using TableName = QString;
-using RowId = int;
-
-using TableNames = QStringList;
-// [G]: May lead to some confusion. TableData suggest data for the entire table.
-// but in reallity it is data per column *of single row* (unless i misunderstand)
-// [F]: That's correct. We could maybe call it EntryData or RowData?
-using TableData = QMap<ColName, ColData>;
-using ColumnData = QPair<ColName, ColData>;
-using ColumnNames = QStringList;
-using TableColumns = QMap<TableName, ColumnNames>;
-
-// [G]: Needs some work. Inheriting from QPair may be helpful but
-// may also be overkill. Lets determine the specific uses of DataPosition
-// and provide our own interface i would say.
-// [F]: Good idea! Implementing something similar to first and second methods
-// of QPair would be useful to carry over, or some other way of quickly and
-// unambiguously accessing the elements.
-struct DataPosition : QPair<TableName, RowId> {
-    TableName tableName;
-    RowId rowId;
-    DataPosition()
-        : tableName(first), rowId(second)
-    {}
-    DataPosition(TableName table_name, RowId row_id)
-        : QPair<TableName, RowId>::QPair(table_name, row_id),
-          tableName(first), rowId(second)
-    {}
-    DataPosition(const DataPosition& other) = default;
-    DataPosition& operator=(const DataPosition& other) = default;
-};
-auto const DEFAULT_PILOT_POSITION    = DataPosition(QStringLiteral("pilots"), 0);
-auto const DEFAULT_TAIL_POSITION     = DataPosition(QStringLiteral("tails"), 0);
-auto const DEFAULT_AIRCRAFT_POSITION = DataPosition(QStringLiteral("aircraft"), 0);
-auto const DEFAULT_FLIGHT_POSITION   = DataPosition(QStringLiteral("flights"), 0);
-
-}
-
-#endif // DECL_H

src/functions/acalc.cpp

@@ -1,10 +1,9 @@
 #include "acalc.h"
 #include "src/testing/adebug.h"
-#include "src/experimental/adatabase.h"
+#include "src/database/adatabase.h"
 #include "src/classes/asettings.h"
 
 using namespace ACalc;
-using namespace experimental;
 
 /*!
  * \brief ACalc::formatTimeInput verifies user input and formats to hh:mm

src/functions/astat.cpp

@@ -16,10 +16,9 @@
  *along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "astat.h"
+#include "src/database/adatabase.h"
 #include "src/testing/adebug.h"
 
-using namespace experimental;
-
 /*!
  * \brief AStat::totalTime Looks up Total Blocktime in the flights database
  * \param yearType - Whether the calculation is based on total time, last

src/functions/astat.h

@@ -20,11 +20,9 @@
 #include <QtCore>
 #include <QSqlQuery>
 #include <QSqlError>
-#include "src/experimental/adatabase.h"
 
 namespace AStat {
 
-
 /*!
  * \brief The AStat namespace provides functionality for retreiving various statistics
  * from the database, such as total times or recency. In general, most values are

src/gui/dialogues/firstrundialog.cpp

@@ -1,10 +1,13 @@
 #include "firstrundialog.h"
 #include "ui_firstrundialog.h"
-
+#include "src/testing/adebug.h"
+#include "src/database/adatabase.h"
+#include "src/database/adatabasesetup.h"
+#include "src/classes/apilotentry.h"
+#include "src/classes/adownload.h"
+#include "src/classes/asettings.h"
 const auto TEMPLATE_URL = QLatin1String("https://raw.githubusercontent.com/fiffty-50/openpilotlog/develop/assets/database/templates/");
 
-using namespace experimental;
-
 FirstRunDialog::FirstRunDialog(QWidget *parent) :
     QDialog(parent),
     ui(new Ui::FirstRunDialog)

src/gui/dialogues/firstrundialog.h

@@ -4,12 +4,6 @@
 #include <QDialog>
 #include <QButtonGroup>
 #include <QMessageBox>
-#include "src/classes/asettings.h"
-#include "src/testing/adebug.h"
-#include "src/experimental/apilotentry.h"
-#include "src/experimental/adatabase.h"
-#include "src/classes/adownload.h"
-#include "src/database/adatabasesetup.h"
 
 namespace Ui {
 class FirstRunDialog;

src/gui/dialogues/newflightdialog.cpp

@@ -17,10 +17,14 @@
  */
 #include "newflightdialog.h"
 #include "ui_newflight.h"
-#include "src/testing/adebug.h"
-#include "src/database/tablecolumnliterals.h"
+#include "src/gui/dialogues/newtaildialog.h"
+#include "src/gui/dialogues/newpilotdialog.h"
+#include "src/functions/acalc.h"
+#include "src/testing/atimer.h"
+#include "src/database/adatabase.h"
+
 
-using namespace experimental;
+#include "src/testing/adebug.h"
 
 /////////////////////////////////////// DEBUG /////////////////////////////////////////////////////
 void NewFlightDialog::onInputRejected()
@@ -481,9 +485,9 @@ void NewFlightDialog::fillDeductibleData()
  * no input validation is done in this step and input data is assumed to be valid.
  * \return
  */
-TableData NewFlightDialog::collectInput()
+RowData NewFlightDialog::collectInput()
 {
-    TableData newData;
+    RowData newData;
     DEB("Collecting Input...");
     // Mandatory data
     newData.insert(DB_FLIGHTS_DOFT, ui->doftLineEdit->text());

src/gui/dialogues/newflightdialog.h

@@ -31,15 +31,9 @@
 #include <QTabWidget>
 #include <QKeyEvent>
 
-#include "src/gui/dialogues/newtaildialog.h"
-#include "src/gui/dialogues/newpilotdialog.h"
-
-#include "src/experimental/adatabase.h"
-#include "src/experimental/aflightentry.h"
-#include "src/experimental/apilotentry.h"
-#include "src/experimental/atailentry.h"
-#include "src/functions/acalc.h"
-#include "src/testing/atimer.h"
+#include "src/classes/aflightentry.h"
+#include "src/classes/apilotentry.h"
+#include "src/classes/atailentry.h"
 
 namespace Ui {
 class NewFlight;
@@ -98,7 +92,7 @@ private:
      * from an old entry, is used to fill the form for editing an entry, or is
      * filled with new data for adding a new entry to the logbook.
      */
-    experimental::AFlightEntry flightEntry;
+    AFlightEntry flightEntry;
 
     QList<QLineEdit*> mandatoryLineEdits;
     QList<QLineEdit*> primaryTimeLineEdits;
@@ -151,7 +145,7 @@ private:
     void addNewTail(QLineEdit*);
     void addNewPilot(QLineEdit *);
 
-    experimental::TableData collectInput();
+    RowData collectInput();
 };
 
 

src/gui/dialogues/newpilotdialog.cpp

@@ -17,6 +17,9 @@
  */
 #include "newpilotdialog.h"
 #include "ui_newpilot.h"
+
+#include "src/database/adatabase.h"
+#include "src/classes/aentry.h"
 #include "src/testing/adebug.h"
 
 /* Examples for names around the world:
@@ -59,8 +62,6 @@ static const auto LINE_EDIT_VALIDATORS = QVector{
         EMPLOYEENR_VALID
 };
 
-using namespace experimental;
-
 // For creating a new entry
 NewPilotDialog::NewPilotDialog(QWidget *parent) :
     QDialog(parent),
@@ -140,7 +141,7 @@ void NewPilotDialog::submitForm()
 {
     DEB("Collecting User Input...");
 
-    TableData new_data;
+    RowData new_data;
     auto line_edits = this->findChildren<QLineEdit *>();
     for(auto& le : line_edits) {
         auto key = le->objectName().remove("LineEdit");

src/gui/dialogues/newpilotdialog.h

@@ -23,11 +23,7 @@
 #include <QRegularExpression>
 #include <QRegularExpressionValidator>
 #include <QCompleter>
-
-#include "src/experimental/adatabase.h"
-#include "src/experimental/aentry.h"
-#include "src/experimental/apilotentry.h"
-#include "src/experimental/decl.h"
+#include "src/classes/apilotentry.h"
 
 namespace Ui {
 class NewPilot;
@@ -46,7 +42,7 @@ private slots:
 private:
     Ui::NewPilot *ui;
 
-    experimental::APilotEntry pilotEntry;
+    APilotEntry pilotEntry;
 
     inline void setup();
 

src/gui/dialogues/newtaildialog.cpp

@@ -18,7 +18,6 @@
 #include "newtaildialog.h"
 #include "ui_newtail.h"
 #include "src/testing/adebug.h"
-#include "src/database/tablecolumnliterals.h"
 
 static const auto REG_VALID = QPair<QString, QRegularExpression> {
     "registrationLineEdit", QRegularExpression("\\w+-\\w+")};
@@ -35,7 +34,7 @@ NewTailDialog::NewTailDialog(QString new_registration, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::NewTail)
 {
-    DEB("new NewTailDialog (experimental)");
+    DEB("new NewTailDialog");
     ui->setupUi(this);
 
     setupCompleter();
@@ -45,15 +44,14 @@ NewTailDialog::NewTailDialog(QString new_registration, QWidget *parent) :
     ui->searchLineEdit->setStyleSheet("border: 1px solid blue");
     ui->searchLineEdit->setFocus();
 
-    entry = experimental::ATailEntry();
+    entry = ATailEntry();
 }
 
 NewTailDialog::NewTailDialog(int row_id, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::NewTail)
 {
-    using namespace experimental;
-    DEB("New experimental New Pilot Dialog (edit existing)");
+    DEB("New New Pilot Dialog (edit existing)");
     ui->setupUi(this);
 
     ui->searchLabel->hide();
@@ -80,7 +78,6 @@ NewTailDialog::~NewTailDialog()
  */
 void NewTailDialog::setupCompleter()
 {
-    using namespace experimental;
     idMap = aDB()->getIdMap(ADatabaseTarget::aircraft);
     aircraftList = aDB()->getCompletionList(ADatabaseTarget::aircraft);
 
@@ -114,9 +111,9 @@ void NewTailDialog::setupValidators()
  * a tail (ATail, used when editing an existing entry)
  * \param entry
  */
-void NewTailDialog::fillForm(experimental::AEntry entry, bool is_template)
+void NewTailDialog::fillForm(AEntry entry, bool is_template)
 {
-    DEB("Filling Form for (experimental) a/c" << entry.getPosition());
+    DEB("Filling Form for a/c" << entry.getPosition());
     //fill Line Edits
     auto line_edits = this->findChildren<QLineEdit *>();
 
@@ -185,8 +182,7 @@ bool NewTailDialog::verify()
 void NewTailDialog::submitForm()
 {
     DEB("Creating Database Object...");
-    using namespace experimental;
-    TableData new_data;
+    RowData new_data;
     //retreive Line Edits
     auto line_edits = this->findChildren<QLineEdit *>();
     line_edits.removeOne(this->findChild<QLineEdit *>("searchLineEdit"));
@@ -301,7 +297,6 @@ void NewTailDialog::onSearchCompleterActivated()
 
             DEB("Template Selected. aircraft_id is: " << idMap.value(text));
             //call autofiller for dialog
-            using namespace experimental;
             fillForm(aDB()->getAircraftEntry(idMap.value(text)), true);
             ui->searchLineEdit->setStyleSheet("border: 1px solid green");
             ui->searchLabel->setText(text);

src/gui/dialogues/newtaildialog.h

@@ -25,9 +25,9 @@
 
 #include "src/classes/asettings.h"
 #include "src/functions/acalc.h"
-#include "src/experimental/adatabase.h"
-#include "src/experimental/atailentry.h"
-#include "src/experimental/aaircraftentry.h"
+#include "src/database/adatabase.h"
+#include "src/classes/atailentry.h"
+#include "src/classes/aaircraftentry.h"
 
 namespace Ui {
 class NewTail;
@@ -44,9 +44,9 @@ class NewTailDialog : public QDialog
     Q_OBJECT
 
 public:
-    // experimental create new tail
+    //create new tail
     explicit NewTailDialog(QString new_registration, QWidget *parent = nullptr);
-    // experimental edit existing tail
+    //edit existing tail
     explicit NewTailDialog(int row_id, QWidget *parent = nullptr);
 
     ~NewTailDialog();
@@ -54,7 +54,7 @@ private:
 
     Ui::NewTail *ui;
 
-    experimental::ATailEntry entry;
+    ATailEntry entry;
 
     QStringList aircraftList;
 
@@ -62,7 +62,7 @@ private:
 
     void setupCompleter();
     void setupValidators();
-    void fillForm(experimental::AEntry entry, bool is_template);
+    void fillForm(AEntry entry, bool is_template);
     bool verify();
     void submitForm();
 

src/gui/widgets/aircraftwidget.cpp

@@ -17,12 +17,12 @@
  */
 #include "aircraftwidget.h"
 #include "ui_aircraftwidget.h"
-
-// Debug Makro
-#define DEB(expr) \
-    qDebug() << __PRETTY_FUNCTION__ << "\t" << expr
-
-using namespace experimental;
+#include "src/gui/dialogues/newtaildialog.h"
+#include "src/classes/asettings.h"
+#include "src/database/adatabase.h"
+#include "src/classes/atailentry.h"
+#include "src/classes/aflightentry.h"
+#include "src/testing/adebug.h"
 
 AircraftWidget::AircraftWidget(QWidget *parent) :
     QWidget(parent),

src/gui/widgets/aircraftwidget.h

@@ -24,12 +24,6 @@
 #include <QDebug>
 #include <QTableView>
 
-#include "src/classes/asettings.h"
-#include "src/gui/dialogues/newtaildialog.h"
-#include "src/experimental/adatabase.h"
-#include "src/experimental/atailentry.h"
-#include "src/experimental/aflightentry.h"
-
 
 namespace Ui {
 class AircraftWidget;

src/gui/widgets/debugwidget.cpp

@@ -1,8 +1,6 @@
 #include "debugwidget.h"
 #include "ui_debugwidget.h"
 
-using namespace experimental;
-
 DebugWidget::DebugWidget(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::DebugWidget)
@@ -177,7 +175,6 @@ void DebugWidget::on_debugPushButton_clicked()
     qlonglong number_of_runs = 5000;
     long time1 = 0;
     long time2 = 0;
-    using namespace experimental;
     {
 
         ATimer timer;
@@ -204,7 +201,6 @@ void DebugWidget::on_debugPushButton_clicked()
 
 /*qlonglong number_of_runs = 500;
         long time1 = 0;
-        using namespace experimental;
         {
 
             ATimer timer;

src/gui/widgets/debugwidget.h

@@ -12,9 +12,9 @@
 #include "src/classes/adownload.h"
 #include "src/functions/areadcsv.h"
 
-#include "src/experimental/adatabase.h"
-#include "src/experimental/aentry.h"
-#include "src/experimental/apilotentry.h"
+#include "src/database/adatabase.h"
+#include "src/classes/aentry.h"
+#include "src/classes/apilotentry.h"
 
 #include "src/testing/abenchmark.h"
 #include "src/testing/atimer.h"

src/gui/widgets/homewidget.h

@@ -30,8 +30,7 @@
 #include "src/gui/dialogues/firstrundialog.h"
 #include "src/gui/dialogues/newflightdialog.h"
 
-#include "src/experimental/adatabase.h"
-#include "src/experimental/decl.h"
+#include "src/database/adatabase.h"
 
 namespace Ui {
 class HomeWidget;

src/gui/widgets/logbookwidget.cpp

@@ -17,9 +17,12 @@
  */
 #include "logbookwidget.h"
 #include "ui_logbookwidget.h"
-#include "src/testing/adebug.h"
 
-using namespace experimental;
+#include "src/classes/aflightentry.h"
+#include "src/database/adatabase.h"
+#include "src/classes/asettings.h"
+#include "src/gui/dialogues/newflightdialog.h"
+#include "src/testing/adebug.h"
 
 const QMap<int, QString> FILTER_MAP = {
     {0, "Date LIKE \"%"},
@@ -202,10 +205,10 @@ void LogbookWidget::on_deleteFlightPushButton_clicked()
         messageBox->exec();
         return;
     } else if (selectedFlights.length() > 0 && selectedFlights.length() < 11) {
-        QList<experimental::AFlightEntry> flights_list;
+        QList<AFlightEntry> flights_list;
 
         for (const auto &flight_id : selectedFlights) {
-            flights_list.append(experimental::aDB()->getFlightEntry(flight_id));
+            flights_list.append(aDB()->getFlightEntry(flight_id));
         }
 
         QString warningMsg = "The following flight(s) will be deleted:<br><br><b><tt>";

src/gui/widgets/logbookwidget.h

@@ -26,10 +26,6 @@
 #include <QMenu>
 #include <QTableView>
 
-#include "src/classes/asettings.h"
-#include "src/gui/dialogues/newflightdialog.h"
-#include "src/experimental/aflightentry.h"
-
 namespace Ui {
 class LogbookWidget;
 }

src/gui/widgets/pilotswidget.cpp

@@ -18,8 +18,9 @@
 #include "pilotswidget.h"
 #include "ui_pilotswidget.h"
 #include "src/testing/adebug.h"
+#include "src/database/adatabase.h"
+#include "src/classes/apilotentry.h"
 
-using namespace experimental;
 PilotsWidget::PilotsWidget(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::PilotsWidget)

src/gui/widgets/settingswidget.cpp

@@ -19,6 +19,10 @@
 #include "ui_settingswidget.h"
 #include "src/testing/adebug.h"
 
+#include "src/classes/asettings.h"
+#include "src/database/adatabase.h"
+#include "src/classes/apilotentry.h"
+
 static const auto FIRSTNAME_VALID = QPair<QString, QRegularExpression> {
     "firstnameLineEdit", QRegularExpression("[a-zA-Z]+")};
 static const auto LASTNAME_VALID = QPair<QString, QRegularExpression> {
@@ -40,8 +44,6 @@ static const auto LINE_EDIT_VALIDATORS = QVector({FIRSTNAME_VALID, LASTNAME_VALI
                                            COMPANY_VALID,     EMPLOYEENR_VALID,
                                            PREFIX_VALID});
 
-using namespace experimental;
-
 SettingsWidget::SettingsWidget(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::SettingsWidget)
@@ -58,7 +60,7 @@ SettingsWidget::SettingsWidget(QWidget *parent) :
     setupValidators();
 
     QObject::connect(themeGroup, QOverload<int>::of(&QButtonGroup::buttonClicked),
-                     this, &SettingsWidget::on_themeGroup_buttonClicked);
+                     this, &SettingsWidget::onThemeGroup_buttonClicked);
 }
 
 SettingsWidget::~SettingsWidget()
@@ -262,7 +264,7 @@ void SettingsWidget::on_prefixLineEdit_textChanged(const QString &arg1)
 /*
  * Misc Tab
  */
-void SettingsWidget::on_themeGroup_buttonClicked(int theme_id)
+void SettingsWidget::onThemeGroup_buttonClicked(int theme_id)
 {
     ASettings::write("main/theme", theme_id);
 

src/gui/widgets/settingswidget.h

@@ -24,9 +24,6 @@
 #include <QMessageBox>
 #include <QProcess>
 #include <QDebug>
-#include "src/classes/asettings.h"
-#include "src/experimental/adatabase.h"
-#include "src/experimental/apilotentry.h"
 
 namespace Ui {
 class SettingsWidget;
@@ -42,7 +39,7 @@ public:
 
 private slots:
 
-    void on_themeGroup_buttonClicked(int theme_id);
+    void onThemeGroup_buttonClicked(int theme_id);
     void on_aboutPushButton_clicked();
     void on_acSortComboBox_currentIndexChanged(int index);
     void on_acAllowIncompleteComboBox_currentIndexChanged(int index);

src/testing/abenchmark.h

@@ -20,9 +20,6 @@
 
 #include <QObject>
 #include "src/testing/adebug.h"
-#include "src/experimental/adatabase.h"
-#include "src/experimental/aentry.h"
-#include "src/experimental/decl.h"
 
 /*!
  * \brief The ABenchmark class provides quick access to benchmarking two functions for
@@ -38,8 +35,6 @@ public:
 
     ABenchmark(bool (*function_one)(), bool (*function_two)(), int number_of_runs);
 
-    //ABenchmark(experimental::AEntry (*function_one)(experimental::DataPosition), experimental::AEntry (*function_two)(int), int number_of_runs);
-
 };
 
 #endif // ABENCHMARK_H