Renamed dbVersion, version and changed backupwidget prepend to append

mainwindow.cpp

@@ -73,7 +73,7 @@ MainWindow::MainWindow(QWidget *parent)
 
 
     // check database version (Debug)
-    int db_ver = aDB->version();
+    int db_ver = aDB->dbVersion();
     if (db_ver != DATABASE_REVISION) {
         DEB << "############## WARNING ##############";
         DEB << "Your database is out of date.";

src/database/adatabase.cpp

@@ -40,9 +40,9 @@ ADatabase::ADatabase()
                    )
 {}
 
-int ADatabase::version() const
+int ADatabase::dbVersion() const
 {
-    return dbVersion;
+    return databaseVersion;
 }
 
 int ADatabase::checkDbVersion() const
@@ -115,7 +115,7 @@ bool ADatabase::connect()
     // Enable foreign key restrictions
     QSqlQuery query(QStringLiteral("PRAGMA foreign_keys = ON;"));
     updateLayout();
-    dbVersion = checkDbVersion();
+    databaseVersion = checkDbVersion();
     return true;
 }
 

src/database/adatabase.h

@@ -93,7 +93,7 @@ private:
     static ADatabase* self;
     TableNames_T tableNames;
     TableColumns_T tableColumns;
-    int dbVersion;
+    int databaseVersion;
 
     ADatabase();
     int checkDbVersion() const;
@@ -107,7 +107,7 @@ public:
     void operator=(const ADatabase&) = delete;
     static ADatabase* instance();
 
-    int version() const;
+    int dbVersion() const;
 
     /*!
      * \brief Return the names of all tables in the database

src/gui/widgets/backupwidget.cpp

@@ -97,11 +97,11 @@ void BackupWidget::fillTableWithSampleData()
     QList<QStandardItem *> total_flights, total_tails, total_pilots, max_doft, total_time;
     for (const auto &entry : entries) {
         QMap<QString, QString> summary = aDB->databaseSummary(backup_dir.absoluteFilePath(entry));
-        total_flights.prepend(new QStandardItem(summary["total_flights"]));
-        total_tails.prepend(new QStandardItem(summary["total_tails"]));
-        total_pilots.prepend(new QStandardItem(summary["total_pilots"]));
-        max_doft.prepend(new QStandardItem(summary["max_doft"]));
-        total_time.prepend(new QStandardItem(summary["total_time"]));
+        total_flights.append(new QStandardItem(summary["total_flights"]));
+        total_tails.append(new QStandardItem(summary["total_tails"]));
+        total_pilots.append(new QStandardItem(summary["total_pilots"]));
+        max_doft.append(new QStandardItem(summary["max_doft"]));
+        total_time.append(new QStandardItem(summary["total_time"]));
     }
 
     // [G]: Sort entries? based on what? the files are abit inconsistent in their naming atm