Browse Source

Switched to C/C++ alias convention `name_t`

George 4 years ago
parent
commit
2bd6051ea0

+ 2 - 2
src/database/adatabase.cpp

@@ -497,7 +497,7 @@ const QStringList ADatabase::getCompletionList(ADatabaseTarget target)
 }
 
 const
-QMap<ADatabase::QueryResult_qstr, ADatabase::QueryResult_i> ADatabase::getIdMap(ADatabaseTarget target)
+QMap<ADatabase::QString, ADatabase::RowId_t> ADatabase::getIdMap(ADatabaseTarget target)
 {
     QString statement;
 
@@ -538,7 +538,7 @@ QMap<ADatabase::QueryResult_qstr, ADatabase::QueryResult_i> ADatabase::getIdMap(
     }
 
     // QVector<QString> query_result;  // [G]: unused
-    auto id_map = QMap<QueryResult_qstr, QueryResult_i>();
+    auto id_map = QMap<QString, RowId_t>();
     while (query.next()) {
         id_map.insert(query.value(1).toString(), query.value(0).toInt());
     }

+ 10 - 12
src/database/adatabase.h

@@ -89,20 +89,18 @@ public:
 class ADatabase : public QObject {
     Q_OBJECT
 public:
+    using RowId_t = int;
 
-    using QueryResult_qstr = QString;
-    using QueryResult_i = int;
+    using PilotName_t = QString;
+    using PilotRowId_t = RowId_t;
 
-    using PilotName_qstr = QueryResult_qstr;
-    using PilotRowId_i = QueryResult_i;
+    using TailRgstr_t = QString;
+    using TailId_t = RowId_t;
 
-    using TailRgstr_qstr = QueryResult_qstr;
-    using TailId_i = QueryResult_i;
-
-    using ArprtICAO_qstr = QueryResult_qstr;
-    using ArprtIATA_qstr = QueryResult_qstr;
-    using ArprtName_qstr = QueryResult_qstr;
-    using ArprtId_i = QueryResult_i;
+    using ArprtICAO_t = QString;
+    using ArprtIATA_t = QString;
+    using ArprtName_t = QString;
+    using ArprtId_t = RowId_t;
 
 
 private:
@@ -242,7 +240,7 @@ public:
      * \brief returns a QMap<QueryResult_qstr, QueryResult_i> of a human-readable database value and
      * its row id. Used in the Dialogs to map user input to unique database entries.
      */
-    const QMap<QueryResult_qstr, QueryResult_i> getIdMap(ADatabaseTarget target);
+    const QMap<QString, RowId_t> getIdMap(ADatabaseTarget target);
 
     /*!
      * \brief returns the ROWID for the newest entry in the respective database.

+ 4 - 0
src/database/declarations.h

@@ -22,6 +22,10 @@
 #include "src/oplconstants.h"
 #include "src/testing/adebug.h"
 
+/// \todo Break apart these aliases to their
+/// corresponding sub section of the program
+/// eg DB related to ADatabase.h and so on
+
 /*!
  * \brief An alias for QString
  *

+ 14 - 14
src/gui/dialogues/newflightdialog.h

@@ -44,14 +44,14 @@ class NewFlight;
 class NewFlightDialog : public QDialog
 {
     Q_OBJECT
-    using PilotName_qstr = ADatabase::PilotName_qstr;
-    using PilotRowId_i = ADatabase::PilotRowId_i;
-    using TailRgstr_qstr = ADatabase::TailRgstr_qstr;
-    using TailId_i = ADatabase::TailId_i;
-    using ArprtICAO_qstr = ADatabase::ArprtICAO_qstr;
-    using ArprtIATA_qstr = ADatabase::ArprtIATA_qstr;
-    using ArprtName_qstr = ADatabase::ArprtName_qstr;
-    using ArprtId_i = ADatabase::ArprtId_i;
+    using PilotName_t = ADatabase::PilotName_t;
+    using PilotRowId_t = ADatabase::PilotRowId_t;
+    using TailRgstr_t = ADatabase::TailRgstr_t;
+    using TailId_t = ADatabase::TailId_t;
+    using ArprtICAO_t = ADatabase::ArprtICAO_t;
+    using ArprtIATA_t = ADatabase::ArprtIATA_t;
+    using ArprtName_t = ADatabase::ArprtName_t;
+    using ArprtId_t = ADatabase::ArprtId_t;
 public:
     /*!
      * \brief NewFlightDialog create a new flight and add it to the logbook.
@@ -129,18 +129,18 @@ private:
     /*!
      * To be used by the QCompleters
      */
-    QStringList pilotList;
+    QStringList pilotList;QVariant
     QStringList tailsList;
     QStringList airportList;
 
     /*!
      * \brief Used to map user input to database keys
      */
-    QMap<PilotName_qstr, PilotRowId_i> pilotsIdMap;
-    QMap<TailRgstr_qstr, TailId_i> tailsIdMap;
-    QMap<ArprtICAO_qstr, ArprtId_i> airportIcaoIdMap;
-    QMap<ArprtIATA_qstr, ArprtId_i> airportIataIdMap;
-    QMap<ArprtName_qstr, ArprtId_i> airportNameIdMap;
+    QMap<PilotName_t, PilotRowId_t> pilotsIdMap;
+    QMap<TailRgstr_t, TailId_t> tailsIdMap;
+    QMap<ArprtICAO_t, ArprtId_t> airportIcaoIdMap;
+    QMap<ArprtIATA_t, ArprtId_t> airportIataIdMap;
+    QMap<ArprtName_t, ArprtId_t> airportNameIdMap;
 
     Opl::Time::FlightTimeFormat flightTimeFormat;