Renamed all "ADataBase..." to "ADatabase..."

The capital B was redundant

mainwindow.cpp

@@ -132,11 +132,11 @@ void MainWindow::on_actionDebug_triggered()
 
 void MainWindow::connectWidgets()
 {
-    QObject::connect(experimental::aDB(), &experimental::ADataBase::dataBaseUpdated,
+    QObject::connect(experimental::aDB(), &experimental::ADatabase::dataBaseUpdated,
                      logbookWidget, &LogbookWidget::onDisplayModel_dataBaseUpdated);
-    QObject::connect(experimental::aDB(), &experimental::ADataBase::dataBaseUpdated,
+    QObject::connect(experimental::aDB(), &experimental::ADatabase::dataBaseUpdated,
                      pilotsWidget, &PilotsWidget::onDisplayModel_dataBaseUpdated);
-    QObject::connect(experimental::aDB(), &experimental::ADataBase::dataBaseUpdated,
+    QObject::connect(experimental::aDB(), &experimental::ADatabase::dataBaseUpdated,
                      aircraftWidget, &AircraftWidget::onDisplayModel_dataBaseUpdated);
 
     QObject::connect(settingsWidget, &SettingsWidget::viewSelectionChanged,

src/experimental/adatabase.cpp

@@ -20,25 +20,25 @@
 
 namespace experimental {
 
-ADataBaseError::ADataBaseError(QString msg_)
+ADatabaseError::ADatabaseError(QString msg_)
     : QSqlError::QSqlError(msg_)
 {}
 
-QString ADataBaseError::text() const
+QString ADatabaseError::text() const
 {
     return "Database Error: " + QSqlError::text();
 }
 
-ADataBase* ADataBase::instance = nullptr;
+ADatabase* ADatabase::instance = nullptr;
 
-ADataBase* ADataBase::getInstance()
+ADatabase* ADatabase::getInstance()
 {
     if(!instance)
-        instance = new ADataBase();
+        instance = new ADatabase();
     return instance;
 }
 
-bool ADataBase::connect()
+bool ADatabase::connect()
 {
     const QString driver("QSQLITE");
 
@@ -72,20 +72,20 @@ bool ADataBase::connect()
     return true;
 }
 
-void ADataBase::disconnect()
+void ADatabase::disconnect()
 {
-    auto db = ADataBase::database();
+    auto db = ADatabase::database();
     db.close();
     db.removeDatabase(db.connectionName());
     DEB("Database connection closed.");
 }
 
-QSqlDatabase ADataBase::database()
+QSqlDatabase ADatabase::database()
 {
     return QSqlDatabase::database("qt_sql_default_connection");
 }
 
-bool ADataBase::commit(AEntry entry)
+bool ADatabase::commit(AEntry entry)
 {
     if (exists(entry)) {
         return update(entry);
@@ -94,11 +94,11 @@ bool ADataBase::commit(AEntry entry)
     }
 }
 
-bool ADataBase::remove(AEntry entry)
+bool ADatabase::remove(AEntry entry)
 {
     if (!exists(entry)) {
         DEB("Error: Database entry not found.");
-        lastError = ADataBaseError("Database entry not found.");
+        lastError = ADatabaseError("Database entry not found.");
         return false;
     }
 
@@ -125,7 +125,7 @@ bool ADataBase::remove(AEntry entry)
     }
 }
 
-bool ADataBase::removeMany(QList<DataPosition> data_position_list)
+bool ADatabase::removeMany(QList<DataPosition> data_position_list)
 {
     int errorCount = 0;
     QSqlQuery query;
@@ -134,7 +134,7 @@ bool ADataBase::removeMany(QList<DataPosition> data_position_list)
 
     for (const auto& data_position : data_position_list) {
         if (!exists(data_position)) {
-            lastError = ADataBaseError("Database entry not found.");
+            lastError = ADatabaseError("Database entry not found.");
             errorCount++;
         }
         QString statement = "DELETE FROM " + data_position.first +
@@ -166,7 +166,7 @@ bool ADataBase::removeMany(QList<DataPosition> data_position_list)
     }
 }
 
-bool ADataBase::exists(AEntry entry)
+bool ADatabase::exists(AEntry entry)
 {
     if(entry.getPosition().second == 0)
         return false;
@@ -191,12 +191,12 @@ bool ADataBase::exists(AEntry entry)
         return true;
     } else {
         DEB("Database entry not found.");
-        lastError = ADataBaseError("Database entry not found.");
+        lastError = ADatabaseError("Database entry not found.");
         return false;
     }
 }
 
-bool ADataBase::exists(DataPosition data_position)
+bool ADatabase::exists(DataPosition data_position)
 {
     if(data_position.second == 0)
         return false;
@@ -220,13 +220,13 @@ bool ADataBase::exists(DataPosition data_position)
         return true;
     } else {
         DEB("No entry exists at DataPosition: " << data_position);
-        lastError = ADataBaseError("Database entry not found.");
+        lastError = ADatabaseError("Database entry not found.");
         return false;
     }
 }
 
 
-bool ADataBase::update(AEntry updated_entry)
+bool ADatabase::update(AEntry updated_entry)
 {
     auto data = updated_entry.getData();
     QString statement = "UPDATE " + updated_entry.getPosition().tableName + " SET ";
@@ -262,7 +262,7 @@ bool ADataBase::update(AEntry updated_entry)
     }
 }
 
-bool ADataBase::insert(AEntry new_entry)
+bool ADatabase::insert(AEntry new_entry)
 {
     auto data = new_entry.getData();
     QString statement = "INSERT INTO " + new_entry.getPosition().tableName + QLatin1String(" (");
@@ -308,7 +308,7 @@ bool ADataBase::insert(AEntry new_entry)
 
 }
 
-TableData ADataBase::getEntryData(DataPosition data_position)
+TableData ADatabase::getEntryData(DataPosition data_position)
 {
     // check table exists
     if (!tableNames.contains(data_position.first)) {
@@ -335,7 +335,7 @@ TableData ADataBase::getEntryData(DataPosition data_position)
     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.");
+        lastError = ADatabaseError("Database entry not found.");
         return TableData();
     }
 
@@ -365,61 +365,61 @@ TableData ADataBase::getEntryData(DataPosition data_position)
     return entry_data;
 }
 
-AEntry ADataBase::getEntry(DataPosition data_position)
+AEntry ADatabase::getEntry(DataPosition data_position)
 {
     AEntry entry(data_position);
     entry.setData(getEntryData(data_position));
     return entry;
 }
 
-APilotEntry ADataBase::getPilotEntry(RowId row_id)
+APilotEntry ADatabase::getPilotEntry(RowId row_id)
 {
     APilotEntry pilot_entry(row_id);
     pilot_entry.setData(getEntryData(pilot_entry.getPosition()));
     return pilot_entry;
 }
 
-ATailEntry ADataBase::getTailEntry(RowId row_id)
+ATailEntry ADatabase::getTailEntry(RowId row_id)
 {
     ATailEntry tail_entry(row_id);
     tail_entry.setData(getEntryData(tail_entry.getPosition()));
     return tail_entry;
 }
 
-AAircraftEntry ADataBase::getAircraftEntry(RowId row_id)
+AAircraftEntry ADatabase::getAircraftEntry(RowId row_id)
 {
     AAircraftEntry aircraft_entry(row_id);
     aircraft_entry.setData(getEntryData(aircraft_entry.getPosition()));
     return aircraft_entry;
 }
 
-AFlightEntry ADataBase::getFlightEntry(RowId row_id)
+AFlightEntry ADatabase::getFlightEntry(RowId row_id)
 {
     AFlightEntry flight_entry(row_id);
     flight_entry.setData(getEntryData(flight_entry.getPosition()));
     return flight_entry;
 }
 
-const QStringList ADataBase::getCompletionList(ADataBaseTarget target)
+const QStringList ADatabase::getCompletionList(ADatabaseTarget target)
 {
     QString statement;
 
     switch (target) {
-    case ADataBaseTarget::pilots:
+    case ADatabaseTarget::pilots:
         statement.append("SELECT piclastname||', '||picfirstname FROM pilots");
         break;
-    case ADataBaseTarget::aircraft:
+    case ADatabaseTarget::aircraft:
         statement.append("SELECT make||' '||model FROM aircraft WHERE model IS NOT NULL "
                          "UNION "
                          "SELECT make||' '||model||'-'||variant FROM aircraft WHERE variant IS NOT NULL");
         break;
-    case ADataBaseTarget::airport_identifier_all:
+    case ADatabaseTarget::airport_identifier_all:
         statement.append("SELECT icao FROM airports UNION SELECT iata FROM airports");
         break;
-    case ADataBaseTarget::registrations:
+    case ADatabaseTarget::registrations:
         statement.append("SELECT registration FROM tails");
         break;
-    case ADataBaseTarget::companies:
+    case ADatabaseTarget::companies:
         statement.append("SELECT company FROM pilots");
         break;
     default:
@@ -448,29 +448,29 @@ const QStringList ADataBase::getCompletionList(ADataBaseTarget target)
     return completer_list;
 }
 
-const QMap<QString, int> ADataBase::getIdMap(ADataBaseTarget target)
+const QMap<QString, int> ADatabase::getIdMap(ADatabaseTarget target)
 {
     QString statement;
 
     switch (target) {
-    case ADataBaseTarget::pilots:
+    case ADatabaseTarget::pilots:
         statement.append("SELECT ROWID, piclastname||', '||picfirstname FROM pilots");
         break;
-    case ADataBaseTarget::aircraft:
+    case ADatabaseTarget::aircraft:
         statement.append("SELECT ROWID, make||' '||model FROM aircraft WHERE model IS NOT NULL "
                          "UNION "
                          "SELECT ROWID, make||' '||model||'-'||variant FROM aircraft WHERE variant IS NOT NULL");
         break;
-    case ADataBaseTarget::airport_identifier_icao:
+    case ADatabaseTarget::airport_identifier_icao:
         statement.append("SELECT ROWID, icao FROM airports");
         break;
-    case ADataBaseTarget::airport_identifier_iata:
+    case ADatabaseTarget::airport_identifier_iata:
         statement.append("SELECT ROWID, iata FROM airports WHERE iata NOT NULL");
         break;
-    case ADataBaseTarget::airport_names:
+    case ADatabaseTarget::airport_names:
         statement.append("SELECT ROWID, name FROM airports");
         break;
-    case ADataBaseTarget::tails:
+    case ADatabaseTarget::tails:
         statement.append("SELECT ROWID, registration FROM tails");
         break;
     default:
@@ -495,18 +495,18 @@ const QMap<QString, int> ADataBase::getIdMap(ADataBaseTarget target)
     }
 }
 
-int ADataBase::getLastEntry(ADataBaseTarget target)
+int ADatabase::getLastEntry(ADatabaseTarget target)
 {
     QString statement = "SELECT MAX(ROWID) FROM ";
 
     switch (target) {
-    case ADataBaseTarget::pilots:
+    case ADatabaseTarget::pilots:
         statement.append(DB_TABLE_PILOTS);
         break;
-    case ADataBaseTarget::aircraft:
+    case ADatabaseTarget::aircraft:
         statement.append(DB_TABLE_AIRCRAFT);
         break;
-    case ADataBaseTarget::tails:
+    case ADatabaseTarget::tails:
         statement.append(DB_TABLE_TAILS);
         break;
     default:
@@ -517,13 +517,13 @@ int ADataBase::getLastEntry(ADataBaseTarget target)
     if (query.first()) {
         return query.value(0).toInt();
     } else {
-        lastError = ADataBaseError("Database entry not found.");
+        lastError = ADatabaseError("Database entry not found.");
         DEB("No entry found.");
         return 0;
     }
 }
 
-QVector<QString> ADataBase::customQuery(QString statement, int return_values)
+QVector<QString> ADatabase::customQuery(QString statement, int return_values)
 {
     QSqlQuery query(statement);
     query.exec();
@@ -549,6 +549,6 @@ QVector<QString> ADataBase::customQuery(QString statement, int return_values)
     }
 }
 
-ADataBase* aDB() { return ADataBase::getInstance(); }
+ADatabase* aDB() { return ADatabase::getInstance(); }
 
 }// namespace experimental

src/experimental/adatabase.h

@@ -41,7 +41,7 @@ namespace experimental {
  * \brief The DBTarget enum provides the items for which QCompleter
  * completion lists are provided from the database.
  */
-enum class ADataBaseTarget
+enum class ADatabaseTarget
 {
     airport_identifier_icao,
     airport_identifier_iata,
@@ -61,10 +61,10 @@ enum class ADataBaseTarget
  * \brief Custom Database Error derived from QSqlError.
  * Extends text() adding "Database Error: " before the text.
  */
-class ADataBaseError : public QSqlError {
+class ADatabaseError : public QSqlError {
 public:
-  ADataBaseError() = default;
-  ADataBaseError(QString msg);
+  ADatabaseError() = default;
+  ADatabaseError(QString msg);
   QString text() const;
 };
 
@@ -72,19 +72,19 @@ public:
  * \brief The DB class encapsulates the SQL database by providing fast access
  * to hot database data.
  */
-class ADataBase : public QObject {
+class ADatabase : public QObject {
     Q_OBJECT
 private:
     TableNames tableNames;
     TableColumns tableColumns;
-    static ADataBase* instance;
-    ADataBase() = default;
+    static ADatabase* instance;
+    ADatabase() = default;
 public:
     // Ensure DB is not copiable or assignable
-    ADataBase(const ADataBase&) = delete;
-    void operator=(const ADataBase&) = delete;
-    static ADataBase* getInstance();
-    ADataBaseError lastError;
+    ADatabase(const ADatabase&) = delete;
+    void operator=(const ADatabase&) = delete;
+    static ADatabase* getInstance();
+    ADatabaseError lastError;
 
     /*!
      * \brief Connect to the database and populate database information.
@@ -197,16 +197,16 @@ public:
      * QCompleter based on database values
      * \return
      */
-    const QStringList getCompletionList(ADataBaseTarget);
+    const QStringList getCompletionList(ADatabaseTarget);
 
     /*!
      * \brief returns a QMap<QString, int> of a human-readable database value and
      * its row id. Used in the Dialogs to map user input to unique database entries.
      * \return
      */
-    const QMap<QString, int> getIdMap(ADataBaseTarget);
+    const QMap<QString, int> getIdMap(ADatabaseTarget);
 
-    int getLastEntry(ADataBaseTarget);
+    int getLastEntry(ADatabaseTarget);
 
 signals:
     /*!
@@ -225,7 +225,7 @@ signals:
  * Write this:
  * aDB()->commit(...)
  */
-ADataBase* aDB();
+ADatabase* aDB();
 
 }  // namespace experimental
 

src/gui/dialogues/newflightdialog.cpp

@@ -206,15 +206,15 @@ void NewFlightDialog::setupButtonGroups()
 void NewFlightDialog::setupRawInputValidation()
 {
     // get Maps
-    pilotsIdMap      = aDB()->getIdMap(ADataBaseTarget::pilots);
-    tailsIdMap       = aDB()->getIdMap(ADataBaseTarget::tails);
-    airportIcaoIdMap = aDB()->getIdMap(ADataBaseTarget::airport_identifier_icao);
-    airportIataIdMap = aDB()->getIdMap(ADataBaseTarget::airport_identifier_iata);
-    airportNameIdMap = aDB()->getIdMap(ADataBaseTarget::airport_names);
+    pilotsIdMap      = aDB()->getIdMap(ADatabaseTarget::pilots);
+    tailsIdMap       = aDB()->getIdMap(ADatabaseTarget::tails);
+    airportIcaoIdMap = aDB()->getIdMap(ADatabaseTarget::airport_identifier_icao);
+    airportIataIdMap = aDB()->getIdMap(ADatabaseTarget::airport_identifier_iata);
+    airportNameIdMap = aDB()->getIdMap(ADatabaseTarget::airport_names);
     //get Completer Lists
-    pilotList   = aDB()->getCompletionList(ADataBaseTarget::pilots);
-    tailsList   = aDB()->getCompletionList(ADataBaseTarget::registrations);
-    airportList = aDB()->getCompletionList(ADataBaseTarget::airport_identifier_all);
+    pilotList   = aDB()->getCompletionList(ADatabaseTarget::pilots);
+    tailsList   = aDB()->getCompletionList(ADatabaseTarget::registrations);
+    airportList = aDB()->getCompletionList(ADatabaseTarget::airport_identifier_all);
     auto tempList = QStringList();
     // define tuples
     const std::tuple<QString, QStringList*, QRegularExpression>
@@ -802,13 +802,13 @@ void NewFlightDialog::addNewTail(QLineEdit *parent_line_edit)
         auto na = NewTailDialog(ui->acftLineEdit->text(), this);
         na.exec();
         // update map and list, set line edit
-        tailsIdMap  = aDB()->getIdMap(ADataBaseTarget::tails);
-        tailsList   = aDB()->getCompletionList(ADataBaseTarget::registrations);
+        tailsIdMap  = aDB()->getIdMap(ADatabaseTarget::tails);
+        tailsList   = aDB()->getCompletionList(ADatabaseTarget::registrations);
 
-        DEB("New Entry added. Id:" << aDB()->getLastEntry(ADataBaseTarget::tails));
+        DEB("New Entry added. Id:" << aDB()->getLastEntry(ADatabaseTarget::tails));
         DEB("AC Map: " << tailsIdMap);
 
-        parent_line_edit->setText(tailsIdMap.key(aDB()->getLastEntry(ADataBaseTarget::tails)));
+        parent_line_edit->setText(tailsIdMap.key(aDB()->getLastEntry(ADatabaseTarget::tails)));
         emit parent_line_edit->editingFinished();
     } else {
         parent_line_edit->setText(DB_NULL);
@@ -834,10 +834,10 @@ void NewFlightDialog::addNewPilot(QLineEdit *parent_line_edit)
         auto np = NewPilotDialog(this);
         np.exec();
         // update map and list, set line edit
-        pilotsIdMap  = aDB()->getIdMap(ADataBaseTarget::pilots);
-        pilotList    = aDB()->getCompletionList(ADataBaseTarget::pilots);
-        DEB("Setting new entry: " << pilotsIdMap.key(aDB()->getLastEntry(ADataBaseTarget::pilots)));
-        parent_line_edit->setText(pilotsIdMap.key(aDB()->getLastEntry(ADataBaseTarget::pilots)));
+        pilotsIdMap  = aDB()->getIdMap(ADatabaseTarget::pilots);
+        pilotList    = aDB()->getCompletionList(ADatabaseTarget::pilots);
+        DEB("Setting new entry: " << pilotsIdMap.key(aDB()->getLastEntry(ADatabaseTarget::pilots)));
+        parent_line_edit->setText(pilotsIdMap.key(aDB()->getLastEntry(ADatabaseTarget::pilots)));
         emit parent_line_edit->editingFinished();
     } else {
         parent_line_edit->setText(DB_NULL);

src/gui/dialogues/newpilotdialog.cpp

@@ -108,7 +108,7 @@ void NewPilotDialog::setup()
     }
 
     DEB("Setting up completer...");
-    auto completer = new QCompleter(aDB()->getCompletionList(ADataBaseTarget::companies), ui->companyLineEdit);
+    auto completer = new QCompleter(aDB()->getCompletionList(ADatabaseTarget::companies), ui->companyLineEdit);
     completer->setCompletionMode(QCompleter::InlineCompletion);
     completer->setCaseSensitivity(Qt::CaseSensitive);
     ui->companyLineEdit->setCompleter(completer);

src/gui/dialogues/newtaildialog.cpp

@@ -81,8 +81,8 @@ NewTailDialog::~NewTailDialog()
 void NewTailDialog::setupCompleter()
 {
     using namespace experimental;
-    idMap = aDB()->getIdMap(ADataBaseTarget::aircraft);
-    aircraftList = aDB()->getCompletionList(ADataBaseTarget::aircraft);
+    idMap = aDB()->getIdMap(ADatabaseTarget::aircraft);
+    aircraftList = aDB()->getCompletionList(ADatabaseTarget::aircraft);
 
     QCompleter *completer = new QCompleter(aircraftList, ui->searchLineEdit);
     completer->setCaseSensitivity(Qt::CaseInsensitive);