2
0
Эх сурвалжийг харах

created dbAircraft class, added documentation and adjusted calls to functions

fiffty-50 4 жил өмнө
parent
commit
4b8b2b0b12
9 өөрчлөгдсөн 299 нэмэгдсэн , 231 устгасан
  1. 243 0
      dbaircraft.cpp
  2. 33 0
      dbaircraft.h
  3. 2 214
      dbman.cpp
  4. 3 3
      editflight.cpp
  5. 8 8
      newacft.cpp
  6. 1 0
      newacft.h
  7. 6 6
      newflight.cpp
  8. 1 0
      newflight.h
  9. 2 0
      openLog.pro

+ 243 - 0
dbaircraft.cpp

@@ -0,0 +1,243 @@
+#include "dbaircraft.h"
+#include "dbman.cpp"
+
+
+
+/*!
+ * \brief RetreiveRegistration Looks up tail_id from Database
+ * \param tail_ID Primary Key of tails database
+ * \return Registration
+ */
+QString dbAircraft::retreiveRegistration(QString tail_ID)
+
+{
+    QString acftRegistration("");
+
+    QSqlQuery query;
+    query.prepare("SELECT registration FROM tails WHERE tail_id == ?");
+    query.addBindValue(tail_ID.toInt());
+    query.exec();
+
+    if(query.first());
+    else
+        qDebug() << ("No Aircraft with this ID found");
+    query.previous();//To go back to index 0
+    while (query.next()) {
+        acftRegistration.append(query.value(0).toString());
+    }
+
+    return acftRegistration;
+}
+
+/*!
+ * \brief newAcftGetString Looks up an aircraft Registration in the database
+ * \param searchstring
+ * \return Registration, make, model and variant
+ */
+QStringList dbAircraft::newAcftGetString(QString searchstring)
+{
+    QStringList result;
+    if(searchstring.length()<2){return result;}
+    QSqlQuery query;
+    query.prepare("SELECT registration, make, model, variant "
+                  "FROM aircraft "
+                  "INNER JOIN tails on tails.aircraft_ID = aircraft.aircraft_id "
+                  "WHERE tails.registration LIKE ?");
+    searchstring.append("%"); searchstring.prepend("%");
+    query.addBindValue(searchstring);
+    query.exec();
+
+    while(query.next())
+    {
+        result.append(query.value(0).toString() + " (" + query.value(1).toString() + "-" + query.value(2).toString() + "-" + query.value(3).toString() + ")");
+    }
+    qDebug() << "newAcftGetString: " << result.length() << result;
+    return result;
+
+}
+/*!
+ * \brief dbAircraft::newAcftGetId Looks up a registration in the databse
+ * \param registration Aircraft Registration
+ * \return tail_id
+ */
+QString dbAircraft::newAcftGetId(QString registration)
+{
+    QString result;
+    QSqlQuery query;
+    query.prepare("SELECT tail_id "
+                  "FROM tails "
+                  "WHERE registration LIKE ?");
+    registration.prepend("%"); registration.append("%");
+    query.addBindValue(registration);
+    query.exec();
+
+    while(query.next())
+    {
+        result.append(query.value(0).toString());
+    }
+    qDebug() << "newAcftGetId: " << result;
+    return result;
+
+}
+/*!
+ * \brief dbAircraft::retreiveAircraftTypeFromReg Searches the tails Database
+ * \param searchstring
+ * \return {registration, type, iata Code, tail_id} or {}
+ */
+QVector<QString> dbAircraft::retreiveAircraftTypeFromReg(QString searchstring)
+{
+
+    QSqlQuery query;
+    query.prepare("SELECT Name, iata, registration, tail_id " //"SELECT Registration, Name, icao, iata "
+                  "FROM aircraft "
+                  "INNER JOIN tails on tails.aircraft_ID = aircraft.aircraft_id "
+                  "WHERE tails.registration LIKE ?");
+    // Returns Registration/Name/icao/iata
+    searchstring.prepend("%");
+    searchstring.append("%");
+    query.addBindValue(searchstring);
+    query.exec();
+
+    QVector<QString> result;
+    if(query.first())
+    {
+        QString acType = query.value(0).toString();
+        QString iataCode = query.value(1).toString();
+        QString registration = query.value(2).toString();
+        QString tail_id = query.value(3).toString();
+        result.append(registration); result.append(acType);
+        result.append(iataCode); result.append(tail_id);
+        return result;
+    }else
+    {
+        return  result; // return empty
+    }
+}
+
+/*!
+ * \brief dbAircraft::retreiveAircraftMake Search function to provide a
+ * QStringList to the QCompleter
+ * \param searchstring A possible aircraft manufacturer
+ * \return Possible values according to the aircraft database
+ */
+QStringList dbAircraft::retreiveAircraftMake(QString searchstring)
+{
+    QStringList result;
+    QSqlQuery query;
+    query.prepare("SELECT make from aircraft WHERE make LIKE ?");
+    searchstring.prepend("%"); searchstring.append("%");
+    query.addBindValue(searchstring);
+    query.exec();
+
+    while(query.next())
+    {
+        result.append(query.value(0).toString());
+    }
+    qDebug() << "db::RetreiveAircraftMake... Result:" << result;
+    return result;
+}
+/*!
+ * \brief dbAircraft::retreiveAircraftModel Search function to provide a
+ * QStringList to the QCompleter
+ * \param make A possible aircraft family (A320, 737,...)
+ * \param searchstring
+ * \return
+ */
+QStringList dbAircraft::retreiveAircraftModel(QString make, QString searchstring)
+{
+    QStringList result;
+    QSqlQuery query;
+    query.prepare("SELECT model FROM aircraft WHERE make = ? AND model LIKE ?");
+    query.addBindValue(make);
+    searchstring.prepend("%"); searchstring.append("%");
+    query.addBindValue(searchstring);
+    query.exec();
+
+    while(query.next())
+    {
+        result.append(query.value(0).toString());
+        qDebug() << "db::RetreiveAircraftModel... Result:" << result;
+    }
+    return result;
+}
+/*!
+ * \brief dbAircraft::retreiveAircraftVariant Search function to provide a
+ * QStringList to the QCompleter
+ * \param make Aircraft manufacturer
+ * \param model Aircraft family
+ * \param searchstring
+ * \return Aircraft Variant
+ */
+QStringList dbAircraft::retreiveAircraftVariant(QString make, QString model, QString searchstring)
+{
+    QStringList result;
+    QSqlQuery query;
+    query.prepare("SELECT variant from aircraft WHERE make = ? AND model = ? AND variant LIKE ?");
+    query.addBindValue(make);
+    query.addBindValue(model);
+    searchstring.prepend("%"); searchstring.append("%");
+    query.addBindValue(searchstring);
+    query.exec();
+
+    while(query.next())
+    {
+        result.append(query.value(0).toString());
+        qDebug() << "db::RetreiveAircraftVariant... Result:" << result;
+    }
+
+    return result;
+}
+/*!
+ * \brief dbAircraft::retreiveAircraftIdFromMakeModelVariant Looks up the unique
+ * aircraft id for a given specification of make, model and variant
+ * \param make Aircraft manufacturer (e.g. Boeing)
+ * \param model Aircraft family (e.g. 737)
+ * \param variant Aircraft variant (e.g. -800)
+ * \return arcraft_id primary key of aircraft database
+ */
+QString dbAircraft::retreiveAircraftIdFromMakeModelVariant(QString make, QString model, QString variant)
+{
+    QString result;
+    QSqlQuery query;
+    query.prepare("SELECT aircraft_id FROM aircraft WHERE make = ? AND model = ? AND variant = ?");
+    query.addBindValue(make);
+    query.addBindValue(model);
+    query.addBindValue(variant);
+    query.exec();
+
+    if(query.first())
+    {
+        result.append(query.value(0).toString());
+        qDebug() << "db::RetreiveAircraftIdFromMakeModelVariant: Aircraft found! ID# " << result;
+        return result;
+    }else
+    {
+        result = result.left(result.length()-1);
+        result.append("0");
+        qDebug() << "db::RetreiveAircraftIdFromMakeModelVariant: ERROR - no AircraftId found.";
+        return  result;
+    }
+}
+/*!
+ * \brief dbAircraft::commitTailToDb Creates a new entry in the tails database
+ * \param registration
+ * \param aircraft_id Primary key of aircraft database
+ * \param company optional entry if a/c is associated with a certain company
+ * \return true on success
+ */
+bool dbAircraft::commitTailToDb(QString registration, QString aircraft_id, QString company)
+{
+    QSqlQuery commit;
+    commit.prepare("INSERT INTO tails (registration, aircraft_id, company) VALUES (?,?,?)");
+    commit.addBindValue(registration);
+    commit.addBindValue(aircraft_id);
+    commit.addBindValue(company);
+    commit.exec();
+
+    if(commit.lastError().text().length() < 0){
+        qWarning() << "db::CommitAircraftToDb:: SQL error:" << commit.lastError().text();
+        return false;
+    }else{
+        return true;
+    }
+}

