Merge pull request #36 from fiffty-50/develop-database-naming-cleanup

Cleaned up Databes column naming

assets/database/templates/changelog.csv

@@ -13,3 +13,4 @@ revision,comment,date
 12,reworked views to display self or picname according CASE,2020-12-11
 13,Reworked viewEASA to incorporate NULL handling,2020-12-17
 14,Edited tails and aircraft tables - engineClass and weightClass instead of columns for each element,2020-12-19
+15,Renamed some columns to have consistent naming.,2020-12-26

assets/database/templates/sample_flights.csv

@@ -1,4 +1,4 @@
-flight_id,doft,dept,dest,tofb,tonb,pic,acft,tblk,tSPSE,tSPME,tMP,tNIGHT,tIFR,tPIC,tPICUS,tSIC,tDUAL,tFI,tSIM,pilotFlying,toDay,toNight,ldgDay,ldgNight,autoland,secondPilot,thirdPilot,ApproachType,FlightNumber,Remarks
+flight_id,doft,dept,dest,tofb,tonb,pic,acft,tblk,tSPSE,tSPME,tMP,tNIGHT,tIFR,tPIC,tPICUS,tSIC,tDUAL,tFI,tSIM,pilotFlying,toDay,toNight,ldgDay,ldgNight,autoland,secondPilot,thirdPilot,approachType,flightNumber,remarks
 2,2020-12-03,KVOK,LTAO,947,1112,1,302,165,165,,,165,,,,,165,,,1,1,,1,,,1224,2481,VISUAL,FR-2263,
 3,2020-11-21,NTKO,VVBM,239,835,1,297,596,,,596,344,596,596,,,,,,,,,,,,549,512,ILS CAT I,FR-2263,
 5,2020-11-09,KSDM,URWI,238,416,1,102,178,,,178,178,178,,,178,,,,,,,,,,1055,536,LOC,FR-2263,

assets/database/templates/sample_pilots.csv

@@ -1,4 +1,4 @@
-pilot_id,picfirstname,piclastname,alias,company,employeeid,phone,email
+pilot_id,firstname,lastname,alias,company,employeeid,phone,email
 1,Dave,Bowman,self,NASA,HAL9000,+12 345 6789,dave@nasa.com
 3,Jens,Lehmann,,PanAm,,,
 4,Hans,Meise,Hansi,NAS,,,

src/database/adatabasesetup.cpp

@@ -23,8 +23,8 @@
 
 const QString createTablePilots = "CREATE TABLE pilots ( "
             " pilot_id       INTEGER NOT NULL, "
-            " piclastname    TEXT    NOT NULL, "
-            " picfirstname   TEXT, "
+            " lastname       TEXT    NOT NULL, "
+            " firstname      TEXT, "
             " alias          TEXT, "
             " company        TEXT, "
             " employeeid     TEXT, "
@@ -76,9 +76,9 @@ const QString createTableFlights = "CREATE TABLE flights ("
             " autoland       INTEGER, "
             " secondPilot    INTEGER, "
             " thirdPilot     INTEGER, "
-            " ApproachType   TEXT, "
-            " FlightNumber   TEXT, "
-            " Remarks        TEXT, "
+            " approachType   TEXT, "
+            " flightNumber   TEXT, "
+            " remarks        TEXT, "
             " FOREIGN KEY(pic)  REFERENCES pilots(pilot_id) ON DELETE RESTRICT, "
             " FOREIGN KEY(acft) REFERENCES tails(tail_id)   ON DELETE RESTRICT, "
             " PRIMARY KEY(flight_id    AUTOINCREMENT) "
@@ -99,7 +99,7 @@ const QString createTableAirports = "CREATE TABLE airports ( "
             ")";
 
 const QString createTableAircraft = "CREATE TABLE aircraft ("
-            " aircraft_id	INTEGER NOT NULL,"
+            " aircraft_id   INTEGER NOT NULL,"
             " make          TEXT,"
             " model         TEXT,"
             " variant       TEXT,"
@@ -129,13 +129,13 @@ const QString createViewDefault = "CREATE VIEW viewDefault AS "
         " printf('%02d',(tblk/60))||':'||printf('%02d',(tblk%60)) AS 'Total', "
         " CASE "
         " WHEN pilot_id = 1 THEN alias "
-        " ELSE piclastname||', '||substr(picfirstname, 1, 1)||'.' "
+        " ELSE lastname||', '||substr(firstname, 1, 1)||'.' "
         " END "
         " AS 'Name PIC', "
         " make||' '||model||'-'||variant AS 'Type', "
         " registration AS 'Registration', "
         " FlightNumber AS 'Flight #', "
-        " Remarks "
+        " remarks AS 'Remarks'"
         " FROM flights "
         " INNER JOIN pilots on flights.pic = pilots.pilot_id "
         " INNER JOIN tails on flights.acft = tails.tail_id "
@@ -155,7 +155,7 @@ const QString createViewEASA = "CREATE VIEW viewEASA AS "
         " printf('%02d',(tblk/60))||':'||printf('%02d',(tblk%60)) AS 'Total', "
         " CASE "
         " WHEN pilot_id = 1 THEN alias "
-        " ELSE piclastname||', '||substr(picfirstname, 1, 1)||'.' "
+        " ELSE lastname||', '||substr(firstname, 1, 1)||'.' "
         " END "
         " AS 'Name PIC', "
         " ldgDay AS 'L/D', "
@@ -166,7 +166,7 @@ const QString createViewEASA = "CREATE VIEW viewEASA AS "
         " (SELECT printf('%02d',(tSIC/60))||':'||printf('%02d',(tSIC%60)) WHERE tSIC IS NOT NULL)  AS 'SIC', "
         " (SELECT printf('%02d',(tDual/60))||':'||printf('%02d',(tDual%60)) WHERE tDual IS NOT NULL)  AS 'Dual', "
         " (SELECT printf('%02d',(tFI/60))||':'||printf('%02d',(tFI%60)) WHERE tFI IS NOT NULL)  AS 'FI', "
-        " Remarks "
+        " remarks AS 'Remarks' "
         " FROM flights "
         " INNER JOIN pilots on flights.pic = pilots.pilot_id "
         " INNER JOIN tails on flights.acft = tails.tail_id "
@@ -174,29 +174,30 @@ const QString createViewEASA = "CREATE VIEW viewEASA AS "
 
 const QString createViewTails = "CREATE VIEW viewTails AS "
         " SELECT "
-        " tail_id AS \"ID\", "
-        " registration AS \"Registration\", "
-        " make||\" \"||model AS \"Type\", "
-        " company AS \"Company\" "
+        " tail_id AS 'ID', "
+        " registration AS 'Registration', "
+        " make||' '||model AS 'Type', "
+        " company AS 'Company' "
         " FROM tails WHERE model IS NOT NULL AND variant IS NULL "
         " UNION "
         " SELECT "
