Merge branch 'main' into includes

src/mainwindow.h

@@ -25,7 +25,6 @@ QT_END_NAMESPACE
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
-    bool initializing;
 
 public:
     MainWindow(QWidget *parent = nullptr);
@@ -33,27 +32,20 @@ public:
 
 private slots:
     void on_actionQuit_triggered();
-
     void on_actionSave_JSON_triggered();
-
     void on_actionGitHub_triggered();
-
     void on_actionRescan_Refresh_triggered();
-
     void on_actionAbout_triggered();
-
     void on_actionIgnore_C4_Reallocation_Event_Count_toggled(bool enabled);
-
     void on_actionHEX_toggled(bool enabled);
-
     void on_actionUse_Fahrenheit_toggled(bool enabled);
-
     void on_actionCyclic_Navigation_toggled(bool arg1);
-
     void on_actionUse_GB_instead_of_TB_toggled(bool arg1);
 
 private:
     Ui::MainWindow *ui;
+    QSettings settings;
+    bool initializing;
     QLocale locale;
     utils Utils;
     QButtonGroup *buttonGroup;
@@ -66,15 +58,12 @@ private:
     QColor goodColor, cautionColor, badColor, naColor;
     QJsonObject deviceJson;
     QSpacerItem *buttonStretch;
-    QSettings settings;
     QAction *actionCyclic_Navigation;
-
     QMenu *menuDevice;
     QMenu *menuDisk;
     QMenu *selfTestMenu;
     QAction *selfTestLogAction;
     QActionGroup *disksGroup;
-
     QJsonArray devices;
     QStringList deviceOutputs;
     QJsonObject globalObj;
@@ -84,10 +73,12 @@ private:
 
     void onNextButtonClicked();
     void onPrevButtonClicked();
-    void updateNavigationButtons(int currentIndex);
+    void updateNavigationButtons(qsizetype currentIndex);
     void updateUI();
     void populateWindow(const QJsonObject &tempObj, const QString &health, const QVector<QPair<QString, int>>& nvmeLogOrdered = QVector<QPair<QString, int>>());
     void addNvmeLogTable(const QVector<QPair<QString, int>>& nvmeLogOrdered);
     void addSmartAttributesTable(const QJsonArray &attributes);
     void mousePressEvent(QMouseEvent*);
 };
+
+#endif