+ 33 - 0
dbaircraft.h

@@ -0,0 +1,33 @@
+#ifndef DBAIRCRAFT_H
+#define DBAIRCRAFT_H
+
+#include <QCoreApplication>
+
+/*!
+ * \brief The dbAircraft class provides functionality for retreiving and storing
+ * data relateted to the aircraft and tails tables of the database.
+ */
+class dbAircraft
+{
+public:
+    static QString retreiveRegistration(QString tail_ID);
+
+    static QStringList newAcftGetString(QString searchstring);
+
+    static QString newAcftGetId(QString registration);
+
+    static QVector<QString> retreiveAircraftTypeFromReg(QString searchstring);
+
+    static QStringList retreiveAircraftMake(QString searchstring);
+
+    static QStringList retreiveAircraftModel(QString make, QString searchstring);
+
+    static QStringList retreiveAircraftVariant(QString make, QString model, QString searchstring);
+
+    static QString retreiveAircraftIdFromMakeModelVariant(QString make, QString model, QString variant);
+
+    static bool commitTailToDb(QString registration, QString aircraft_id, QString company);
+
+};
+
+#endif // DBAIRCRAFT_H

+ 2 - 214
dbman.cpp

@@ -23,6 +23,7 @@
 #include <QSqlQuery>
 #include "calc.h"
 #include "dbpilots.h"
