Browse Source

changed data type of setting_id to int in all functions

fiffty-50 4 years ago
parent
commit
2c5f723738
6 changed files with 19 additions and 20 deletions
  1. 1 1
      dbsettings.cpp
  2. 1 1
      dbsettings.h
  3. 1 2
      dbstat.cpp
  4. 1 1
      main.cpp
  5. 13 13
      newflight.cpp
  6. 2 2
      settingswidget.cpp

+ 1 - 1
dbsettings.cpp

@@ -25,7 +25,7 @@ void dbSettings::storeSetting(int setting_id, QString setting_value)
  * \param setting_id
  * \return setting value
  */
-QString dbSettings::retreiveSetting(QString setting_id)
+QString dbSettings::retreiveSetting(int setting_id)
 {
     QSqlQuery query;
     query.prepare("SELECT setting FROM settings WHERE setting_id = ?");

+ 1 - 1
dbsettings.h

@@ -14,7 +14,7 @@ public:
 
     static void storeSetting(int setting_id, QString setting_value);
 
-    static QString retreiveSetting(QString setting_id);
+    static QString retreiveSetting(int setting_id);
 
     static QVector<QString> retreiveSettingInfo(QString setting_id);
 };

+ 1 - 2
dbstat.cpp

@@ -42,9 +42,8 @@ QString dbStat::retreiveTotalTime()
  */
 QString dbStat::retreiveTotalTimeThisCalendarYear()
 {
-    QDate today = QDate::currentDate();
     QDate start;
-    start.setDate(today.year(),1,1);
+    start.setDate(QDate::currentDate().year(),1,1);
     QString startdate = start.toString(Qt::ISODate);
 
     QSqlQuery query;

+ 1 - 1
main.cpp

@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
 
     //Theming with CSS inlcues QFile,QTextStream, QDir, themes folder and TARGET = flog, RESOURCES = themes/breeze.qrc in pro
     // credit: https://github.com/Alexhuszagh/BreezeStyleSheets
-    selectedtheme = dbSettings::retreiveSetting("10").toInt();
+    selectedtheme = dbSettings::retreiveSetting(10).toInt();
     QDir::setCurrent("/themes");
     if (selectedtheme == 1){
         qDebug() << "Loading light theme";

+ 13 - 13
newflight.cpp

@@ -138,7 +138,7 @@ NewFlight::NewFlight(QWidget *parent) :
     ui->destTZ->setFocusPolicy(Qt::NoFocus);
     ui->newDept->setFocus();
 
-    QString flightNumberPrefix = dbSettings::retreiveSetting("50");
+    QString flightNumberPrefix = dbSettings::retreiveSetting(50);
     if(flightNumberPrefix.length() != 0){
         ui->FlightNumberLineEdit->setText(flightNumberPrefix);
     }
@@ -358,18 +358,18 @@ void NewFlight::storeSettings()
 void NewFlight::restoreSettings()
 {
     qDebug() << "Restoring Settings...";//crashes if db is empty due to QVector index out of range.
-    ui->FunctionComboBox->setCurrentText(dbSettings::retreiveSetting("100"));
-    ui->ApproachComboBox->setCurrentText(dbSettings::retreiveSetting("101"));
-    ui->PilotFlyingCheckBox->setChecked(dbSettings::retreiveSetting("102").toInt());
-    ui->PilotMonitoringCheckBox->setChecked(dbSettings::retreiveSetting("103").toInt());
-    ui->TakeoffSpinBox->setValue(dbSettings::retreiveSetting("104").toInt());
-    ui->TakeoffCheckBox->setChecked(dbSettings::retreiveSetting("105").toInt());
-    ui->LandingSpinBox->setValue(dbSettings::retreiveSetting("106").toInt());
-    ui->LandingCheckBox->setChecked(dbSettings::retreiveSetting("107").toInt());
-    ui->AutolandSpinBox->setValue(dbSettings::retreiveSetting("108").toInt());
-    ui->AutolandCheckBox->setChecked(dbSettings::retreiveSetting("109").toInt());
-    ui->IfrCheckBox->setChecked(dbSettings::retreiveSetting("110").toInt());
-    ui->VfrCheckBox->setChecked(dbSettings::retreiveSetting("111").toInt());
+    ui->FunctionComboBox->setCurrentText(dbSettings::retreiveSetting(100));
+    ui->ApproachComboBox->setCurrentText(dbSettings::retreiveSetting(101));
+    ui->PilotFlyingCheckBox->setChecked(dbSettings::retreiveSetting(102).toInt());
+    ui->PilotMonitoringCheckBox->setChecked(dbSettings::retreiveSetting(103).toInt());
+    ui->TakeoffSpinBox->setValue(dbSettings::retreiveSetting(104).toInt());
+    ui->TakeoffCheckBox->setChecked(dbSettings::retreiveSetting(105).toInt());
+    ui->LandingSpinBox->setValue(dbSettings::retreiveSetting(106).toInt());
+    ui->LandingCheckBox->setChecked(dbSettings::retreiveSetting(107).toInt());
+    ui->AutolandSpinBox->setValue(dbSettings::retreiveSetting(108).toInt());
+    ui->AutolandCheckBox->setChecked(dbSettings::retreiveSetting(109).toInt());
+    ui->IfrCheckBox->setChecked(dbSettings::retreiveSetting(110).toInt());
+    ui->VfrCheckBox->setChecked(dbSettings::retreiveSetting(111).toInt());
     //ui->autoNightCheckBox->setChecked(dbSettings::retreiveSetting("112")[1].toInt());
     //qDebug() << "restore Settings ifr to int: " << dbSettings::retreiveSetting("110")[1].toInt();
 

+ 2 - 2
settingswidget.cpp

@@ -22,7 +22,7 @@ settingsWidget::settingsWidget(QWidget *parent) :
     themeGroup->addButton(ui->lightThemeCheckBox);
     themeGroup->addButton(ui->darkThemeCheckBox);
 
-    switch (dbSettings::retreiveSetting("10").toInt()) {
+    switch (dbSettings::retreiveSetting(10).toInt()) {
       case 0:
         qDebug() << "System Theme";
         ui->systemThemeCheckBox->setChecked(true);
@@ -38,7 +38,7 @@ settingsWidget::settingsWidget(QWidget *parent) :
     /*
      * Flight Logging Tab
      */
-    QString storedPrefix = dbSettings::retreiveSetting("50");
+    QString storedPrefix = dbSettings::retreiveSetting(50);
     if (storedPrefix.length() != 0){
         ui->flightNumberPrefixLineEdit->setText(storedPrefix);
     }