Merge pull request #12 from riiga/includes

Reorganize includes

src/custombutton.cpp

@@ -1,5 +1,7 @@
 #include "custombutton.h"
+
 #include <QFontMetrics>
+#include <QPainter>
 
 CustomButton::CustomButton(const QString &text1_, const QString &text2_, const QString &text3_, const QColor &lineColor_, QWidget *parent)
     : QPushButton(parent), text1(text1_), text2(text2_), text3(text3_), lineColor(lineColor_) {

src/custombutton.h

@@ -1,8 +1,9 @@
-#ifndef CUSTOMBUTTON_H
+#pragma once
-#define CUSTOMBUTTON_H
 
+#include <QColor>
 #include <QPushButton>
-#include <QPainter>
+#include <QString>
+#include <QWidget>
 
 class CustomButton : public QPushButton {
     Q_OBJECT
@@ -24,5 +25,3 @@ private:
     QString text3;
     QColor lineColor;
 };
-
-#endif

src/jsonparser.cpp

@@ -1,8 +1,6 @@
 #include "jsonparser.h"
 
-JsonParser::JsonParser()
+#include <QStringList>
-{
-}
 
 QVector<QPair<QString, int>> JsonParser::parse(const QString &json)
 {

src/jsonparser.h

@@ -1,20 +1,16 @@
-#ifndef JSONPARSER_H
+#pragma once
-#define JSONPARSER_H
 
 #include <QString>
 #include <QVector>
-#include <QStringList>
 #include <QPair>
 
 class JsonParser
 {
 public:
-    JsonParser();
+    JsonParser() = default;
 
     QVector<QPair<QString, int>> parse(const QString &json);
 
 private:
     QString removeQuotes(const QString &s);
 };
-
-#endif

src/mainwindow.cpp

@@ -1,5 +1,11 @@
 #include "mainwindow.h"
 
+#include <QDesktopServices>
+#include <QFileDialog>
+#include <QJsonDocument>
+#include <QMessageBox>
+#include <QUrl>
+
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
     , ui(new Ui::MainWindow)

src/mainwindow.h

@@ -1,7 +1,13 @@
-#ifndef MAINWINDOW_H
+#pragma once
-#define MAINWINDOW_H
 
+#include <QAction>
+#include <QActionGroup>
+#include <QJsonObject>
 #include <QMainWindow>
+#include <QMouseEvent>
+#include <QSettings>
+#include <QTableWidget>
+#include <QWidget>
 #include <cmath>
 
 #include "statusdot.h"
@@ -74,5 +80,3 @@ private:
     void addSmartAttributesTable(const QJsonArray &attributes);
     void mousePressEvent(QMouseEvent*);
 };
-
-#endif

src/statusdot.h

@@ -1,5 +1,4 @@
-#ifndef STATUSDOT_H
+#pragma once
-#define STATUSDOT_H
 
 #include <QPainter>
 #include <QStyleOptionViewItem>
@@ -16,5 +15,3 @@ public:
                const QStyleOptionViewItem &option,
                const QModelIndex &index) const override;
 };
-
-#endif

src/utils.cpp

@@ -1,6 +1,14 @@
 #include "utils.h"
 
-utils::utils() {}
+#include <QAbstractButton>
+#include <QApplication>
+#include <QDir>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QMessageBox>
+#include <QProcess>
+#include <QPushButton>
+#include <QTimer>
 
 void utils::clearButtonGroup(QButtonGroup* buttonGroup, QHBoxLayout* horizontalLayout, QSpacerItem* buttonStretch, QMenu* menuDisk)
 {

src/utils.h

@@ -1,33 +1,15 @@
-#ifndef UTILS_H
+#pragma once
-#define UTILS_H
 
-#include <QMainWindow>
-#include <QProcess>
-#include <QWidget>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
 #include <QButtonGroup>
-#include <QAction>
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QDesktopServices>
-#include <QUrl>
-#include <QTimer>
-#include <QSettings>
-#include <QMouseEvent>
-#include <QActionGroup>
 #include <QHBoxLayout>
-#include <QSpacerItem>
+#include <QJsonArray>
-#include <QPushButton>
-#include <QAbstractButton>
 #include <QMenu>
-#include <QApplication>
+#include <QSpacerItem>
 
 class utils
 {
 public:
-    utils();
+    utils() = default;
 
     void clearButtonGroup(QButtonGroup* buttonGroup, QHBoxLayout* horizontalLayout, QSpacerItem* buttonStretch, QMenu* menuDisk);
     QString getSmartctlPath();
@@ -38,5 +20,3 @@ public:
     void selfTestHandler(const QString &mode, const QString &name, const QString &minutes);
     QString toTitleCase(const QString& sentence);
 };
-
-#endif