Pull request review changes

main.cpp

@@ -20,7 +20,7 @@
 #include "src/classes/arunguard.h"
 #include "src/database/adatabase.h"
 #include "src/classes/asettings.h"
-#include "src/astandardpaths.h"
+#include "src/classes/astandardpaths.h"
 #include "src/classes/asettings.h"
 #include <QApplication>
 #include <QProcess>

openPilotLog.pro

@@ -18,7 +18,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
 SOURCES += \
     main.cpp \
     mainwindow.cpp \
-    src/astandardpaths.cpp \
+    src/classes/astandardpaths.cpp \
     src/classes/aaircraftentry.cpp \
     src/classes/adownload.cpp \
     src/classes/aentry.cpp \
@@ -48,7 +48,7 @@ SOURCES += \
 
 HEADERS += \
     mainwindow.h \
-    src/astandardpaths.h \
+    src/classes/astandardpaths.h \
     src/classes/aaircraftentry.h \
     src/classes/adownload.h \
     src/classes/aentry.h \

src/classes/asettings.cpp

@@ -16,13 +16,12 @@
  *along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "asettings.h"
-#include "src/astandardpaths.h"
+#include "astandardpaths.h"
 #include <QSettings>
 
 
 QMap<ASettings::Main, QString> ASettings::mainMap = {
     {Main::Theme,   QStringLiteral("theme")},
-    {Main::ThemeID, QStringLiteral("theme_id")}, // inconsistent naming
 };
 
 QMap<ASettings::LogBook, QString> ASettings::logBookMap = {
@@ -77,60 +76,60 @@ void ASettings::setup()
 //
 
 QVariant ASettings::read(const FlightLogging key)
-{ return QSettings().value(pathOfKey(key)); }
+{ return QSettings().value(groupOfKey(key)); }
 
 void ASettings::write(const FlightLogging key, const QVariant &val)
-{ QSettings().setValue(pathOfKey(key), val); }
+{ QSettings().setValue(groupOfKey(key), val); }
 
 QVariant ASettings::read(const LogBook key)
-{ return QSettings().value(pathOfKey(key)); }
+{ return QSettings().value(groupOfKey(key)); }
 
 void ASettings::write(const LogBook key, const QVariant &val)
-{ QSettings().setValue(pathOfKey(key), val); }
+{ QSettings().setValue(groupOfKey(key), val); }
 
 QVariant ASettings::read(const Main key)
-{ return QSettings().value(pathOfKey(key)); }
+{ return QSettings().value(groupOfKey(key)); }
 
 void ASettings::write(const Main key, const QVariant &val)
-{ QSettings().setValue(pathOfKey(key), val); }
+{ QSettings().setValue(groupOfKey(key), val); }
 
 QVariant ASettings::read(const Setup key)
-{ return QSettings().value(pathOfKey(key)); }
+{ return QSettings().value(groupOfKey(key)); }
 
 void ASettings::write(const Setup key, const QVariant &val)
-{ QSettings().setValue(pathOfKey(key), val); }
+{ QSettings().setValue(groupOfKey(key), val); }
 
 QVariant ASettings::read(const NewFlight key)
-{ return QSettings().value(pathOfKey(key)); }
+{ return QSettings().value(groupOfKey(key)); }
 
 void ASettings::write(const NewFlight key, const QVariant &val)
-{ QSettings().setValue(pathOfKey(key), val); }
+{ QSettings().setValue(groupOfKey(key), val); }
 
 QVariant ASettings::read(const UserData key)
-{ return QSettings().value(pathOfKey(key)); }
+{ return QSettings().value(groupOfKey(key)); }
 
 void ASettings::write(const UserData key, const QVariant &val)
-{ QSettings().setValue(pathOfKey(key), val); }
+{ QSettings().setValue(groupOfKey(key), val); }
 
 //
 // QString conversion PATH
 //
-QString ASettings::pathOfKey (const ASettings::FlightLogging key)
+QString ASettings::groupOfKey (const ASettings::FlightLogging key)
 { return QStringLiteral("flightlogging/") + flightLoggingMap[key]; }
 
-QString ASettings::pathOfKey (const ASettings::LogBook key)
+QString ASettings::groupOfKey (const ASettings::LogBook key)
 { return QStringLiteral("logbook/") + logBookMap[key]; }
 
-QString ASettings::pathOfKey (const ASettings::Main key)
+QString ASettings::groupOfKey (const ASettings::Main key)
 { return QStringLiteral("main/") + mainMap[key]; }
 
-QString ASettings::pathOfKey (const ASettings::NewFlight key)
+QString ASettings::groupOfKey (const ASettings::NewFlight key)
 { return QStringLiteral("NewFlight/") + newFlightMap[key]; }
 
-QString ASettings::pathOfKey (const ASettings::Setup key)
+QString ASettings::groupOfKey (const ASettings::Setup key)
 { return QStringLiteral("setup/") + setupMap[key]; }
 
-QString ASettings::pathOfKey (const ASettings::UserData key)
+QString ASettings::groupOfKey (const ASettings::UserData key)
 { return QStringLiteral("userdata/") + userDataMap[key]; }
 
 //

src/classes/asettings.h

@@ -32,7 +32,6 @@ public:
 
     enum class Main {
         Theme,
-        ThemeID,
     };
 
     enum class LogBook {
@@ -100,14 +99,14 @@ public:
     // All enums should be unique of course thats easy. See At the end of the file
     // for details
     /*!
-     * \brief Return string representation of path to key: "ini_header/key"
+     * \brief Return string representation of group of key: "ini_header/key"
      */
-    static QString pathOfKey(const Main key);
-    static QString pathOfKey(const LogBook key);
-    static QString pathOfKey(const NewFlight key);
-    static QString pathOfKey(const FlightLogging key);
-    static QString pathOfKey(const Setup key);
-    static QString pathOfKey(const UserData key);
+    static QString groupOfKey(const Main key);
+    static QString groupOfKey(const LogBook key);
+    static QString groupOfKey(const NewFlight key);
+    static QString groupOfKey(const FlightLogging key);
+    static QString groupOfKey(const Setup key);
+    static QString groupOfKey(const UserData key);
 
     /*!
      * \brief Return string representation of key
@@ -129,8 +128,8 @@ private:
     static QMap<Setup, QString> setupMap;
     static QMap<NewFlight, QString> newFlightMap;
 
-#define REFACTOR_PROPOSAL_REVIEWED true
-#if (REFACTOR_PROPOSAL_REVIEWED)
+#define FOR_CURRENT_VERSION 0
+#if (FOR_CURRENT_VERSION)
     /* By default unless specified each enum is + 1.
        If we are interested in doing multiple returns at once then
        we should make them so that the can be OR-ed.
@@ -197,6 +196,7 @@ private:
     QStringList stringOfKeys2(Keys ks);
 
 #endif
+#undef FOR_CURRENT_VERSION
 
 };
 

src/database/adatabase.cpp

@@ -17,7 +17,7 @@
  */
 #include "adatabase.h"
 #include "src/testing/adebug.h"
-#include "src/astandardpaths.h"
+#include "src/classes/astandardpaths.h"
 
 #define DATABASE_VERSION 15
 const auto SQL_DRIVER = QStringLiteral("QSQLITE");

src/database/adatabase.h

@@ -37,7 +37,7 @@
 #include "src/classes/atailentry.h"
 #include "src/classes/aaircraftentry.h"
 #include "src/classes/aflightentry.h"
-#include "src/astandardpaths.h"
+#include "src/classes/astandardpaths.h"
 
 /*!
  * \brief The DBTarget enum lists database items that are

src/database/adatabasesetup.cpp

@@ -19,7 +19,7 @@
 #include "src/database/adatabase.h"
 #include "src/testing/adebug.h"
 #include "src/functions/areadcsv.h"
-#include "src/astandardpaths.h"
+#include "src/classes/astandardpaths.h"
 #include "src/classes/adownload.h"
 
 // Statements for creation of database tables, Revision 15

src/gui/dialogues/firstrundialog.cpp

@@ -6,7 +6,7 @@
 #include "src/classes/apilotentry.h"
 #include "src/classes/adownload.h"
 #include "src/classes/asettings.h"
-#include "src/astandardpaths.h"
+#include "src/classes/astandardpaths.h"
 #include <QErrorMessage>
 
 FirstRunDialog::FirstRunDialog(QWidget *parent) :
@@ -24,8 +24,7 @@ FirstRunDialog::FirstRunDialog(QWidget *parent) :
     themeGroup->addButton(ui->lightThemeCheckBox, 1);
     themeGroup->addButton(ui->darkThemeCheckBox, 2);
 
-    // [G]: no sure what this connects and why button is overloaded but changed it to what QtCreator suggests
-    QObject::connect(themeGroup, &QButtonGroup::idClicked,
+    QObject::connect(themeGroup, QOverload<int>::of(&QButtonGroup::buttonClicked),
                      this, &FirstRunDialog::on_themeGroup_toggled);
 }
 
@@ -138,7 +137,7 @@ bool FirstRunDialog::setupDatabase()
     auto confirm = QMessageBox(QMessageBox::Question, QStringLiteral("Create Database"),
                                QStringLiteral("We are now going to create the database.<br>"  // [G]: Why both <br> and \n ?
                                               "Would you like to download the latest database information?"
-                                              "<br>(Recommended, Internet connection required)\n"),
+                                              "<br>(Recommended, Internet connection required)"),
                                QMessageBox::Yes | QMessageBox::No, this);
     confirm.setDefaultButton(QMessageBox::No);
 
@@ -163,17 +162,15 @@ bool FirstRunDialog::setupDatabase()
 void FirstRunDialog::reject()
 {
     auto confirm = QMessageBox(QMessageBox::Critical,
-                                     QStringLiteral("Setup incomplete"),
-                                     QStringLiteral("Without completing the initial setup"
-                                                    " you cannot use the application.<br><br>"
-                                                    "Quit anyway?"),
-                                     QMessageBox::Yes | QMessageBox::No,
-                                     this
-                                     );
+                               QStringLiteral("Setup incomplete"),
+                               QStringLiteral("Without completing the initial setup"
+                                              " you cannot use the application.<br><br>"
+                                              "Quit anyway?"),
+                               QMessageBox::Yes | QMessageBox::No, this);
     confirm.setDefaultButton(QMessageBox::No);
 
     if (confirm.exec() == QMessageBox::Yes) {
         DEB << "rejected.";
         QDialog::reject();
-        }
+    }
 }

src/gui/widgets/debugwidget.cpp

@@ -1,6 +1,6 @@
 #include "debugwidget.h"
 #include "ui_debugwidget.h"
-#include "src/astandardpaths.h"
+#include "src/classes/astandardpaths.h"
 
 DebugWidget::DebugWidget(QWidget *parent) :
     QWidget(parent),