Refactored ASettings

Renamed Settings class to ASettings, changed filenames, includes, minor style adjustments

openPilotLog.pro

@@ -20,10 +20,10 @@ SOURCES += \
     mainwindow.cpp \
     src/classes/aircraft.cpp \
     src/classes/arunguard.cpp \
+    src/classes/asettings.cpp \
     src/classes/download.cpp \
     src/classes/flight.cpp \
     src/classes/pilot.cpp \
-    src/classes/settings.cpp \
     src/classes/stat.cpp \
     src/classes/strictrxvalidator.cpp \
     src/database/db.cpp \
@@ -51,10 +51,10 @@ HEADERS += \
     mainwindow.h \
     src/classes/aircraft.h \
     src/classes/arunguard.h \
+    src/classes/asettings.h \
     src/classes/download.h \
     src/classes/flight.h \
     src/classes/pilot.h \
-    src/classes/settings.h \
     src/classes/stat.h \
     src/classes/strictrxvalidator.h \
     src/database/db.h \

src/classes/settings.cpp → src/classes/asettings.cpp

@@ -15,15 +15,15 @@
  *You should have received a copy of the GNU General Public License
  *along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#include "settings.h"
+#include "asettings.h"
 
-QVariant Settings::read(const QString &key)
+QVariant ASettings::read(const QString &key)
 {
     QSettings settings;
     return settings.value(key);
 }
 
