Optimize usage of defglobal.h.

src/app/puzzle/carousel/vpcarrousel.h

@@ -29,13 +29,15 @@
 #ifndef VPCARROUSEL_H
 #define VPCARROUSEL_H
 
-#include <QWidget>
 #include <QComboBox>
 #include <QScrollArea>
 #include <QUuid>
+#include <QWidget>
 
 #include "../layout/layoutdef.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 namespace Ui
 {
@@ -54,6 +56,7 @@ struct VPCarrouselSheet
 class VPCarrousel : public QWidget
 {
     Q_OBJECT // NOLINT
+
 public:
     explicit VPCarrousel(const VPLayoutPtr &layout, QWidget *parent = nullptr);
     ~VPCarrousel() override = default;
@@ -87,7 +90,7 @@ public slots:
     void on_ActiveSheetChanged(const VPSheetPtr &sheet);
 
 protected:
-    void changeEvent(QEvent* event) override;
+    void changeEvent(QEvent *event) override;
 
 private slots:
 

src/app/puzzle/carousel/vpcarrouselpiece.h

@@ -28,18 +28,23 @@
 #ifndef VPCARROUSELPIECE_H
 #define VPCARROUSELPIECE_H
 
-#include <QMouseEvent>
 #include <QListWidgetItem>
+#include <QMouseEvent>
 
 #include "../layout/layoutdef.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class VPCarrouselPiece : public QListWidgetItem
 {
 public:
-    enum { Type = UserType + 1};
+    enum
+    {
+        Type = UserType + 1
+    };
 
-    explicit VPCarrouselPiece(const VPPiecePtr &piece, QListWidget* parent);
+    explicit VPCarrouselPiece(const VPPiecePtr &piece, QListWidget *parent);
     ~VPCarrouselPiece() override = default;
 
     /**
@@ -60,7 +65,6 @@ public:
      */
     auto CreatePieceIcon(const QSize &size, bool isDragIcon = false) const -> QIcon;
 
-
 private:
     // cppcheck-suppress unknownMacro
     Q_DISABLE_COPY_MOVE(VPCarrouselPiece) // NOLINT

src/app/puzzle/carousel/vpmimedatapiece.h

@@ -34,7 +34,9 @@
 #include <QUuid>
 
 #include "../layout/layoutdef.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class VPMimeDataPiece : public QMimeData
 {

src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.h

@@ -30,11 +30,13 @@
 
 #include <QWidget>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 namespace Ui
 {
-    class PuzzlePreferencesConfigurationPage;
+class PuzzlePreferencesConfigurationPage;
 }
 
 class PuzzlePreferencesConfigurationPage : public QWidget
@@ -48,7 +50,7 @@ public:
     auto Apply() -> QStringList;
 
 protected:
-    void changeEvent(QEvent* event) override;
+    void changeEvent(QEvent *event) override;
 
 private:
     // cppcheck-suppress unknownMacro

src/app/puzzle/dialogs/dialogpuzzlepreferences.h

@@ -30,11 +30,13 @@
 
 #include <QDialog>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 namespace Ui
 {
-    class DialogPuzzlePreferences;
+class DialogPuzzlePreferences;
 }
 
 class PuzzlePreferencesConfigurationPage;
@@ -56,7 +58,7 @@ signals:
 protected:
     void showEvent(QShowEvent *event) override;
     void resizeEvent(QResizeEvent *event) override;
-    void changeEvent(QEvent* event) override;
+    void changeEvent(QEvent *event) override;
 
 private slots:
     void Apply();

src/app/puzzle/dialogs/dialogsavemanuallayout.h

@@ -30,6 +30,7 @@
 
 #include "../vlayout/dialogs/vabstractlayoutdialog.h"
 #include "../vlayout/vlayoutdef.h"
+#include "../vmisc/defglobal.h"
 
 namespace Ui
 {
@@ -57,7 +58,7 @@ public:
     void SetShowGrainline(bool show);
     auto IsShowGrainline() const -> bool;
 
-    void SetDestinationPath(const QString& cmdDestinationPath);
+    void SetDestinationPath(const QString &cmdDestinationPath);
 
     auto IsTextAsPaths() const -> bool;
     void SetTextAsPaths(bool textAsPaths);
@@ -86,7 +87,7 @@ private:
     bool m_consoleExport;
 
     static auto SupportPSTest() -> bool;
-    static auto InitFormats() -> QVector<std::pair<QString, LayoutExportFormats> >;
+    static auto InitFormats() -> QVector<std::pair<QString, LayoutExportFormats>>;
 
     void RemoveFormatFromList(LayoutExportFormats format);
 

src/app/puzzle/dialogs/vpdialogabout.h

@@ -31,11 +31,13 @@
 
 #include <QDialog>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 namespace Ui
 {
-    class VPDialogAbout;
+class VPDialogAbout;
 }
 
 class VPDialogAbout : public QDialog
@@ -47,7 +49,7 @@ public:
     ~VPDialogAbout() override;
 
 protected:
-    void changeEvent(QEvent* event) override;
+    void changeEvent(QEvent *event) override;
     void showEvent(QShowEvent *event) override;
 
 private:

src/app/puzzle/scene/vpgraphicssheet.h

@@ -33,7 +33,9 @@
 #include <QPainter>
 
 #include "../layout/layoutdef.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class VPLayout;
 
@@ -41,7 +43,7 @@ class VPGraphicsSheet : public QGraphicsItem
 {
 public:
     explicit VPGraphicsSheet(const VPLayoutPtr &layout, QGraphicsItem *parent = nullptr);
-    ~VPGraphicsSheet() override =default;
+    ~VPGraphicsSheet() override = default;
 
     auto boundingRect() const -> QRectF override;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;

src/app/puzzle/scene/vpgraphicstilegrid.h

@@ -33,7 +33,6 @@
 #include <QPainter>
 #include <QUuid>
 
-#include "../vmisc/def.h"
 #include "../layout/layoutdef.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)

src/app/puzzle/vpcommandline.h

@@ -28,19 +28,22 @@
 #ifndef VPCOMMANDLINE_H
 #define VPCOMMANDLINE_H
 
-#include <memory>
-#include <QCoreApplication>
 #include <QCommandLineParser>
+#include <QCoreApplication>
 #include <ciso646>
+#include <memory>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class VPCommandLine;
 using VPCommandLinePtr = std::shared_ptr<VPCommandLine>;
 
-class VPCommandLine: public QObject
+class VPCommandLine : public QObject
 {
     Q_OBJECT // NOLINT
+
 public:
     ~VPCommandLine() override = default;
 
@@ -57,12 +60,14 @@ public:
     auto IsNoScalingEnabled() const -> bool;
 
     Q_NORETURN void ShowHelp(int exitCode = 0);
+
 protected:
     VPCommandLine();
 
     /** @brief create the single instance of the class inside vpapplication */
     static auto Instance() -> VPCommandLinePtr;
     static void ProcessInstance(VPCommandLinePtr &instance, const QStringList &arguments);
+
 private:
     // cppcheck-suppress unknownMacro
     Q_DISABLE_COPY_MOVE(VPCommandLine) // NOLINT
@@ -74,7 +79,7 @@ private:
     /** @brief add options to the QCommandLineParser that there are in the cmd can be */
     void InitCommandLineOptions();
 
-    auto IsOptionSet(const QString &option)const -> bool;
+    auto IsOptionSet(const QString &option) const -> bool;
     auto OptionValue(const QString &option) const -> QString;
     auto OptionValues(const QString &option) const -> QStringList;
 };

src/app/puzzle/vptilefactory.cpp

@@ -8,8 +8,8 @@
 #include "../vmisc/literals.h"
 #include "../vmisc/vcommonsettings.h"
 #include "../vwidgets/vmaingraphicsscene.h"
+#include "layout/vplayout.h"
 #include "layout/vpsheet.h"
-#include "qobject.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"

src/app/puzzle/vptilefactory.h

@@ -29,11 +29,11 @@
 #ifndef VPTILEFACTORY_H
 #define VPTILEFACTORY_H
 
-#include <QtMath>
 #include <QObject>
+#include <QtMath>
 
-#include "layout/vplayout.h"
 #include "../ifc/ifcdef.h"
+#include "layout/layoutdef.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"

src/app/tape/dialogs/dialogabouttape.h

@@ -31,11 +31,13 @@
 
 #include <QDialog>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 namespace Ui
 {
-    class DialogAboutTape;
+class DialogAboutTape;
 }
 
 class DialogAboutTape : public QDialog
@@ -47,7 +49,7 @@ public:
     ~DialogAboutTape() override;
 
 protected:
-    void changeEvent(QEvent* event) override;
+    void changeEvent(QEvent *event) override;
     void showEvent(QShowEvent *event) override;
 
 private:

src/app/tape/dialogs/dialogmdatabase.h

@@ -31,11 +31,13 @@
 
 #include <QDialog>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 namespace Ui
 {
-    class DialogMDataBase;
+class DialogMDataBase;
 }
 
 class QTreeWidgetItem;
@@ -56,7 +58,7 @@ public:
     static auto ImgTag(const QString &number) -> QString;
 
 protected:
-    void changeEvent(QEvent* event) override;
+    void changeEvent(QEvent *event) override;
     auto eventFilter(QObject *target, QEvent *event) -> bool override;
 
 private slots:

src/app/tape/dialogs/dialogtapepreferences.h

@@ -31,11 +31,13 @@
 
 #include <QDialog>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 namespace Ui
 {
-    class DialogTapePreferences;
+class DialogTapePreferences;
 }
 
 class TapePreferencesConfigurationPage;
@@ -51,14 +53,16 @@ public:
     ~DialogTapePreferences() override;
 signals:
     void UpdateProperties();
+
 protected:
     void showEvent(QShowEvent *event) override;
     void resizeEvent(QResizeEvent *event) override;
-    void changeEvent(QEvent* event) override;
+    void changeEvent(QEvent *event) override;
 private slots:
     void Apply();
     void Ok();
     void PageChanged(QListWidgetItem *current, QListWidgetItem *previous);
+
 private:
     // cppcheck-suppress unknownMacro
     Q_DISABLE_COPY_MOVE(DialogTapePreferences) // NOLINT

src/app/valentina/core/vformulapropertyeditor.h

@@ -29,13 +29,15 @@
 #ifndef VFORMULAPROPERTYEDITOR_H
 #define VFORMULAPROPERTYEDITOR_H
 
-#include <QWidget>
-#include <QToolButton>
-#include <QLineEdit>
 #include <QLabel>
+#include <QLineEdit>
+#include <QToolButton>
+#include <QWidget>
 
 #include "../vpatterndb/vformula.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class VFormulaPropertyEditor : public QWidget
 {
@@ -56,7 +58,7 @@ public:
 
 signals:
     //! This is emitted, when the user changes the color
-    void dataChangedByUser(const VFormula &GetFormula, VFormulaPropertyEditor* editor);
+    void dataChangedByUser(const VFormula &GetFormula, VFormulaPropertyEditor *editor);
 
     void dataChanged();
 
@@ -71,9 +73,8 @@ private:
     // cppcheck-suppress unknownMacro
     Q_DISABLE_COPY_MOVE(VFormulaPropertyEditor) // NOLINT
     VFormula m_formula{};
-    QToolButton* m_ToolButton{nullptr};
+    QToolButton *m_ToolButton{nullptr};
-    QLabel* m_TextLabel{nullptr};
+    QLabel *m_TextLabel{nullptr};
 };
 
-
 #endif // VFORMULAPROPERTYEDITOR_H

src/app/valentina/dialogs/dialogaboutapp.h

@@ -31,11 +31,13 @@
 
 #include <QDialog>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 namespace Ui
 {
-    class DialogAboutApp;
+class DialogAboutApp;
 }
 
 class DialogAboutApp : public QDialog

src/app/valentina/dialogs/dialogdatetimeformats.h

@@ -29,15 +29,17 @@
 #ifndef DIALOGDATETIMEFORMATS_H
 #define DIALOGDATETIMEFORMATS_H
 
-#include <QDialog>
 #include <QDate>
+#include <QDialog>
 #include <QTime>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 namespace Ui
 {
-    class DialogDateTimeFormats;
+class DialogDateTimeFormats;
 }
 
 class QListWidgetItem;

src/app/valentina/dialogs/dialogknownmaterials.h

@@ -31,11 +31,13 @@
 
 #include <QDialog>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 namespace Ui
 {
-    class DialogKnownMaterials;
+class DialogKnownMaterials;
 }
 
 class DialogKnownMaterials : public QDialog

src/app/valentina/dialogs/dialoglayoutprogress.h

@@ -33,11 +33,13 @@
 #include <QElapsedTimer>
 #include <QTimer>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 namespace Ui
 {
-    class DialogLayoutProgress;
+class DialogLayoutProgress;
 }
 
 class DialogLayoutProgress : public QDialog

src/app/valentina/dialogs/dialogpatternproperties.h

@@ -33,7 +33,9 @@
 #include <QMap>
 #include <QPointer>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class VPattern;
 class VContainer;
@@ -43,17 +45,19 @@ class QTemporaryFile;
 
 namespace Ui
 {
-    class DialogPatternProperties;
+class DialogPatternProperties;
 }
 
 class DialogPatternProperties : public QDialog
 {
     Q_OBJECT // NOLINT
+
 public:
     explicit DialogPatternProperties(VPattern *doc, VContainer *pattern, QWidget *parent = nullptr);
     ~DialogPatternProperties() override;
 signals:
     void UpddatePieces();
+
 protected:
     auto eventFilter(QObject *object, QEvent *event) -> bool override;
 private slots:
@@ -65,6 +69,7 @@ private slots:
     void ShowImage();
     void BrowseLabelPath();
     void LabelPathChanged(const QString &text);
+
 private:
     // cppcheck-suppress unknownMacro
     Q_DISABLE_COPY_MOVE(DialogPatternProperties) // NOLINT

src/app/valentina/dialogs/dialogpreferences.h

@@ -31,11 +31,13 @@
 
 #include <QDialog>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 namespace Ui
 {
-    class DialogPreferences;
+class DialogPreferences;
 }
 
 class PreferencesConfigurationPage;
@@ -53,12 +55,14 @@ public:
     ~DialogPreferences() override;
 signals:
     void UpdateProperties();
+
 protected:
     void showEvent(QShowEvent *event) override;
     void resizeEvent(QResizeEvent *event) override;
-    void changeEvent(QEvent* event) override;
+    void changeEvent(QEvent *event) override;
 private slots:
     void PageChanged(QListWidgetItem *current, QListWidgetItem *previous);
+
 private:
     // cppcheck-suppress unknownMacro
     Q_DISABLE_COPY_MOVE(DialogPreferences) // NOLINT

src/app/valentina/dialogs/vwidgetdetails.h

@@ -31,7 +31,9 @@
 
 #include <QWidget>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class VAbstractPattern;
 class VContainer;
@@ -40,7 +42,7 @@ class QTableWidgetItem;
 
 namespace Ui
 {
-    class VWidgetDetails;
+class VWidgetDetails;
 }
 
 class VWidgetDetails : public QWidget
@@ -60,7 +62,7 @@ public slots:
     void ToggledPiece(quint32 id);
 
 protected:
-    void changeEvent ( QEvent * event) override;
+    void changeEvent(QEvent *event) override;
 
 private slots:
     void InLayoutStateChanged(int row, int column);

src/app/valentina/dialogs/vwidgetgroups.h

@@ -29,9 +29,11 @@
 #ifndef VWIDGETGROUPS_H
 #define VWIDGETGROUPS_H
 
-#include <QWidget>
 #include "../vmisc/typedef.h"
+#include <QWidget>
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class QTableWidgetItem;
 class VAbstractPattern;
@@ -39,7 +41,7 @@ struct VGroupData;
 
 namespace Ui
 {
-    class VWidgetGroups;
+class VWidgetGroups;
 }
 
 class VWidgetGroups : public QWidget

src/libs/fervor/fvavailableupdate.h

@@ -28,11 +28,14 @@
 #include <QUrl>
 #include <QtGlobal>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class FvAvailableUpdate final : public QObject
 {
     Q_OBJECT // NOLINT
+
 public:
     explicit FvAvailableUpdate(QObject *parent = nullptr);
 

src/libs/fervor/fvupdatewindow.h

@@ -28,13 +28,15 @@
 #include <QString>
 #include <QtGlobal>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class QGraphicsScene;
 
 namespace Ui
 {
-    class FvUpdateWindow;
+class FvUpdateWindow;
 }
 
 class FvUpdateWindow : public QDialog
@@ -52,7 +54,7 @@ private:
     // cppcheck-suppress unknownMacro
     Q_DISABLE_COPY_MOVE(FvUpdateWindow) // NOLINT
 
-    Ui::FvUpdateWindow*	m_ui;
+    Ui::FvUpdateWindow *m_ui;
 };
 
 #endif // FVUPDATEWINDOW_H

src/libs/qmuparser/qmuparsererror.h

@@ -34,7 +34,9 @@
 #include "qmuparserdef.h"
 #include "qmutranslation.h"
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 /** @file
     @brief This file defines the error class used by the parser.

src/libs/vdxf/libdxfrw/intern/dxfreader.h

@@ -14,11 +14,15 @@
 #define DXFREADER_H
 
 #include "drw_textcodec.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
-class dxfReader {
+class dxfReader
+{
 public:
-    enum TYPE {
+    enum TYPE
+    {
         STRING,
         INT32,
         INT64,
@@ -27,6 +31,7 @@ public:
         INVALID
     };
     TYPE type;
+
 public:
     explicit dxfReader(std::istream *stream)
       : type(INVALID),
@@ -37,7 +42,8 @@ public:
         int64(),
         skip(),
         decoder()
-    {}
+    {
+    }
 
     virtual ~dxfReader() = default;
     auto readRec(int *codeData) -> bool;
@@ -51,10 +57,10 @@ public:
     auto getInt64() const -> unsigned long long int { return int64; }
     auto getBool() const -> bool { return (intData == 0) ? false : true; }
     auto getVersion() const -> int { return decoder.getVersion(); }
-    void setVersion(const std::string &v, bool dxfFormat){decoder.setVersion(v, dxfFormat);}
+    void setVersion(const std::string &v, bool dxfFormat) { decoder.setVersion(v, dxfFormat); }
-    void setCodePage(const std::string &c){decoder.setCodePage(c, true);}
+    void setCodePage(const std::string &c) { decoder.setCodePage(c, true); }
     auto getCodePage() const -> std::string { return decoder.getCodePage(); }
-    void setIgnoreComments(const bool bValue) {m_bIgnoreComments = bValue;}
+    void setIgnoreComments(const bool bValue) { m_bIgnoreComments = bValue; }
 
 protected:
     virtual auto readCode(int *code) -> bool = 0; // return true if successful (not EOF)
@@ -71,20 +77,24 @@ protected:
     std::istream *filestr;
     std::string strData;
     double doubleData;
-    signed int intData; //32 bits integer
+    signed int intData;           // 32 bits integer
-    unsigned long long int int64; //64 bits integer
+    unsigned long long int int64; // 64 bits integer
-    bool skip; //set to true for ascii dxf, false for binary
+    bool skip;                    // set to true for ascii dxf, false for binary
+
 private:
     Q_DISABLE_COPY_MOVE(dxfReader) // NOLINT
     DRW_TextCodec decoder;
-    bool m_bIgnoreComments {false};
+    bool m_bIgnoreComments{false};
 };
 
-class dxfReaderBinary : public dxfReader {
+class dxfReaderBinary : public dxfReader
+{
 public:
     explicit dxfReaderBinary(std::istream *stream)
       : dxfReader(stream)
-    {skip = false; }
+    {
+        skip = false;
+    }
 
     virtual ~dxfReaderBinary() = default;
     virtual auto readCode(int *code) -> bool override;
@@ -98,11 +108,14 @@ public:
     virtual auto readBool() -> bool override;
 };
 
-class dxfReaderAscii final : public dxfReader {
+class dxfReaderAscii final : public dxfReader
+{
 public:
     explicit dxfReaderAscii(std::istream *stream)
       : dxfReader(stream)
-    {skip = true; }
+    {
+        skip = true;
+    }
 
     virtual ~dxfReaderAscii() = default;
     virtual auto readCode(int *code) -> bool override;

src/libs/vhpgl/vhpglengine.h

@@ -28,7 +28,6 @@
 #ifndef VHPGLENGINE_H
 #define VHPGLENGINE_H
 
-#include "../vmisc/def.h"
 #include <QPoint>
 #include <QSize>
 #include <QString>

src/libs/vlayout/dialogs/dialoglayoutscale.h

@@ -30,11 +30,13 @@
 
 #include <QDialog>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 namespace Ui
 {
-    class DialogLayoutScale;
+class DialogLayoutScale;
 }
 
 class DialogLayoutScale final : public QDialog

src/libs/vlayout/dialogs/vabstractlayoutdialog.h

@@ -32,14 +32,17 @@
 #include <QComboBox>
 #include <QDialog>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 enum class Unit : qint8;
 
 class VAbstractLayoutDialog : public QDialog
 {
 public:
-    enum class PaperSizeTemplate : qint8 {
+    enum class PaperSizeTemplate : qint8
+    {
         A0 = 0,
         A1,
         A2,
@@ -73,7 +76,6 @@ protected:
 
     static auto RoundTemplateSize(qreal width, qreal height, Unit unit) -> QSizeF;
 
-
 private:
     Q_DISABLE_COPY_MOVE(VAbstractLayoutDialog) // NOLINT
 };

src/libs/vmisc/dialogs/dialogexporttocsv.h

@@ -31,11 +31,13 @@
 
 #include <QDialog>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../defglobal.h"
+#endif
 
 namespace Ui
 {
-    class DialogExportToCSV;
+class DialogExportToCSV;
 }
 
 class DialogExportToCSV : public QDialog
@@ -61,7 +63,7 @@ public:
     static auto MakeHelpSeparatorList() -> QString;
 
 protected:
-    virtual void changeEvent(QEvent* event) override;
+    virtual void changeEvent(QEvent *event) override;
     virtual void showEvent(QShowEvent *event) override;
 
 private:

src/libs/vmisc/dialogs/dialogselectlanguage.h

@@ -30,7 +30,9 @@
 
 #include <QDialog>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../defglobal.h"
+#endif
 
 namespace Ui
 {

src/libs/vmisc/vlockguard.h

@@ -32,7 +32,7 @@
 
 #include <QtGlobal>
 #ifdef Q_OS_WIN
-#  include <qt_windows.h>
+#include <qt_windows.h>
 #endif /*Q_OS_WIN*/
 
 #include <QString>
@@ -41,7 +41,10 @@
 #if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
 #endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 #include <QFileInfo>
 #include <QLockFile>
@@ -53,18 +56,16 @@
  *
  * On older Qt lock assumed always taken and compile-time warning is shown.
  *
-*/
+ */
-template <typename Guarded>
+template <typename Guarded> class VLockGuard
-class VLockGuard
 {
 public:
-    explicit VLockGuard(const QString& lockName, int stale = 0, int timeout = 0);
+    explicit VLockGuard(const QString &lockName, int stale = 0, int timeout = 0);
 
-    template <typename Alloc>
+    template <typename Alloc> VLockGuard(const QString &lockName, Alloc a, int stale = 0, int timeout = 0);
-    VLockGuard(const QString& lockName, Alloc a, int stale = 0, int timeout=0);
 
     template <typename Alloc, typename Delete>
-    VLockGuard(const QString& lockName, Alloc a, Delete d, int stale = 0, int timeout=0);
+    VLockGuard(const QString &lockName, Alloc a, Delete d, int stale = 0, int timeout = 0);
 
     auto GetProtected() const -> const QSharedPointer<Guarded> &;
     auto GetLockError() const -> int;
@@ -87,7 +88,10 @@ private:
 //---------------------------------------------------------------------------------------------------------------------
 template <typename Guarded>
 VLockGuard<Guarded>::VLockGuard(const QString &lockName, int stale, int timeout)
-    : holder(nullptr), lockError(0), lockFile(), lock(nullptr)
+  : holder(nullptr),
+    lockError(0),
+    lockFile(),
+    lock(nullptr)
 {
     if (TryLock(lockName, stale, timeout))
     {
@@ -96,11 +100,15 @@ VLockGuard<Guarded>::VLockGuard(const QString &lockName, int stale, int timeout)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-//using allocator lambdas seems logically better than supplying pointer, because we will take ownership of allocated
+// using allocator lambdas seems logically better than supplying pointer, because we will take ownership of allocated
-//object
+// object
-template <typename Guarded> template <typename Alloc>
+template <typename Guarded>
-VLockGuard<Guarded>::VLockGuard(const QString& lockName, Alloc a, int stale, int timeout)
+template <typename Alloc>
-    : holder(nullptr), lockError(0), lockFile(), lock(nullptr)
+VLockGuard<Guarded>::VLockGuard(const QString &lockName, Alloc a, int stale, int timeout)
+  : holder(nullptr),
+    lockError(0),
+    lockFile(),
+    lock(nullptr)
 {
     if (TryLock(lockName, stale, timeout))
     {
@@ -109,9 +117,13 @@ VLockGuard<Guarded>::VLockGuard(const QString& lockName, Alloc a, int stale, int
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-template <typename Guarded> template <typename Alloc, typename Delete>
+template <typename Guarded>
-VLockGuard<Guarded>::VLockGuard(const QString& lockName, Alloc a, Delete d, int stale, int timeout)
+template <typename Alloc, typename Delete>
-    : holder(nullptr), lockError(0), lockFile(), lock(nullptr)
+VLockGuard<Guarded>::VLockGuard(const QString &lockName, Alloc a, Delete d, int stale, int timeout)
+  : holder(nullptr),
+    lockError(0),
+    lockFile(),
+    lock(nullptr)
 {
     if (TryLock(lockName, stale, timeout))
     {
@@ -138,8 +150,7 @@ template <typename Guarded> inline auto VLockGuard<Guarded>::IsLocked() const ->
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-template<typename Guarded>
+template <typename Guarded> inline void VLockGuard<Guarded>::Unlock()
-inline void VLockGuard<Guarded>::Unlock()
 {
     if (IsLocked())
     {
@@ -191,27 +202,27 @@ template <typename Guarded> auto VLockGuard<Guarded>::TryLock(const QString &loc
     return res;
 }
 
-//use pointer and function below to persistent things like class-member, because lock is taken by constructor
+// use pointer and function below to persistent things like class-member, because lock is taken by constructor
-//helper functions allow to write shorter creating and setting new lock-pointer
+// helper functions allow to write shorter creating and setting new lock-pointer
 
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_INTEL(1418)
 
 template <typename Guarded>
-void VlpCreateLock(QSharedPointer<VLockGuard<Guarded>>& r, const QString& lockName, int stale = 0, int timeout = 0)
+void VlpCreateLock(QSharedPointer<VLockGuard<Guarded>> &r, const QString &lockName, int stale = 0, int timeout = 0)
 {
     r.reset(new VLockGuard<Guarded>(lockName, stale, timeout));
 }
 
 template <typename Guarded, typename Alloc>
-void VlpCreateLock(QSharedPointer<VLockGuard<Guarded>>& r, const QString& lockName, Alloc a, int stale = 0,
+void VlpCreateLock(QSharedPointer<VLockGuard<Guarded>> &r, const QString &lockName, Alloc a, int stale = 0,
                    int timeout = 0)
 {
     r.reset(new VLockGuard<Guarded>(lockName, a, stale, timeout));
 }
 
 template <typename Guarded, typename Alloc, typename Del>
-void VlpCreateLock(QSharedPointer<VLockGuard<Guarded>>& r, const QString& lockName, Alloc a, Del d, int stale = 0,
+void VlpCreateLock(QSharedPointer<VLockGuard<Guarded>> &r, const QString &lockName, Alloc a, Del d, int stale = 0,
                    int timeout = 0)
 {
     r.reset(new VLockGuard<Guarded>(lockName, a, d, stale, timeout));

src/libs/vobj/vobjengine.cpp

@@ -40,14 +40,14 @@
 #include <QString>
 #include <QTextStream>
 #include <QVector>
-#include <QtDebug>
 #include <Qt>
+#include <QtDebug>
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 #include "../vmisc/diagnostic.h"
 #endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
 
-#include "../vmisc/vmath.h"
+#include "../vmisc/defglobal.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
 #include "../vmisc/backport/text.h"
@@ -65,28 +65,31 @@ class QRectF;
 //---------------------------------------------------------------------------------------------------------------------
 static inline auto svgEngineFeatures() -> QPaintEngine::PaintEngineFeatures
 {
-QT_WARNING_PUSH
+    QT_WARNING_PUSH
-QT_WARNING_DISABLE_CLANG("-Wsign-conversion")
+    QT_WARNING_DISABLE_CLANG("-Wsign-conversion")
-// cppcheck-suppress unknownMacro
+    // cppcheck-suppress unknownMacro
-QT_WARNING_DISABLE_INTEL(68)
+    QT_WARNING_DISABLE_INTEL(68)
-QT_WARNING_DISABLE_INTEL(2022)
+    QT_WARNING_DISABLE_INTEL(2022)
 
-    return QPaintEngine::PaintEngineFeatures(
+    return QPaintEngine::PaintEngineFeatures(QPaintEngine::AllFeatures & ~QPaintEngine::PatternBrush &
-        QPaintEngine::AllFeatures
+                                             ~QPaintEngine::PerspectiveTransform & ~QPaintEngine::ConicalGradientFill &
-        & ~QPaintEngine::PatternBrush
+                                             ~QPaintEngine::PorterDuff);
-        & ~QPaintEngine::PerspectiveTransform
-        & ~QPaintEngine::ConicalGradientFill
-        & ~QPaintEngine::PorterDuff);
 
-QT_WARNING_POP
+    QT_WARNING_POP
 }
 
 //---------------------------------------------------------------------------------------------------------------------
 VObjEngine::VObjEngine()
-    :QPaintEngine(svgEngineFeatures()), stream(), globalPointsCount(0), outputDevice(), planeCount(0),
+  : QPaintEngine(svgEngineFeatures()),
-      size(), resolution(96), matrix()
+    stream(),
+    globalPointsCount(0),
+    outputDevice(),
+    planeCount(0),
+    size(),
+    resolution(96),
+    matrix()
 {
-    for (int i=0; i < MAX_POINTS; i++)
+    for (int i = 0; i < MAX_POINTS; i++)
     {
         points[i].x = 0;
         points[i].y = 0;
@@ -94,7 +97,7 @@ VObjEngine::VObjEngine()
 }
 
 #if defined(Q_CC_INTEL)
-#pragma warning( pop )
+#pragma warning(pop)
 #endif
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -129,7 +132,7 @@ auto VObjEngine::begin(QPaintDevice *pdev) -> bool
 
     if (size.isValid() == false)
     {
-        qWarning()<<"VObjEngine::begin(), size is not valid";
+        qWarning() << "VObjEngine::begin(), size is not valid";
         return false;
     }
 
@@ -155,7 +158,6 @@ void VObjEngine::updateState(const QPaintEngineState &state)
     // always stream full gstate, which is not required, but...
     flags |= QPaintEngine::AllDirty;
 
-
     if (flags & QPaintEngine::DirtyTransform)
     {
         matrix = state.transform(); // Save new matrix for moving paths
@@ -166,7 +168,7 @@ void VObjEngine::updateState(const QPaintEngineState &state)
 void VObjEngine::drawPath(const QPainterPath &path)
 {
     QPolygonF polygon = path.toFillPolygon(matrix);
-    polygon = MakePointsUnique(polygon);// Points must be unique
+    polygon = MakePointsUnique(polygon); // Points must be unique
     if (polygon.size() < 3)
     {
         return;
@@ -181,7 +183,7 @@ void VObjEngine::drawPath(const QPainterPath &path)
 
     for (auto &p : polygon)
     {
-        if ( num_points < MAX_POINTS )
+        if (num_points < MAX_POINTS)
         {
             points[num_points].x = p.x();
             points[num_points].y = p.y();
@@ -190,47 +192,47 @@ void VObjEngine::drawPath(const QPainterPath &path)
     }
 
     int offset = 0;
-    delaunay2d_t *res = delaunay2d_from(points, num_points);//Calculate faces
+    delaunay2d_t *res = delaunay2d_from(points, num_points); // Calculate faces
 
     QPointF pf[MAX_POINTS];
     // cppcheck-suppress unreadVariable
-    bool skipFace=false;//Need skip first face
+    bool skipFace = false; // Need skip first face
 
-    for (quint32 i = 0; i < res->num_faces; i++ )
+    for (quint32 i = 0; i < res->num_faces; i++)
     {
         if (offset == 0)
         {
-            skipFace=true;
+            skipFace = true;
         }
         else
         {
-            skipFace=false;
+            skipFace = false;
         }
         int num_verts = static_cast<int>(res->faces[offset]);
         offset++;
-        for ( int j = 0; j < num_verts; j++ )
+        for (int j = 0; j < num_verts; j++)
         {
             int p0 = static_cast<int>(res->faces[offset + j]);
             pf[j] = QPointF(points[p0].x, points[p0].y);
         }
-        if (skipFace == false )
+        if (skipFace == false)
         {
             QPolygonF face;
-            for ( int ind = 0; ind < num_verts; ind++ )
+            for (int ind = 0; ind < num_verts; ind++)
             {
                 face << QPointF(pf[ind]);
             }
             QPolygonF united = polygon.united(face);
             qint64 sqUnited = Square(united);
             if (sqUnited <= sq)
-            {// This face incide our base polygon.
+            { // This face incide our base polygon.
                 drawPolygon(pf, num_verts, QPaintEngine::OddEvenMode);
             }
         }
         offset += num_verts;
     }
 
-    delaunay2d_release(res);//Don't forget release data
+    delaunay2d_release(res); // Don't forget release data
     *stream << "s off" << Qt::endl;
 }
 
@@ -266,10 +268,11 @@ void VObjEngine::drawPoints(const QPointF *points, int pointCount)
 {
     for (int i = 0; i < pointCount; ++i)
     {
-        qreal x = ((points[i].x() - 0)/qFloor(size.width()/2.0)) - 1.0;
+        qreal x = ((points[i].x() - 0) / qFloor(size.width() / 2.0)) - 1.0;
-        qreal y = (((points[i].y() - 0)/qFloor(size.width()/2.0)) - 1.0)*-1;
+        qreal y = (((points[i].y() - 0) / qFloor(size.width() / 2.0)) - 1.0) * -1;
 
-        *stream << "v" << " " << QString::number(x, 'f', 6 ) << " " << QString::number(y, 'f', 6 ) << " "
+        *stream << "v"
+                << " " << QString::number(x, 'f', 6) << " " << QString::number(y, 'f', 6) << " "
                 << "0.000000" << Qt::endl;
         ++globalPointsCount;
     }
@@ -355,7 +358,7 @@ auto VObjEngine::Square(const QPolygonF &poly) const -> qint64
     qreal s, res = 0;
     qint64 sq = 0;
 
-    for (int i=0; i < n; i++)
+    for (int i = 0; i < n; i++)
     {
         x.append(poly.at(i).x());
         y.append(poly.at(i).y());
@@ -366,23 +369,23 @@ auto VObjEngine::Square(const QPolygonF &poly) const -> qint64
     {
         if (i == 0)
         {
-            s = x.at(i)*(y.at(n-1) - y.at(i+1)); //if i == 0, then y[i-1] replace on y[n-1]
+            s = x.at(i) * (y.at(n - 1) - y.at(i + 1)); // if i == 0, then y[i-1] replace on y[n-1]
             res += s;
         }
         else
         {
-            if (i == n-1)
+            if (i == n - 1)
             {
-                s = x.at(i)*(y.at(i-1) - y.at(0)); // if i == n-1, then y[i+1] replace on y[0]
+                s = x.at(i) * (y.at(i - 1) - y.at(0)); // if i == n-1, then y[i+1] replace on y[0]
                 res += s;
             }
             else
             {
-                s = x.at(i)*(y.at(i-1) - y.at(i+1));
+                s = x.at(i) * (y.at(i - 1) - y.at(i + 1));
                 res += s;
             }
         }
     }
-    sq = qFloor(qAbs(res/2.0));
+    sq = qFloor(qAbs(res / 2.0));
     return sq;
 }

src/libs/vobj/vobjengine.h

@@ -29,7 +29,6 @@
 #ifndef VOBJENGINE_H
 #define VOBJENGINE_H
 
-
 #include <QPaintEngine>
 #include <QPolygonF>
 #include <QRectF>
@@ -38,7 +37,9 @@
 #include <QtGlobal>
 
 #include "delaunay.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class QTextStream;
 

src/libs/vobj/vobjpaintdevice.h

@@ -29,14 +29,15 @@
 #ifndef VOBJPAINTDEVICE_H
 #define VOBJPAINTDEVICE_H
 
-
 #include <QPaintDevice>
 #include <QSharedPointer>
 #include <QSize>
 #include <QString>
 #include <QtGlobal>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class QIODevice;
 class VObjEngine;

src/libs/vpropertyexplorer/vpropertyfactorymanager.h

@@ -21,7 +21,6 @@
 #ifndef VPROPERTYFACTORYMANAGER_H
 #define VPROPERTYFACTORYMANAGER_H
 
-
 #include <QMetaObject>
 #include <QObject>
 #include <QString>
@@ -29,7 +28,9 @@
 
 #include "vpropertyexplorer_global.h"
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 namespace VPE
 {
@@ -41,9 +42,10 @@ class VPropertyFactoryManagerPrivate;
 class VPROPERTYEXPLORERSHARED_EXPORT VPropertyFactoryManager : public QObject
 {
     Q_OBJECT // NOLINT
+
 public:
     //! Constructor
-    explicit VPropertyFactoryManager(QObject* parent = nullptr);
+    explicit VPropertyFactoryManager(QObject *parent = nullptr);
 
     //! Destructor
     virtual ~VPropertyFactoryManager() override;
@@ -51,7 +53,7 @@ public:
     //! Register a factory to the factory manager
     //! Note that the manager takes ownership of the factory, so don't delete it.
     //! You can unregister a factory using unregisterFactory()
-    void registerFactory(const QString& type, VAbstractPropertyFactory* factory);
+    void registerFactory(const QString &type, VAbstractPropertyFactory *factory);
 
     //! Removes a factory from the manager.
     //! \param factory The factory to unregister
@@ -59,7 +61,7 @@ public:
     //! for are being removed
     //! \param delete_if_unused Determines whether the factory should be deleted, if it not used anymore by this
     //! manager. Default: true. Otherwise, if the factory is unused by this manager, ownership is being passed on.
-    void unregisterFactory(VAbstractPropertyFactory* factory, const QString& type = QString(),
+    void unregisterFactory(VAbstractPropertyFactory *factory, const QString &type = QString(),
                            bool delete_if_unused = true);
 
     //! Returns whether a factory is registered (and thus owned) by this factory manager
@@ -80,20 +82,21 @@ public:
                         const QString &default_value = QString()) -> VProperty *;
 
     //! Returns the default manager.
-    //static VPropertyFactoryManager* getDefaultManager();
+    // static VPropertyFactoryManager* getDefaultManager();
 
     //! Returns a list of all supported property types
     auto getSupportedTypes() -> QStringList;
 
 protected:
-    VPropertyFactoryManagerPrivate* d_ptr;
+    VPropertyFactoryManagerPrivate *d_ptr;
 
     //! The default manager
-    static VPropertyFactoryManager* DefaultManager;
+    static VPropertyFactoryManager *DefaultManager;
+
 private:
     Q_DISABLE_COPY_MOVE(VPropertyFactoryManager) // NOLINT
 };
 
-}
+} // namespace VPE
 
 #endif // VPROPERTYFACTORYMANAGER_H

src/libs/vpropertyexplorer/vpropertytreeview.h

@@ -21,7 +21,6 @@
 #ifndef VPROPERTYTREEVIEW_H
 #define VPROPERTYTREEVIEW_H
 
-
 #include <QMetaObject>
 #include <QObject>
 #include <QString>
@@ -30,7 +29,9 @@
 
 #include "vpropertyexplorer_global.h"
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 namespace VPE
 {
@@ -42,13 +43,14 @@ class VPropertyTreeViewPrivate;
 class VPROPERTYEXPLORERSHARED_EXPORT VPropertyTreeView : public QTreeView
 {
     Q_OBJECT // NOLINT
+
 public:
     //! Default constructor
     explicit VPropertyTreeView(QWidget *parent = nullptr);
 
     //! The destructor, taking a model and setting it to the tree view
     //! \param model The model to set as model for this tree view
-    explicit VPropertyTreeView(VPropertyModel* model, QWidget *parent = nullptr);
+    explicit VPropertyTreeView(VPropertyModel *model, QWidget *parent = nullptr);
 
     //! Destructor
     virtual ~VPropertyTreeView() override;
@@ -56,16 +58,15 @@ public:
     //! Sets the height for each row. Set this to 0 in order to let the standard delegate decide
     void setRowHeight(int height = 0, bool add_to_standard = false);
 
-
 protected:
     //! This method is called by the constructors to initialize the view
     virtual void init();
 
     //! protected constructor
-    VPropertyTreeView(VPropertyTreeViewPrivate* d, bool init_, QWidget *parent = nullptr);
+    VPropertyTreeView(VPropertyTreeViewPrivate *d, bool init_, QWidget *parent = nullptr);
 
     //! The protected data
-    VPropertyTreeViewPrivate* d_ptr;
+    VPropertyTreeViewPrivate *d_ptr;
 
 private:
     Q_DISABLE_COPY_MOVE(VPropertyTreeView) // NOLINT

src/libs/vtools/dialogs/support/dialogeditlabel.h

@@ -32,11 +32,13 @@
 #include <QDialog>
 #include <QMap>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 namespace Ui
 {
-    class DialogEditLabel;
+class DialogEditLabel;
 }
 
 struct VLabelTemplateLine;

src/libs/vtools/dialogs/support/dialogeditwrongformula.h

@@ -37,6 +37,10 @@
 #include <QTableWidgetItem>
 #include <QtGlobal>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
+#include "../vmisc/defglobal.h"
+#endif
+
 class VMeasurement;
 struct FormulaData;
 class VContainer;

src/libs/vtools/dialogs/support/dialogundo.h

@@ -35,6 +35,10 @@
 #include <QString>
 #include <QtGlobal>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
+#include "../vmisc/defglobal.h"
+#endif
+
 namespace Ui
 {
 class DialogUndo;

src/libs/vtools/visualization/path/vistoolarc.h

@@ -29,7 +29,6 @@
 #ifndef VISTOOLARC_H
 #define VISTOOLARC_H
 
-
 #include <QGraphicsItem>
 #include <QMetaObject>
 #include <QObject>
@@ -37,15 +36,18 @@
 #include <QtGlobal>
 
 #include "../vmisc/def.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 #include "vispath.h"
 
 class VisToolArc final : public VisPath
 {
     Q_OBJECT // NOLINT
+
 public:
     explicit VisToolArc(const VContainer *data, QGraphicsItem *parent = nullptr);
-    ~VisToolArc() override =default;
+    ~VisToolArc() override = default;
 
     void RefreshGeometry() override;
     void VisualMode(quint32 id) override;
@@ -55,8 +57,11 @@ public:
     void SetF1(const QString &expression);
     void SetF2(const QString &expression);
 
-    auto type() const -> int override {return Type;}
+    auto type() const -> int override { return Type; }
-    enum {Type = UserType + static_cast<int>(Vis::ToolArc)};
+    enum
+    {
+        Type = UserType + static_cast<int>(Vis::ToolArc)
+    };
 
     auto StickyEnd(qreal angle) const -> qreal;
 

src/libs/vtools/visualization/path/vistoolarcwithlength.h

@@ -29,7 +29,6 @@
 #ifndef VISTOOLARCWITHLENGTH_H
 #define VISTOOLARCWITHLENGTH_H
 
-
 #include <QGraphicsItem>
 #include <QMetaObject>
 #include <QObject>
@@ -38,14 +37,17 @@
 
 #include "../vmisc/def.h"
 #include "vispath.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class VisToolArcWithLength final : public VisPath
 {
     Q_OBJECT // NOLINT
+
 public:
     explicit VisToolArcWithLength(const VContainer *data, QGraphicsItem *parent = nullptr);
-    ~VisToolArcWithLength() override =default;
+    ~VisToolArcWithLength() override = default;
 
     void RefreshGeometry() override;
     void VisualMode(quint32 id) override;
@@ -55,10 +57,14 @@ public:
     void SetF1(const QString &expression);
     void SetLength(const QString &expression);
 
-    auto type() const -> int override {return Type;}
+    auto type() const -> int override { return Type; }
-    enum {Type = UserType + static_cast<int>(Vis::ToolArcWithLength)};
+    enum
+    {
+        Type = UserType + static_cast<int>(Vis::ToolArcWithLength)
+    };
 
     static auto CorrectAngle(qreal angle) -> qreal;
+
 private:
     Q_DISABLE_COPY_MOVE(VisToolArcWithLength) // NOLINT
     VScaledEllipse *m_arcCenter{nullptr};

src/libs/vwidgets/fancytabbar/fancytab.h

@@ -33,7 +33,9 @@
 #include <QIcon>
 #include <QPropertyAnimation>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class FancyTab final : public QObject
 {
@@ -41,6 +43,7 @@ class FancyTab final : public QObject
     Q_OBJECT // NOLINT
 
     Q_PROPERTY(double fader READ fader WRITE setFader)
+
 public:
     explicit FancyTab(QWidget *tabbar);
 

src/libs/vwidgets/fancytabbar/fancytabbar.h

@@ -31,14 +31,15 @@
 #define FANCYTABWIDGET_H
 
 #include <QIcon>
-#include <QWidget>
-#include <QTimer>
 #include <QPropertyAnimation>
+#include <QTimer>
+#include <QWidget>
+
+#include "../vmisc/defglobal.h"
+#include "fancytab.h"
 
 class QPainter;
 
-#include "fancytab.h"
-
 class FancyTabBar : public QWidget
 {
     Q_OBJECT // NOLINT
@@ -101,7 +102,13 @@ private slots:
 private:
     Q_DISABLE_COPY_MOVE(FancyTabBar) // NOLINT
 
-    enum Corner { OutsideBeginning, OutsideEnd, InsideBeginning, InsideEnd };
+    enum Corner
+    {
+        OutsideBeginning,
+        OutsideEnd,
+        InsideBeginning,
+        InsideEnd
+    };
 
     static const int m_rounding;
 
@@ -109,7 +116,7 @@ private:
     QRect m_hoverRect;
     int m_hoverIndex;
     int m_currentIndex;
-    QList<FancyTab*> m_attachedTabs;
+    QList<FancyTab *> m_attachedTabs;
     QTimer m_timerTriggerChangedSignal;
 
     auto GetCorner(const QRect &rect, const Corner corner) const -> QPoint;

src/libs/vwidgets/qtcolorpicker.cpp

@@ -45,24 +45,25 @@
 ****************************************************************************/
 
 #include <QApplication>
-#include <QPainter>
-#include <QPushButton>
 #include <QColorDialog>
-#include <QtCore/QMap>
-#include <QLayout>
-#include <QStyle>
-#include <QLabel>
-#include <QToolTip>
-#include <QPixmap>
 #include <QFocusEvent>
-#include <QPaintEvent>
 #include <QGridLayout>
 #include <QHideEvent>
 #include <QKeyEvent>
-#include <QShowEvent>
+#include <QLabel>
+#include <QLayout>
 #include <QMouseEvent>
+#include <QPaintEvent>
+#include <QPainter>
+#include <QPixmap>
+#include <QPushButton>
+#include <QShowEvent>
+#include <QStyle>
+#include <QToolTip>
+#include <QtCore/QMap>
 #include <cmath>
 
+#include "../vmisc/defglobal.h"
 #include "qtcolorpicker.h"
 
 /*! \class QtColorPicker
@@ -167,8 +168,7 @@ class ColorPickerItem : public QFrame
     Q_OBJECT // NOLINT
 
 public:
-    ColorPickerItem(const QColor &color = Qt::white, const QString &text = QString(),
+    ColorPickerItem(const QColor &color = Qt::white, const QString &text = QString(), QWidget *parent = 0);
-		      QWidget *parent = 0);
     ~ColorPickerItem();
 
     auto color() const -> QColor;
@@ -203,8 +203,7 @@ class ColorPickerPopup : public QFrame
     Q_OBJECT // NOLINT
 
 public:
-    ColorPickerPopup(int width, bool withColorDialog,
+    ColorPickerPopup(int width, bool withColorDialog, QWidget *parent = nullptr);
-               QWidget *parent = nullptr);
     ~ColorPickerPopup();
 
     void insertColor(const QColor &col, const QString &text, vsizetype index);
@@ -239,7 +238,7 @@ protected:
 
 private:
     Q_DISABLE_COPY_MOVE(ColorPickerPopup) // NOLINT
-    QMap<int, QMap<int, QWidget *> > widgetAt{};
+    QMap<int, QMap<int, QWidget *>> widgetAt{};
     QList<ColorPickerItem *> items{};
     QGridLayout *grid{nullptr};
     ColorPickerButton *moreButton{nullptr};
@@ -287,8 +286,7 @@ QtColorPicker::QtColorPicker(QWidget *parent, int columns, bool enableColorDialo
 
     // Create color grid popup and connect to it.
     popup = new ColorPickerPopup(columns, withColorDialog, this);
-    connect(popup, SIGNAL(selected(const QColor &)),
+    connect(popup, SIGNAL(selected(const QColor &)), SLOT(setCurrentColor(const QColor &)));
-	    SLOT(setCurrentColor(const QColor &)));
     connect(popup, SIGNAL(hid()), SLOT(popupClosed()));
 
     // Connect this push button's pressed() signal.
@@ -347,7 +345,8 @@ void QtColorPicker::buttonPressed(bool toggled)
 */
 void QtColorPicker::paintEvent(QPaintEvent *e)
 {
-    if (dirty) {
+    if (dirty)
+    {
         int iconSize = style()->pixelMetric(QStyle::PM_SmallIconSize);
         QPixmap pix(iconSize, iconSize);
         pix.fill(palette().button().color());
@@ -442,7 +441,6 @@ auto QtColorPicker::CustomColors() const -> QVector<QColor>
     return customColor;
 }
 
-
 /*!
     Makes \a color current. If \a color is not already in the color grid, it
     is inserted with the text "Custom".
@@ -483,7 +481,8 @@ void QtColorPicker::setCurrentColor(const QColor &color)
 void QtColorPicker::insertColor(const QColor &color, const QString &text, int index)
 {
     popup->insertColor(color, text, index);
-    if (!firstInserted) {
+    if (!firstInserted)
+    {
         col = color;
         setText(text);
         firstInserted = true;
@@ -582,7 +581,6 @@ ColorPickerPopup::ColorPickerPopup(int width, bool withColorDialog, QWidget *par
     regenerateGrid();
 }
 
-
 /*! \internal
 
     Destructs the popup widget.
@@ -602,8 +600,8 @@ ColorPickerPopup::~ColorPickerPopup()
 */
 auto ColorPickerPopup::find(const QColor &col) const -> ColorPickerItem *
 {
-    auto item = std::find_if(items.begin(), items.end(),
+    auto item =
-                             [col](ColorPickerItem *item){return item && item->color() == col;});
+        std::find_if(items.begin(), items.end(), [col](ColorPickerItem *item) { return item && item->color() == col; });
 
     if (item != items.end())
     {
@@ -666,7 +664,7 @@ void ColorPickerPopup::insertColor(const QColor &col, const QString &text, vsize
 */
 auto ColorPickerPopup::color(int index) const -> QColor
 {
-    if (index < 0 || index > static_cast<int> (items.count() - 1))
+    if (index < 0 || index > static_cast<int>(items.count() - 1))
     {
         return QColor();
     }
@@ -675,14 +673,14 @@ auto ColorPickerPopup::color(int index) const -> QColor
     return that->items.at(index)->color();
 }
 
-auto ColorPickerPopup::CustomItems() const ->QVector<ColorPickerItem *>
+auto ColorPickerPopup::CustomItems() const -> QVector<ColorPickerItem *>
 {
     QVector<ColorPickerItem *> customItems;
     customItems.reserve(items.size());
 
     for (auto *item : items)
     {
-        if (item!= nullptr && item->text() == QCoreApplication::translate("ColorPickerPopup", "Custom"))
+        if (item != nullptr && item->text() == QCoreApplication::translate("ColorPickerPopup", "Custom"))
         {
             customItems.append(item);
         }
@@ -700,7 +698,7 @@ void ColorPickerPopup::exec()
 
     QEventLoop e;
     eventLoop = &e;
-    (void) e.exec();
+    (void)e.exec();
     eventLoop = nullptr;
 }
 
@@ -779,7 +777,8 @@ void ColorPickerPopup::keyPressEvent(QKeyEvent *e)
             }
             else if (curRow > 0)
             {
-                --curRow; curCol = grid->columnCount() - 1;
+                --curRow;
+                curCol = grid->columnCount() - 1;
             }
             break;
         case Qt::Key_Right:
@@ -789,7 +788,8 @@ void ColorPickerPopup::keyPressEvent(QKeyEvent *e)
             }
             else if (curRow < grid->rowCount() - 1)
             {
-                ++curRow; curCol = 0;
+                ++curRow;
+                curCol = 0;
             }
             break;
         case Qt::Key_Up:
@@ -797,7 +797,8 @@ void ColorPickerPopup::keyPressEvent(QKeyEvent *e)
             {
                 --curRow;
             }
-            else curCol = 0;
+            else
+                curCol = 0;
             break;
         case Qt::Key_Down:
             if (curRow < grid->rowCount() - 1)
@@ -807,7 +808,8 @@ void ColorPickerPopup::keyPressEvent(QKeyEvent *e)
                 {
                     ++curRow;
                 }
-                else for (int i = 1; i < grid->columnCount(); ++i)
+                else
+                    for (int i = 1; i < grid->columnCount(); ++i)
                     {
                         if (!widgetAt[curRow + 1][i])
                         {
@@ -964,7 +966,8 @@ void ColorPickerPopup::regenerateGrid()
     // When the number of columns grows, the number of rows will
     // fall. There's no way to shrink a grid, so we create a new
     // one.
-    if (grid) delete grid;
+    if (grid)
+        delete grid;
     grid = new QGridLayout(this);
     grid->setContentsMargins(1, 1, 1, 1);
     grid->setSpacing(0);
@@ -1014,9 +1017,11 @@ void ColorPickerPopup::getColorFromDialog()
     Constructs a ColorPickerItem whose color is set to \a color, and
     whose name is set to \a text.
 */
-ColorPickerItem::ColorPickerItem(const QColor &color, const QString &text,
+ColorPickerItem::ColorPickerItem(const QColor &color, const QString &text, QWidget *parent)
-				     QWidget *parent)
+  : QFrame(parent),
-    : QFrame(parent), c(color), t(text), sel(false)
+    c(color),
+    t(text),
+    sel(false)
 {
     setToolTip(t);
     setFixedWidth(24);
@@ -1114,14 +1119,14 @@ void ColorPickerItem::paintEvent(QPaintEvent *)
     int w = width();  // width of cell in pixels
     int h = height(); // height of cell in pixels
 
-    p.setPen( QPen( Qt::gray, 0, Qt::SolidLine ) );
+    p.setPen(QPen(Qt::gray, 0, Qt::SolidLine));
 
     if (sel)
     {
         p.drawRect(1, 1, w - 3, h - 3);
     }
 
-    p.setPen( QPen( Qt::black, 0, Qt::SolidLine ) );
+    p.setPen(QPen(Qt::black, 0, Qt::SolidLine));
     p.drawRect(3, 3, w - 7, h - 7);
     p.fillRect(QRect(4, 4, w - 8, h - 8), QBrush(c));
 
@@ -1176,10 +1181,7 @@ void ColorPickerButton::mouseReleaseEvent(QMouseEvent *e)
 */
 void ColorPickerButton::keyPressEvent(QKeyEvent *e)
 {
-    if (e->key() == Qt::Key_Up
+    if (e->key() == Qt::Key_Up || e->key() == Qt::Key_Down || e->key() == Qt::Key_Left || e->key() == Qt::Key_Right)
-	|| e->key() == Qt::Key_Down
-	|| e->key() == Qt::Key_Left
-    || e->key() == Qt::Key_Right)
     {
         QCoreApplication::sendEvent(parent(), e);
     }
@@ -1199,10 +1201,7 @@ void ColorPickerButton::keyPressEvent(QKeyEvent *e)
 */
 void ColorPickerButton::keyReleaseEvent(QKeyEvent *e)
 {
-    if (e->key() == Qt::Key_Up
+    if (e->key() == Qt::Key_Up || e->key() == Qt::Key_Down || e->key() == Qt::Key_Left || e->key() == Qt::Key_Right)
-	|| e->key() == Qt::Key_Down
-	|| e->key() == Qt::Key_Left
-    || e->key() == Qt::Key_Right)
     {
         QCoreApplication::sendEvent(parent(), e);
     }
@@ -1216,7 +1215,6 @@ void ColorPickerButton::keyReleaseEvent(QKeyEvent *e)
     {
         QFrame::keyReleaseEvent(e);
     }
-
 }
 
 /*!
@@ -1257,16 +1255,15 @@ void ColorPickerButton::paintEvent(QPaintEvent *e)
     p.setPen(pen);
 
     p.drawRect(r.center().x() + offset - 4, r.center().y() + offset, 1, 1);
-    p.drawRect(r.center().x() + offset    , r.center().y() + offset, 1, 1);
+    p.drawRect(r.center().x() + offset, r.center().y() + offset, 1, 1);
     p.drawRect(r.center().x() + offset + 4, r.center().y() + offset, 1, 1);
     if (hasFocus())
     {
-        p.setPen( QPen( Qt::black, 0, Qt::SolidLine ) );
+        p.setPen(QPen(Qt::black, 0, Qt::SolidLine));
         p.drawRect(0, 0, width() - 1, height() - 1);
     }
 
     p.end();
-
 }
 
 #include "qtcolorpicker.moc"

src/libs/vwidgets/qtcolorpicker.h

@@ -46,15 +46,17 @@
 
 #ifndef QTCOLORPICKER_H
 #define QTCOLORPICKER_H
+#include <QColor>
 #include <QPushButton>
 #include <QtCore/QString>
-#include <QColor>
 
+#include <QFocusEvent>
 #include <QLabel>
 #include <QtCore/QEvent>
-#include <QFocusEvent>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class ColorPickerPopup;
 class ColorPickerItem;
@@ -66,8 +68,7 @@ class QtColorPicker : public QPushButton
     Q_PROPERTY(bool colorDialog READ colorDialogEnabled WRITE setColorDialogEnabled)
 
 public:
-    QtColorPicker(QWidget *parent = 0,
+    QtColorPicker(QWidget *parent = 0, int columns = -1, bool enableColorDialog = true);
-                  int columns = -1, bool enableColorDialog = true);
 
     ~QtColorPicker();
 

src/libs/vwidgets/velidedlabel.h

@@ -30,7 +30,9 @@
 
 #include <QFrame>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class VElidedLabel : public QFrame
 {
@@ -38,6 +40,7 @@ class VElidedLabel : public QFrame
     Q_PROPERTY(QString text READ text WRITE setText)
     Q_PROPERTY(bool IsElided READ IsElided)
     Q_PROPERTY(bool showElided READ ShowElided WRITE SetShowElided)
+
 public:
     explicit VElidedLabel(QWidget *parent = nullptr);
     explicit VElidedLabel(const QString &text, QWidget *parent = nullptr);

src/libs/vwidgets/vlineedit.cpp

@@ -35,6 +35,8 @@
 #include <QtDebug>
 #include <chrono>
 
+#include "../vmisc/defglobal.h"
+
 #if (defined(Q_CC_GNU) && Q_CC_GNU < 409) && !defined(Q_CC_CLANG)
 // DO NOT WORK WITH GCC 4.8
 #else
@@ -51,8 +53,8 @@ namespace
 class MultiSelectCompleter : public QCompleter
 {
 public:
-    explicit MultiSelectCompleter(QObject* parent=nullptr);
+    explicit MultiSelectCompleter(QObject *parent = nullptr);
-    virtual ~MultiSelectCompleter() =default;
+    virtual ~MultiSelectCompleter() = default;
 
     virtual auto pathFromIndex(const QModelIndex &index) const -> QString override;
     virtual auto splitPath(const QString &path) const -> QStringList override;
@@ -60,20 +62,21 @@ public:
 private:
     Q_DISABLE_COPY_MOVE(MultiSelectCompleter) // NOLINT
 };
-}
+} // namespace
 
-//MultiSelectCompleter
+// MultiSelectCompleter
 //---------------------------------------------------------------------------------------------------------------------
 MultiSelectCompleter::MultiSelectCompleter(QObject *parent)
   : QCompleter(parent)
-{}
+{
+}
 
 //---------------------------------------------------------------------------------------------------------------------
 auto MultiSelectCompleter::pathFromIndex(const QModelIndex &index) const -> QString
 {
     QString path = QCompleter::pathFromIndex(index);
 
-    QString text = static_cast<QLineEdit*>(widget())->text();
+    QString text = static_cast<QLineEdit *>(widget())->text();
 
     vsizetype pos = text.lastIndexOf(',');
     if (pos >= 0)
@@ -97,18 +100,20 @@ auto MultiSelectCompleter::splitPath(const QString &path) const -> QStringList
     return QStringList(path.mid(pos));
 }
 
-//VLineEdit
+// VLineEdit
 //---------------------------------------------------------------------------------------------------------------------
 VLineEdit::VLineEdit(QWidget *parent)
   : QLineEdit(parent),
     m_selectOnMousePress(false)
-{}
+{
+}
 
 //---------------------------------------------------------------------------------------------------------------------
 VLineEdit::VLineEdit(const QString &contents, QWidget *parent)
   : QLineEdit(contents, parent),
     m_selectOnMousePress(false)
-{}
+{
+}
 
 //---------------------------------------------------------------------------------------------------------------------
 void VLineEdit::focusInEvent(QFocusEvent *e)
@@ -137,7 +142,7 @@ void VLineEdit::focusOutEvent(QFocusEvent *e)
 void VLineEdit::mousePressEvent(QMouseEvent *e)
 {
     QLineEdit::mousePressEvent(e);
-    if(m_selectOnMousePress)
+    if (m_selectOnMousePress)
     {
         selectAll();
         m_selectOnMousePress = false;
@@ -174,7 +179,7 @@ void VCompleterLineEdit::focusInEvent(QFocusEvent *e)
 //---------------------------------------------------------------------------------------------------------------------
 void VCompleterLineEdit::ShowCompletion()
 {
-//    PrepareCompletion();
+    //    PrepareCompletion();
 
     // force to show all items when text is empty
     completer()->setCompletionMode(text().isEmpty() ? QCompleter::UnfilteredPopupCompletion

src/libs/vwidgets/vlineedit.h

@@ -31,21 +31,25 @@
 
 #include <QLineEdit>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class QStringListModel;
 
 class VLineEdit : public QLineEdit
 {
     Q_OBJECT // NOLINT
+
 public:
-    explicit VLineEdit(QWidget * parent = nullptr);
+    explicit VLineEdit(QWidget *parent = nullptr);
     explicit VLineEdit(const QString &contents, QWidget *parent = nullptr);
 
 protected:
     virtual void focusInEvent(QFocusEvent *e) override;
     virtual void focusOutEvent(QFocusEvent *e) override;
     virtual void mousePressEvent(QMouseEvent *e) override;
+
 private:
     // cppcheck-suppress unknownMacro
     Q_DISABLE_COPY_MOVE(VLineEdit) // NOLINT
@@ -60,6 +64,7 @@ private:
 class VCompleterLineEdit : public VLineEdit
 {
     Q_OBJECT // NOLINT
+
 public:
     explicit VCompleterLineEdit(QWidget *parent = nullptr);
 
@@ -68,7 +73,7 @@ public:
 
 protected:
     virtual void focusInEvent(QFocusEvent *e) override;
-    virtual void customEvent(QEvent* e) override;
+    virtual void customEvent(QEvent *e) override;
 
 private slots:
     void ShowCompletion();

src/libs/vwidgets/vmaingraphicsview.h

@@ -29,18 +29,19 @@
 #ifndef VMAINGRAPHICSVIEW_H
 #define VMAINGRAPHICSVIEW_H
 
-
 #include <QGraphicsView>
 #include <QMetaObject>
 #include <QObject>
 #include <QPointF>
+#include <QPointer>
 #include <QRectF>
 #include <QString>
 #include <Qt>
 #include <QtGlobal>
-#include <QPointer>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 /*!
  * This class adds ability to zoom QGraphicsView using mouse wheel. The point under cursor
@@ -75,8 +76,9 @@ class QPinchGesture;
 class GraphicsViewZoom : public QObject
 {
     Q_OBJECT // NOLINT
+
 public:
-    explicit GraphicsViewZoom(QGraphicsView* view);
+    explicit GraphicsViewZoom(QGraphicsView *view);
     void gentle_zoom(double factor);
     void set_modifiers(Qt::KeyboardModifiers modifiers);
     void set_zoom_factor_base(double value);
@@ -87,6 +89,7 @@ public slots:
     void VerticalScrollingTime(qreal x);
     void HorizontalScrollingTime(qreal x);
     void animFinished();
+
 protected:
     virtual auto eventFilter(QObject *object, QEvent *event) -> bool override;
 
@@ -107,11 +110,11 @@ private:
 
     void FictiveSceneRect(QGraphicsScene *sc, QGraphicsView *view);
 
-    void StartVerticalScrollings(QWheelEvent* wheel_event);
+    void StartVerticalScrollings(QWheelEvent *wheel_event);
-    void StartHorizontalScrollings(QWheelEvent* wheel_event);
+    void StartHorizontalScrollings(QWheelEvent *wheel_event);
 
     auto GestureEvent(QGestureEvent *event) -> bool;
-    void PinchTriggered(QPinchGesture* gesture);
+    void PinchTriggered(QPinchGesture *gesture);
 };
 
 /**
@@ -120,6 +123,7 @@ private:
 class VMainGraphicsView : public QGraphicsView
 {
     Q_OBJECT // NOLINT
+
 public:
     explicit VMainGraphicsView(QWidget *parent = nullptr);
     void setShowToolOptions(bool value);
@@ -161,6 +165,7 @@ public slots:
     void ZoomOriginal();
     void ZoomFitBest();
     void ResetScrollingAnimation();
+
 protected:
     void mousePressEvent(QMouseEvent *event) override;
     void mouseMoveEvent(QMouseEvent *event) override;
@@ -169,9 +174,10 @@ protected:
     void dragEnterEvent(QDragEnterEvent *event) override;
     void dragMoveEvent(QDragMoveEvent *event) override;
     void dropEvent(QDropEvent *event) override;
+
 private:
     Q_DISABLE_COPY_MOVE(VMainGraphicsView) // NOLINT
-    GraphicsViewZoom* zoom;
+    GraphicsViewZoom *zoom;
     bool showToolOptions;
     bool isAllowRubberBand;
     QPoint m_ptStartPos;

src/libs/vwidgets/vwidgetpopup.h

@@ -35,7 +35,9 @@
 #include <QString>
 #include <QtGlobal>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 /**
     \brief Class showing a widget as popup window.

src/test/CollectionTest/tst_tapecommandline.h

@@ -30,11 +30,14 @@
 #define TST_TAPECOMMANDLINE_H
 
 #include "../vtest/abstracttest.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class TST_TapeCommandLine : public AbstractTest
 {
     Q_OBJECT // NOLINT
+
 public:
     explicit TST_TapeCommandLine(QObject *parent = nullptr);
 
@@ -46,7 +49,6 @@ private slots:
 
 private:
     Q_DISABLE_COPY_MOVE(TST_TapeCommandLine) // NOLINT
-
 };
 
 #endif // TST_TAPECOMMANDLINE_H

src/test/CollectionTest/tst_valentinacommandline.h

@@ -30,11 +30,14 @@
 #define TST_VALENTINACOMMANDLINE_H
 
 #include "../vtest/abstracttest.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class TST_ValentinaCommandLine : public AbstractTest
 {
     Q_OBJECT // NOLINT
+
 public:
     explicit TST_ValentinaCommandLine(QObject *parent = nullptr);
 

src/test/TranslationsTest/tst_abstractregexp.h

@@ -30,7 +30,9 @@
 #define TST_ABSTRACTREGEXP_H
 
 #include "../vtest/abstracttest.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 #include <QPointer>
 
@@ -40,6 +42,7 @@ class VTranslateVars;
 class TST_AbstractRegExp : public AbstractTest
 {
     Q_OBJECT // NOLINT
+
 public:
     TST_AbstractRegExp(const QString &locale, QObject *parent = nullptr);
     virtual ~TST_AbstractRegExp();
@@ -49,7 +52,7 @@ protected:
     QPointer<QTranslator> m_vTranslator;
     VTranslateVars *m_trMs;
 
-    virtual void        PrepareData()=0;
+    virtual void PrepareData() = 0;
     virtual auto AllNames() -> QStringList = 0;
 
     auto LoadVariables(const QString &checkedLocale) -> int;

src/test/TranslationsTest/tst_abstracttranslation.h

@@ -28,17 +28,20 @@
 #ifndef TST_ABSTRACTTRANSLATION_H
 #define TST_ABSTRACTTRANSLATION_H
 
-#include <QObject>
-#include <QFile>
-#include <QSharedPointer>
 #include <QDomDocument>
+#include <QFile>
+#include <QObject>
+#include <QSharedPointer>
 #include <ciso646>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class TST_AbstractTranslation : public QObject
 {
     Q_OBJECT // NOLINT
+
 public:
     explicit TST_AbstractTranslation(QObject *parent = nullptr);
 

src/test/TranslationsTest/tst_measurementregexp.h

@@ -29,11 +29,13 @@
 #ifndef TST_MEASUREMENTREGEXP_H
 #define TST_MEASUREMENTREGEXP_H
 
-#include "../vmisc/defglobal.h"
-#include "tst_abstractregexp.h"
-
 #include <QPointer>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
+#include "../vmisc/defglobal.h"
+#endif
+#include "tst_abstractregexp.h"
+
 class QTranslator;
 class VTranslateVars;
 
@@ -41,7 +43,8 @@ class TST_MeasurementRegExp : public TST_AbstractRegExp
 {
     Q_OBJECT // NOLINT
 
-        public : TST_MeasurementRegExp(const QString &systemCode, const QString &locale, QObject *parent = nullptr);
+public:
+    TST_MeasurementRegExp(const QString &systemCode, const QString &locale, QObject *parent = nullptr);
     virtual ~TST_MeasurementRegExp();
 
     static const QStringList pmSystems;

src/test/ValentinaTest/tst_misc.h

@@ -31,11 +31,14 @@
 
 #include <QObject>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
-class TST_Misc :public QObject
+class TST_Misc : public QObject
 {
     Q_OBJECT // NOLINT
+
 public:
     explicit TST_Misc(QObject *parent = nullptr);
 

src/test/ValentinaTest/tst_qmutokenparser.h

@@ -32,11 +32,14 @@
 #include <QLocale>
 #include <QObject>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class TST_QmuTokenParser : public QObject
 {
     Q_OBJECT // NOLINT
+
 public:
     explicit TST_QmuTokenParser(QObject *parent = nullptr);
 private slots:
@@ -45,6 +48,7 @@ private slots:
     void TokenFromUser_data();
     void TokenFromUser();
     void cleanupTestCase();
+
 private:
     // cppcheck-suppress unknownMacro
     Q_DISABLE_COPY_MOVE(TST_QmuTokenParser) // NOLINT

src/test/ValentinaTest/tst_vcommandline.h

@@ -31,11 +31,14 @@
 
 #include <QObject>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class TST_VCommandLine : public QObject
 {
     Q_OBJECT // NOLINT
+
 public:
     explicit TST_VCommandLine(QObject *parent = nullptr);
 

src/test/ValentinaTest/tst_vcubicbezierpath.h

@@ -31,11 +31,14 @@
 
 #include <QObject>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class TST_VCubicBezierPath : public QObject
 {
     Q_OBJECT // NOLINT
+
 public:
     explicit TST_VCubicBezierPath(QObject *parent = nullptr);
 
@@ -49,7 +52,6 @@ private slots:
 
 private:
     Q_DISABLE_COPY_MOVE(TST_VCubicBezierPath) // NOLINT
-
 };
 
 #endif // TST_VCUBICBEZIERPATH_H

src/test/ValentinaTest/tst_vdomdocument.h

@@ -30,17 +30,21 @@
 
 #include <QObject>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
-class TST_VDomDocument :public QObject
+class TST_VDomDocument : public QObject
 {
     Q_OBJECT // NOLINT
+
 public:
     explicit TST_VDomDocument(QObject *parent = nullptr);
 
 private slots:
     void TestCompareDomElements_data();
     void TestCompareDomElements();
+
 private:
     Q_DISABLE_COPY_MOVE(TST_VDomDocument) // NOLINT
 };

src/test/ValentinaTest/tst_vellipticalarc.h

@@ -30,11 +30,14 @@
 #define TST_VELLIPTICALARC_H
 
 #include "../vtest/abstracttest.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class TST_VEllipticalArc : public AbstractTest
 {
     Q_OBJECT // NOLINT
+
 public:
     explicit TST_VEllipticalArc(QObject *parent = nullptr);
 

src/test/ValentinaTest/tst_vpiece.h

@@ -30,11 +30,14 @@
 #define TST_VDETAIL_H
 
 #include "../vtest/abstracttest.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class TST_VPiece : public AbstractTest
 {
     Q_OBJECT // NOLINT
+
 public:
     explicit TST_VPiece(QObject *parent = nullptr);
 

src/test/ValentinaTest/tst_vpointf.h

@@ -32,16 +32,20 @@
 #include <QtCore/QObject>
 #include <QtCore/qglobal.h>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class TST_VPointF : public QObject
 {
     Q_OBJECT // NOLINT
+
 public:
     explicit TST_VPointF(QObject *parent = nullptr);
 private slots:
     void TestFlip_data();
     void TestFlip();
+
 private:
     Q_DISABLE_COPY_MOVE(TST_VPointF) // NOLINT
 };

src/test/ValentinaTest/tst_vspline.h

@@ -30,13 +30,16 @@
 #define TST_VSPLINE_H
 
 #include "../vtest/abstracttest.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class VSpline;
 
 class TST_VSpline : public AbstractTest
 {
     Q_OBJECT // NOLINT
+
 public:
     explicit TST_VSpline(QObject *parent = nullptr);
 

src/test/ValentinaTest/tst_vsplinepath.h

@@ -31,11 +31,14 @@
 
 #include <QObject>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class TST_VSplinePath : public QObject
 {
     Q_OBJECT // NOLINT
+
 public:
     explicit TST_VSplinePath(QObject *parent = nullptr);
 private slots:
@@ -43,6 +46,7 @@ private slots:
     void TestRotation();
     void TestFlip_data();
     void TestFlip();
+
 private:
     Q_DISABLE_COPY_MOVE(TST_VSplinePath) // NOLINT
 };

src/test/ValentinaTest/tst_vtooluniondetails.h

@@ -31,16 +31,20 @@
 
 #include <QObject>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class TST_VToolUnionDetails : public QObject
 {
     Q_OBJECT // NOLINT
+
 public:
     explicit TST_VToolUnionDetails(QObject *parent = nullptr);
 private slots:
     void TestUnitingMainPaths_data();
     void TestUnitingMainPaths();
+
 private:
     Q_DISABLE_COPY_MOVE(TST_VToolUnionDetails) // NOLINT
 };

src/test/ValentinaTest/tst_vtranslatevars.h

@@ -29,17 +29,20 @@
 #ifndef TST_VTRANSLATEVARS_H
 #define TST_VTRANSLATEVARS_H
 
-#include <QtCore/qglobal.h>
 #include <QLocale>
 #include <QObject>
+#include <QtCore/qglobal.h>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #include "../vmisc/defglobal.h"
+#endif
 
 class VTranslateVars;
 
 class TST_VTranslateVars : public QObject
 {
     Q_OBJECT // NOLINT
+
 public:
     explicit TST_VTranslateVars(QObject *parent = nullptr);
 private slots:
@@ -49,6 +52,7 @@ private slots:
     void TestFormulaToUser_data();
     void TestFormulaToUser();
     void cleanupTestCase();
+
 private:
     // cppcheck-suppress unknownMacro
     Q_DISABLE_COPY_MOVE(TST_VTranslateVars) // NOLINT