Cleanup

minor adjustments, mainly style
added some more qstringliterals

src/classes/aaircraftentry.cpp

@@ -21,7 +21,7 @@ AAircraftEntry::AAircraftEntry()
     : AEntry::AEntry(DEFAULT_AIRCRAFT_POSITION)
 {}
 
-AAircraftEntry::AAircraftEntry(int row_id)
+AAircraftEntry::AAircraftEntry(RowId row_id)
     : AEntry::AEntry(DataPosition(DB_TABLE_AIRCRAFT, row_id))
 {}
 

src/classes/aaircraftentry.h

@@ -7,10 +7,11 @@
 struct AAircraftEntry : public AEntry {
 public:
     AAircraftEntry();
+    AAircraftEntry(RowId row_id);
+    AAircraftEntry(RowData table_data);
+
     AAircraftEntry(const AAircraftEntry& te) = default;
     AAircraftEntry& operator=(const AAircraftEntry& te) = default;
-    AAircraftEntry(int row_id);
-    AAircraftEntry(RowData table_data);
 };
 
 #endif // AAIRCRAFTENTRY_H

src/classes/aflightentry.cpp

@@ -22,7 +22,7 @@ AFlightEntry::AFlightEntry()
     : AEntry::AEntry(DEFAULT_FLIGHT_POSITION)
 {}
 
-AFlightEntry::AFlightEntry(int row_id)
+AFlightEntry::AFlightEntry(RowId row_id)
     : AEntry::AEntry(DataPosition(DB_TABLE_FLIGHTS, row_id))
 {}
 

src/classes/aflightentry.h