+#include "dbaircraft.h"
 #include <chrono>
 #include <QRandomGenerator>
 #include <QStandardPaths>
@@ -99,220 +100,7 @@ public:
 
 
 
-    /*
- * Aircraft Database Related Functions
- */
-
-    /*!
-     * \brief RetreiveRegistration Looks up tail_id from Database
-     * \param tail_ID Primary Key of tails database
-     * \return Registration
-     */
-    static QString RetreiveRegistration(QString tail_ID)
-
-    {
-        QString acftRegistration("");
-
-        QSqlQuery query;
-        query.prepare("SELECT registration FROM tails WHERE tail_id == ?");
-        query.addBindValue(tail_ID.toInt());
-        query.exec();
-
-        if(query.first());
-        else
-            qDebug() << ("No Aircraft with this ID found");
-        query.previous();//To go back to index 0
-        while (query.next()) {
-            acftRegistration.append(query.value(0).toString());
-        }
-
-        return acftRegistration;
-    }
-
-    /*!
-     * \brief newAcftGetString Looks up an aircraft Registration in the database
-     * \param searchstring
-     * \return Registration, make, model and variant
-     */
-    static QStringList newAcftGetString(QString searchstring)
-    {
-        QStringList result;
-        if(searchstring.length()<2){return result;}
-        QSqlQuery query;
-        query.prepare("SELECT registration, make, model, variant "
-                      "FROM aircraft "
-                      "INNER JOIN tails on tails.aircraft_ID = aircraft.aircraft_id "
-                      "WHERE tails.registration LIKE ?");
-        searchstring.append("%"); searchstring.prepend("%");
-        query.addBindValue(searchstring);
-        query.exec();
-
-        while(query.next())
-        {
-            result.append(query.value(0).toString() + " (" + query.value(1).toString() + "-" + query.value(2).toString() + "-" + query.value(3).toString() + ")");
-        }
-        qDebug() << "newAcftGetString: " << result.length() << result;
-        return result;
-
-    }
-
-    static QString newAcftGetId(QString registration)
-    {
-        QString result;
-        QSqlQuery query;
-        query.prepare("SELECT tail_id "
-                      "FROM tails "
-                      "WHERE registration LIKE ?");
-        registration.prepend("%"); registration.append("%");
-        query.addBindValue(registration);
-        query.exec();
-
-        while(query.next())
-        {
-            result.append(query.value(0).toString());
-        }
-        qDebug() << "newAcftGetId: " << result;
-        return result;
-
-    }
-
-    static QVector<QString> RetreiveAircraftTypeFromReg(QString searchstring)
-    /*
-     * Searches the tails Database and returns the aircraft Type.
-     */
-    {
-
-        QSqlQuery query;
-        query.prepare("SELECT Name, iata, registration, tail_id " //"SELECT Registration, Name, icao, iata "
-                      "FROM aircraft "
-                      "INNER JOIN tails on tails.aircraft_ID = aircraft.aircraft_id "
-                      "WHERE tails.registration LIKE ?");
-        // Returns Registration/Name/icao/iata
-        searchstring.prepend("%");
-        searchstring.append("%");
-        query.addBindValue(searchstring);
-        query.exec();
-
-        QVector<QString> result;
 
-        if(query.first())
-        {
-            QString acType = query.value(0).toString();
-            QString iataCode = query.value(1).toString();
-            QString registration = query.value(2).toString();
-            QString tail_id = query.value(3).toString();
-            //QString formatted = acType + " [ " + registration + " | " + iataCode + " ]";
-            //qDebug() << formatted;
-            result.append(registration); result.append(acType);
-            result.append(iataCode); result.append(tail_id);
-            return result;
-        }else
-        {
-            return  result; // empty vector
-        }
-
-
-    }
-
-    static QStringList RetreiveAircraftMake(QString searchstring)
-    {
-        QStringList result;
-        QSqlQuery query;
-        query.prepare("SELECT make from aircraft WHERE make LIKE ?");
-        searchstring.prepend("%"); searchstring.append("%");
-        query.addBindValue(searchstring);
-        query.exec();
-
-
-        while(query.next())
-        {
-            result.append(query.value(0).toString());
-        }
-        qDebug() << "db::RetreiveAircraftMake says... Result:" << result;
-        return result;
-    }
-
-    static QStringList RetreiveAircraftModel(QString make, QString searchstring)
-    {
-        QStringList result;
-        QSqlQuery query;
-        query.prepare("SELECT model FROM aircraft WHERE make = ? AND model LIKE ?");
-        query.addBindValue(make);
-        searchstring.prepend("%"); searchstring.append("%");
-        query.addBindValue(searchstring);
-        query.exec();
-
-        while(query.next())
-        {
-            result.append(query.value(0).toString());
-            qDebug() << "db::RetreiveAircraftModel says... Result:" << result;
-        }
-
-        return result;
-    }
-
-    static QStringList RetreiveAircraftVariant(QString make, QString model, QString searchstring)
-    {
-        QStringList result;
-        QSqlQuery query;
-        query.prepare("SELECT variant from aircraft WHERE make = ? AND model = ? AND variant LIKE ?");
-        query.addBindValue(make);
-        query.addBindValue(model);
-        searchstring.prepend("%"); searchstring.append("%");
-        query.addBindValue(searchstring);
-        query.exec();
-
-        while(query.next())
-        {
-            result.append(query.value(0).toString());
-            qDebug() << "db::RetreiveAircraftVariant says... Result:" << result;
-        }
-
-        return result;
-    }
-
-    static QString RetreiveAircraftIdFromMakeModelVariant(QString make, QString model, QString variant)
-    {
-        QString result;
-        QSqlQuery query;
-        query.prepare("SELECT aircraft_id FROM aircraft WHERE make = ? AND model = ? AND variant = ?");
-        query.addBindValue(make);
-        query.addBindValue(model);
-        query.addBindValue(variant);
-        query.exec();
-
-        if(query.first())
-        {
-            result.append(query.value(0).toString());
-            qDebug() << "db::RetreiveAircraftIdFromMakeModelVariant: Aircraft found! ID# " << result;
-            return result;
-        }else
-        {
-            result = result.left(result.length()-1);
-            result.append("0");
-            qDebug() << "db::RetreiveAircraftIdFromMakeModelVariant: ERROR - no AircraftId found.";
-            return  result;
-        }
-    }
-
-    static bool CommitTailToDb(QString registration, QString aircraft_id, QString company)
-    {
-        QSqlQuery commit;
-        commit.prepare("INSERT INTO tails (registration, aircraft_id, company) VALUES (?,?,?)");
-        commit.addBindValue(registration);
-        commit.addBindValue(aircraft_id);
-        commit.addBindValue(company);
-        commit.exec();
-        QString error = commit.lastError().text();
-        if(error.length() < 0)
-        {
-            qDebug() << "db::CommitAircraftToDb:: SQL error:" << error;
-            return false;
-        }else
-        {
-            return true;
-        }
-    }
 
 /*
  *  Obsolete Functions
@@ -364,7 +152,7 @@ public:
             QString tonb = calc::minutes_to_string((query.value(5).toString()));
             QString tblk = calc::minutes_to_string((query.value(6).toString()));
             QString pic = dbPilots::retreivePilotNameFromID(query.value(7).toString());
-            QString acft = db::RetreiveRegistration(query.value(8).toString());
+            QString acft = dbAircraft::retreiveRegistration(query.value(8).toString());
             //qDebug() << id << doft << dept << tofb << dest << tonb << tblk << pic << acft << endl;
             flight[index] = id;
             ++index;

+ 3 - 3
editflight.cpp

@@ -189,7 +189,7 @@ void EditFlight::returnInput(QVector<QString> flight)
     ui->newTonb->setText(flight[5]);
     // flight[6] is blocktime
     ui->newPic->setText(dbPilots::retreivePilotNameFromID(flight[7]));
-    ui->newAcft->setText(db::RetreiveRegistration(flight[8]));
+    ui->newAcft->setText(dbAircraft::retreiveRegistration(flight[8]));
 }
 
 /*
@@ -386,7 +386,7 @@ void EditFlight::on_newAcft_textChanged(const QString &arg1)
 {
     if(arg1.length() > 2)
     {
-        QVector<QString> hint = db::RetreiveAircraftTypeFromReg(arg1);
+        QVector<QString> hint = dbAircraft::retreiveAircraftTypeFromReg(arg1);
         if(hint.size() != 0)
         {
             ui->acftHintLineEdit->setPlaceholderText(hint[1] + " [ " + hint[0] + " | " + hint[2] + " ]");
@@ -401,7 +401,7 @@ void EditFlight::on_newAcft_editingFinished()
     if(ui->newAcft->text().length()>2)
     {
         QVector<QString> result;
-        result = db::RetreiveAircraftTypeFromReg(editacft);
+        result = dbAircraft::retreiveAircraftTypeFromReg(editacft);
         if(result.size()!=0)
         {
             ui->newAcft->setText(result[0]);// to do: pop up to navigate result set, here first result is selected

+ 8 - 8
newacft.cpp

@@ -51,7 +51,7 @@ NewAcft::~NewAcft()
 
 void NewAcft::on_MakeLineEdit_textEdited(const QString &arg1)
 {
-    QStringList makeList = db::RetreiveAircraftMake(arg1);
+    QStringList makeList = dbAircraft::retreiveAircraftMake(arg1);
     makeList.removeDuplicates();
     QCompleter *makeCompleter = new QCompleter(makeList, this);
     makeCompleter->setCaseSensitivity(Qt::CaseInsensitive);
@@ -61,7 +61,7 @@ void NewAcft::on_MakeLineEdit_textEdited(const QString &arg1)
 }
 void NewAcft::on_MakeLineEdit_editingFinished()
 {
-    QStringList makeList = db::RetreiveAircraftMake(ui->MakeLineEdit->text());
+    QStringList makeList = dbAircraft::retreiveAircraftMake(ui->MakeLineEdit->text());
     if(makeList.length() != 0)
     {
         make = makeList.first();
@@ -78,7 +78,7 @@ void NewAcft::on_MakeLineEdit_editingFinished()
 
 void NewAcft::on_ModelLineEdit_textEdited(const QString &arg1)
 {
-    QStringList modelList = db::RetreiveAircraftModel(make, arg1);
+    QStringList modelList = dbAircraft::retreiveAircraftModel(make, arg1);
     modelList.removeDuplicates();
     QCompleter *modelCompleter = new QCompleter(modelList, this);
     modelCompleter->setCaseSensitivity(Qt::CaseInsensitive);
@@ -87,7 +87,7 @@ void NewAcft::on_ModelLineEdit_textEdited(const QString &arg1)
 }
 void NewAcft::on_ModelLineEdit_editingFinished()
 {
-    QStringList modelList = db::RetreiveAircraftModel(make, ui->ModelLineEdit->text());
+    QStringList modelList = dbAircraft::retreiveAircraftModel(make, ui->ModelLineEdit->text());
     if(modelList.length() != 0)
     {
         model = modelList.first();
@@ -103,7 +103,7 @@ void NewAcft::on_ModelLineEdit_editingFinished()
 
 void NewAcft::on_VariantLineEdit_textEdited(const QString &arg1)
 {
-    QStringList variantList = db::RetreiveAircraftVariant(make, model, arg1);
+    QStringList variantList = dbAircraft::retreiveAircraftVariant(make, model, arg1);
     variantList.removeDuplicates();
     QCompleter *variantCompleter = new QCompleter(variantList, this);
     variantCompleter->setCaseSensitivity(Qt::CaseInsensitive);
@@ -113,7 +113,7 @@ void NewAcft::on_VariantLineEdit_textEdited(const QString &arg1)
 
 void NewAcft::on_VariantLineEdit_editingFinished()
 {
-    QStringList VariantList = db::RetreiveAircraftVariant(make, model, ui->VariantLineEdit->text());
+    QStringList VariantList = dbAircraft::retreiveAircraftVariant(make, model, ui->VariantLineEdit->text());
     if(VariantList.length() != 0)
     {
         variant = VariantList.first();
@@ -130,7 +130,7 @@ void NewAcft::on_VariantLineEdit_editingFinished()
 void NewAcft::on_buttonBox_accepted()
 {
     qDebug() << "Accepted Button pressed";
-    aircraft_id = db::RetreiveAircraftIdFromMakeModelVariant(make, model, variant);
+    aircraft_id = dbAircraft::retreiveAircraftIdFromMakeModelVariant(make, model, variant);
     if(aircraft_id.contains("0") && aircraft_id.length() < 2)
     {
         QMessageBox nope;
@@ -140,7 +140,7 @@ void NewAcft::on_buttonBox_accepted()
         nope.exec();
     }else
     {
-        db::CommitTailToDb(registration, aircraft_id, "");
+        dbAircraft::commitTailToDb(registration, aircraft_id, "");
         NewAcft::reject();
     }
 

+ 1 - 0
newacft.h

@@ -19,6 +19,7 @@
 #define NEWACFT_H
 
 #include <QDialog>
+#include "dbaircraft.h"
 
 namespace Ui {
 class NewAcft;

+ 6 - 6
newflight.cpp

@@ -331,7 +331,7 @@ void NewFlight::returnInput(QVector<QString> flight)
     ui->newTonb->setText(flight[5]);
     // flight[6] is blocktime
     ui->newPic->setText(dbPilots::retreivePilotNameFromID(flight[7]));
-    ui->newAcft->setText(db::RetreiveRegistration(flight[8]));
+    ui->newAcft->setText(dbAircraft::retreiveRegistration(flight[8]));
 }
 
 void NewFlight::storeSettings()
@@ -544,7 +544,7 @@ void NewFlight::on_newAcft_textEdited(const QString &arg1)
 {
     if(arg1.length()>1)
     {
-        QStringList acftList = db::newAcftGetString(arg1);
+        QStringList acftList = dbAircraft::newAcftGetString(arg1);
         QCompleter *acftCompleter = new QCompleter(acftList, this);
         acftCompleter->setCaseSensitivity(Qt::CaseInsensitive);
         acftCompleter->setCompletionMode(QCompleter::UnfilteredPopupCompletion);
@@ -560,11 +560,11 @@ void NewFlight::on_newAcft_editingFinished()
     {
         QStringList input = ui->newAcft->text().split(" ");
         QString registration = input[0].trimmed();
-        QStringList result = db::newAcftGetString(registration);
+        QStringList result = dbAircraft::newAcftGetString(registration);
         if(result.length() > 0)
         {
             ui->newAcft->setText(result[0]);
-            acft = db::newAcftGetId(registration);
+            acft = dbAircraft::newAcftGetId(registration);
         }else
         {
             acft = "-1";
@@ -572,14 +572,14 @@ void NewFlight::on_newAcft_editingFinished()
     }else // is input from user
     {
         QString input = ui->newAcft->text();
-        QStringList result = db::newAcftGetString(input);
+        QStringList result = dbAircraft::newAcftGetString(input);
         if(result.length() > 0)
         {
             ui->newAcft->setText(result[0]);
 
             QStringList input = ui->newAcft->text().split(" ");
             QString registration = input[0].trimmed();
-            acft = db::newAcftGetId(registration);
+            acft = dbAircraft::newAcftGetId(registration);
         }else
         {
             acft = "-1";

+ 1 - 0
newflight.h

@@ -25,6 +25,7 @@
 #include "dbflight.h"
 #include "dbpilots.h"
 #include "dbairport.h"
+#include "dbaircraft.h"
 
 namespace Ui {
 class NewFlight;

+ 2 - 0
openLog.pro

@@ -23,6 +23,7 @@ DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs depr
 
 SOURCES += \
     calc.cpp \
+    dbaircraft.cpp \
     dbairport.cpp \
     dbflight.cpp \
     dbman.cpp \
@@ -42,6 +43,7 @@ SOURCES += \
 
 HEADERS += \
     calc.h \
+    dbaircraft.h \
     dbairport.h \
     dbflight.h \
     dbpilots.h \