reordered includes in GUI code (#3790)

gui/aboutdialog.h

@@ -19,9 +19,10 @@
 #ifndef ABOUT_DIALOG_H
 #define ABOUT_DIALOG_H
 
+#include "ui_about.h"
+
 #include <QDialog>
 #include <QString>
-#include "ui_about.h"
 
 class QWidget;
 

gui/applicationdialog.cpp

@@ -18,14 +18,14 @@
 
 #include "applicationdialog.h"
 
+#include "application.h"
+#include "common.h"
+
 #include <QDialogButtonBox>
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QPushButton>
 
-#include "application.h"
-#include "common.h"
-
 
 ApplicationDialog::ApplicationDialog(const QString &title,
                                      Application &app,

gui/applicationdialog.h

@@ -19,9 +19,10 @@
 #ifndef APPLICATIONDIALOG_H
 #define APPLICATIONDIALOG_H
 
+#include "ui_application.h"
+
 #include <QDialog>
 #include <QString>
-#include "ui_application.h"
 
 class QWidget;
 class Application;

gui/applicationlist.cpp

@@ -18,15 +18,15 @@
 
 #include "applicationlist.h"
 
+#include "application.h"
+#include "common.h"
+
+#include <cstdlib>
+
 #include <QFileInfo>
 #include <QSettings>
 #include <QStringList>
 
-#include "common.h"
-#include "application.h"
-
-#include <cstdlib>
-
 ApplicationList::ApplicationList(QObject *parent) :
     QObject(parent),
     mDefaultApplicationIndex(-1)

gui/applicationlist.h

@@ -19,9 +19,10 @@
 #ifndef APPLICATIONLIST_H
 #define APPLICATIONLIST_H
 
-#include <QObject>
 #include "application.h"
 
+#include <QObject>
+
 /// @addtogroup GUI
 /// @{
 

gui/checkstatistics.h

@@ -19,12 +19,12 @@
 #ifndef CHECKSTATISTICS_H
 #define CHECKSTATISTICS_H
 
-#include <QObject>
-#include <QMap>
-#include <QString>
-
 #include "showtypes.h"
 
+#include <QMap>
+#include <QObject>
+#include <QString>
+
 /// @addtogroup GUI
 /// @{
 

gui/checkthread.cpp

@@ -18,15 +18,16 @@
 
 #include "checkthread.h"
 
+#include "common.h"
+#include "cppcheck.h"
+#include "erroritem.h"
+#include "threadresult.h"
+
 #include <QDebug>
 #include <QDir>
 #include <QFile>
 #include <QProcess>
 #include <QSettings>
-#include "erroritem.h"
-#include "threadresult.h"
-#include "cppcheck.h"
-#include "common.h"
 
 static bool executeCommand(std::string exe, std::vector<std::string> args, std::string redirect, std::string *output)
 {

gui/checkthread.h

@@ -20,10 +20,11 @@
 #ifndef CHECKTHREAD_H
 #define CHECKTHREAD_H
 
-#include <QThread>
 #include "cppcheck.h"
 #include "suppressions.h"
 
+#include <QThread>
+
 class Settings;
 class ThreadResult;
 

gui/codeeditor.cpp

@@ -18,10 +18,11 @@
 
 #include "codeeditor.h"
 
-#include <QShortcut>
-#include <QPainter>
 #include "codeeditorstyle.h"
 
+#include <QPainter>
+#include <QShortcut>
+
 
 Highlighter::Highlighter(QTextDocument *parent,
                          CodeEditorStyle *widgetStyle) :

gui/codeeditor.h

@@ -19,9 +19,9 @@
 #ifndef CODEEDITOR_H
 #define CODEEDITOR_H
 
-#include <QSyntaxHighlighter>
 #include <QPlainTextEdit>
 #include <QRegularExpression>
+#include <QSyntaxHighlighter>
 
 class CodeEditorStyle;
 class QPaintEvent;

gui/codeeditorstyle.cpp

@@ -17,6 +17,7 @@
  */
 
 #include "codeeditorstyle.h"
+
 #include <QSettings>
 
 CodeEditorStyle::CodeEditorStyle(

gui/codeeditorstyle.h

@@ -19,9 +19,9 @@
 #ifndef CODEEDITORSTYLE_H
 #define CODEEDITORSTYLE_H
 
-#include <QString>
 #include <QColor>
 #include <QFont>
+#include <QString>
 
 const QString SETTINGS_STYLE_GROUP("EditorStyle");
 const QString SETTINGS_STYLE_TYPE("StyleType");

gui/codeeditstylecontrols.cpp

@@ -17,6 +17,7 @@
  */
 
 #include "codeeditstylecontrols.h"
+
 #include <QColorDialog>
 
 SelectColorButton::SelectColorButton(QWidget* parent) :

gui/codeeditstylecontrols.h

@@ -22,10 +22,10 @@
 #ifndef CODEEDITORSTYLECONTROLS_H
 #define CODEEDITORSTYLECONTROLS_H
 
-#include <QPushButton>
-#include <QComboBox>
 #include <QColor>
+#include <QComboBox>
 #include <QFont>
+#include <QPushButton>
 
 class SelectColorButton : public QPushButton {
     Q_OBJECT

gui/codeeditstyledialog.cpp

@@ -20,8 +20,9 @@
 
 #include "codeeditor.h"
 #include "codeeditstylecontrols.h"
-#include <QFormLayout>
+
 #include <QDialogButtonBox>
+#include <QFormLayout>
 
 const QString StyleEditDialog::mSampleDocument(
     "/*****\n"

gui/codeeditstyledialog.h

@@ -19,9 +19,10 @@
 #ifndef CODEEDITSTYLEDIALOG_H
 #define CODEEDITSTYLEDIALOG_H
 
-#include <QDialog>
 #include "codeeditorstyle.h"
 
+#include <QDialog>
+
 class CodeEditor;
 class SelectColorButton;
 class SelectFontWeightCombo;

gui/common.cpp

@@ -18,10 +18,11 @@
 
 
 #include "common.h"
+
 #include <QCoreApplication>
-#include <QSettings>
-#include <QFileInfo>
 #include <QDir>
+#include <QFileInfo>
+#include <QSettings>
 
 
 QString getPath(const QString &type)

gui/csvreport.cpp

@@ -18,10 +18,11 @@
 
 #include "csvreport.h"
 
-#include <QDir>
 #include "erroritem.h"
 #include "report.h"
 
+#include <QDir>
+
 CsvReport::CsvReport(const QString &filename) :
     Report(filename)
 {}

gui/csvreport.h

@@ -19,9 +19,10 @@
 #ifndef CSV_REPORT_H
 #define CSV_REPORT_H
 
+#include "report.h"
+
 #include <QString>
 #include <QTextStream>
-#include "report.h"
 
 /// @addtogroup GUI
 /// @{

gui/erroritem.cpp

@@ -17,6 +17,7 @@
  */
 
 #include "erroritem.h"
+
 #include "common.h"
 
 QErrorPathItem::QErrorPathItem(const ErrorMessage::FileLocation &loc)

gui/erroritem.h

@@ -19,11 +19,12 @@
 #ifndef ERRORITEM_H
 #define ERRORITEM_H
 
-#include <QString>
-#include <QMetaType>
-#include <QList>
 #include "errorlogger.h"
 
+#include <QList>
+#include <QMetaType>
+#include <QString>
+
 /// @addtogroup GUI
 /// @{
 

gui/filelist.cpp

@@ -18,9 +18,10 @@
 
 #include "filelist.h"
 
-#include <QDir>
 #include "pathmatch.h"
 
+#include <QDir>
+
 QStringList FileList::getDefaultFilters()
 {
     QStringList extensions;

gui/fileviewdialog.cpp

@@ -18,8 +18,8 @@
 
 #include "fileviewdialog.h"
 
-#include <QFile>
 #include <QByteArray>
+#include <QFile>
 #include <QMessageBox>
 #include <QTextEdit>
 

gui/fileviewdialog.h

@@ -19,9 +19,10 @@
 #ifndef FILEVIEW_DIALOG_H
 #define FILEVIEW_DIALOG_H
 
+#include "ui_file.h"
+
 #include <QDialog>
 #include <QString>
-#include "ui_file.h"
 
 class QWidget;
 class QTextEdit;

gui/functioncontractdialog.cpp

@@ -17,6 +17,7 @@
  */
 
 #include "functioncontractdialog.h"
+
 #include "ui_functioncontractdialog.h"
 
 static QString formatFunctionName(QString f)

gui/helpdialog.cpp

@@ -17,7 +17,9 @@
  */
 
 #include "helpdialog.h"
+
 #include "ui_helpdialog.h"
+
 #include "common.h"
 
 #include <QFileInfo>

gui/libraryaddfunctiondialog.cpp

@@ -17,6 +17,7 @@
  */
 
 #include "libraryaddfunctiondialog.h"
+
 #include "ui_libraryaddfunctiondialog.h"
 
 #include <QRegExp>

gui/librarydialog.cpp

@@ -17,16 +17,18 @@
  */
 
 #include "librarydialog.h"
+
 #include "ui_librarydialog.h"
+
+#include "common.h"
 #include "libraryaddfunctiondialog.h"
 #include "libraryeditargdialog.h"
-#include "common.h"
 #include "path.h"
 
 #include <QFile>
 #include <QFileDialog>
-#include <QTextStream>
 #include <QMessageBox>
+#include <QTextStream>
 
 // TODO: get/compare functions from header
 

gui/librarydialog.h

@@ -19,10 +19,10 @@
 #ifndef LIBRARYDIALOG_H
 #define LIBRARYDIALOG_H
 
-#include <QDialog>
-
 #include "cppchecklibrarydata.h"
 
+#include <QDialog>
+
 class QListWidgetItem;
 
 namespace Ui {

gui/libraryeditargdialog.cpp

@@ -17,6 +17,7 @@
  */
 
 #include "libraryeditargdialog.h"
+
 #include "ui_libraryeditargdialog.h"
 
 LibraryEditArgDialog::LibraryEditArgDialog(QWidget *parent, const CppcheckLibraryData::Function::Arg &arg) :

gui/libraryeditargdialog.h

@@ -19,9 +19,10 @@
 #ifndef LIBRARYEDITARGDIALOG_H
 #define LIBRARYEDITARGDIALOG_H
 
-#include <QDialog>
 #include "cppchecklibrarydata.h"
 
+#include <QDialog>
+
 namespace Ui {
     class LibraryEditArgDialog;
 }

gui/main.cpp

@@ -16,23 +16,26 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QApplication>
-#include <QCoreApplication>
-#include <QMetaType>
-#include <QStringList>
-#include <QSettings>
-#ifdef _WIN32
-#include <QMessageBox>
-#include "aboutdialog.h"
-#else
-#include <iostream>
-#endif
 #include "cppcheck.h"
 #include "common.h"
 #include "mainwindow.h"
 #include "erroritem.h"
 #include "translationhandler.h"
 
+#ifdef _WIN32
+#include "aboutdialog.h"
+
+#include <QMessageBox>
+#else
+#include <iostream>
+#endif
+
+#include <QApplication>
+#include <QCoreApplication>
+#include <QMetaType>
+#include <QStringList>
+#include <QSettings>
+
 
 static void ShowUsage();
 static void ShowVersion();

gui/mainwindow.cpp

@@ -18,23 +18,10 @@
 
 #include "mainwindow.h"
 
-#include <QApplication>
-#include <QDebug>
-#include <QMessageBox>
-#include <QFileInfo>
-#include <QDir>
-#include <QAction>
-#include <QActionGroup>
-#include <QFile>
-#include <QInputDialog>
-#include <QTimer>
-#include <QSettings>
-
-#include "cppcheck.h"
-
 #include "applicationlist.h"
 #include "aboutdialog.h"
 #include "common.h"
+#include "cppcheck.h"
 #include "filelist.h"
 #include "fileviewdialog.h"
 #include "functioncontractdialog.h"
@@ -52,6 +39,18 @@
 #include "translationhandler.h"
 #include "variablecontractsdialog.h"
 
+#include <QApplication>
+#include <QAction>
+#include <QActionGroup>
+#include <QDebug>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QInputDialog>
+#include <QMessageBox>
+#include <QSettings>
+#include <QTimer>
+
 static const QString OnlineHelpURL("https://cppcheck.sourceforge.io/manual.html");
 static const QString compile_commands_json("compile_commands.json");
 

gui/mainwindow.h

@@ -19,13 +19,14 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QMainWindow>
+#include "ui_mainwindow.h"
-#include <QFileDialog>
-#include <QStringList>
 
 #include "settings.h"
 #include "platforms.h"
-#include "ui_mainwindow.h"
+
+#include <QFileDialog>
+#include <QMainWindow>
+#include <QStringList>
 
 class ThreadHandler;
 class TranslationHandler;

gui/newsuppressiondialog.cpp

@@ -17,7 +17,9 @@
  */
 
 #include "newsuppressiondialog.h"
+
 #include "ui_newsuppressiondialog.h"
+
 #include "cppcheck.h"
 #include "color.h"
 #include "errorlogger.h"

gui/newsuppressiondialog.h

@@ -19,9 +19,10 @@
 #ifndef NEWSUPPRESSIONDIALOG_H
 #define NEWSUPPRESSIONDIALOG_H
 
-#include <QDialog>
 #include "suppressions.h"
 
+#include <QDialog>
+
 namespace Ui {
     class NewSuppressionDialog;
 }

gui/platforms.h

@@ -19,10 +19,11 @@
 #ifndef PLATFORMS_H
 #define PLATFORMS_H
 
+#include "settings.h"
+
+#include <QList>
 #include <QObject>
 #include <QString>
-#include <QList>
-#include "settings.h"
 
 class QAction;
 

gui/printablereport.cpp

@@ -19,6 +19,7 @@
 #include "printablereport.h"
 
 #include "erroritem.h"
+
 #include <QDir>
 
 PrintableReport::PrintableReport() :

gui/projectfile.cpp

@@ -18,13 +18,13 @@
 
 #include "projectfile.h"
 
+#include "common.h"
+#include "importproject.h"
+#include "settings.h"
+
 #include <QFile>
 #include <QDir>
 #include <QXmlStreamReader>
-#include "common.h"
-#include "importproject.h"
-
-#include "settings.h"
 
 ProjectFile *ProjectFile::mActiveProject;
 

gui/projectfile.h

@@ -19,15 +19,15 @@
 #ifndef PROJECT_FILE_H
 #define PROJECT_FILE_H
 
+#include "settings.h"
+#include "suppressions.h"
+
 #include <map>
+
 #include <QObject>
 #include <QString>
 #include <QStringList>
 
-#include "suppressions.h"
-
-#include <settings.h>
-
 class QXmlStreamReader;
 class QXmlStreamWriter;
 

gui/projectfiledialog.cpp

@@ -18,17 +18,18 @@
 
 #include "projectfiledialog.h"
 
-#include <QFileInfo>
-#include <QFileDialog>
-#include <QDir>
-#include <QSettings>
-#include "common.h"
-#include "newsuppressiondialog.h"
 #include "checkthread.h"
-#include "projectfile.h"
+#include "common.h"
-#include "library.h"
-#include "platforms.h"
 #include "importproject.h"
+#include "library.h"
+#include "newsuppressiondialog.h"
+#include "platforms.h"
+#include "projectfile.h"
+
+#include <QDir>
+#include <QFileDialog>
+#include <QFileInfo>
+#include <QSettings>
 
 /** Return paths from QListWidget */
 static QStringList getPaths(const QListWidget *list)

gui/projectfiledialog.h

@@ -19,13 +19,13 @@
 #ifndef PROJECTFILE_DIALOG_H
 #define PROJECTFILE_DIALOG_H
 
-#include <QDialog>
+#include "ui_projectfiledialog.h"
-#include <QString>
-#include <QStringList>
 
 #include "suppressions.h"
 
-#include "ui_projectfiledialog.h"
+#include <QDialog>
+#include <QString>
+#include <QStringList>
 
 class QWidget;
 class QCheckBox;

gui/report.h

@@ -19,9 +19,9 @@
 #ifndef REPORT_H
 #define REPORT_H
 
+#include <QFile>
 #include <QObject>
 #include <QString>
-#include <QFile>
 
 class ErrorItem;
 

gui/resultstree.cpp

@@ -18,35 +18,36 @@
 
 #include "resultstree.h"
 
-#include <QApplication>
+#include "application.h"
-#include <QDebug>
+#include "applicationlist.h"
-#include <QList>
-#include <QMap>
-#include <QVariant>
-#include <QMenu>
-#include <QSignalMapper>
-#include <QProcess>
-#include <QDir>
-#include <QMessageBox>
-#include <QAction>
-#include <QFileInfo>
-#include <QFileDialog>
-#include <QClipboard>
-#include <QDesktopServices>
-#include <QUrl>
-#include <QKeyEvent>
-#include <QSettings>
 #include "common.h"
 #include "erroritem.h"
-#include "applicationlist.h"
+#include "path.h"
-#include "report.h"
-#include "application.h"
 #include "projectfile.h"
+#include "report.h"
 #include "showtypes.h"
 #include "threadhandler.h"
-#include "path.h"
 #include "xmlreportv2.h"
 
+#include <QAction>
+#include <QApplication>
+#include <QClipboard>
+#include <QDebug>
+#include <QDesktopServices>
+#include <QDir>
+#include <QFileInfo>
+#include <QFileDialog>
+#include <QKeyEvent>
+#include <QList>
+#include <QMap>
+#include <QMenu>
+#include <QMessageBox>
+#include <QProcess>
+#include <QSettings>
+#include <QSignalMapper>
+#include <QUrl>
+#include <QVariant>
+
 static const char COLUMN[] = "column";
 static const char CWE[] = "cwe";
 static const char ERRORID[] = "id";

gui/resultstree.h

@@ -20,11 +20,12 @@
 #ifndef RESULTSTREE_H
 #define RESULTSTREE_H
 
-#include <QTreeView>
-#include <QStandardItemModel>
 #include "errortypes.h"
 #include "showtypes.h"
 
+#include <QStandardItemModel>
+#include <QTreeView>
+
 class ApplicationList;
 class Report;
 class ErrorItem;

gui/resultsview.cpp

@@ -18,27 +18,28 @@
 
 #include "resultsview.h"
 
-#include <QMessageBox>
+#include "checkstatistics.h"
-#include <QStandardItemModel>
+#include "codeeditorstyle.h"
-#include <QVariant>
-#include <QPrinter>
-#include <QPrintDialog>
-#include <QPrintPreviewDialog>
-#include <QSettings>
-#include <QDir>
-#include <QDate>
-#include <QMenu>
-#include <QClipboard>
 #include "common.h"
+#include "csvreport.h"
 #include "erroritem.h"
+#include "path.h"
+#include "printablereport.h"
 #include "txtreport.h"
 #include "xmlreport.h"
 #include "xmlreportv2.h"
-#include "csvreport.h"
+
-#include "printablereport.h"
+#include <QClipboard>
-#include "checkstatistics.h"
+#include <QDate>
-#include "path.h"
+#include <QDir>
-#include "codeeditorstyle.h"
+#include <QMenu>
+#include <QMessageBox>
+#include <QPrintDialog>
+#include <QPrintPreviewDialog>
+#include <QPrinter>
+#include <QSettings>
+#include <QStandardItemModel>
+#include <QVariant>
 
 ResultsView::ResultsView(QWidget * parent) :
     QWidget(parent),

gui/resultsview.h

@@ -20,10 +20,10 @@
 #ifndef RESULTSVIEW_H
 #define RESULTSVIEW_H
 
+#include "ui_resultsview.h"
 
 #include "report.h"
 #include "showtypes.h"
-#include "ui_resultsview.h"
 
 class ErrorItem;
 class ApplicationList;

gui/scratchpad.cpp

@@ -17,6 +17,7 @@
  */
 
 #include "scratchpad.h"
+
 #include "mainwindow.h"
 
 ScratchPad::ScratchPad(MainWindow& mainWindow)

gui/scratchpad.h

@@ -19,9 +19,10 @@
 #ifndef SCRATCHPAD_H
 #define SCRATCHPAD_H
 
-#include <QDialog>
 #include "ui_scratchpad.h"
 
+#include <QDialog>
+
 class MainWindow;
 
 /// @addtogroup GUI

gui/settingsdialog.cpp

@@ -18,18 +18,19 @@
 
 #include "settingsdialog.h"
 
-#include <QWidget>
-#include <QList>
-#include <QFileDialog>
-#include <QFileInfo>
-#include <QThread>
-#include <QSettings>
 #include "applicationdialog.h"
 #include "applicationlist.h"
-#include "translationhandler.h"
 #include "codeeditorstyle.h"
 #include "codeeditstyledialog.h"
 #include "common.h"
+#include "translationhandler.h"
+
+#include <QFileDialog>
+#include <QFileInfo>
+#include <QList>
+#include <QSettings>
+#include <QThread>
+#include <QWidget>
 
 SettingsDialog::SettingsDialog(ApplicationList *list,
                                TranslationHandler *translator,

gui/settingsdialog.h

@@ -20,9 +20,10 @@
 #ifndef SETTINGSDIALOG_H
 #define SETTINGSDIALOG_H
 
-#include <QDialog>
 #include "ui_settings.h"
 
+#include <QDialog>
+
 class QSettings;
 class QWidget;
 class ApplicationList;

gui/showtypes.cpp

@@ -20,8 +20,8 @@
 
 #include "common.h"
 
-#include <QSettings>
 #include <QMap>
+#include <QSettings>
 #include <QString>
 
 ShowTypes::ShowTypes()

gui/showtypes.h

@@ -19,10 +19,10 @@
 #ifndef SHOWTYPES_H
 #define SHOWTYPES_H
 
-#include <QVariant>
-
 #include "errortypes.h"
 
+#include <QVariant>
+
 /// @addtogroup GUI
 /// @{
 

gui/statsdialog.cpp

@@ -18,18 +18,18 @@
 
 #include "statsdialog.h"
 
-#include <QPrinter>
+#include "checkstatistics.h"
+#include "common.h"
+#include "projectfile.h"
+
+#include <QClipboard>
 #include <QDate>
 #include <QFileDialog>
 #include <QFileInfo>
+#include <QMimeData>
+#include <QPrinter>
 #include <QTextDocument>
 #include <QWidget>
-#include <QClipboard>
-#include <QMimeData>
-
-#include "projectfile.h"
-#include "checkstatistics.h"
-#include "common.h"
 
 static const QString CPPCHECK("cppcheck");
 

gui/statsdialog.h

@@ -19,11 +19,12 @@
 #ifndef STATSDIALOG_H
 #define STATSDIALOG_H
 
+#include "ui_stats.h"
+
 #include <QDialog>
 #ifdef HAVE_QCHART
 #include <QtCharts>
 #endif
-#include "ui_stats.h"
 
 class ProjectFile;
 class CheckStatistics;

gui/test/benchmark/simple/benchmarksimple.cpp

@@ -16,15 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QObject>
-#include <QFile>
-#include <QString>
-#include <QByteArray>
-#include <sstream>
 #include "benchmarksimple.h"
-#include "tokenize.h"
+
-#include "token.h"
 #include "settings.h"
+#include "token.h"
+#include "tokenize.h"
+
+#include <sstream>
+
+#include <QByteArray>
+#include <QFile>
+#include <QObject>
+#include <QString>
 
 void BenchmarkSimple::tokenize()
 {

gui/test/benchmark/simple/benchmarksimple.h

@@ -16,10 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtTest/QtTest>
-#include <QObject>
 #include "errorlogger.h"
 
+#include <QObject>
+#include <QtTest/QtTest>
+
 class BenchmarkSimple : public QObject, public ErrorLogger {
     Q_OBJECT
 

gui/test/cppchecklibrarydata/testcppchecklibrarydata.h

@@ -16,9 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtTest/QtTest>
 #include "cppchecklibrarydata.h"
 
+#include <QtTest/QtTest>
+
 class TestCppcheckLibraryData : public QObject {
     Q_OBJECT
 

gui/test/filelist/testfilelist.cpp

@@ -16,12 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QObject>
-#include <QDir>
-#include <QString>
 #include "testfilelist.h"
+
 #include "filelist.h"
 
+#include <QDir>
+#include <QObject>
+#include <QString>
+
 void TestFileList::addFile()
 {
     // Accepted extensions: *.cpp, *.cxx, *.cc, *.c, *.c++, *.txx, *.tpp, *.ipp, *.ixx"

gui/test/filelist/testfilelist.h

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtTest/QtTest>
 #include <QObject>
+#include <QtTest/QtTest>
 
 class TestFileList : public QObject {
     Q_OBJECT

gui/test/projectfile/testprojectfile.cpp

@@ -16,11 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QObject>
 #include "testprojectfile.h"
+
 #include "projectfile.h"
 #include "settings.h"
 
+#include <QObject>
+
 // Mock...
 const char Settings::SafeChecks::XmlRootName[] = "safe-checks";
 const char Settings::SafeChecks::XmlClasses[] = "class-public";

gui/test/projectfile/testprojectfile.h

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtTest/QtTest>
 #include <QObject>
+#include <QtTest/QtTest>
 
 class TestProjectFile : public QObject {
     Q_OBJECT

gui/test/translationhandler/testtranslationhandler.cpp

@@ -16,10 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QObject>
 #include "testtranslationhandler.h"
+
 #include "translationhandler.h"
 
+#include <QObject>
+
 static const QStringList getTranslationNames(const TranslationHandler& handler)
 {
     QStringList names;

gui/test/translationhandler/testtranslationhandler.h

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QtTest/QtTest>
 #include <QObject>
+#include <QtTest/QtTest>
 
 class TestTranslationHandler : public QObject {
     Q_OBJECT

gui/test/xmlreportv2/testxmlreportv2.cpp

@@ -16,10 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QObject>
 #include "testxmlreportv2.h"
-#include "xmlreportv2.h"
+
 #include "erroritem.h"
+#include "xmlreportv2.h"
+
+#include <QObject>
 
 void TestXmlReportV2::readXml()
 {

gui/threadhandler.cpp

@@ -18,13 +18,14 @@
 
 #include "threadhandler.h"
 
-#include <QFileInfo>
-#include <QDebug>
-#include <QSettings>
-#include "common.h"
-#include "settings.h"
 #include "checkthread.h"
+#include "common.h"
 #include "resultsview.h"
+#include "settings.h"
+
+#include <QDebug>
+#include <QFileInfo>
+#include <QSettings>
 
 ThreadHandler::ThreadHandler(QObject *parent) :
     QObject(parent),

gui/threadhandler.h

@@ -20,13 +20,15 @@
 #ifndef THREADHANDLER_H
 #define THREADHANDLER_H
 
-#include <QObject>
+#include "suppressions.h"
-#include <QStringList>
+#include "threadresult.h"
+
+#include <set>
+
 #include <QDateTime>
 #include <QElapsedTimer>
-#include <set>
+#include <QObject>
-#include "threadresult.h"
+#include <QStringList>
-#include "suppressions.h"
 
 class ResultsView;
 class CheckThread;

gui/threadresult.cpp

@@ -18,11 +18,12 @@
 
 #include "threadresult.h"
 
-#include <QFile>
 #include "common.h"
 #include "erroritem.h"
 #include "errorlogger.h"
 
+#include <QFile>
+
 ThreadResult::ThreadResult() : QObject(), ErrorLogger(), mMaxProgress(0), mProgress(0), mFilesChecked(0), mTotalFiles(0)
 {
     //ctor

gui/threadresult.h

@@ -20,13 +20,14 @@
 #ifndef THREADRESULT_H
 #define THREADRESULT_H
 
-#include <QMutex>
-#include <QObject>
-#include <QStringList>
 #include "color.h"
 #include "errorlogger.h"
 #include "importproject.h"
 
+#include <QMutex>
+#include <QObject>
+#include <QStringList>
+
 class ErrorItem;
 
 /// @addtogroup GUI

gui/translationhandler.cpp

@@ -18,13 +18,14 @@
 
 #include "translationhandler.h"
 
+#include "common.h"
+
 #include <QApplication>
 #include <QFile>
+#include <QFileInfo>
 #include <QLocale>
 #include <QMessageBox>
-#include <QFileInfo>
 #include <QTranslator>
-#include "common.h"
 
 
 // Provide own translations for standard buttons. This (garbage) code is needed to enforce them to appear in .ts files even after "lupdate gui.pro"

gui/translationhandler.h

@@ -19,9 +19,9 @@
 #ifndef TRANSLATIONHANDLER_H
 #define TRANSLATIONHANDLER_H
 
-#include <QStringList>
-#include <QObject>
 #include <QList>
+#include <QObject>
+#include <QStringList>
 
 class QTranslator;
 

gui/txtreport.cpp

@@ -18,9 +18,10 @@
 
 #include "txtreport.h"
 
-#include <QDir>
 #include "erroritem.h"
 
+#include <QDir>
+
 TxtReport::TxtReport(const QString &filename) :
     Report(filename)
 {}

gui/txtreport.h

@@ -19,9 +19,10 @@
 #ifndef TXT_REPORT_H
 #define TXT_REPORT_H
 
+#include "report.h"
+
 #include <QString>
 #include <QTextStream>
-#include "report.h"
 
 /// @addtogroup GUI
 /// @{

gui/variablecontractsdialog.cpp

@@ -17,6 +17,7 @@
  */
 
 #include "variablecontractsdialog.h"
+
 #include "ui_variablecontractsdialog.h"
 
 #include <QRegExpValidator>

gui/xmlreport.cpp

@@ -18,9 +18,10 @@
 
 #include "xmlreport.h"
 
+#include "report.h"
+
 #include <QFile>
 #include <QXmlStreamReader>
-#include "report.h"
 
 static const char ResultElementName[] = "results";
 static const char VersionAttribute[] = "version";

gui/xmlreport.h

@@ -19,9 +19,10 @@
 #ifndef XML_REPORT_H
 #define XML_REPORT_H
 
+#include "report.h"
+
 #include <QString>
 #include <QList>
-#include "report.h"
 
 class ErrorItem;
 

gui/xmlreportv2.cpp

@@ -18,13 +18,14 @@
 
 #include "xmlreportv2.h"
 
+#include "cppcheck.h"
+#include "erroritem.h"
+#include "report.h"
+#include "xmlreport.h"
+
+#include <QDebug>
 #include <QDir>
 #include <QXmlStreamWriter>
-#include <QDebug>
-#include "report.h"
-#include "erroritem.h"
-#include "xmlreport.h"
-#include "cppcheck.h"
 
 static const QString ResultElementName = "results";
 static const QString CppcheckElementName = "cppcheck";

gui/xmlreportv2.h

@@ -19,9 +19,10 @@
 #ifndef XML_REPORTV2_H
 #define XML_REPORTV2_H
 
-#include <QString>
 #include "xmlreport.h"
 
+#include <QString>
+
 class QXmlStreamReader;
 class QXmlStreamWriter;
 

tools/triage/main.cpp

@@ -17,6 +17,7 @@
  */
 
 #include "mainwindow.h"
+
 #include <QApplication>
 
 int main(int argc, char *argv[])

tools/triage/mainwindow.cpp

@@ -17,19 +17,22 @@
  */
 
 #include "mainwindow.h"
+
 #include "ui_mainwindow.h"
+
+#include <cstdlib>
+#include <ctime>
+
 #include <QClipboard>
-#include <QProcess>
-#include <QFile>
-#include <QTextStream>
 #include <QDir>
 #include <QDirIterator>
-#include <QFileInfo>
+#include <QFile>
 #include <QFileDialog>
-#include <QProgressDialog>
+#include <QFileInfo>
 #include <QMimeDatabase>
-#include <ctime>
+#include <QProcess>
-#include <cstdlib>
+#include <QProgressDialog>
+#include <QTextStream>
 
 const QString WORK_FOLDER(QDir::homePath() + "/triage");
 const QString DACA2_PACKAGES(QDir::homePath() + "/daca2-packages");

tools/triage/mainwindow.h

@@ -19,9 +19,9 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
+#include <QFileSystemModel>
 #include <QMainWindow>
 #include <QString>
-#include <QFileSystemModel>
 
 class QListWidgetItem;
 class QTextStream;