-        " tail_id AS \"ID\", "
-        " registration AS \"Registration\", "
-        " make||\" \"||model||\"-\"||variant AS \"Type\", "
-        " company AS \"Company\" "
+        " tail_id AS 'ID', "
+        " registration AS 'Registration', "
+        " make||' '||model||'-'||variant AS 'Type', "
+        " company AS 'Company' "
         " FROM tails WHERE variant IS NOT NULL";
 
 const QString createViewPilots = "CREATE VIEW viewPilots AS "
         " SELECT "
-        " pilot_id AS \"ID\", "
-        " piclastname AS \"Last Name\", "
-        " picfirstname AS \"First Name\", company AS \"Company\" "
+        " pilot_id AS 'ID', "
+        " lastname AS 'Last Name', "
+        " firstname AS 'First Name', "
+        " company AS 'Company' "
         " FROM pilots";
 
 const QString createViewQCompleter = "CREATE VIEW viewQCompleter AS "
         " SELECT airport_id, icao, iata, tail_id, registration, pilot_id, "
-        " piclastname||\", \"||picfirstname AS \"pilot_name\", alias "
+        " lastname||', '||firstname AS 'pilot_name', alias "
         " FROM airports "
         " LEFT JOIN tails ON airports.airport_id = tails.tail_id "
         " LEFT JOIN pilots ON airports.airport_id = pilots.pilot_id";
@@ -221,7 +222,7 @@ const QString createViewTotals = "CREATE VIEW viewTotals AS "
 
 /*const QString createViewPilotsTailsMap = "CREATE VIEW viewPilotsTailsMap AS "
         "SELECT "
-        "pilot_id, piclastname, picfirstname, tail_id, registration "
+        "pilot_id, lastname, firstname, tail_id, registration "
         "FROM pilots "
         "LEFT JOIN tails "
         "ON pilots.pilot_id = tails.tail_id";*/

src/database/tablecolumnliterals.h

@@ -24,58 +24,58 @@ static const auto DB_TABLE_AIRCRAFT = QStringLiteral("aircraft");
 static const auto DB_TABLE_AIRPORTS = QStringLiteral("airports");
 
 // Flights table
-static const auto DB_doft           = QStringLiteral("doft");
-static const auto DB_dept           = QStringLiteral("dept");
-static const auto DB_dest           = QStringLiteral("dest");
-static const auto DB_tofb           = QStringLiteral("tofb");
-static const auto DB_tonb           = QStringLiteral("tonb");
-static const auto DB_pic            = QStringLiteral("pic");
-static const auto DB_acft           = QStringLiteral("acft");
-static const auto DB_tblk           = QStringLiteral("tblk");
-static const auto DB_tSPSE          = QStringLiteral("tSPSE");
-static const auto DB_tSPME          = QStringLiteral("tSPME");
-static const auto DB_tMP            = QStringLiteral("tMP");
-static const auto DB_tNIGHT         = QStringLiteral("tNIGHT");
-static const auto DB_tIFR           = QStringLiteral("tIFR");
-static const auto DB_tPIC           = QStringLiteral("tPIC");
-static const auto DB_tPICUS         = QStringLiteral("tPICUS");
-static const auto DB_tSIC           = QStringLiteral("tSIC");
-static const auto DB_tDUAL          = QStringLiteral("tDUAL");
-static const auto DB_tFI            = QStringLiteral("tFI");
-static const auto DB_tSIM           = QStringLiteral("tSIM");
-static const auto DB_pilotFlying    = QStringLiteral("pilotFlying");
-static const auto DB_toDay          = QStringLiteral("toDay");
-static const auto DB_toNight        = QStringLiteral("toNight");
-static const auto DB_ldgDay         = QStringLiteral("ldgDay");
-static const auto DB_ldgNight       = QStringLiteral("ldgNight");
-static const auto DB_autoland       = QStringLiteral("autoland");
-static const auto DB_secondPilot    = QStringLiteral("secondPilot");
-static const auto DB_thirdPilot     = QStringLiteral("thirdPilot");
-static const auto DB_ApproachType   = QStringLiteral("ApproachType");
-static const auto DB_FlightNumber   = QStringLiteral("FlightNumber");
-static const auto DB_Remarks        = QStringLiteral("Remarks");
+static const auto DB_FLIGHTS_DOFT           = QStringLiteral("doft");
+static const auto DB_FLIGHTS_DEPT           = QStringLiteral("dept");
+static const auto DB_FLIGHTS_DEST           = QStringLiteral("dest");
+static const auto DB_FLIGHTS_TOFB           = QStringLiteral("tofb");
+static const auto DB_FLIGHTS_TONB           = QStringLiteral("tonb");
+static const auto DB_FLIGHTS_PIC            = QStringLiteral("pic");
+static const auto DB_FLIGHTS_ACFT           = QStringLiteral("acft");
+static const auto DB_FLIGHTS_TBLK           = QStringLiteral("tblk");
+static const auto DB_FLIGHTS_TSPSE          = QStringLiteral("tSPSE");
+static const auto DB_FLIGHTS_SPME           = QStringLiteral("tSPME");
+static const auto DB_FLIGHTS_TMP            = QStringLiteral("tMP");
+static const auto DB_FLIGHTS_TNIGHT         = QStringLiteral("tNIGHT");
+static const auto DB_FLIGHTS_TIFR           = QStringLiteral("tIFR");
+static const auto DB_FLIGHTS_TPIC           = QStringLiteral("tPIC");
+static const auto DB_FLIGHTS_TPICUS         = QStringLiteral("tPICUS");
+static const auto DB_FLIGHTS_TSIC           = QStringLiteral("tSIC");
+static const auto DB_FLIGHTS_TDUAL          = QStringLiteral("tDUAL");
+static const auto DB_FLIGHTS_TFI            = QStringLiteral("tFI");
+static const auto DB_FLIGHTS_TSIM           = QStringLiteral("tSIM");
+static const auto DB_FLIGHTS_PILOTFLYING    = QStringLiteral("pilotFlying");
+static const auto DB_FLIGHTS_TODAY          = QStringLiteral("toDay");
+static const auto DB_FLIGHTS_TONIGHT        = QStringLiteral("toNight");
+static const auto DB_FLIGHTS_LDGDAY         = QStringLiteral("ldgDay");
+static const auto DB_FLIGHTS_LDGNIGHT       = QStringLiteral("ldgNight");
+static const auto DB_FLIGHTS_AUTOLAND       = QStringLiteral("autoland");
+static const auto DB_FLIGHTS_SECONDPILOT    = QStringLiteral("secondPilot");
+static const auto DB_FLIGHTS_THIRDPILOT     = QStringLiteral("thirdPilot");
+static const auto DB_FLIGHTS_APPROACHTYPE   = QStringLiteral("approachType");
+static const auto DB_FLIGHTS_FLIGHTNUMBER   = QStringLiteral("flightNumber");
+static const auto DB_FLIGHTS_REMARKS        = QStringLiteral("remarks");
 
