Cleaned up custom datatypes in experimental

src/experimental/DataBase.cpp

@@ -2,7 +2,7 @@
 
 namespace experimental {
 
-DataBase* DataBase::instance = nullptr;
+DataBase* const DataBase::instance = nullptr;
 
 DataBase* DataBase::getInstance()
 {

src/experimental/DataBase.h

@@ -24,9 +24,9 @@ namespace experimental {
 
 class DataBase {
 private:
-    QStringList tableNames;
-    QMap<QString, QStringList> tableColumns;
-    static DataBase* instance;
+    TableNames tableNames;
+    TableColumns tableColumns;
+    static DataBase* const instance;
     DataBase() = default;
 public:
     // Ensure DB is not copiable or assignable
@@ -77,7 +77,7 @@ public:
  * Instead of this:
  * DataBase::getInstance().commit(...)
  * Write this:
- * DB().commit(...)
+ * DB()->commit(...)
  */
 DataBase* DB();
 

src/experimental/Decl.h

@@ -7,29 +7,36 @@
 
 namespace experimental {
 
-//using ColName = QString;
-//using ColData = QString;
-//using TableName = QString;
-//using RowId = int;
-
-//using TableNames = QStringList;
-//using TableData = QMap<ColName, ColData>;
-//using ColumnData = QPair<ColName, ColData>;
-//using ColumnNames = QStringList;
-//using TableColumns = QMap<TableName, ColumnNames>;
-
-struct DataPosition : QPair<QString, int> {
-    QString& tableName;
-    int& rowId;
+using ColName = QString;
+using ColData = QString;
+using TableName = QString;
+using RowId = int;
+
+using TableNames = QStringList;
+using TableData = QMap<ColName, ColData>;
+using ColumnData = QPair<ColName, ColData>;
+using ColumnNames = QStringList;
+using TableColumns = QMap<TableName, ColumnNames>;
+
+struct DataPosition : QPair<TableName, RowId> {
+    TableName& tableName;
+    RowId& rowId;
     DataPosition()
-        : QPair<QString, int>::QPair(), tableName(first), rowId(second)
+        : QPair<TableName, RowId>::QPair(), tableName(first), rowId(second)
     {}
-    DataPosition(QString tn, int ri)
-        : QPair<QString, int>::QPair(tn, ri), 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;
+    void operator=(const DataPosition& other)
+    {
+        tableName = other.tableName;
+        rowId = other.rowId;
+    }
 };
 
-auto const DEFAULT_PILOT_POSITION = QPair<QString, int>("pilots", 0);
+auto const DEFAULT_PILOT_POSITION = DataPosition("pilots", 0);
 
 }
 

src/experimental/Entry.cpp

@@ -2,22 +2,22 @@
 
 namespace experimental {
 
-Entry::Entry(QPair<QString, int> position_)
+Entry::Entry(DataPosition position_)
     : position(position_)
 {}
 
-void Entry::operator=(const Entry& e)
+void Entry::operator=(const Entry& other)
 {
-    position = e.position;
-    tableData = e.tableData;
+    position = other.position;
+    tableData = other.tableData;
 }
 
-void Entry::setData(QMap<QString, QString> data)
+void Entry::setData(TableData table_data)
 {
-    tableData = data;
+    tableData = table_data;
 }
 
-const QMap<QString, QString>& Entry::getData()
+const TableData& Entry::getData()
 {
     return tableData;
 }
@@ -33,10 +33,10 @@ void PilotEntry::operator=(const PilotEntry& pe)
 }
 
 PilotEntry::PilotEntry(int row_id)
-    : Entry::Entry(QPair<QString, int>("pilots", row_id))
+    : Entry::Entry(DataPosition("pilots", row_id))
 {}
 
-PilotEntry::PilotEntry(QMap<QString, QString> fromNewPilotDialog)
+PilotEntry::PilotEntry(TableData fromNewPilotDialog)
     : Entry::Entry(DEFAULT_PILOT_POSITION)
 {
     setData(fromNewPilotDialog);

src/experimental/Entry.h

@@ -16,16 +16,16 @@ namespace experimental {
  */
 class Entry {
 public:
-    QPair<QString, int> position;
+    DataPosition position;
 protected:
-    QMap<QString, QString> tableData;
+    TableData tableData;
 public:
     Entry() = default;
     Entry(const Entry&) = default;
     void operator=(const Entry&);
-    Entry(QPair<QString, int> position_);
-    void setData(QMap<QString, QString> data);
-    const QMap<QString, QString>& getData();
+    Entry(DataPosition position_);
+    void setData(TableData table_data);
+    const TableData& getData();
 
 };
 
@@ -35,7 +35,7 @@ public:
     PilotEntry(const PilotEntry& pe);
     void operator=(const PilotEntry& pe);
     PilotEntry(int row_id);
-    PilotEntry(QMap<QString, QString> fromNewPilotDialog);
+    PilotEntry(TableData fromNewPilotDialog);
 };
 
 }