@@ -24,10 +24,12 @@
 class AFlightEntry : public AEntry {
 public:
     AFlightEntry();
+    AFlightEntry(RowId row_id);
+    AFlightEntry(RowData table_data);
+
     AFlightEntry(const AFlightEntry& pe) = default;
     AFlightEntry& operator=(const AFlightEntry& pe) = default;
-    AFlightEntry(int row_id);
-    AFlightEntry(RowData table_data);
+
 
     enum class pilotPosition { pic, secondPilot, thirdPilot };
 

src/classes/apilotentry.cpp

@@ -21,7 +21,7 @@ APilotEntry::APilotEntry()
     : AEntry::AEntry(DEFAULT_PILOT_POSITION)
 {}
 
-APilotEntry::APilotEntry(int row_id)
+APilotEntry::APilotEntry(RowId row_id)
     : AEntry::AEntry(DataPosition(DB_TABLE_PILOTS, row_id))
 {}
 

src/classes/apilotentry.h

@@ -24,10 +24,11 @@
 struct APilotEntry : public AEntry {
 public:
     APilotEntry();
+    APilotEntry(RowId row_id);
+    APilotEntry(RowData table_data);
+
     APilotEntry(const APilotEntry& pe) = default;
     APilotEntry& operator=(const APilotEntry& pe) = default;
-    APilotEntry(int row_id);
-    APilotEntry(RowData table_data);
 
     const QString name();
 };

src/classes/atailentry.cpp

@@ -21,7 +21,7 @@ ATailEntry::ATailEntry()
     : AEntry::AEntry(DEFAULT_TAIL_POSITION)
 {}
 
-ATailEntry::ATailEntry(int row_id)
+ATailEntry::ATailEntry(RowId row_id)
     : AEntry::AEntry(DataPosition(DB_TABLE_TAILS, row_id))
 {}
 

src/classes/atailentry.h

@@ -26,7 +26,7 @@ public:
     ATailEntry();
     ATailEntry(const ATailEntry& te) = default;
     ATailEntry& operator=(const ATailEntry& te) = default;
-    ATailEntry(int row_id);
+    ATailEntry(RowId row_id);
     ATailEntry(RowData table_data);
 
     const QString registration();

src/database/adatabase.cpp

@@ -56,7 +56,7 @@ ADatabase* ADatabase::getInstance()
 const QString ADatabase::sqliteVersion()
 {
     QSqlQuery query;
-    query.prepare("SELECT sqlite_version()");
+    query.prepare(QStringLiteral("SELECT sqlite_version()"));
     query.exec();
     query.next();
     return query.value(0).toString();
@@ -67,8 +67,8 @@ bool ADatabase::connect()
     if (!QSqlDatabase::isDriverAvailable(SQL_DRIVER))
         return false;
 
-    QDir directory("data");
-    QString databaseLocation = directory.filePath("logbook.db");
+    QDir directory(QStringLiteral("data"));
+    QString databaseLocation = directory.filePath(QStringLiteral("logbook.db"));
     QSqlDatabase db = QSqlDatabase::addDatabase(SQL_DRIVER);
     db.setDatabaseName(databaseLocation);
 
@@ -77,7 +77,7 @@ bool ADatabase::connect()
 
     DEB "Database connection established." << db.lastError().text();
     // Enable foreign key restrictions
-    QSqlQuery query("PRAGMA foreign_keys = ON;");
+    QSqlQuery query(QStringLiteral("PRAGMA foreign_keys = ON;"));
     tableNames = db.tables();
 
     QStringList column_names;
@@ -103,7 +103,7 @@ void ADatabase::disconnect()
 
 QSqlDatabase ADatabase::database()
 {
-    return QSqlDatabase::database("qt_sql_default_connection");
+    return QSqlDatabase::database(QStringLiteral("qt_sql_default_connection"));
 }
 
 bool ADatabase::commit(AEntry entry)
@@ -119,7 +119,7 @@ bool ADatabase::remove(AEntry entry)
 {
     if (!exists(entry)) {
         DEB "Error: Database entry not found.";
-        lastError = ADatabaseError("Database entry not found.");
+        lastError = ADatabaseError(QStringLiteral("Database entry not found."));
         return false;
     }
 
@@ -150,7 +150,7 @@ bool ADatabase::removeMany(QList<DataPosition> data_position_list)
 {
     int errorCount = 0;
     QSqlQuery query;
-    query.prepare("BEGIN EXCLUSIVE TRANSACTION");
+    query.prepare(QStringLiteral("BEGIN EXCLUSIVE TRANSACTION"));
     query.exec();
 
     for (const auto& data_position : data_position_list) {
@@ -170,7 +170,7 @@ bool ADatabase::removeMany(QList<DataPosition> data_position_list)
     }
 
     if (errorCount == 0) {
-        query.prepare("COMMIT");
+        query.prepare(QStringLiteral("COMMIT"));
         query.exec();
         if(query.lastError().type() == QSqlError::NoError) {
             emit dataBaseUpdated();
@@ -181,7 +181,7 @@ bool ADatabase::removeMany(QList<DataPosition> data_position_list)
             return false;
         }
     } else {
-        query.prepare("ROLLBACK");
+        query.prepare(QStringLiteral("ROLLBACK"));
         query.exec();
         lastError = "Transaction unsuccessful (no changes have been made). Error count: " + QString::number(errorCount);
         return false;
@@ -213,7 +213,7 @@ bool ADatabase::exists(AEntry entry)
         return true;
     } else {
         DEB "Database entry not found.";
-        lastError = ADatabaseError("Database entry not found.");
+        lastError = ADatabaseError(QStringLiteral("Database entry not found."));
         return false;
     }
 }
@@ -242,7 +242,7 @@ bool ADatabase::exists(DataPosition data_position)
         return true;
     } else {
         DEB "No entry exists at DataPosition: " << data_position.tableName << data_position.rowId;
-        lastError = ADatabaseError("Database entry not found.");
+        lastError = ADatabaseError(QStringLiteral("Database entry not found."));
         return false;
     }
 }
@@ -428,21 +428,21 @@ const QStringList ADatabase::getCompletionList(ADatabaseTarget target)
 
     switch (target) {
     case ADatabaseTarget::pilots:
-        statement.append("SELECT lastname||', '||firstname FROM pilots");
+        statement.append(QStringLiteral("SELECT lastname||', '||firstname FROM pilots"));
         break;
     case ADatabaseTarget::aircraft:
-        statement.append("SELECT make||' '||model FROM aircraft WHERE model IS NOT NULL "
+        statement.append(QStringLiteral("SELECT make||' '||model FROM aircraft WHERE model IS NOT NULL "
                          "UNION "
-                         "SELECT make||' '||model||'-'||variant FROM aircraft WHERE variant IS NOT NULL");
+                         "SELECT make||' '||model||'-'||variant FROM aircraft WHERE variant IS NOT NULL"));
         break;
     case ADatabaseTarget::airport_identifier_all:
-        statement.append("SELECT icao FROM airports UNION SELECT iata FROM airports");
+        statement.append(QStringLiteral("SELECT icao FROM airports UNION SELECT iata FROM airports"));
         break;
     case ADatabaseTarget::registrations:
-        statement.append("SELECT registration FROM tails");
+        statement.append(QStringLiteral("SELECT registration FROM tails"));
         break;
     case ADatabaseTarget::companies:
-        statement.append("SELECT company FROM pilots");
+        statement.append(QStringLiteral("SELECT company FROM pilots"));
         break;
     default:
         DEB "Not a valid completer target for this function.";
@@ -476,24 +476,24 @@ const QMap<QString, int> ADatabase::getIdMap(ADatabaseTarget target)
 
     switch (target) {
     case ADatabaseTarget::pilots:
-        statement.append("SELECT ROWID, lastname||', '||firstname FROM pilots");
+        statement.append(QStringLiteral("SELECT ROWID, lastname||', '||firstname FROM pilots"));
         break;
     case ADatabaseTarget::aircraft:
-        statement.append("SELECT ROWID, make||' '||model FROM aircraft WHERE model IS NOT NULL "
+        statement.append(QStringLiteral("SELECT ROWID, make||' '||model FROM aircraft WHERE model IS NOT NULL "
                          "UNION "
-                         "SELECT ROWID, make||' '||model||'-'||variant FROM aircraft WHERE variant IS NOT NULL");
+                         "SELECT ROWID, make||' '||model||'-'||variant FROM aircraft WHERE variant IS NOT NULL"));
         break;
     case ADatabaseTarget::airport_identifier_icao:
-        statement.append("SELECT ROWID, icao FROM airports");
+        statement.append(QStringLiteral("SELECT ROWID, icao FROM airports"));
         break;
     case ADatabaseTarget::airport_identifier_iata:
-        statement.append("SELECT ROWID, iata FROM airports WHERE iata NOT NULL");
+        statement.append(QStringLiteral("SELECT ROWID, iata FROM airports WHERE iata NOT NULL"));
         break;
     case ADatabaseTarget::airport_names:
-        statement.append("SELECT ROWID, name FROM airports");
+        statement.append(QStringLiteral("SELECT ROWID, name FROM airports"));
         break;
     case ADatabaseTarget::tails:
-        statement.append("SELECT ROWID, registration FROM tails");
+        statement.append(QStringLiteral("SELECT ROWID, registration FROM tails"));
         break;
     default:
         DEB "Not a valid completer target for this function.";
@@ -539,7 +539,7 @@ int ADatabase::getLastEntry(ADatabaseTarget target)
     if (query.first()) {
         return query.value(0).toInt();
     } else {
-        lastError = ADatabaseError("Database entry not found.");
+        lastError = ADatabaseError(QStringLiteral("Database entry not found."));
         DEB "No entry found.";
         return 0;
     }

src/database/adatabasesetup.cpp

@@ -23,7 +23,7 @@
 
 // Statements for creation of database tables, Revision 15
 
-const QString createTablePilots = "CREATE TABLE pilots ( "
+const auto createTablePilots = QStringLiteral("CREATE TABLE pilots ( "
             " pilot_id       INTEGER NOT NULL, "
             " lastname       TEXT    NOT NULL, "
             " firstname      TEXT, "
@@ -33,9 +33,9 @@ const QString createTablePilots = "CREATE TABLE pilots ( "
             " phone          TEXT, "
             " email          TEXT, "
             " PRIMARY KEY(pilot_id AUTOINCREMENT)"
-            ")";
+            ")");
 
-const QString createTableTails = "CREATE TABLE tails ("
+const auto createTableTails = QStringLiteral("CREATE TABLE tails ("
             " tail_id        INTEGER NOT NULL,"
             " registration   TEXT NOT NULL,"
             " company        TEXT,"
@@ -47,9 +47,9 @@ const QString createTableTails = "CREATE TABLE tails ("
             " engineType     INTEGER,"
             " weightClass    INTEGER,"
             " PRIMARY KEY(tail_id AUTOINCREMENT)"
-            ")";
+            ")");
 
-const QString createTableFlights = "CREATE TABLE flights ("
+const auto createTableFlights = QStringLiteral("CREATE TABLE flights ("
             " flight_id      INTEGER NOT NULL, "
             " doft           NUMERIC NOT NULL, "
             " dept           TEXT NOT NULL, "
@@ -84,9 +84,9 @@ const QString createTableFlights = "CREATE TABLE flights ("
             " 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) "
-        ")";
+        ")");
 
-const QString createTableAirports = "CREATE TABLE airports ( "
+const auto createTableAirports = QStringLiteral("CREATE TABLE airports ( "
             " airport_id     INTEGER NOT NULL, "
             " icao           TEXT NOT NULL, "
             " iata           TEXT, "
@@ -98,9 +98,9 @@ const QString createTableAirports = "CREATE TABLE airports ( "
             " utcoffset      INTEGER, "
             " tzolson        TEXT, "
             " PRIMARY KEY(airport_id AUTOINCREMENT) "
-            ")";
+            ")");
 
-const QString createTableAircraft = "CREATE TABLE aircraft ("
+const auto createTableAircraft = QStringLiteral("CREATE TABLE aircraft ("
             " aircraft_id   INTEGER NOT NULL,"
             " make          TEXT,"
             " model         TEXT,"
@@ -113,17 +113,17 @@ const QString createTableAircraft = "CREATE TABLE aircraft ("
             " engineType    INTEGER,"
             " weightClass   INTEGER,"
             " PRIMARY KEY(aircraft_id AUTOINCREMENT)"
-            ")";
+            ")");
 
-const QString createTableChangelog = "CREATE TABLE changelog ( "
+const auto createTableChangelog = QStringLiteral("CREATE TABLE changelog ( "
             " revision   INTEGER NOT NULL, "
             " comment    TEXT, "
             " date       NUMERIC, "
             " PRIMARY KEY(revision) "
-            ")";
+            ")");
 
 // Statements for creation of views in the database
-const QString createViewDefault = "CREATE VIEW viewDefault AS "
+const auto createViewDefault = QStringLiteral("CREATE VIEW viewDefault AS "
         " SELECT flight_id, doft as 'Date', "
         " dept AS 'Dept', "
         " printf('%02d',(tofb/60))||':'||printf('%02d',(tofb%60)) AS 'Time', "
@@ -141,9 +141,9 @@ const QString createViewDefault = "CREATE VIEW viewDefault AS "
         " FROM flights "
         " INNER JOIN pilots on flights.pic = pilots.pilot_id "
         " INNER JOIN tails on flights.acft = tails.tail_id "
-        " ORDER BY date DESC ";
+        " ORDER BY date DESC ");
 
-const QString createViewEASA = "CREATE VIEW viewEASA AS "
+const auto createViewEASA = QStringLiteral("CREATE VIEW viewEASA AS "
         " SELECT "
         " flight_id, doft as 'Date', "
         " dept AS 'Dept', "
@@ -172,9 +172,9 @@ const QString createViewEASA = "CREATE VIEW viewEASA AS "
         " FROM flights "
         " INNER JOIN pilots on flights.pic = pilots.pilot_id "
         " INNER JOIN tails on flights.acft = tails.tail_id "
-        " ORDER BY date DESC";
+        " ORDER BY date DESC");
 
-const QString createViewTails = "CREATE VIEW viewTails AS "
+const auto createViewTails = QStringLiteral("CREATE VIEW viewTails AS "
         " SELECT "
         " tail_id AS 'ID', "
         " registration AS 'Registration', "
@@ -187,24 +187,24 @@ const QString createViewTails = "CREATE VIEW viewTails AS "
         " registration AS 'Registration', "
         " make||' '||model||'-'||variant AS 'Type', "
         " company AS 'Company' "
-        " FROM tails WHERE variant IS NOT NULL";
+        " FROM tails WHERE variant IS NOT NULL");
 
-const QString createViewPilots = "CREATE VIEW viewPilots AS "
+const auto createViewPilots = QStringLiteral("CREATE VIEW viewPilots AS "
         " SELECT "
         " pilot_id AS 'ID', "
         " lastname AS 'Last Name', "
         " firstname AS 'First Name', "
         " company AS 'Company' "
-        " FROM pilots";
+        " FROM pilots");
 
-const QString createViewQCompleter = "CREATE VIEW viewQCompleter AS "
+const auto createViewQCompleter = QStringLiteral("CREATE VIEW viewQCompleter AS "
         " SELECT airport_id, icao, iata, tail_id, registration, pilot_id, "
         " 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";
+        " LEFT JOIN pilots ON airports.airport_id = pilots.pilot_id");
 
-const QString createViewTotals = "CREATE VIEW viewTotals AS "
+const auto createViewTotals = QStringLiteral("CREATE VIEW viewTotals AS "
         " SELECT "
         " printf(\"%02d\",CAST(SUM(tblk) AS INT)/60)||\":\"||printf(\"%02d\",CAST(SUM(tblk) AS INT)%60) AS \"TOTAL\", "
         " printf(\"%02d\",CAST(SUM(tSPSE) AS INT)/60)||\":\"||printf(\"%02d\",CAST(SUM(tSPSE) AS INT)%60) AS \"SP SE\", "
@@ -220,14 +220,7 @@ const QString createViewTotals = "CREATE VIEW viewTotals AS "
         " printf(\"%02d\",CAST(SUM(tMP) AS INT)/60)||\":\"||printf(\"%02d\",CAST(SUM(tMP) AS INT)%60) AS \"MultPilot\", "
         " CAST(SUM(toDay) AS INT) AS \"TO Day\", CAST(SUM(toNight) AS INT) AS \"TO Night\", "
         " CAST(SUM(ldgDay) AS INT) AS \"LDG Day\", CAST(SUM(ldgNight) AS INT) AS \"LDG Night\" "
-        " FROM flights";
-
-/*const QString createViewPilotsTailsMap = "CREATE VIEW viewPilotsTailsMap AS "
-        "SELECT "
-        "pilot_id, lastname, firstname, tail_id, registration "
-        "FROM pilots "
-        "LEFT JOIN tails "
-        "ON pilots.pilot_id = tails.tail_id";*/
+        " FROM flights");
 
 const QStringList tables = {
     createTablePilots,

src/database/declarations.h

@@ -91,7 +91,7 @@ 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_TSPME           = 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");

src/functions/acalc.cpp

@@ -17,25 +17,25 @@ QString ACalc::formatTimeInput(QString user_input)
     QString output; //
     QTime temp_time; //empty time object is invalid by default
 
-    bool contains_seperator = user_input.contains(":");
+    bool contains_seperator = user_input.contains(':');
     if (user_input.length() == 4 && !contains_seperator) {
-        temp_time = QTime::fromString(user_input, "hhmm");
+        temp_time = QTime::fromString(user_input, QStringLiteral("hhmm"));
     } else if (user_input.length() == 3 && !contains_seperator) {
         if (user_input.toInt() < 240) { //Qtime is invalid if time is between 000 and 240 for this case
-            QString tempstring = user_input.prepend("0");
-            temp_time = QTime::fromString(tempstring, "hhmm");
+            QString tempstring = user_input.prepend(QStringLiteral("0"));
+            temp_time = QTime::fromString(tempstring, QStringLiteral("hhmm"));
         } else {
-            temp_time = QTime::fromString(user_input, "Hmm");
+            temp_time = QTime::fromString(user_input, QStringLiteral("Hmm"));
         }
     } else if (user_input.length() == 4 && contains_seperator) {
-        temp_time = QTime::fromString(user_input, "h:mm");
+        temp_time = QTime::fromString(user_input, QStringLiteral("h:mm"));
     } else if (user_input.length() == 5 && contains_seperator) {
-        temp_time = QTime::fromString(user_input, "hh:mm");
+        temp_time = QTime::fromString(user_input, QStringLiteral("hh:mm"));
     }
 
-    output = temp_time.toString("hh:mm");
+    output = temp_time.toString(QStringLiteral("hh:mm"));
     if (output.isEmpty()) {
-        qDebug() << "Time input is invalid.";
+        DEB "Time input is invalid.";
     }
     return output;
 }
@@ -86,8 +86,8 @@ double ACalc::greatCircleDistance(double lat1, double lon1, double lat2, double
 
 double ACalc::greatCircleDistanceBetweenAirports(const QString &dept, const QString &dest)
 {
-    auto statement = "SELECT lat, long FROM airports WHERE icao = '" + dept;
-    statement.append("' OR icao = '" + dest + "'");
+    auto statement = "SELECT lat, long FROM airports WHERE icao = '"
+            + dept + "' OR icao = '" + dest + "'";
     auto lat_lon = aDB()->customQuery(statement, 2);
 
     if (lat_lon.length() != 4) {
@@ -205,8 +205,7 @@ double ACalc::solarElevation(QDateTime utc_time_point, double lat, double lon)
 int ACalc::calculateNightTime(const QString &dept, const QString &dest, QDateTime departureTime, int tblk, int nightAngle)
 {
 
-    auto statement = "SELECT lat, long FROM airports WHERE icao = '" + dept;
-    statement.append("' OR icao = '" + dest + "'");
+    auto statement = "SELECT lat, long FROM airports WHERE icao = '" + dept + "' OR icao = '" + dest + "'";
     auto lat_lon = aDB()->customQuery(statement, 2);
 
     if (lat_lon.length() != 4) {
@@ -262,40 +261,37 @@ bool ACalc::isNight(const QString &icao, QDateTime event_time, int night_angle)
 void ACalc::updateAutoTimes(int acft_id)
 {
     //find all flights for aircraft
-    auto statement = "SELECT flight_id FROM flights WHERE acft = " + QString::number(acft_id);
+    const QString statement = QStringLiteral("SELECT flight_id FROM flights WHERE acft = ") + QString::number(acft_id);
     auto flight_list = aDB()->customQuery(statement, 1);
-
     if (flight_list.isEmpty()) {
         DEB "No flights for this tail found.";
         return;
     }
-
     DEB "Updating " << flight_list.length() << " flights with this aircraft.";
 
     auto acft = aDB()->getTailEntry(acft_id);
     auto acft_data = acft.getData();
     for (const auto& item : flight_list) {
-
         auto flight = aDB()->getFlightEntry(item.toInt());
         auto flight_data = flight.getData();
 
-        if(acft_data.value("multipilot").toInt() == 0
-                && acft_data.value("multiengine") == 0) {
+        if(acft_data.value(DB_TAILS_MULTIPILOT).toInt() == 0
+                && acft_data.value(DB_TAILS_MULTIENGINE) == 0) {
             DEB "SPSE";
-            flight_data.insert("tSPSE", flight_data.value("tblk"));
-            flight_data.insert("tSPME", "");
-            flight_data.insert("tMP", "");
-        } else if ((acft_data.value("multipilot") == 0
-                    && acft.getData().value("multiengine") == 1)) {
+            flight_data.insert(DB_FLIGHTS_TSPSE, flight_data.value(DB_FLIGHTS_TBLK));
+            flight_data.insert(DB_FLIGHTS_TSPME, DB_NULL);
+            flight_data.insert(DB_FLIGHTS_TMP, DB_NULL);
+        } else if ((acft_data.value(DB_TAILS_MULTIPILOT) == 0
+                    && acft.getData().value(DB_TAILS_MULTIENGINE) == 1)) {
             DEB "SPME";
-            flight_data.insert("tSPME", flight_data.value("tblk"));
-            flight_data.insert("tSPSE", "");
-            flight_data.insert("tMP", "");
-        } else if ((acft_data.value("multipilot") == 1)) {
+            flight_data.insert(DB_FLIGHTS_TSPME, flight_data.value(DB_FLIGHTS_TBLK));
+            flight_data.insert(DB_FLIGHTS_TSPSE, DB_NULL);
+            flight_data.insert(DB_FLIGHTS_TMP, DB_NULL);
+        } else if ((acft_data.value(DB_TAILS_MULTIPILOT) == 1)) {
             DEB "MPME";
-            flight_data.insert("tMP", flight_data.value("tblk"));
-            flight_data.insert("tSPSE", "");
-            flight_data.insert("tSPME", "");
+            flight_data.insert(DB_FLIGHTS_TMP, flight_data.value(DB_FLIGHTS_TBLK));
+            flight_data.insert(DB_FLIGHTS_TSPSE, DB_NULL);
+            flight_data.insert(DB_FLIGHTS_TSPME, DB_NULL);
         }
         flight.setData(flight_data);
         aDB()->commit(flight);
@@ -307,7 +303,7 @@ void ACalc::updateAutoTimes(int acft_id)
  */
 void ACalc::updateNightTimes()
 {
-    const int night_angle = ASettings::read("flightlogging/nightangle").toInt();
+    const int night_angle = ASettings::read(QStringLiteral("flightlogging/nightangle")).toInt();
 
     //find all flights for aircraft
     auto statement = "SELECT ROWID FROM flights";
@@ -323,15 +319,15 @@ void ACalc::updateNightTimes()
 
         auto flt = aDB()->getFlightEntry(item.toInt());
         auto data = flt.getData();
-        auto dateTime = QDateTime(QDate::fromString(data.value(QLatin1String("doft")).toString(), Qt::ISODate),
-                                  QTime().addSecs(data.value(QLatin1String("tofb")).toInt() * 60),
+        auto dateTime = QDateTime(QDate::fromString(data.value(DB_FLIGHTS_DOFT).toString(), Qt::ISODate),
+                                  QTime().addSecs(data.value(DB_FLIGHTS_TOFB).toInt() * 60),
                                   Qt::UTC);
-        data.insert(QLatin1String("tNIGHT"), QString::number(
-                             calculateNightTime(data.value(QLatin1String("dept")).toString(),
-                             data.value(QLatin1String("dest")).toString(),
-                             dateTime,
-                             data.value(QLatin1String("tblk")).toInt(),
-                             night_angle)));
+        data.insert(DB_FLIGHTS_TNIGHT,
+                    calculateNightTime(data.value(DB_FLIGHTS_DEPT).toString(),
+                                       data.value(DB_FLIGHTS_DEST).toString(),
+                                       dateTime,
+                                       data.value(DB_FLIGHTS_TBLK).toInt(),
+                                       night_angle));
         flt.setData(data);
         aDB()->commit(flt);
     }

src/gui/dialogues/newflightdialog.cpp

@@ -515,8 +515,8 @@ RowData NewFlightDialog::collectInput()
               : newData.insert(DB_FLIGHTS_TSPSE, ACalc::stringToMinutes(ui->tSPSETimeLineEdit->text()));
 
     ui->tSPMETimeLineEdit->text().isEmpty() ?
-                newData.insert(DB_FLIGHTS_SPME, DB_NULL)
-              : newData.insert(DB_FLIGHTS_SPME, ACalc::stringToMinutes(ui->tSPMETimeLineEdit->text()));
+                newData.insert(DB_FLIGHTS_TSPME, DB_NULL)
+              : newData.insert(DB_FLIGHTS_TSPME, ACalc::stringToMinutes(ui->tSPMETimeLineEdit->text()));
     ui->tMPTimeLineEdit->text().isEmpty() ?
                 newData.insert(DB_FLIGHTS_TMP, DB_NULL)
               : newData.insert(DB_FLIGHTS_TMP, ACalc::stringToMinutes(ui->tMPTimeLineEdit->text()));

src/gui/widgets/logbookwidget.cpp

@@ -241,7 +241,7 @@ void LogbookWidget::on_deleteFlightPushButton_clicked()
             displayModel->select();
         }
     } else if (selectedFlights.length() > 10) {
-        auto& warningMsg = "You have selected " + QString::number(selectedFlights.length())
+        auto warningMsg = "You have selected " + QString::number(selectedFlights.length())
                 + " flights.\n\n Deleting flights is irreversible.\n\n"
                   "Are you sure you want to proceed?";
         QMessageBox confirm;