-// aircraft and tails tables
+// tails table
 
-static const auto DB_registration   = QStringLiteral("registration");
-//static const auto DB_company      = QStringLiteral("company"); to do - resolve naming conflict with pilots.company, time being these are equivalent since they are unique in their respective tables but still..
-static const auto DB_make           = QStringLiteral("make");
-static const auto DB_model          = QStringLiteral("model");
-static const auto DB_variant        = QStringLiteral("variant");
-static const auto DB_multipilot     = QStringLiteral("multipilot");
-static const auto DB_multiengine    = QStringLiteral("multiengine");
-static const auto DB_engineType     = QStringLiteral("engineType");
-static const auto DB_weightClass    = QStringLiteral("weightClass");
+static const auto DB_TAILS_REGISTRATION   = QStringLiteral("registration");
+static const auto DB_TAILS_COMPANY        = QStringLiteral("company");
+static const auto DB_TAILS_MAKE           = QStringLiteral("make");
+static const auto DB_TAILS_MODEL          = QStringLiteral("model");
+static const auto DB_TAILS_VARIANT        = QStringLiteral("variant");
+static const auto DB_TAILS_MULTIPILOT     = QStringLiteral("multipilot");
+static const auto DB_TAILS_MULTIENGINE    = QStringLiteral("multiengine");
+static const auto DB_TAILS_ENGINETYPE     = QStringLiteral("engineType");
+static const auto DB_TAILS_WEIGHTCLASS    = QStringLiteral("weightClass");
 
 // pilots table
 
-static const auto DB_piclastname    = QStringLiteral("piclastname");
-static const auto DB_picfirstname   = QStringLiteral("picfirstname");
-static const auto DB_alias          = QStringLiteral("alias");
-static const auto DB_company        = QStringLiteral("company");
-static const auto DB_employeeid     = QStringLiteral("employeeid");
-static const auto DB_phone          = QStringLiteral("phone");
-static const auto DB_email          = QStringLiteral("email");
+static const auto DB_PILOTS_LASTNAME       = QStringLiteral("lastname");
+static const auto DB_PILOTS_FIRSTNAME      = QStringLiteral("firstname");
+static const auto DB_PILOTS_ALIAS          = QStringLiteral("alias");
+static const auto DB_PILOTS_COMPANY        = QStringLiteral("company");
+static const auto DB_PILOTS_EMPLOYEEID     = QStringLiteral("employeeid");
+static const auto DB_PILOTS_PHONE          = QStringLiteral("phone");
+static const auto DB_PILOTS_EMAIL          = QStringLiteral("email");
 
 // all tables
 

src/experimental/adatabase.cpp