-void Settings::write(const QString& key, const QVariant& val)
+void ASettings::write(const QString &key, const QVariant &val)
 {
     QSettings settings;
     settings.setValue(key, val);

src/classes/settings.h → src/classes/asettings.h

@@ -24,12 +24,12 @@
  * \brief The Settings class is a thin wrapper for the QSettings class,
  * simplifying reading and writing of settings.
  */
-class Settings
+class ASettings
 {
 public:
-    static QVariant read(const QString& key);
+    static QVariant read(const QString &key);
 
-    static void write(const QString& key, const QVariant& val);
+    static void write(const QString &key, const QVariant &val);
 };
 
 #endif // SETTINGS_H

src/functions/acalc.cpp

@@ -449,7 +449,7 @@ void ACalc::updateAutoTimes(int acft_id)
  */
 void ACalc::updateNightTimes()
 {
-    const int nightAngle = Settings::read("flightlogging/nightangle").toInt();
+    const int nightAngle = ASettings::read("flightlogging/nightangle").toInt();
     auto flights = Db::multiSelect({"flight_id"}, "flights");
     for (const auto& item : flights) {
         auto flt = new Flight(item.toInt());

src/functions/acalc.h

@@ -4,7 +4,7 @@
 #include "src/database/db.h"
 #include "src/classes/aircraft.h"
 #include "src/classes/flight.h"
-#include "src/classes/settings.h"
+#include "src/classes/asettings.h"
 #include <QDateTime>
 #include <cmath>
 #include <QDebug>

src/gui/dialogues/firstrundialog.cpp

@@ -40,7 +40,7 @@ void FirstRunDialog::on_nextPushButton_clicked()
 
 void FirstRunDialog::themeGroup_toggled(int id)
 {
-    Settings::write("main/theme", id);
+    ASettings::write("main/theme", id);
 }
 
 void FirstRunDialog::on_finishButton_clicked()
@@ -50,30 +50,30 @@ void FirstRunDialog::on_finishButton_clicked()
         mb->setText("You have to enter a valid first and last name for the logbook.");
         mb->show();
     } else {
-        Settings::write("userdata/piclastname",ui->piclastnameLineEdit->text());
-        Settings::write("userdata/picfirstname",ui->picfirstnameLineEdit->text());
-        Settings::write("userdata/employeeid",ui->employeeidLineEdit->text());
-        Settings::write("userdata/phone",ui->phoneLineEdit->text());
-        Settings::write("userdata/email",ui->emailLineEdit->text());
+        ASettings::write("userdata/piclastname",ui->piclastnameLineEdit->text());
+        ASettings::write("userdata/picfirstname",ui->picfirstnameLineEdit->text());
+        ASettings::write("userdata/employeeid",ui->employeeidLineEdit->text());
+        ASettings::write("userdata/phone",ui->phoneLineEdit->text());
+        ASettings::write("userdata/email",ui->emailLineEdit->text());
 
-        Settings::write("flightlogging/function", ui->functionComboBox->currentText());
-        Settings::write("flightlogging/rules", ui->rulesComboBox->currentText());
-        Settings::write("flightlogging/approach", ui->approachComboBox->currentText());
-        Settings::write("flightlogging/nightlogging", ui->nightComboBox->currentIndex());
-        Settings::write("flightlogging/flightnumberPrefix", ui->prefixLineEdit->text());
+        ASettings::write("flightlogging/function", ui->functionComboBox->currentText());
+        ASettings::write("flightlogging/rules", ui->rulesComboBox->currentText());
+        ASettings::write("flightlogging/approach", ui->approachComboBox->currentText());
+        ASettings::write("flightlogging/nightlogging", ui->nightComboBox->currentIndex());
+        ASettings::write("flightlogging/flightnumberPrefix", ui->prefixLineEdit->text());
 
         QMap<QString,QString> data;
         switch (ui->aliasComboBox->currentIndex()) {
         case 0:
-            Settings::write("userdata/displayselfas",ui->aliasComboBox->currentIndex());
+            ASettings::write("userdata/displayselfas",ui->aliasComboBox->currentIndex());
             data.insert("displayname","self");
             break;
         case 1:
-            Settings::write("userdata/displayselfas",ui->aliasComboBox->currentIndex());
+            ASettings::write("userdata/displayselfas",ui->aliasComboBox->currentIndex());
             data.insert("displayname","SELF");
             break;
         case 2:{
-            Settings::write("userdata/displayselfas",ui->aliasComboBox->currentIndex());
+            ASettings::write("userdata/displayselfas",ui->aliasComboBox->currentIndex());
             QString name;
             name.append(ui->piclastnameLineEdit->text());
             name.append(QLatin1String(", "));
@@ -87,7 +87,7 @@ void FirstRunDialog::on_finishButton_clicked()
         }
         data.insert("piclastname",ui->piclastnameLineEdit->text());
         data.insert("picfirstname",ui->picfirstnameLineEdit->text());
-        data.insert("alias", Settings::read("userdata/displayselfas").toString());
+        data.insert("alias", ASettings::read("userdata/displayselfas").toString());
         data.insert("employeeid",ui->employeeidLineEdit->text());
         data.insert("phone",ui->phoneLineEdit->text());
         data.insert("email",ui->emailLineEdit->text());
@@ -96,7 +96,7 @@ void FirstRunDialog::on_finishButton_clicked()
         pic.setData(data);
         pic.commit();
 
-        switch(Settings::read("main/theme").toInt()){
+        switch(ASettings::read("main/theme").toInt()){
         case 0:
             accept();
             break;
@@ -109,7 +109,7 @@ void FirstRunDialog::on_finishButton_clicked()
             QProcess::startDetached(qApp->arguments()[0], qApp->arguments());
             break;
         default:
-            Settings::write("main/theme", 0);
+            ASettings::write("main/theme", 0);
             accept();
         }
     }

src/gui/dialogues/firstrundialog.h

@@ -5,7 +5,7 @@
 #include <QButtonGroup>
 #include <QMessageBox>
 #include <QRegularExpressionValidator>
-#include "src/classes/settings.h"
+#include "src/classes/asettings.h"
 #include "src/classes/pilot.h"
 
 namespace Ui {

src/gui/dialogues/newflightdialog.cpp

@@ -396,18 +396,18 @@ void NewFlightDialog::writeSettings()
 {
     DEB("Writing Settings...");
 
-    Settings::write("NewFlight/FunctionComboBox",ui->FunctionComboBox->currentText());
-    Settings::write("NewFlight/ApproachComboBox",ui->ApproachComboBox->currentText());
-    Settings::write("NewFlight/PilotFlyingCheckBox",ui->PilotFlyingCheckBox->isChecked());
-    Settings::write("NewFlight/PilotMonitoringCheckBox",ui->PilotMonitoringCheckBox->isChecked());
-    Settings::write("NewFlight/TakeoffSpinBox",ui->TakeoffSpinBox->value());
-    Settings::write("NewFlight/TakeoffCheckBox",ui->TakeoffCheckBox->isChecked());
-    Settings::write("NewFlight/LandingSpinBox",ui->LandingSpinBox->value());
-    Settings::write("NewFlight/LandingCheckBox",ui->LandingCheckBox->isChecked());
-    Settings::write("NewFlight/AutolandSpinBox",ui->AutolandSpinBox->value());
-    Settings::write("NewFlight/AutolandCheckBox",ui->AutolandCheckBox->isChecked());
-    Settings::write("NewFlight/IfrCheckBox",ui->IfrCheckBox->isChecked());
-    Settings::write("NewFlight/VfrCheckBox",ui->VfrCheckBox->isChecked());
+    ASettings::write("NewFlight/FunctionComboBox",ui->FunctionComboBox->currentText());
+    ASettings::write("NewFlight/ApproachComboBox",ui->ApproachComboBox->currentText());
+    ASettings::write("NewFlight/PilotFlyingCheckBox",ui->PilotFlyingCheckBox->isChecked());
+    ASettings::write("NewFlight/PilotMonitoringCheckBox",ui->PilotMonitoringCheckBox->isChecked());
+    ASettings::write("NewFlight/TakeoffSpinBox",ui->TakeoffSpinBox->value());
+    ASettings::write("NewFlight/TakeoffCheckBox",ui->TakeoffCheckBox->isChecked());
+    ASettings::write("NewFlight/LandingSpinBox",ui->LandingSpinBox->value());
+    ASettings::write("NewFlight/LandingCheckBox",ui->LandingCheckBox->isChecked());
+    ASettings::write("NewFlight/AutolandSpinBox",ui->AutolandSpinBox->value());
+    ASettings::write("NewFlight/AutolandCheckBox",ui->AutolandCheckBox->isChecked());
+    ASettings::write("NewFlight/IfrCheckBox",ui->IfrCheckBox->isChecked());
+    ASettings::write("NewFlight/VfrCheckBox",ui->VfrCheckBox->isChecked());
 }
 
 /*!
@@ -419,24 +419,24 @@ void NewFlightDialog::readSettings()
     DEB("Reading Settings...");
     QSettings settings;
 
-    ui->FunctionComboBox->setCurrentText(Settings::read("NewFlight/FunctionComboBox").toString());
-    ui->ApproachComboBox->setCurrentText(Settings::read("NewFlight/ApproachComboBox").toString());
-    ui->PilotFlyingCheckBox->setChecked(Settings::read("NewFlight/PilotFlyingCheckBox").toBool());
-    ui->PilotMonitoringCheckBox->setChecked(Settings::read("NewFlight/PilotMonitoringCheckBox").toBool());
-    ui->TakeoffSpinBox->setValue(Settings::read("NewFlight/TakeoffSpinBox").toInt());
-    ui->TakeoffCheckBox->setChecked(Settings::read("NewFlight/TakeoffCheckBox").toBool());
-    ui->LandingSpinBox->setValue(Settings::read("NewFlight/LandingSpinBox").toInt());
-    ui->LandingCheckBox->setChecked(Settings::read("NewFlight/LandingCheckBox").toBool());
-    ui->AutolandSpinBox->setValue(Settings::read("NewFlight/AutolandSpinBox").toInt());
-    ui->AutolandCheckBox->setChecked(Settings::read("NewFlight/AutolandCheckBox").toBool());
-    ui->IfrCheckBox->setChecked(Settings::read("NewFlight/IfrCheckBox").toBool());
-    ui->VfrCheckBox->setChecked(Settings::read("NewFlight/VfrCheckBox").toBool());
-    ui->FlightNumberLineEdit->setText(Settings::read("flightlogging/flightnumberPrefix").toString());
-
-    if(Settings::read("NewFlight/FunctionComboBox").toString() == "PIC"){
+    ui->FunctionComboBox->setCurrentText(ASettings::read("NewFlight/FunctionComboBox").toString());
+    ui->ApproachComboBox->setCurrentText(ASettings::read("NewFlight/ApproachComboBox").toString());
+    ui->PilotFlyingCheckBox->setChecked(ASettings::read("NewFlight/PilotFlyingCheckBox").toBool());
+    ui->PilotMonitoringCheckBox->setChecked(ASettings::read("NewFlight/PilotMonitoringCheckBox").toBool());
+    ui->TakeoffSpinBox->setValue(ASettings::read("NewFlight/TakeoffSpinBox").toInt());
+    ui->TakeoffCheckBox->setChecked(ASettings::read("NewFlight/TakeoffCheckBox").toBool());
+    ui->LandingSpinBox->setValue(ASettings::read("NewFlight/LandingSpinBox").toInt());
+    ui->LandingCheckBox->setChecked(ASettings::read("NewFlight/LandingCheckBox").toBool());
+    ui->AutolandSpinBox->setValue(ASettings::read("NewFlight/AutolandSpinBox").toInt());
+    ui->AutolandCheckBox->setChecked(ASettings::read("NewFlight/AutolandCheckBox").toBool());
+    ui->IfrCheckBox->setChecked(ASettings::read("NewFlight/IfrCheckBox").toBool());
+    ui->VfrCheckBox->setChecked(ASettings::read("NewFlight/VfrCheckBox").toBool());
+    ui->FlightNumberLineEdit->setText(ASettings::read("flightlogging/flightnumberPrefix").toString());
+
+    if(ASettings::read("NewFlight/FunctionComboBox").toString() == "PIC"){
         ui->picNameLineEdit->setText("self");
         ui->secondPilotNameLineEdit->setText("");
-    }else if (Settings::read("NewFlight/FunctionComboBox").toString() == "Co-Pilot") {
+    }else if (ASettings::read("NewFlight/FunctionComboBox").toString() == "Co-Pilot") {
         ui->picNameLineEdit->setText("");
         ui->secondPilotNameLineEdit->setText("self");
     }
@@ -670,7 +670,7 @@ void NewFlightDialog::collectAdditionalData()
     QString deptDate = ui->doftLineEdit->text() + 'T' + tofb.toString("hh:mm");
     QDateTime deptDateTime = QDateTime::fromString(deptDate,"yyyy-MM-ddThh:mm");
     int tblk = blockMinutes.toInt();
-    const int nightAngle = Settings::read("flightlogging/nightangle").toInt();
+    const int nightAngle = ASettings::read("flightlogging/nightangle").toInt();
 
     QString nightTime = QString::number(
                         ACalc::calculateNightTime(
@@ -820,7 +820,7 @@ void NewFlightDialog::fillExtras()
     QString deptDate = ui->doftLineEdit->text() + 'T' + tofb.toString("hh:mm");
     QDateTime deptDateTime = QDateTime::fromString(deptDate,"yyyy-MM-ddThh:mm");
     int tblk = blockMinutes.toInt();
-    const int nightAngle = Settings::read("flightlogging/nightangle").toInt();
+    const int nightAngle = ASettings::read("flightlogging/nightangle").toInt();
 
     QString nightTime = QString::number(
                         ACalc::calculateNightTime(

src/gui/dialogues/newflightdialog.h

@@ -39,7 +39,7 @@
 #include "src/classes/flight.h"
 #include "src/classes/aircraft.h"
 #include "src/classes/strictrxvalidator.h"
-#include "src/classes/settings.h"
+#include "src/classes/asettings.h"
 #include "src/functions/acalc.h"
 #include "src/experimental/adatabase.h"
 

src/gui/dialogues/newtaildialog.cpp

@@ -296,7 +296,7 @@ void NewTailDialog::on_buttonBox_accepted()
             submitForm(role);
             accept();
         } else {
-            if (!Settings::read("userdata/acAllowIncomplete").toInt()) {
+            if (!ASettings::read("userdata/acAllowIncomplete").toInt()) {
                 auto nope = QMessageBox(this);
                 nope.setText("Some or all fields are empty.\nPlease go back and "
                               "complete the form.\n\nYou can allow logging incomplete entries on the settings page.");

src/gui/dialogues/newtaildialog.h

@@ -23,7 +23,7 @@
 #include <QMessageBox>
 #include <QRegularExpression>
 
-#include "src/classes/settings.h"
+#include "src/classes/asettings.h"
 #include "src/classes/aircraft.h"
 #include "src/classes/strictrxvalidator.h"
 #include "src/functions/acalc.h"

src/gui/widgets/aircraftwidget.cpp

@@ -28,7 +28,7 @@ AircraftWidget::AircraftWidget(QWidget *parent) :
 {
     DEB("New AircraftWidet");
     ui->setupUi(this);
-    sortColumn = Settings::read("userdata/acSortColumn").toInt();
+    sortColumn = ASettings::read("userdata/acSortColumn").toInt();
     refreshModelAndView();
 }
 
@@ -163,7 +163,7 @@ void AircraftWidget::tableView_selectionChanged()
 void AircraftWidget::tableView_headerClicked(int column)
 {
     sortColumn = column;
-    Settings::write("userdata/acSortColumn", column);
+    ASettings::write("userdata/acSortColumn", column);
 }
 
 void AircraftWidget::acft_editing_finished()

src/gui/widgets/aircraftwidget.h

@@ -25,7 +25,7 @@
 #include <QLabel>
 #include <QHBoxLayout>
 
-#include "src/classes/settings.h"
+#include "src/classes/asettings.h"
 #include "src/gui/dialogues/newtaildialog.h"
 #include "src/classes/aircraft.h"
 #include "src/database/db.h"

src/gui/widgets/logbookwidget.cpp

@@ -36,7 +36,7 @@ LogbookWidget::LogbookWidget(QWidget *parent) :
     //message Box
     nope = new QMessageBox(this);
 
-    refreshView(Settings::read("logbook/view").toInt());
+    refreshView(ASettings::read("logbook/view").toInt());
 }
 
 LogbookWidget::~LogbookWidget()
@@ -152,7 +152,7 @@ void LogbookWidget::on_newFlightButton_clicked()
     auto nf = new NewFlightDialog(this, Db::createNew);
     nf->setAttribute(Qt::WA_DeleteOnClose);
     nf->exec();
-    refreshView(Settings::read("logbook/view").toInt());
+    refreshView(ASettings::read("logbook/view").toInt());
 }
 
 void LogbookWidget::on_editFlightButton_clicked()
@@ -161,7 +161,7 @@ void LogbookWidget::on_editFlightButton_clicked()
         auto ef = new NewFlightDialog(this,Flight(selectedFlights.first()), Db::editExisting);
         ef->setAttribute(Qt::WA_DeleteOnClose);
         ef->exec();
-        refreshView(Settings::read("logbook/view").toInt());
+        refreshView(ASettings::read("logbook/view").toInt());
     } else if (selectedFlights.isEmpty()) {
         nope->setText("No flight selected.\n");
         nope->exec();
@@ -205,7 +205,7 @@ void LogbookWidget::on_deleteFlightPushButton_clicked()
                 auto entry = Flight(selectedFlight);
                 entry.remove();
             }
-            refreshView(Settings::read("logbook/view").toInt());
+            refreshView(ASettings::read("logbook/view").toInt());
         }
     } else if (selectedFlights.length() == 0) {
         nope->setIcon(QMessageBox::Information);
@@ -228,7 +228,7 @@ void LogbookWidget::on_deleteFlightPushButton_clicked()
                 auto entry = Flight(selectedFlight);
                 entry.remove();
             }
-            refreshView(Settings::read("logbook/view").toInt());
+            refreshView(ASettings::read("logbook/view").toInt());
         }
     }
 }
@@ -251,7 +251,7 @@ void LogbookWidget::on_filterFlightsByDateButton_clicked()
 
 void LogbookWidget::on_showAllButton_clicked()
 {
-    refreshView(Settings::read("logbook/view").toInt());
+    refreshView(ASettings::read("logbook/view").toInt());
 }
 
 void LogbookWidget::on_tableView_customContextMenuRequested(const QPoint &pos)

src/gui/widgets/logbookwidget.h

@@ -26,7 +26,7 @@
 #include <QDebug>
 #include <QMenu>
 
-#include "src/classes/settings.h"
+#include "src/classes/asettings.h"
 #include "src/database/db.h"
 #include "src/classes/flight.h"
 #include "src/gui/dialogues/newflightdialog.h"

src/gui/widgets/pilotswidget.cpp

@@ -25,7 +25,7 @@ PilotsWidget::PilotsWidget(QWidget *parent) :
     ui(new Ui::PilotsWidget)
 {
     ui->setupUi(this);
-    sortColumn = Settings::read("userdata/pilSortColumn").toInt();
+    sortColumn = ASettings::read("userdata/pilSortColumn").toInt();
 
     setupModelAndView();
     refreshModelAndView();
@@ -110,7 +110,7 @@ void PilotsWidget::tableView_selectionChanged()//const QItemSelection &index, co
 void PilotsWidget::tableView_headerClicked(int column)
 {
     sortColumn = column;
-    Settings::write("userdata/pilSortColumn", column);
+    ASettings::write("userdata/pilSortColumn", column);
 }
 
 void PilotsWidget::on_newButton_clicked()

src/gui/widgets/pilotswidget.h

@@ -24,7 +24,7 @@
 #include <QDebug>
 #include <QLabel>
 #include <QTableView>
-#include "src/classes/settings.h"
+#include "src/classes/asettings.h"
 #include "src/classes/pilot.h"
 #include "src/gui/dialogues/newpilotdialog.h"
 

src/gui/widgets/settingswidget.cpp

@@ -68,25 +68,25 @@ void SettingsWidget::fillSettings()
     /*
      * Personal Tab
      */
-    ui->piclastnameLineEdit->setText(Settings::read("userdata/piclastname").toString());
-    ui->picfirstnameLineEdit->setText(Settings::read("userdata/picfirstname").toString());
-    ui->companyLineEdit->setText(Settings::read("userdata/company").toString());
-    ui->employeeidLineEdit->setText(Settings::read("userdata/employeeid").toString());
-    ui->phoneLineEdit->setText(Settings::read("userdata/phone").toString());
-    ui->emailLineEdit->setText(Settings::read("userdata/email").toString());
+    ui->piclastnameLineEdit->setText(ASettings::read("userdata/piclastname").toString());
+    ui->picfirstnameLineEdit->setText(ASettings::read("userdata/picfirstname").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());
+    ui->emailLineEdit->setText(ASettings::read("userdata/email").toString());
     /*
      * Flight Logging Tab
      */
-    ui->aliasComboBox->setCurrentIndex(Settings::read("userdata/displayselfas").toInt());
-    ui->functionComboBox->setCurrentText(Settings::read("flightlogging/function").toString());
-    ui->rulesComboBox->setCurrentText(Settings::read("flightlogging/rules").toString());
-    ui->approachComboBox->setCurrentText(Settings::read("flightlogging/approach").toString());
-    ui->nightComboBox->setCurrentIndex(Settings::read("flightlogging/nightlogging").toInt());
-    ui->prefixLineEdit->setText(Settings::read("flightlogging/flightnumberPrefix").toString());
+    ui->aliasComboBox->setCurrentIndex(ASettings::read("userdata/displayselfas").toInt());
+    ui->functionComboBox->setCurrentText(ASettings::read("flightlogging/function").toString());
+    ui->rulesComboBox->setCurrentText(ASettings::read("flightlogging/rules").toString());
+    ui->approachComboBox->setCurrentText(ASettings::read("flightlogging/approach").toString());
+    ui->nightComboBox->setCurrentIndex(ASettings::read("flightlogging/nightlogging").toInt());
+    ui->prefixLineEdit->setText(ASettings::read("flightlogging/flightnumberPrefix").toString());
     /*
      * Misc Tab
      */
-    switch (Settings::read("main/theme").toInt()) {
+    switch (ASettings::read("main/theme").toInt()) {
     case 0:
         ui->systemThemeCheckBox->setChecked(true);
         break;
@@ -96,13 +96,13 @@ void SettingsWidget::fillSettings()
     case 2:
         ui->darkThemeCheckBox->setChecked(true);
     }
-    ui->logbookViewComboBox->setCurrentIndex(Settings::read("logbook/view").toInt());
+    ui->logbookViewComboBox->setCurrentIndex(ASettings::read("logbook/view").toInt());
     /*
      * Aircraft Tab
      */
-    ui->acSortComboBox->setCurrentIndex(Settings::read("userdata/acSortColumn").toInt());
-    ui->pilotSortComboBox->setCurrentIndex(Settings::read("userdata/pilSortColumn").toInt());
-    ui->acAllowIncompleteComboBox->setCurrentIndex(Settings::read("userdata/acAllowIncomplete").toInt());
+    ui->acSortComboBox->setCurrentIndex(ASettings::read("userdata/acSortColumn").toInt());
+    ui->pilotSortComboBox->setCurrentIndex(ASettings::read("userdata/pilSortColumn").toInt());
+    ui->acAllowIncompleteComboBox->setCurrentIndex(ASettings::read("userdata/acAllowIncomplete").toInt());
 }
 
 void SettingsWidget::setupValidators()
@@ -166,10 +166,10 @@ void SettingsWidget::updatePersonalDetails()
 void SettingsWidget::on_piclastnameLineEdit_editingFinished()
 {
     if(ui->piclastnameLineEdit->text().isEmpty()){
-        ui->piclastnameLineEdit->setText(Settings::read("userdata/piclastname").toString());
+        ui->piclastnameLineEdit->setText(ASettings::read("userdata/piclastname").toString());
         ui->piclastnameLineEdit->setFocus();
     } else {
-        Settings::write("userdata/piclastname",ui->piclastnameLineEdit->text());
+        ASettings::write("userdata/piclastname",ui->piclastnameLineEdit->text());
         updatePersonalDetails();
     }
 }
@@ -177,35 +177,35 @@ void SettingsWidget::on_piclastnameLineEdit_editingFinished()
 void SettingsWidget::on_picfirstnameLineEdit_editingFinished()
 {
     if(ui->picfirstnameLineEdit->text().isEmpty()){
-        ui->picfirstnameLineEdit->setText(Settings::read("userdata/picfirstname").toString());
+        ui->picfirstnameLineEdit->setText(ASettings::read("userdata/picfirstname").toString());
         ui->picfirstnameLineEdit->setFocus();
     } else {
-        Settings::write("userdata/picfirstname",ui->picfirstnameLineEdit->text());
+        ASettings::write("userdata/picfirstname",ui->picfirstnameLineEdit->text());
         updatePersonalDetails();
     }
 }
 
 void SettingsWidget::on_companyLineEdit_editingFinished()
 {
-    Settings::write("userdata/company",ui->companyLineEdit->text());
+    ASettings::write("userdata/company",ui->companyLineEdit->text());
     updatePersonalDetails();
 }
 
 void SettingsWidget::on_employeeidLineEdit_editingFinished()
 {
-    Settings::write("userdata/employeeid",ui->employeeidLineEdit->text());
+    ASettings::write("userdata/employeeid",ui->employeeidLineEdit->text());
     updatePersonalDetails();
 }
 
 void SettingsWidget::on_emailLineEdit_editingFinished()
 {
-    Settings::write("userdata/email",ui->emailLineEdit->text());
+    ASettings::write("userdata/email",ui->emailLineEdit->text());
     updatePersonalDetails();
 }
 
 void SettingsWidget::on_phoneLineEdit_editingFinished()
 {
-    Settings::write("userdata/phone",ui->phoneLineEdit->text());
+    ASettings::write("userdata/phone",ui->phoneLineEdit->text());
     updatePersonalDetails();
 }
 
@@ -215,43 +215,43 @@ void SettingsWidget::on_phoneLineEdit_editingFinished()
 
 void SettingsWidget::on_aliasComboBox_currentIndexChanged(int index)
 {
-    Settings::write("userdata/displayselfas",index);
+    ASettings::write("userdata/displayselfas",index);
     updatePersonalDetails();
 }
 
 void SettingsWidget::on_functionComboBox_currentIndexChanged(const QString &arg1)
 {
-    Settings::write("flightlogging/function", arg1);
+    ASettings::write("flightlogging/function", arg1);
 }
 
 void SettingsWidget::on_rulesComboBox_currentIndexChanged(const QString &arg1)
 {
-    Settings::write("flightlogging/rules", arg1);
+    ASettings::write("flightlogging/rules", arg1);
 }
 
 void SettingsWidget::on_approachComboBox_currentIndexChanged(const QString &arg1)
 {
-    Settings::write("flightlogging/approach", arg1);
+    ASettings::write("flightlogging/approach", arg1);
 }
 
 void SettingsWidget::on_nightComboBox_currentIndexChanged(int index)
 {
-    Settings::write("flightlogging/nightlogging", index);
+    ASettings::write("flightlogging/nightlogging", index);
     switch (index) {
     case 1:
-        Settings::write("flightlogging/nightangle",-6);
+        ASettings::write("flightlogging/nightangle",-6);
         break;
     case 2:
-        Settings::write("flightlogging/nightangle",0);
+        ASettings::write("flightlogging/nightangle",0);
         break;
     default:
-        Settings::write("flightlogging/nightangle",-6);
+        ASettings::write("flightlogging/nightangle",-6);
     }
 }
 
 void SettingsWidget::on_prefixLineEdit_textChanged(const QString &arg1)
 {
-    Settings::write("flightlogging/flightnumberPrefix", arg1);
+    ASettings::write("flightlogging/flightnumberPrefix", arg1);
 
 }
 
@@ -260,7 +260,7 @@ void SettingsWidget::on_prefixLineEdit_textChanged(const QString &arg1)
  */
 void SettingsWidget::themeGroup_toggled(int id)
 {
-    Settings::write("main/theme", id);
+    ASettings::write("main/theme", id);
 
     QMessageBox::StandardButton reply;
     reply = QMessageBox::question(this, "Changing Themes",
@@ -278,21 +278,21 @@ void SettingsWidget::themeGroup_toggled(int id)
 }
 void SettingsWidget::on_logbookViewComboBox_currentIndexChanged(int index)
 {
-    Settings::write("logbook/view", index);
+    ASettings::write("logbook/view", index);
 }
 void SettingsWidget::on_pilotSortComboBox_currentIndexChanged(int index)
 {
-    Settings::write("userdata/pilSortColumn", index);
+    ASettings::write("userdata/pilSortColumn", index);
 }
 
 void SettingsWidget::on_acSortComboBox_currentIndexChanged(int index)
 {
-    Settings::write("userdata/acSortColumn", index);
+    ASettings::write("userdata/acSortColumn", index);
 }
 
 void SettingsWidget::on_acAllowIncompleteComboBox_currentIndexChanged(int index)
 {
-    Settings::write("userdata/acAllowIncomplete", index);
+    ASettings::write("userdata/acAllowIncomplete", index);
     if (index) {
         QMessageBox::StandardButton reply;
         reply = QMessageBox::warning(this, "Warning",
@@ -304,7 +304,7 @@ void SettingsWidget::on_acAllowIncompleteComboBox_currentIndexChanged(int index)
                                       "Are you sure you want to proceed?",
                                       QMessageBox::Yes | QMessageBox::No);
         if (reply == QMessageBox::Yes) {
-            Settings::write("userdata/acAllowIncomplete", index);
+            ASettings::write("userdata/acAllowIncomplete", index);
         } else {
             ui->acAllowIncompleteComboBox->setCurrentIndex(0);
         }

src/gui/widgets/settingswidget.h

@@ -25,7 +25,7 @@
 #include <QMessageBox>
 #include <QProcess>
 #include <QDebug>
-#include "src/classes/settings.h"
+#include "src/classes/asettings.h"
 #include "src/database/db.h"
 #include "src/classes/pilot.h"