@@ -407,7 +407,7 @@ const QStringList ADatabase::getCompletionList(ADatabaseTarget target)
 
     switch (target) {
     case ADatabaseTarget::pilots:
-        statement.append("SELECT piclastname||', '||picfirstname FROM pilots");
+        statement.append("SELECT lastname||', '||firstname FROM pilots");
         break;
     case ADatabaseTarget::aircraft:
         statement.append("SELECT make||' '||model FROM aircraft WHERE model IS NOT NULL "
@@ -455,7 +455,7 @@ const QMap<QString, int> ADatabase::getIdMap(ADatabaseTarget target)
 
     switch (target) {
     case ADatabaseTarget::pilots:
-        statement.append("SELECT ROWID, piclastname||', '||picfirstname FROM pilots");
+        statement.append("SELECT ROWID, lastname||', '||firstname FROM pilots");
         break;
     case ADatabaseTarget::aircraft:
         statement.append("SELECT ROWID, make||' '||model FROM aircraft WHERE model IS NOT NULL "

src/experimental/aflightentry.cpp

@@ -8,7 +8,7 @@ AFlightEntry::AFlightEntry()
 {}
 
 AFlightEntry::AFlightEntry(int row_id)
-    : AEntry::AEntry(DataPosition("flights", row_id))
+    : AEntry::AEntry(DataPosition(QStringLiteral("flights"), row_id))
 {}
 
 AFlightEntry::AFlightEntry(TableData table_data)
@@ -66,7 +66,7 @@ const QString AFlightEntry::getPilotName(pilot pilot_)
     if(row_id == QString())
         return row_id;
 
-    QString statement = "SELECT piclastname||\", \"||picfirstname "
+    QString statement = "SELECT lastname||', '||firstname "
                         "FROM pilots "
                         "WHERE ROWID =" + row_id;
 

src/experimental/apilotentry.cpp

@@ -36,8 +36,8 @@ const QString APilotEntry::name()
     if (tableData.isEmpty())
         return QLatin1String("");
 
-    return tableData.value(QStringLiteral("piclastname")).toString() + ','
-           +tableData.value(QStringLiteral("picfirstname")).toString().left(1) + '.';
+    return tableData.value(QStringLiteral("lastname")).toString() + ','
+           +tableData.value(QStringLiteral("firstname")).toString().left(1) + '.';
 }
 
 } // namespace experimental

src/gui/dialogues/firstrundialog.cpp

@@ -11,7 +11,7 @@ FirstRunDialog::FirstRunDialog(QWidget *parent) :
 {
     ui->setupUi(this);
     ui->tabWidget->setCurrentIndex(0);
-    ui->piclastnameLineEdit->setFocus();
+    ui->lastnameLineEdit->setFocus();
     ui->nightComboBox->setCurrentIndex(1);
 
     auto *themeGroup = new QButtonGroup;
@@ -51,13 +51,13 @@ void FirstRunDialog::on_themeGroup_toggled(int id)
 
 void FirstRunDialog::on_finishButton_clicked()
 {
-    if(ui->piclastnameLineEdit->text().isEmpty() || ui->picfirstnameLineEdit->text().isEmpty()){
+    if(ui->lastnameLineEdit->text().isEmpty() || ui->firstnameLineEdit->text().isEmpty()){
         auto mb = new QMessageBox(this);
         mb->setText("You have to enter a valid first and last name for the logbook.");
         mb->show();
     } else {
-        ASettings::write("userdata/piclastname", ui->piclastnameLineEdit->text());
-        ASettings::write("userdata/picfirstname", ui->picfirstnameLineEdit->text());
+        ASettings::write("userdata/lastname", ui->lastnameLineEdit->text());
+        ASettings::write("userdata/firstname", ui->firstnameLineEdit->text());
         ASettings::write("userdata/employeeid", ui->employeeidLineEdit->text());
         ASettings::write("userdata/phone", ui->phoneLineEdit->text());
         ASettings::write("userdata/email", ui->emailLineEdit->text());
@@ -89,8 +89,8 @@ void FirstRunDialog::on_finishButton_clicked()
         default:
             break;
         }
-        data.insert("piclastname", ui->piclastnameLineEdit->text());
-        data.insert("picfirstname", ui->picfirstnameLineEdit->text());
+        data.insert("lastname", ui->lastnameLineEdit->text());
+        data.insert("firstname", ui->firstnameLineEdit->text());
         data.insert("alias", "self");
         data.insert("employeeid", ui->employeeidLineEdit->text());
         data.insert("phone", ui->phoneLineEdit->text());

src/gui/dialogues/firstrundialog.ui

@@ -45,7 +45,7 @@
         </widget>
        </item>
        <item row="1" column="1">
-        <widget class="QLineEdit" name="piclastnameLineEdit">
+        <widget class="QLineEdit" name="lastnameLineEdit">
          <property name="maxLength">
           <number>40</number>
          </property>
@@ -62,7 +62,7 @@
         </widget>
        </item>
        <item row="2" column="1">
-        <widget class="QLineEdit" name="picfirstnameLineEdit">
+        <widget class="QLineEdit" name="firstnameLineEdit">
          <property name="maxLength">
           <number>40</number>
          </property>
@@ -473,8 +473,8 @@
   </layout>
  </widget>
  <tabstops>
-  <tabstop>piclastnameLineEdit</tabstop>
-  <tabstop>picfirstnameLineEdit</tabstop>
+  <tabstop>lastnameLineEdit</tabstop>
+  <tabstop>firstnameLineEdit</tabstop>
   <tabstop>employeeidLineEdit</tabstop>
   <tabstop>emailLineEdit</tabstop>
   <tabstop>phoneLineEdit</tabstop>

src/gui/dialogues/newflightdialog.cpp

@@ -408,19 +408,19 @@ void NewFlightDialog::fillDeductibleData()
 
 
     // SP SE
-    if(acft.getData().value(DB_multipilot).toInt() == 0
-            && acft.getData().value(DB_multiengine).toInt() == 0){
+    if(acft.getData().value(DB_TAILS_MULTIPILOT).toInt() == 0
+            && acft.getData().value(DB_TAILS_MULTIENGINE).toInt() == 0){
         ui->tSPSETimeLineEdit->setText(block_time);
         ui->tSPSELabel->setText(block_time);
     }
     // SP ME
-    if(acft.getData().value(DB_multipilot).toInt() == 0
-            && acft.getData().value(DB_multiengine).toInt() == 1){
+    if(acft.getData().value(DB_TAILS_MULTIPILOT).toInt() == 0
+            && acft.getData().value(DB_TAILS_MULTIENGINE).toInt() == 1){
         ui->tSPMETimeLineEdit->setText(block_time);
         ui->tSPMELabel->setText(block_time);
     }
     // MP
-    if(acft.getData().value(DB_multipilot).toInt() == 1){
+    if(acft.getData().value(DB_TAILS_MULTIPILOT).toInt() == 1){
         ui->tMPTimeLineEdit->setText(block_time);
         ui->tMPLabel->setText(block_time);
     }
@@ -486,41 +486,41 @@ TableData NewFlightDialog::collectInput()
     TableData newData;
     DEB("Collecting Input...");
     // Mandatory data
-    newData.insert(DB_doft, ui->doftLineEdit->text());
-    newData.insert(DB_dept, ui->deptLocLineEdit->text());
-    newData.insert(DB_tofb, ACalc::stringToMinutes(ui->tofbTimeLineEdit->text()));
-    newData.insert(DB_dest, ui->destLocLineEdit->text());
-    newData.insert(DB_tonb, ACalc::stringToMinutes(ui->tonbTimeLineEdit->text()));
+    newData.insert(DB_FLIGHTS_DOFT, ui->doftLineEdit->text());
+    newData.insert(DB_FLIGHTS_DEPT, ui->deptLocLineEdit->text());
+    newData.insert(DB_FLIGHTS_TOFB, ACalc::stringToMinutes(ui->tofbTimeLineEdit->text()));
+    newData.insert(DB_FLIGHTS_DEST, ui->destLocLineEdit->text());
+    newData.insert(DB_FLIGHTS_TONB, ACalc::stringToMinutes(ui->tonbTimeLineEdit->text()));
     //Block Time
     const auto tofb = QTime::fromString(ui->tofbTimeLineEdit->text(), TIME_FORMAT);
     const auto tonb = QTime::fromString(ui->tonbTimeLineEdit->text(), TIME_FORMAT);
     const QString block_time = ACalc::blocktime(tofb, tonb).toString(TIME_FORMAT);
     const int block_minutes = ACalc::stringToMinutes(block_time);
 
-    newData.insert(DB_tblk, block_minutes);
+    newData.insert(DB_FLIGHTS_TBLK, block_minutes);
     // Aircraft
-    newData.insert(DB_acft, tailsIdMap.value(ui->acftLineEdit->text()));
+    newData.insert(DB_FLIGHTS_ACFT, tailsIdMap.value(ui->acftLineEdit->text()));
     // Pilots
-    newData.insert(DB_pic, pilotsIdMap.value(ui->picNameLineEdit->text()));
-    newData.insert(DB_secondPilot, pilotsIdMap.value(ui->secondPilotNameLineEdit->text()));
-    newData.insert(DB_thirdPilot, pilotsIdMap.value(ui->thirdPilotNameLineEdit->text()));
+    newData.insert(DB_FLIGHTS_PIC, pilotsIdMap.value(ui->picNameLineEdit->text()));
+    newData.insert(DB_FLIGHTS_SECONDPILOT, pilotsIdMap.value(ui->secondPilotNameLineEdit->text()));
+    newData.insert(DB_FLIGHTS_THIRDPILOT, pilotsIdMap.value(ui->thirdPilotNameLineEdit->text()));
 
     // Extra Times
     ui->tSPSETimeLineEdit->text().isEmpty() ?
-                newData.insert(DB_tSPSE, DB_NULL)
-              : newData.insert(DB_tSPSE, ACalc::stringToMinutes(ui->tSPSETimeLineEdit->text()));
+                newData.insert(DB_FLIGHTS_TSPSE, DB_NULL)
+              : newData.insert(DB_FLIGHTS_TSPSE, ACalc::stringToMinutes(ui->tSPSETimeLineEdit->text()));
 
     ui->tSPMETimeLineEdit->text().isEmpty() ?
-                newData.insert(DB_tSPME, DB_NULL)
-              : newData.insert(DB_tSPME, ACalc::stringToMinutes(ui->tSPMETimeLineEdit->text()));
+                newData.insert(DB_FLIGHTS_SPME, DB_NULL)
+              : newData.insert(DB_FLIGHTS_SPME, ACalc::stringToMinutes(ui->tSPMETimeLineEdit->text()));
     ui->tMPTimeLineEdit->text().isEmpty() ?
-                newData.insert(DB_tMP, DB_NULL)
-              : newData.insert(DB_tMP, ACalc::stringToMinutes(ui->tMPTimeLineEdit->text()));
+                newData.insert(DB_FLIGHTS_TMP, DB_NULL)
+              : newData.insert(DB_FLIGHTS_TMP, ACalc::stringToMinutes(ui->tMPTimeLineEdit->text()));
 
     if (ui->IfrCheckBox->isChecked()) {
-        newData.insert(DB_tIFR, block_minutes);
+        newData.insert(DB_FLIGHTS_TIFR, block_minutes);
     } else {
-        newData.insert(DB_tIFR, DB_NULL);
+        newData.insert(DB_FLIGHTS_TIFR, DB_NULL);
     }
     // Night
     const auto dept_date = ui->doftLineEdit->text() + QStringLiteral("T") + tofb.toString(TIME_FORMAT);
@@ -533,96 +533,96 @@ TableData NewFlightDialog::collectInput()
                     dept_date_time,
                     block_minutes,
                     night_angle);
-    newData.insert(DB_tNIGHT, night_minutes);
+    newData.insert(DB_FLIGHTS_TNIGHT, night_minutes);
 
     // Function times - This is a little explicit but these are mutually exclusive so its better to be safe than sorry here.
     switch (ui->FunctionComboBox->currentIndex()) {
     case 0://PIC
-        newData.insert(DB_tPIC, block_minutes);
-        newData.insert(DB_tPICUS, DB_NULL);
-        newData.insert(DB_tSIC, DB_NULL);
-        newData.insert(DB_tDUAL, DB_NULL);
-        newData.insert(DB_tFI, DB_NULL);
+        newData.insert(DB_FLIGHTS_TPIC, block_minutes);
+        newData.insert(DB_FLIGHTS_TPICUS, DB_NULL);
+        newData.insert(DB_FLIGHTS_TSIC, DB_NULL);
+        newData.insert(DB_FLIGHTS_TDUAL, DB_NULL);
+        newData.insert(DB_FLIGHTS_TFI, DB_NULL);
         break;
     case 1://PICUS
-        newData.insert(DB_tPIC, DB_NULL);
-        newData.insert(DB_tPICUS, block_minutes);
-        newData.insert(DB_tSIC, DB_NULL);
-        newData.insert(DB_tDUAL, DB_NULL);
-        newData.insert(DB_tFI, DB_NULL);
+        newData.insert(DB_FLIGHTS_TPIC, DB_NULL);
+        newData.insert(DB_FLIGHTS_TPICUS, block_minutes);
+        newData.insert(DB_FLIGHTS_TSIC, DB_NULL);
+        newData.insert(DB_FLIGHTS_TDUAL, DB_NULL);
+        newData.insert(DB_FLIGHTS_TFI, DB_NULL);
         break;
     case 2://Co-Pilot
-        newData.insert(DB_tPIC, DB_NULL);
-        newData.insert(DB_tPICUS, DB_NULL);
-        newData.insert(DB_tSIC, block_minutes);
-        newData.insert(DB_tDUAL, DB_NULL);
-        newData.insert(DB_tFI, DB_NULL);
+        newData.insert(DB_FLIGHTS_TPIC, DB_NULL);
+        newData.insert(DB_FLIGHTS_TPICUS, DB_NULL);
+        newData.insert(DB_FLIGHTS_TSIC, block_minutes);
+        newData.insert(DB_FLIGHTS_TDUAL, DB_NULL);
+        newData.insert(DB_FLIGHTS_TFI, DB_NULL);
         break;
     case 3://Dual
-        newData.insert(DB_tPIC, DB_NULL);
-        newData.insert(DB_tPICUS, DB_NULL);
-        newData.insert(DB_tSIC, DB_NULL);
-        newData.insert(DB_tDUAL, block_minutes);
-        newData.insert(DB_tFI, DB_NULL);
+        newData.insert(DB_FLIGHTS_TPIC, DB_NULL);
+        newData.insert(DB_FLIGHTS_TPICUS, DB_NULL);
+        newData.insert(DB_FLIGHTS_TSIC, DB_NULL);
+        newData.insert(DB_FLIGHTS_TDUAL, block_minutes);
+        newData.insert(DB_FLIGHTS_TFI, DB_NULL);
         break;
     case 4://Instructor
-        newData.insert(DB_tPIC, block_minutes);
-        newData.insert(DB_tPICUS, DB_NULL);
-        newData.insert(DB_tSIC, DB_NULL);
-        newData.insert(DB_tDUAL, DB_NULL);
-        newData.insert(DB_tFI, block_minutes);
+        newData.insert(DB_FLIGHTS_TPIC, block_minutes);
+        newData.insert(DB_FLIGHTS_TPICUS, DB_NULL);
+        newData.insert(DB_FLIGHTS_TSIC, DB_NULL);
+        newData.insert(DB_FLIGHTS_TDUAL, DB_NULL);
+        newData.insert(DB_FLIGHTS_TFI, block_minutes);
     }
     // Pilot Flying
-    newData.insert(DB_pilotFlying, ui->PilotFlyingCheckBox->isChecked());
+    newData.insert(DB_FLIGHTS_PILOTFLYING, ui->PilotFlyingCheckBox->isChecked());
     // TO and LDG - again a bit explicit, but we  need to check for both night to day as well as day to night transitions.
     if (ui->TakeoffCheckBox->isChecked()) {
         if (night_minutes == 0) { // all day
-            newData.insert(DB_toDay, ui->TakeoffSpinBox->value());
-            newData.insert(DB_toNight, 0);
+            newData.insert(DB_FLIGHTS_TODAY, ui->TakeoffSpinBox->value());
+            newData.insert(DB_FLIGHTS_TONIGHT, 0);
         } else if (night_minutes == block_minutes) { // all night
-            newData.insert(DB_toDay, 0);
-            newData.insert(DB_toNight, ui->TakeoffSpinBox->value());
+            newData.insert(DB_FLIGHTS_TODAY, 0);
+            newData.insert(DB_FLIGHTS_TONIGHT, ui->TakeoffSpinBox->value());
         } else {
             if(ACalc::isNight(ui->deptLocLineEdit->text(), dept_date_time,  night_angle)) {
-                newData.insert(DB_toDay, 0);
-                newData.insert(DB_toNight, ui->TakeoffSpinBox->value());
+                newData.insert(DB_FLIGHTS_TODAY, 0);
+                newData.insert(DB_FLIGHTS_TONIGHT, ui->TakeoffSpinBox->value());
             } else {
-                newData.insert(DB_toDay, ui->TakeoffSpinBox->value());
-                newData.insert(DB_toNight, 0);
+                newData.insert(DB_FLIGHTS_TODAY, ui->TakeoffSpinBox->value());
+                newData.insert(DB_FLIGHTS_TONIGHT, 0);
             }
         }
     } else {
-        newData.insert(DB_toDay, 0);
-        newData.insert(DB_toNight, 0);
+        newData.insert(DB_FLIGHTS_TODAY, 0);
+        newData.insert(DB_FLIGHTS_TONIGHT, 0);
     }
 
     if (ui->LandingCheckBox->isChecked()) {
         if (night_minutes == 0) { // all day
-            newData.insert(DB_ldgDay, ui->LandingSpinBox->value());
-            newData.insert(DB_ldgNight, 0);
+            newData.insert(DB_FLIGHTS_LDGDAY, ui->LandingSpinBox->value());
+            newData.insert(DB_FLIGHTS_LDGNIGHT, 0);
         } else if (night_minutes == block_minutes) { // all night
-            newData.insert(DB_ldgDay, 0);
-            newData.insert(DB_ldgNight, ui->LandingSpinBox->value());
+            newData.insert(DB_FLIGHTS_LDGDAY, 0);
+            newData.insert(DB_FLIGHTS_LDGNIGHT, ui->LandingSpinBox->value());
         } else { //check
             const auto dest_date = ui->doftLineEdit->text() + QStringLiteral("T") + tonb.toString(TIME_FORMAT);
             const auto dest_date_time = QDateTime::fromString(dest_date, QStringLiteral("yyyy-MM-ddThh:mm"));
             if (ACalc::isNight(ui->destLocLineEdit->text(), dest_date_time,  night_angle)) {
-                newData.insert(DB_ldgDay, 0);
-                newData.insert(DB_ldgNight, ui->LandingSpinBox->value());
+                newData.insert(DB_FLIGHTS_LDGDAY, 0);
+                newData.insert(DB_FLIGHTS_LDGNIGHT, ui->LandingSpinBox->value());
             } else {
-                newData.insert(DB_ldgDay, ui->LandingSpinBox->value());
-                newData.insert(DB_ldgNight, 0);
+                newData.insert(DB_FLIGHTS_LDGDAY, ui->LandingSpinBox->value());
+                newData.insert(DB_FLIGHTS_LDGNIGHT, 0);
             }
         }
     } else {
-        newData.insert(DB_ldgDay, 0);
-        newData.insert(DB_ldgNight, 0);
+        newData.insert(DB_FLIGHTS_LDGDAY, 0);
+        newData.insert(DB_FLIGHTS_LDGNIGHT, 0);
     }
 
-    newData.insert(DB_autoland, ui->AutolandSpinBox->value());
-    newData.insert(DB_ApproachType, ui->ApproachComboBox->currentText());
-    newData.insert(DB_FlightNumber, ui->FlightNumberLineEdit->text());
-    newData.insert(DB_Remarks, ui->RemarksLineEdit->text());
+    newData.insert(DB_FLIGHTS_AUTOLAND, ui->AutolandSpinBox->value());
+    newData.insert(DB_FLIGHTS_APPROACHTYPE, ui->ApproachComboBox->currentText());
+    newData.insert(DB_FLIGHTS_FLIGHTNUMBER, ui->FlightNumberLineEdit->text());
+    newData.insert(DB_FLIGHTS_REMARKS, ui->RemarksLineEdit->text());
 
     DEB("New Flight Data: " << newData);
 
@@ -707,18 +707,18 @@ void NewFlightDialog::formFiller()
         }
     }
     // Approach Combo Box
-    const QString& app = flightEntry.getData().value(DB_ApproachType).toString();
+    const QString& app = flightEntry.getData().value(DB_FLIGHTS_APPROACHTYPE).toString();
     if(app != DB_NULL){
         ui->ApproachComboBox->setCurrentText(app);
     }
     // Task and Rules
-    qint8 PF = flightEntry.getData().value(DB_pilotFlying).toInt();
+    qint8 PF = flightEntry.getData().value(DB_FLIGHTS_PILOTFLYING).toInt();
     if (PF > 0) {
         ui->PilotFlyingCheckBox->setChecked(true);
     } else {
         ui->PilotMonitoringCheckBox->setChecked(true);
     }
-    qint8 FR = flightEntry.getData().value(DB_tIFR).toInt();
+    qint8 FR = flightEntry.getData().value(DB_FLIGHTS_TIFR).toInt();
     if (FR > 0) {
         ui->IfrCheckBox->setChecked(true);
     } else {
@@ -726,10 +726,10 @@ void NewFlightDialog::formFiller()
         ui->VfrCheckBox->setChecked(true);
     }
     // Take Off and Landing
-    qint8 TO = flightEntry.getData().value(DB_toDay).toInt()
-            + flightEntry.getData().value(DB_toNight).toInt();
-    qint8 LDG = flightEntry.getData().value(DB_ldgDay).toInt()
-            + flightEntry.getData().value(DB_ldgNight).toInt();
+    qint8 TO = flightEntry.getData().value(DB_FLIGHTS_TODAY).toInt()
+            + flightEntry.getData().value(DB_FLIGHTS_TONIGHT).toInt();
+    qint8 LDG = flightEntry.getData().value(DB_FLIGHTS_LDGDAY).toInt()
+            + flightEntry.getData().value(DB_FLIGHTS_LDGNIGHT).toInt();
     if(TO > 0) {
         ui->TakeoffCheckBox->setChecked(true);
         ui->TakeoffSpinBox->setValue(TO);
@@ -744,7 +744,7 @@ void NewFlightDialog::formFiller()
         ui->LandingCheckBox->setChecked(false);
         ui->LandingSpinBox->setValue(0);
     }
-    qint8 AL = flightEntry.getData().value(DB_autoland).toInt();
+    qint8 AL = flightEntry.getData().value(DB_FLIGHTS_AUTOLAND).toInt();
     if(AL > 0) {
         ui->AutolandCheckBox->setChecked(true);
         ui->AutolandSpinBox->setValue(AL);
@@ -1184,7 +1184,7 @@ void NewFlightDialog::onPilotNameLineEdit_editingFinished()
         DEB("self recognized.");
         line_edit->setText(pilotsIdMap.key(1));
         auto pilot = aDB()->getPilotEntry(1);
-        ui->picCompanyLabel->setText(pilot.getData().value(DB_company).toString());
+        ui->picCompanyLabel->setText(pilot.getData().value(DB_TAILS_COMPANY).toString());
         onGoodInputReceived(line_edit);
         return;
     }
@@ -1192,7 +1192,7 @@ void NewFlightDialog::onPilotNameLineEdit_editingFinished()
     if(pilotsIdMap.value(line_edit->text()) != 0) {
         DEB("Mapped: " << line_edit->text() << pilotsIdMap.value(line_edit->text()));
         auto pilot = aDB()->getPilotEntry(pilotsIdMap.value(line_edit->text()));
-        ui->picCompanyLabel->setText(pilot.getData().value(DB_company).toString());
+        ui->picCompanyLabel->setText(pilot.getData().value(DB_TAILS_COMPANY).toString());
         onGoodInputReceived(line_edit);
         return;
     }

src/gui/dialogues/newpilot.ui

@@ -15,28 +15,28 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
-    <widget class="QLabel" name="piclastnameLabel">
+    <widget class="QLabel" name="lastnameLabel">
      <property name="text">
       <string>Last Name</string>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="QLineEdit" name="piclastnameLineEdit">
+    <widget class="QLineEdit" name="lastnameLineEdit">
      <property name="maxLength">
       <number>40</number>
      </property>
     </widget>
    </item>
    <item row="1" column="0">
-    <widget class="QLabel" name="picfirstnameLabel">
+    <widget class="QLabel" name="firstnameLabel">
      <property name="text">
       <string>First Name</string>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="QLineEdit" name="picfirstnameLineEdit">
+    <widget class="QLineEdit" name="firstnameLineEdit">
      <property name="maxLength">
       <number>40</number>
      </property>
@@ -128,8 +128,8 @@
   </layout>
  </widget>
  <tabstops>
-  <tabstop>piclastnameLineEdit</tabstop>
-  <tabstop>picfirstnameLineEdit</tabstop>
+  <tabstop>lastnameLineEdit</tabstop>
+  <tabstop>firstnameLineEdit</tabstop>
   <tabstop>companyLineEdit</tabstop>
   <tabstop>aliasLineEdit</tabstop>
   <tabstop>employeeidLineEdit</tabstop>

src/gui/dialogues/newpilotdialog.cpp

@@ -36,9 +36,9 @@
 
 static const auto NAME_RX = QLatin1String("(\\p{L}+(\\s|'|\\-)?\\s?(\\p{L}+)?\\s?)");
 static const auto FIRSTNAME_VALID = QPair<QString, QRegularExpression> {
-     "picfirstnameLineEdit", QRegularExpression(NAME_RX + NAME_RX + NAME_RX)};
+     "firstnameLineEdit", QRegularExpression(NAME_RX + NAME_RX + NAME_RX)};
 static const auto LASTNAME_VALID = QPair<QString, QRegularExpression> {
-     "piclastnameLineEdit", QRegularExpression(NAME_RX + NAME_RX + NAME_RX)};
+     "lastnameLineEdit", QRegularExpression(NAME_RX + NAME_RX + NAME_RX)};
 static const auto PHONE_VALID = QPair<QString, QRegularExpression> {
      "phoneLineEdit", QRegularExpression("^[+]{0,1}[0-9\\-\\s]+")};
 static const auto EMAIL_VALID = QPair<QString, QRegularExpression> {
@@ -70,7 +70,7 @@ NewPilotDialog::NewPilotDialog(QWidget *parent) :
     setup();
 
     pilotEntry = APilotEntry();
-    ui->piclastnameLineEdit->setFocus();
+    ui->lastnameLineEdit->setFocus();
 }
 
 NewPilotDialog::NewPilotDialog(int rowId, QWidget *parent) :
@@ -83,7 +83,7 @@ NewPilotDialog::NewPilotDialog(int rowId, QWidget *parent) :
     pilotEntry = aDB()->getPilotEntry(rowId);
     DEB("Pilot Entry position: " << pilotEntry.getPosition());
     formFiller();
-    ui->piclastnameLineEdit->setFocus();
+    ui->lastnameLineEdit->setFocus();
 }
 
 NewPilotDialog::~NewPilotDialog()
@@ -116,7 +116,7 @@ void NewPilotDialog::setup()
 
 void NewPilotDialog::on_buttonBox_accepted()
 {
-    if (ui->piclastnameLineEdit->text().isEmpty() || ui->picfirstnameLineEdit->text().isEmpty()) {
+    if (ui->lastnameLineEdit->text().isEmpty() || ui->firstnameLineEdit->text().isEmpty()) {
         auto mb = QMessageBox(this);
         mb.setText("Last Name and First Name are required.");
         mb.show();

src/gui/dialogues/newtaildialog.cpp

@@ -130,10 +130,10 @@ void NewTailDialog::fillForm(experimental::AEntry entry, bool is_template)
         le->setText(data.value(key).toString());
     }
 
-    ui->operationComboBox->setCurrentIndex(data.value(DB_multipilot).toInt() + 1);
-    ui->ppNumberComboBox ->setCurrentIndex(data.value(DB_multiengine).toInt() + 1);
-    ui->ppTypeComboBox->setCurrentIndex(data.value(DB_engineType).toInt() + 1);
-    ui->weightComboBox->setCurrentIndex(data.value(DB_weightClass).toInt() + 1);
+    ui->operationComboBox->setCurrentIndex(data.value(DB_TAILS_MULTIPILOT).toInt() + 1);
+    ui->ppNumberComboBox ->setCurrentIndex(data.value(DB_TAILS_MULTIENGINE).toInt() + 1);
+    ui->ppTypeComboBox->setCurrentIndex(data.value(DB_TAILS_ENGINETYPE).toInt() + 1);
+    ui->weightComboBox->setCurrentIndex(data.value(DB_TAILS_WEIGHTCLASS).toInt() + 1);
 }
 
 /*!
@@ -197,16 +197,16 @@ void NewTailDialog::submitForm()
     }
 
     if (ui->operationComboBox->currentIndex() != 0) { // bool Multipilot
-        new_data.insert(DB_multipilot, ui->operationComboBox->currentIndex() - 1);
+        new_data.insert(DB_TAILS_MULTIPILOT, ui->operationComboBox->currentIndex() - 1);
     }
     if (ui->ppNumberComboBox->currentIndex() != 0) { // bool MultiEngine
-        new_data.insert(DB_multiengine, ui->ppNumberComboBox->currentIndex() - 1);
+        new_data.insert(DB_TAILS_MULTIENGINE, ui->ppNumberComboBox->currentIndex() - 1);
     }
     if (ui->ppTypeComboBox->currentIndex() != 0) { // int 0=unpowered,....4=jet
-        new_data.insert(DB_engineType, ui->ppTypeComboBox->currentIndex() - 1);
+        new_data.insert(DB_TAILS_ENGINETYPE, ui->ppTypeComboBox->currentIndex() - 1);
     }
     if (ui->weightComboBox->currentIndex() != 0) { // int 0=light...3=super
-        new_data.insert(DB_weightClass, ui->weightComboBox->currentIndex() - 1);
+        new_data.insert(DB_TAILS_WEIGHTCLASS, ui->weightComboBox->currentIndex() - 1);
     }
 
     //create db object

src/gui/widgets/settingswidget.cpp

@@ -21,9 +21,9 @@
 #include "src/testing/adebug.h"
 
 static const auto FIRSTNAME_VALID = QPair<QString, QRegularExpression> {
-    "picfirstnameLineEdit", QRegularExpression("[a-zA-Z]+")};
+    "firstnameLineEdit", QRegularExpression("[a-zA-Z]+")};
 static const auto LASTNAME_VALID = QPair<QString, QRegularExpression> {
-    "piclastnameLineEdit", QRegularExpression("\\w+")};
+    "lastnameLineEdit", QRegularExpression("\\w+")};
 static const auto PHONE_VALID = QPair<QString, QRegularExpression> {
     "phoneLineEdit", QRegularExpression("^[+]{0,1}[0-9\\-\\s]+")};
 static const auto EMAIL_VALID = QPair<QString, QRegularExpression> {
@@ -72,8 +72,8 @@ void SettingsWidget::readSettings()
     /*
      * Personal Tab
      */
-    ui->piclastnameLineEdit->setText(ASettings::read("userdata/piclastname").toString());
-    ui->picfirstnameLineEdit->setText(ASettings::read("userdata/picfirstname").toString());
+    ui->lastnameLineEdit->setText(ASettings::read("userdata/lastname").toString());
+    ui->firstnameLineEdit->setText(ASettings::read("userdata/firstname").toString());
     ui->companyLineEdit->setText(ASettings::read("userdata/company").toString());
     ui->employeeidLineEdit->setText(ASettings::read("userdata/employeeid").toString());
     ui->phoneLineEdit->setText(ASettings::read("userdata/phone").toString());
@@ -136,9 +136,9 @@ void SettingsWidget::updatePersonalDetails()
         break;
     case 2:{
         QString name;
-        name.append(ui->piclastnameLineEdit->text());
+        name.append(ui->lastnameLineEdit->text());
         name.append(QLatin1String(", "));
-        name.append(ui->picfirstnameLineEdit->text().left(1));
+        name.append(ui->firstnameLineEdit->text().left(1));
         name.append(QLatin1Char('.'));
         data.insert("alias", name);
     }
@@ -146,8 +146,8 @@ void SettingsWidget::updatePersonalDetails()
     default:
         break;
     }
-    data.insert("piclastname", ui->piclastnameLineEdit->text());
-    data.insert("picfirstname", ui->picfirstnameLineEdit->text());
+    data.insert("lastname", ui->lastnameLineEdit->text());
+    data.insert("firstname", ui->firstnameLineEdit->text());
     data.insert("company", ui->companyLineEdit->text());
     data.insert("employeeid", ui->employeeidLineEdit->text());
     data.insert("phone", ui->phoneLineEdit->text());
@@ -168,24 +168,24 @@ void SettingsWidget::updatePersonalDetails()
  * Personal Tab
  */
 
-void SettingsWidget::on_piclastnameLineEdit_editingFinished()
+void SettingsWidget::on_lastnameLineEdit_editingFinished()
 {
-    if(ui->piclastnameLineEdit->text().isEmpty()){
-        ui->piclastnameLineEdit->setText(ASettings::read("userdata/piclastname").toString());
-        ui->piclastnameLineEdit->setFocus();
+    if(ui->lastnameLineEdit->text().isEmpty()){
+        ui->lastnameLineEdit->setText(ASettings::read("userdata/lastname").toString());
+        ui->lastnameLineEdit->setFocus();
     } else {
-        ASettings::write("userdata/piclastname",ui->piclastnameLineEdit->text());
+        ASettings::write("userdata/lastname",ui->lastnameLineEdit->text());
         updatePersonalDetails();
     }
 }
 
-void SettingsWidget::on_picfirstnameLineEdit_editingFinished()
+void SettingsWidget::on_firstnameLineEdit_editingFinished()
 {
-    if(ui->picfirstnameLineEdit->text().isEmpty()){
-        ui->picfirstnameLineEdit->setText(ASettings::read("userdata/picfirstname").toString());
-        ui->picfirstnameLineEdit->setFocus();
+    if(ui->firstnameLineEdit->text().isEmpty()){
+        ui->firstnameLineEdit->setText(ASettings::read("userdata/firstname").toString());
+        ui->firstnameLineEdit->setFocus();
     } else {
-        ASettings::write("userdata/picfirstname",ui->picfirstnameLineEdit->text());
+        ASettings::write("userdata/firstname",ui->firstnameLineEdit->text());
         updatePersonalDetails();
     }
 }

src/gui/widgets/settingswidget.h

@@ -47,8 +47,8 @@ private slots:
     void on_acSortComboBox_currentIndexChanged(int index);
     void on_acAllowIncompleteComboBox_currentIndexChanged(int index);
     void on_prefixLineEdit_textChanged(const QString &arg1);
-    void on_piclastnameLineEdit_editingFinished();
-    void on_picfirstnameLineEdit_editingFinished();
+    void on_lastnameLineEdit_editingFinished();
+    void on_firstnameLineEdit_editingFinished();
     void on_employeeidLineEdit_editingFinished();
     void on_emailLineEdit_editingFinished();
     void on_phoneLineEdit_editingFinished();

src/gui/widgets/settingswidget.ui

@@ -32,7 +32,7 @@
         </widget>
        </item>
        <item row="0" column="2">
-        <widget class="QLineEdit" name="piclastnameLineEdit">
+        <widget class="QLineEdit" name="lastnameLineEdit">
          <property name="maxLength">
           <number>40</number>
          </property>
@@ -49,7 +49,7 @@
         </widget>
        </item>
        <item row="1" column="2">
-        <widget class="QLineEdit" name="picfirstnameLineEdit">
+        <widget class="QLineEdit" name="firstnameLineEdit">
          <property name="maxLength">
           <number>40</number>
          </property>

src/gui/widgets/totalswidget.cpp

@@ -15,7 +15,7 @@ TotalsWidget::TotalsWidget(QWidget *parent) :
         line_edit->setText(field.second);
     }
     QSettings settings;
-    QString name = settings.value("userdata/picfirstname").toString();
+    QString name = settings.value("userdata/firstname").toString();
     if(!name.isEmpty()) {
         QString salutation = "Welcome to openPilotLog, " + name + QLatin1Char('!');
         ui->welcomeLabel->setText(salutation);