diff --git a/src/app/puzzle/carousel/vpcarrousel.h b/src/app/puzzle/carousel/vpcarrousel.h index ed3ad74b4..440060080 100644 --- a/src/app/puzzle/carousel/vpcarrousel.h +++ b/src/app/puzzle/carousel/vpcarrousel.h @@ -29,13 +29,15 @@ #ifndef VPCARROUSEL_H #define VPCARROUSEL_H -#include #include #include #include +#include #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: diff --git a/src/app/puzzle/carousel/vpcarrouselpiece.h b/src/app/puzzle/carousel/vpcarrouselpiece.h index 8146210ac..a9b0c7782 100644 --- a/src/app/puzzle/carousel/vpcarrouselpiece.h +++ b/src/app/puzzle/carousel/vpcarrouselpiece.h @@ -28,18 +28,23 @@ #ifndef VPCARROUSELPIECE_H #define VPCARROUSELPIECE_H -#include #include +#include #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 diff --git a/src/app/puzzle/carousel/vpmimedatapiece.h b/src/app/puzzle/carousel/vpmimedatapiece.h index 2cafc668b..1096ae87b 100644 --- a/src/app/puzzle/carousel/vpmimedatapiece.h +++ b/src/app/puzzle/carousel/vpmimedatapiece.h @@ -34,7 +34,9 @@ #include #include "../layout/layoutdef.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) #include "../vmisc/defglobal.h" +#endif class VPMimeDataPiece : public QMimeData { diff --git a/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.h b/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.h index f2ae802f9..64b5a8c7b 100644 --- a/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.h +++ b/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.h @@ -30,11 +30,13 @@ #include +#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 diff --git a/src/app/puzzle/dialogs/dialogpuzzlepreferences.h b/src/app/puzzle/dialogs/dialogpuzzlepreferences.h index bb8ae8cf7..16deab212 100644 --- a/src/app/puzzle/dialogs/dialogpuzzlepreferences.h +++ b/src/app/puzzle/dialogs/dialogpuzzlepreferences.h @@ -30,11 +30,13 @@ #include +#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(); @@ -69,8 +71,8 @@ private: Ui::DialogPuzzlePreferences *ui; bool m_isInitialized{false}; PuzzlePreferencesConfigurationPage *m_configurationPage; - PuzzlePreferencesLayoutPage *m_layoutPage; - PuzzlePreferencesPathPage *m_pathPage; + PuzzlePreferencesLayoutPage *m_layoutPage; + PuzzlePreferencesPathPage *m_pathPage; }; #endif // DIALOGPUZZLEPREFERENCES_H diff --git a/src/app/puzzle/dialogs/dialogsavemanuallayout.h b/src/app/puzzle/dialogs/dialogsavemanuallayout.h index ed57ed45d..e720cf7f8 100644 --- a/src/app/puzzle/dialogs/dialogsavemanuallayout.h +++ b/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 >; + static auto InitFormats() -> QVector>; void RemoveFormatFromList(LayoutExportFormats format); diff --git a/src/app/puzzle/dialogs/vpdialogabout.h b/src/app/puzzle/dialogs/vpdialogabout.h index e1c993d49..60d64d229 100644 --- a/src/app/puzzle/dialogs/vpdialogabout.h +++ b/src/app/puzzle/dialogs/vpdialogabout.h @@ -31,11 +31,13 @@ #include +#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: diff --git a/src/app/puzzle/scene/vpgraphicssheet.h b/src/app/puzzle/scene/vpgraphicssheet.h index f228f2fe7..f4187c649 100644 --- a/src/app/puzzle/scene/vpgraphicssheet.h +++ b/src/app/puzzle/scene/vpgraphicssheet.h @@ -33,7 +33,9 @@ #include #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; diff --git a/src/app/puzzle/scene/vpgraphicstilegrid.h b/src/app/puzzle/scene/vpgraphicstilegrid.h index 6aa0740a9..ab0cc825c 100644 --- a/src/app/puzzle/scene/vpgraphicstilegrid.h +++ b/src/app/puzzle/scene/vpgraphicstilegrid.h @@ -33,7 +33,6 @@ #include #include -#include "../vmisc/def.h" #include "../layout/layoutdef.h" #if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) diff --git a/src/app/puzzle/vpcommandline.h b/src/app/puzzle/vpcommandline.h index f1e5a6f2f..4d5d030a7 100644 --- a/src/app/puzzle/vpcommandline.h +++ b/src/app/puzzle/vpcommandline.h @@ -28,19 +28,22 @@ #ifndef VPCOMMANDLINE_H #define VPCOMMANDLINE_H -#include -#include #include +#include #include +#include +#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) #include "../vmisc/defglobal.h" +#endif class VPCommandLine; using VPCommandLinePtr = std::shared_ptr; -class VPCommandLine: public QObject +class VPCommandLine : public QObject { Q_OBJECT // NOLINT + public: ~VPCommandLine() override = default; @@ -57,16 +60,18 @@ 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 - static VPCommandLinePtr instance; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables) + static VPCommandLinePtr instance; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables) QCommandLineParser parser{}; bool isGuiEnabled{true}; friend class VPApplication; @@ -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; }; diff --git a/src/app/puzzle/vptilefactory.cpp b/src/app/puzzle/vptilefactory.cpp index dd7e911dd..2037bce6f 100644 --- a/src/app/puzzle/vptilefactory.cpp +++ b/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" diff --git a/src/app/puzzle/vptilefactory.h b/src/app/puzzle/vptilefactory.h index 8b9725b66..9afe528b4 100644 --- a/src/app/puzzle/vptilefactory.h +++ b/src/app/puzzle/vptilefactory.h @@ -29,11 +29,11 @@ #ifndef VPTILEFACTORY_H #define VPTILEFACTORY_H -#include #include +#include -#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" @@ -108,7 +108,7 @@ private: // cppcheck-suppress unknownMacro Q_DISABLE_COPY_MOVE(VPTileFactory) // NOLINT - VPLayoutWeakPtr m_layout; + VPLayoutWeakPtr m_layout; VCommonSettings *m_commonSettings{nullptr}; /** diff --git a/src/app/tape/dialogs/dialogabouttape.h b/src/app/tape/dialogs/dialogabouttape.h index 7f92576de..0a9057eac 100644 --- a/src/app/tape/dialogs/dialogabouttape.h +++ b/src/app/tape/dialogs/dialogabouttape.h @@ -31,11 +31,13 @@ #include +#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: diff --git a/src/app/tape/dialogs/dialogmdatabase.h b/src/app/tape/dialogs/dialogmdatabase.h index cced0993b..c60e8afe9 100644 --- a/src/app/tape/dialogs/dialogmdatabase.h +++ b/src/app/tape/dialogs/dialogmdatabase.h @@ -31,11 +31,13 @@ #include +#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: diff --git a/src/app/tape/dialogs/dialogtapepreferences.h b/src/app/tape/dialogs/dialogtapepreferences.h index d263b367c..09521aa2e 100644 --- a/src/app/tape/dialogs/dialogtapepreferences.h +++ b/src/app/tape/dialogs/dialogtapepreferences.h @@ -31,11 +31,13 @@ #include +#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) #include "../vmisc/defglobal.h" +#endif namespace Ui { - class DialogTapePreferences; +class DialogTapePreferences; } class TapePreferencesConfigurationPage; @@ -51,21 +53,23 @@ 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 Ui::DialogTapePreferences *ui; bool m_isInitialized{false}; TapePreferencesConfigurationPage *m_configurationPage; - TapePreferencesPathPage *m_pathPage; + TapePreferencesPathPage *m_pathPage; }; #endif // DIALOGTAPEPREFERENCES_H diff --git a/src/app/valentina/core/vformulapropertyeditor.h b/src/app/valentina/core/vformulapropertyeditor.h index 17f024623..3dd949474 100644 --- a/src/app/valentina/core/vformulapropertyeditor.h +++ b/src/app/valentina/core/vformulapropertyeditor.h @@ -29,13 +29,15 @@ #ifndef VFORMULAPROPERTYEDITOR_H #define VFORMULAPROPERTYEDITOR_H -#include -#include -#include #include +#include +#include +#include #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}; - QLabel* m_TextLabel{nullptr}; + QToolButton *m_ToolButton{nullptr}; + QLabel *m_TextLabel{nullptr}; }; - #endif // VFORMULAPROPERTYEDITOR_H diff --git a/src/app/valentina/dialogs/dialogaboutapp.h b/src/app/valentina/dialogs/dialogaboutapp.h index 75aa969a4..597c9e0f1 100644 --- a/src/app/valentina/dialogs/dialogaboutapp.h +++ b/src/app/valentina/dialogs/dialogaboutapp.h @@ -31,11 +31,13 @@ #include +#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) #include "../vmisc/defglobal.h" +#endif namespace Ui { - class DialogAboutApp; +class DialogAboutApp; } class DialogAboutApp : public QDialog diff --git a/src/app/valentina/dialogs/dialogdatetimeformats.h b/src/app/valentina/dialogs/dialogdatetimeformats.h index 52e3fdfc2..8b09fd60f 100644 --- a/src/app/valentina/dialogs/dialogdatetimeformats.h +++ b/src/app/valentina/dialogs/dialogdatetimeformats.h @@ -29,15 +29,17 @@ #ifndef DIALOGDATETIMEFORMATS_H #define DIALOGDATETIMEFORMATS_H -#include #include +#include #include +#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) #include "../vmisc/defglobal.h" +#endif namespace Ui { - class DialogDateTimeFormats; +class DialogDateTimeFormats; } class QListWidgetItem; @@ -65,7 +67,7 @@ private: // cppcheck-suppress unknownMacro Q_DISABLE_COPY_MOVE(DialogDateTimeFormats) // NOLINT Ui::DialogDateTimeFormats *ui; - bool m_dateMode; + bool m_dateMode; QDate m_date{}; QTime m_time{}; QStringList m_predefined; diff --git a/src/app/valentina/dialogs/dialogknownmaterials.h b/src/app/valentina/dialogs/dialogknownmaterials.h index 08738f4c3..d7518ddef 100644 --- a/src/app/valentina/dialogs/dialogknownmaterials.h +++ b/src/app/valentina/dialogs/dialogknownmaterials.h @@ -31,11 +31,13 @@ #include +#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) #include "../vmisc/defglobal.h" +#endif namespace Ui { - class DialogKnownMaterials; +class DialogKnownMaterials; } class DialogKnownMaterials : public QDialog diff --git a/src/app/valentina/dialogs/dialoglayoutprogress.h b/src/app/valentina/dialogs/dialoglayoutprogress.h index da24a054b..d886cc5ae 100644 --- a/src/app/valentina/dialogs/dialoglayoutprogress.h +++ b/src/app/valentina/dialogs/dialoglayoutprogress.h @@ -33,11 +33,13 @@ #include #include +#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) #include "../vmisc/defglobal.h" +#endif namespace Ui { - class DialogLayoutProgress; +class DialogLayoutProgress; } class DialogLayoutProgress : public QDialog diff --git a/src/app/valentina/dialogs/dialogpatternproperties.h b/src/app/valentina/dialogs/dialogpatternproperties.h index a3e18b2f9..33a1b5245 100644 --- a/src/app/valentina/dialogs/dialogpatternproperties.h +++ b/src/app/valentina/dialogs/dialogpatternproperties.h @@ -33,7 +33,9 @@ #include #include +#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 diff --git a/src/app/valentina/dialogs/dialogpreferences.h b/src/app/valentina/dialogs/dialogpreferences.h index be8d546b6..17f10a22c 100644 --- a/src/app/valentina/dialogs/dialogpreferences.h +++ b/src/app/valentina/dialogs/dialogpreferences.h @@ -31,11 +31,13 @@ #include +#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) #include "../vmisc/defglobal.h" +#endif namespace Ui { - class DialogPreferences; +class DialogPreferences; } class PreferencesConfigurationPage; @@ -53,20 +55,22 @@ 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 Ui::DialogPreferences *ui; bool m_isInitialized{false}; PreferencesConfigurationPage *m_configurePage; - PreferencesPatternPage *m_patternPage; - PreferencesPathPage *m_pathPage; + PreferencesPatternPage *m_patternPage; + PreferencesPathPage *m_pathPage; void Apply(); void Ok(); diff --git a/src/app/valentina/dialogs/vwidgetdetails.h b/src/app/valentina/dialogs/vwidgetdetails.h index ead0734b5..7de5cf531 100644 --- a/src/app/valentina/dialogs/vwidgetdetails.h +++ b/src/app/valentina/dialogs/vwidgetdetails.h @@ -31,7 +31,9 @@ #include +#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); @@ -72,9 +74,9 @@ private: // cppcheck-suppress unknownMacro Q_DISABLE_COPY_MOVE(VWidgetDetails) // NOLINT Ui::VWidgetDetails *ui; - VAbstractPattern *m_doc; - VContainer *m_data; - QTimer *m_updateListTimer; + VAbstractPattern *m_doc; + VContainer *m_data; + QTimer *m_updateListTimer; void FillTable(const QHash *details); void ToggleSectionDetails(bool select); diff --git a/src/app/valentina/dialogs/vwidgetgroups.h b/src/app/valentina/dialogs/vwidgetgroups.h index 75a96cc55..b81a540d8 100644 --- a/src/app/valentina/dialogs/vwidgetgroups.h +++ b/src/app/valentina/dialogs/vwidgetgroups.h @@ -29,9 +29,11 @@ #ifndef VWIDGETGROUPS_H #define VWIDGETGROUPS_H -#include #include "../vmisc/typedef.h" +#include +#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 diff --git a/src/libs/fervor/fvavailableupdate.h b/src/libs/fervor/fvavailableupdate.h index 4b7a1bb01..1a89c26dc 100644 --- a/src/libs/fervor/fvavailableupdate.h +++ b/src/libs/fervor/fvavailableupdate.h @@ -28,11 +28,14 @@ #include #include +#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); @@ -50,9 +53,9 @@ private: // cppcheck-suppress unknownMacro Q_DISABLE_COPY_MOVE(FvAvailableUpdate) // NOLINT - QUrl m_enclosureUrl; - QString m_enclosureVersion; - QString m_enclosurePlatform; + QUrl m_enclosureUrl; + QString m_enclosureVersion; + QString m_enclosurePlatform; }; #endif // FVAVAILABLEUPDATE_H diff --git a/src/libs/fervor/fvupdatewindow.h b/src/libs/fervor/fvupdatewindow.h index f9eaefbb8..80c9e9354 100644 --- a/src/libs/fervor/fvupdatewindow.h +++ b/src/libs/fervor/fvupdatewindow.h @@ -28,13 +28,15 @@ #include #include +#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 diff --git a/src/libs/qmuparser/qmuparsererror.h b/src/libs/qmuparser/qmuparsererror.h index 2654df382..1eb588879 100644 --- a/src/libs/qmuparser/qmuparsererror.h +++ b/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. @@ -78,11 +80,11 @@ enum EErrorCodes ecEMPTY_EXPRESSION = 25, ///< The Expression is empty ecNAME_CONFLICT = 26, ///< Name conflict ecOPT_PRI = 27, ///< Invalid operator priority - // - ecDOMAIN_ERROR = 28, ///< catch division by zero, sqrt(-1), log(0) (currently unused) - ecDIV_BY_ZERO = 29, ///< Division by zero (currently unused) - ecGENERIC = 30, ///< Generic error - ecLOCALE = 31, ///< Conflict with current locale + // + ecDOMAIN_ERROR = 28, ///< catch division by zero, sqrt(-1), log(0) (currently unused) + ecDIV_BY_ZERO = 29, ///< Division by zero (currently unused) + ecGENERIC = 30, ///< Generic error + ecLOCALE = 31, ///< Conflict with current locale ecUNEXPECTED_CONDITIONAL = 32, ecMISSING_ELSE_CLAUSE = 33, diff --git a/src/libs/vdxf/libdxfrw/intern/dxfreader.h b/src/libs/vdxf/libdxfrw/intern/dxfreader.h index 213fa4454..643604b07 100644 --- a/src/libs/vdxf/libdxfrw/intern/dxfreader.h +++ b/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,17 +31,19 @@ public: INVALID }; TYPE type; + public: explicit dxfReader(std::istream *stream) - : type(INVALID), - filestr(stream), - strData(), - doubleData(), - intData(), - int64(), - skip(), - decoder() - {} + : type(INVALID), + filestr(stream), + strData(), + doubleData(), + intData(), + 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 setCodePage(const std::string &c){decoder.setCodePage(c, true);} + void setVersion(const std::string &v, bool dxfFormat) { decoder.setVersion(v, dxfFormat); } + 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 - unsigned long long int int64; //64 bits integer - bool skip; //set to true for ascii dxf, false for binary + signed int intData; // 32 bits integer + unsigned long long int int64; // 64 bits integer + 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; } + : dxfReader(stream) + { + 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; } + : dxfReader(stream) + { + skip = true; + } virtual ~dxfReaderAscii() = default; virtual auto readCode(int *code) -> bool override; diff --git a/src/libs/vhpgl/vhpglengine.h b/src/libs/vhpgl/vhpglengine.h index a6ea8d7cb..d3cc62142 100644 --- a/src/libs/vhpgl/vhpglengine.h +++ b/src/libs/vhpgl/vhpglengine.h @@ -28,7 +28,6 @@ #ifndef VHPGLENGINE_H #define VHPGLENGINE_H -#include "../vmisc/def.h" #include #include #include diff --git a/src/libs/vlayout/dialogs/dialoglayoutscale.h b/src/libs/vlayout/dialogs/dialoglayoutscale.h index f0251610d..ef277af18 100644 --- a/src/libs/vlayout/dialogs/dialoglayoutscale.h +++ b/src/libs/vlayout/dialogs/dialoglayoutscale.h @@ -30,11 +30,13 @@ #include +#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 @@ -45,13 +47,13 @@ public: explicit DialogLayoutScale(bool printTiled, QWidget *parent = nullptr); ~DialogLayoutScale(); - void SetTiledMargins(QMarginsF margins); + void SetTiledMargins(QMarginsF margins); auto GetTiledMargins() const -> QMarginsF; - void SetXScale(qreal scale); + void SetXScale(qreal scale); auto GetXScale() const -> qreal; - void SetYScale(qreal scale); + void SetYScale(qreal scale); auto GetYScale() const -> qreal; protected: diff --git a/src/libs/vlayout/dialogs/vabstractlayoutdialog.h b/src/libs/vlayout/dialogs/vabstractlayoutdialog.h index 9b7b89beb..410b3a676 100644 --- a/src/libs/vlayout/dialogs/vabstractlayoutdialog.h +++ b/src/libs/vlayout/dialogs/vabstractlayoutdialog.h @@ -32,14 +32,17 @@ #include #include +#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 }; diff --git a/src/libs/vmisc/dialogs/dialogexporttocsv.h b/src/libs/vmisc/dialogs/dialogexporttocsv.h index a24d08c5d..d5d7e5b81 100644 --- a/src/libs/vmisc/dialogs/dialogexporttocsv.h +++ b/src/libs/vmisc/dialogs/dialogexporttocsv.h @@ -31,11 +31,13 @@ #include +#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) #include "../defglobal.h" +#endif namespace Ui { - class DialogExportToCSV; +class DialogExportToCSV; } class DialogExportToCSV : public QDialog @@ -53,7 +55,7 @@ public: void SetSelectedMib(int value); auto GetSeparator() const -> QChar; - void SetSeparator(const QChar &separator); + void SetSeparator(const QChar &separator); void ShowFilePreview(const QString &fileName); @@ -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: diff --git a/src/libs/vmisc/dialogs/dialogselectlanguage.h b/src/libs/vmisc/dialogs/dialogselectlanguage.h index 69e378cb8..6a4df3fb3 100644 --- a/src/libs/vmisc/dialogs/dialogselectlanguage.h +++ b/src/libs/vmisc/dialogs/dialogselectlanguage.h @@ -30,7 +30,9 @@ #include +#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) #include "../defglobal.h" +#endif namespace Ui { diff --git a/src/libs/vmisc/vlockguard.h b/src/libs/vmisc/vlockguard.h index 744f56c6c..70a3e45bf 100644 --- a/src/libs/vmisc/vlockguard.h +++ b/src/libs/vmisc/vlockguard.h @@ -32,7 +32,7 @@ #include #ifdef Q_OS_WIN -# include +#include #endif /*Q_OS_WIN*/ #include @@ -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 #include @@ -53,32 +56,30 @@ * * On older Qt lock assumed always taken and compile-time warning is shown. * -*/ -template -class VLockGuard + */ +template 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 - VLockGuard(const QString& lockName, Alloc a, int stale = 0, int timeout=0); + template VLockGuard(const QString &lockName, Alloc a, int stale = 0, int timeout = 0); template - 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 &; auto GetLockError() const -> int; auto IsLocked() const -> bool; - void Unlock(); + void Unlock(); auto GetLockFile() const -> QString; private: // cppcheck-suppress unknownMacro Q_DISABLE_COPY_MOVE(VLockGuard) // NOLINT - QSharedPointer holder; - int lockError; - QString lockFile; + QSharedPointer holder; + int lockError; + QString lockFile; QSharedPointer lock; auto TryLock(const QString &lockName, int stale, int timeout) -> bool; @@ -87,7 +88,10 @@ private: //--------------------------------------------------------------------------------------------------------------------- template VLockGuard::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::VLockGuard(const QString &lockName, int stale, int timeout) } //--------------------------------------------------------------------------------------------------------------------- -//using allocator lambdas seems logically better than supplying pointer, because we will take ownership of allocated -//object -template template -VLockGuard::VLockGuard(const QString& lockName, Alloc a, int stale, int timeout) - : holder(nullptr), lockError(0), lockFile(), lock(nullptr) +// using allocator lambdas seems logically better than supplying pointer, because we will take ownership of allocated +// object +template +template +VLockGuard::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::VLockGuard(const QString& lockName, Alloc a, int stale, int } //--------------------------------------------------------------------------------------------------------------------- -template template -VLockGuard::VLockGuard(const QString& lockName, Alloc a, Delete d, int stale, int timeout) - : holder(nullptr), lockError(0), lockFile(), lock(nullptr) +template +template +VLockGuard::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 inline auto VLockGuard::IsLocked() const -> } //--------------------------------------------------------------------------------------------------------------------- -template -inline void VLockGuard::Unlock() +template inline void VLockGuard::Unlock() { if (IsLocked()) { @@ -191,27 +202,27 @@ template auto VLockGuard::TryLock(const QString &loc return res; } -//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 +// 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 QT_WARNING_PUSH QT_WARNING_DISABLE_INTEL(1418) template -void VlpCreateLock(QSharedPointer>& r, const QString& lockName, int stale = 0, int timeout = 0) +void VlpCreateLock(QSharedPointer> &r, const QString &lockName, int stale = 0, int timeout = 0) { r.reset(new VLockGuard(lockName, stale, timeout)); } template -void VlpCreateLock(QSharedPointer>& r, const QString& lockName, Alloc a, int stale = 0, +void VlpCreateLock(QSharedPointer> &r, const QString &lockName, Alloc a, int stale = 0, int timeout = 0) { r.reset(new VLockGuard(lockName, a, stale, timeout)); } template -void VlpCreateLock(QSharedPointer>& r, const QString& lockName, Alloc a, Del d, int stale = 0, +void VlpCreateLock(QSharedPointer> &r, const QString &lockName, Alloc a, Del d, int stale = 0, int timeout = 0) { r.reset(new VLockGuard(lockName, a, d, stale, timeout)); diff --git a/src/libs/vobj/vobjengine.cpp b/src/libs/vobj/vobjengine.cpp index 289758bde..ccd65c8cc 100644 --- a/src/libs/vobj/vobjengine.cpp +++ b/src/libs/vobj/vobjengine.cpp @@ -40,14 +40,14 @@ #include #include #include -#include #include +#include #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_DISABLE_CLANG("-Wsign-conversion") -// cppcheck-suppress unknownMacro -QT_WARNING_DISABLE_INTEL(68) -QT_WARNING_DISABLE_INTEL(2022) + QT_WARNING_PUSH + QT_WARNING_DISABLE_CLANG("-Wsign-conversion") + // cppcheck-suppress unknownMacro + QT_WARNING_DISABLE_INTEL(68) + QT_WARNING_DISABLE_INTEL(2022) - return QPaintEngine::PaintEngineFeatures( - QPaintEngine::AllFeatures - & ~QPaintEngine::PatternBrush - & ~QPaintEngine::PerspectiveTransform - & ~QPaintEngine::ConicalGradientFill - & ~QPaintEngine::PorterDuff); + return QPaintEngine::PaintEngineFeatures(QPaintEngine::AllFeatures & ~QPaintEngine::PatternBrush & + ~QPaintEngine::PerspectiveTransform & ~QPaintEngine::ConicalGradientFill & + ~QPaintEngine::PorterDuff); -QT_WARNING_POP + QT_WARNING_POP } //--------------------------------------------------------------------------------------------------------------------- VObjEngine::VObjEngine() - :QPaintEngine(svgEngineFeatures()), stream(), globalPointsCount(0), outputDevice(), planeCount(0), - size(), resolution(96), matrix() + : QPaintEngine(svgEngineFeatures()), + 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,13 +132,13 @@ 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; } stream = QSharedPointer(new QTextStream(outputDevice.data())); - *stream << "# Valentina OBJ File" << Qt::endl; - *stream << "# smart-pattern.com.ua/" << Qt::endl; + *stream << "# Valentina OBJ File" << Qt::endl; + *stream << "# smart-pattern.com.ua/" << Qt::endl; return true; } @@ -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(res->faces[offset]); offset++; - for ( int j = 0; j < num_verts; j++ ) + for (int j = 0; j < num_verts; j++) { int p0 = static_cast(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 y = (((points[i].y() - 0)/qFloor(size.width()/2.0)) - 1.0)*-1; + 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; - *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; } diff --git a/src/libs/vobj/vobjengine.h b/src/libs/vobj/vobjengine.h index 7c366d0aa..ba27fd1b7 100644 --- a/src/libs/vobj/vobjengine.h +++ b/src/libs/vobj/vobjengine.h @@ -29,7 +29,6 @@ #ifndef VOBJENGINE_H #define VOBJENGINE_H - #include #include #include @@ -38,11 +37,13 @@ #include #include "delaunay.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) #include "../vmisc/defglobal.h" +#endif class QTextStream; -#define MAX_POINTS 512 +#define MAX_POINTS 512 class VObjEngine final : public QPaintEngine { @@ -74,13 +75,13 @@ private: // cppcheck-suppress unknownMacro Q_DISABLE_COPY_MOVE(VObjEngine) // NOLINT QSharedPointer stream; - quint32 globalPointsCount; + quint32 globalPointsCount; QSharedPointer outputDevice; - del_point2d_t points[MAX_POINTS]; - quint32 planeCount; - QSize size; - int resolution; - QTransform matrix; + del_point2d_t points[MAX_POINTS]; + quint32 planeCount; + QSize size; + int resolution; + QTransform matrix; auto MakePointsUnique(const QPolygonF &polygon) const -> QPolygonF; auto Square(const QPolygonF &poly) const -> qint64; diff --git a/src/libs/vobj/vobjpaintdevice.h b/src/libs/vobj/vobjpaintdevice.h index e5ce565b7..989aee12c 100644 --- a/src/libs/vobj/vobjpaintdevice.h +++ b/src/libs/vobj/vobjpaintdevice.h @@ -29,14 +29,15 @@ #ifndef VOBJPAINTDEVICE_H #define VOBJPAINTDEVICE_H - #include #include #include #include #include +#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) #include "../vmisc/defglobal.h" +#endif class QIODevice; class VObjEngine; @@ -67,8 +68,8 @@ private: // cppcheck-suppress unknownMacro Q_DISABLE_COPY_MOVE(VObjPaintDevice) // NOLINT QSharedPointer engine; - QString fileName; - uint owns_iodevice; + QString fileName; + uint owns_iodevice; }; #endif // VOBJPAINTDEVICE_H diff --git a/src/libs/vpropertyexplorer/vpropertyfactorymanager.h b/src/libs/vpropertyexplorer/vpropertyfactorymanager.h index bacc03c1a..16cf728a5 100644 --- a/src/libs/vpropertyexplorer/vpropertyfactorymanager.h +++ b/src/libs/vpropertyexplorer/vpropertyfactorymanager.h @@ -21,7 +21,6 @@ #ifndef VPROPERTYFACTORYMANAGER_H #define VPROPERTYFACTORYMANAGER_H - #include #include #include @@ -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 diff --git a/src/libs/vpropertyexplorer/vpropertytreeview.h b/src/libs/vpropertyexplorer/vpropertytreeview.h index 988f24c87..962b59b91 100644 --- a/src/libs/vpropertyexplorer/vpropertytreeview.h +++ b/src/libs/vpropertyexplorer/vpropertytreeview.h @@ -21,7 +21,6 @@ #ifndef VPROPERTYTREEVIEW_H #define VPROPERTYTREEVIEW_H - #include #include #include @@ -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,21 +58,20 @@ 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 }; -} // namespace VPE +} // namespace VPE #endif // VPROPERTYTREEVIEWEEVIEW_H diff --git a/src/libs/vtools/dialogs/support/dialogeditlabel.h b/src/libs/vtools/dialogs/support/dialogeditlabel.h index 90caa8e20..d2ed13ad2 100644 --- a/src/libs/vtools/dialogs/support/dialogeditlabel.h +++ b/src/libs/vtools/dialogs/support/dialogeditlabel.h @@ -32,11 +32,13 @@ #include #include +#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) #include "../vmisc/defglobal.h" +#endif namespace Ui { - class DialogEditLabel; +class DialogEditLabel; } struct VLabelTemplateLine; @@ -77,9 +79,9 @@ private: // cppcheck-suppress unknownMacro Q_DISABLE_COPY_MOVE(DialogEditLabel) // NOLINT Ui::DialogEditLabel *ui; - QMenu *m_placeholdersMenu; + QMenu *m_placeholdersMenu; const VAbstractPattern *m_doc; - const VContainer *m_data; + const VContainer *m_data; QMap> m_placeholders{}; diff --git a/src/libs/vtools/dialogs/support/dialogeditwrongformula.h b/src/libs/vtools/dialogs/support/dialogeditwrongformula.h index c6ef00e1d..a0d1231f1 100644 --- a/src/libs/vtools/dialogs/support/dialogeditwrongformula.h +++ b/src/libs/vtools/dialogs/support/dialogeditwrongformula.h @@ -37,6 +37,10 @@ #include #include +#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) +#include "../vmisc/defglobal.h" +#endif + class VMeasurement; struct FormulaData; class VContainer; diff --git a/src/libs/vtools/dialogs/support/dialogundo.h b/src/libs/vtools/dialogs/support/dialogundo.h index f7bc1e85f..cc56b239d 100644 --- a/src/libs/vtools/dialogs/support/dialogundo.h +++ b/src/libs/vtools/dialogs/support/dialogundo.h @@ -35,6 +35,10 @@ #include #include +#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) +#include "../vmisc/defglobal.h" +#endif + namespace Ui { class DialogUndo; diff --git a/src/libs/vtools/visualization/path/vistoolarc.h b/src/libs/vtools/visualization/path/vistoolarc.h index ab19447e9..89e9a0ab9 100644 --- a/src/libs/vtools/visualization/path/vistoolarc.h +++ b/src/libs/vtools/visualization/path/vistoolarc.h @@ -29,7 +29,6 @@ #ifndef VISTOOLARC_H #define VISTOOLARC_H - #include #include #include @@ -37,15 +36,18 @@ #include #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;} - enum {Type = UserType + static_cast(Vis::ToolArc)}; + auto type() const -> int override { return Type; } + enum + { + Type = UserType + static_cast(Vis::ToolArc) + }; auto StickyEnd(qreal angle) const -> qreal; @@ -64,10 +69,10 @@ private: Q_DISABLE_COPY_MOVE(VisToolArc) // NOLINT VScaledEllipse *m_arcCenter{nullptr}; VScaledEllipse *m_f1Point{nullptr}; - qreal m_radius{0}; - qreal m_f1{-1}; - qreal m_f2{-1}; - quint32 m_centerId{NULL_ID}; + qreal m_radius{0}; + qreal m_f1{-1}; + qreal m_f2{-1}; + quint32 m_centerId{NULL_ID}; }; //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/visualization/path/vistoolarcwithlength.h b/src/libs/vtools/visualization/path/vistoolarcwithlength.h index 516efb78c..004e4df05 100644 --- a/src/libs/vtools/visualization/path/vistoolarcwithlength.h +++ b/src/libs/vtools/visualization/path/vistoolarcwithlength.h @@ -29,7 +29,6 @@ #ifndef VISTOOLARCWITHLENGTH_H #define VISTOOLARCWITHLENGTH_H - #include #include #include @@ -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,18 +57,22 @@ public: void SetF1(const QString &expression); void SetLength(const QString &expression); - auto type() const -> int override {return Type;} - enum {Type = UserType + static_cast(Vis::ToolArcWithLength)}; + auto type() const -> int override { return Type; } + enum + { + Type = UserType + static_cast(Vis::ToolArcWithLength) + }; static auto CorrectAngle(qreal angle) -> qreal; + private: Q_DISABLE_COPY_MOVE(VisToolArcWithLength) // NOLINT VScaledEllipse *m_arcCenter{nullptr}; VScaledEllipse *m_f1Point{nullptr}; - qreal m_radius{0}; - qreal m_f1{-1}; - qreal m_length{0}; - quint32 m_centerId{NULL_ID}; + qreal m_radius{0}; + qreal m_f1{-1}; + qreal m_length{0}; + quint32 m_centerId{NULL_ID}; }; //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vwidgets/fancytabbar/fancytab.h b/src/libs/vwidgets/fancytabbar/fancytab.h index ef23dfc90..ed53d4f7e 100644 --- a/src/libs/vwidgets/fancytabbar/fancytab.h +++ b/src/libs/vwidgets/fancytabbar/fancytab.h @@ -33,7 +33,9 @@ #include #include +#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) #include "../vmisc/defglobal.h" +#endif class FancyTab final : public QObject { @@ -41,11 +43,12 @@ class FancyTab final : public QObject Q_OBJECT // NOLINT Q_PROPERTY(double fader READ fader WRITE setFader) + public: explicit FancyTab(QWidget *tabbar); auto fader() -> double; - void setFader(double value); + void setFader(double value); void fadeIn(); void fadeOut(); @@ -53,13 +56,13 @@ public: private: // cppcheck-suppress unknownMacro Q_DISABLE_COPY_MOVE(FancyTab) // NOLINT - QIcon m_icon; - QString m_text; - QString m_toolTip; - bool m_enabled; + QIcon m_icon; + QString m_text; + QString m_toolTip; + bool m_enabled; QPropertyAnimation m_Animator; - QWidget *m_TabBar; - double m_Fader; + QWidget *m_TabBar; + double m_Fader; }; #endif // FANCYTAB_H diff --git a/src/libs/vwidgets/fancytabbar/fancytabbar.h b/src/libs/vwidgets/fancytabbar/fancytabbar.h index a63c04481..9c924bf1b 100644 --- a/src/libs/vwidgets/fancytabbar/fancytabbar.h +++ b/src/libs/vwidgets/fancytabbar/fancytabbar.h @@ -31,14 +31,15 @@ #define FANCYTABWIDGET_H #include -#include -#include #include +#include +#include + +#include "../vmisc/defglobal.h" +#include "fancytab.h" class QPainter; -#include "fancytab.h" - class FancyTabBar : public QWidget { Q_OBJECT // NOLINT @@ -69,13 +70,13 @@ public: void SetCurrentIndex(int index); auto CurrentIndex() const -> int; - void SetTabToolTip(int index, const QString &toolTip); + void SetTabToolTip(int index, const QString &toolTip); auto TabToolTip(int index) const -> QString; auto TabIcon(int index) const -> QIcon; auto TabText(int index) const -> QString; - void SetTabText(int index, const QString &text); + void SetTabText(int index, const QString &text); auto Count() const -> vsizetype; auto TabRect(int index) const -> QRect; @@ -101,16 +102,22 @@ 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; - TabBarPosition m_position; - QRect m_hoverRect; - int m_hoverIndex; - int m_currentIndex; - QList m_attachedTabs; - QTimer m_timerTriggerChangedSignal; + TabBarPosition m_position; + QRect m_hoverRect; + int m_hoverIndex; + int m_currentIndex; + QList m_attachedTabs; + QTimer m_timerTriggerChangedSignal; auto GetCorner(const QRect &rect, const Corner corner) const -> QPoint; @@ -122,7 +129,7 @@ private: -> QPoint; auto TabSizeHint(bool minimum = false) const -> QSize; - void PaintTab(QPainter *painter, int tabIndex) const; + void PaintTab(QPainter *painter, int tabIndex) const; auto ValidIndex(int index) const -> bool; }; diff --git a/src/libs/vwidgets/qtcolorpicker.cpp b/src/libs/vwidgets/qtcolorpicker.cpp index b9c15e6a1..948cf24ca 100644 --- a/src/libs/vwidgets/qtcolorpicker.cpp +++ b/src/libs/vwidgets/qtcolorpicker.cpp @@ -1,17 +1,17 @@ /**************************************************************************** -** +** ** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) -** +** ** This file is part of a Qt Solutions component. ** -** Commercial Usage +** Commercial Usage ** Licensees holding valid Qt Commercial licenses may use this file in ** accordance with the Qt Solutions Commercial License Agreement provided ** with the Software or, alternatively, in accordance with the terms ** contained in a written agreement between you and Nokia. -** +** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser ** General Public License version 2.1 as published by the Free Software @@ -19,50 +19,51 @@ ** packaging of this file. Please review the following information to ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** +** ** In addition, as a special exception, Nokia gives you certain ** additional rights. These rights are described in the Nokia Qt LGPL ** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this ** package. -** -** GNU General Public License Usage +** +** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU ** General Public License version 3.0 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. Please review the following information to ** ensure the GNU General Public License version 3.0 requirements will be ** met: http://www.gnu.org/copyleft/gpl.html. -** +** ** Please note Third Party Software included with Qt Solutions may impose ** additional restrictions and it is the user's responsibility to ensure ** that they have met the licensing requirements of the GPL, LGPL, or Qt ** Solutions Commercial license and the relevant license of the Third ** Party Software they are using. -** +** ** If you are unsure which license is appropriate for your use, please ** contact Nokia at qt-info@nokia.com. -** +** ****************************************************************************/ #include -#include -#include #include -#include -#include -#include -#include -#include -#include #include -#include #include #include #include -#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include #include +#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(), - QWidget *parent = 0); + ColorPickerItem(const QColor &color = Qt::white, const QString &text = QString(), 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, - QWidget *parent = nullptr); + ColorPickerPopup(int width, bool withColorDialog, 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 > widgetAt{}; + QMap> widgetAt{}; QList items{}; QGridLayout *grid{nullptr}; ColorPickerButton *moreButton{nullptr}; @@ -268,8 +267,8 @@ private: \sa QFrame */ QtColorPicker::QtColorPicker(QWidget *parent, int columns, bool enableColorDialog) - : QPushButton(parent), - withColorDialog(enableColorDialog) + : QPushButton(parent), + withColorDialog(enableColorDialog) { setFocusPolicy(Qt::StrongFocus); setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); @@ -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 &)), - SLOT(setCurrentColor(const QColor &))); + connect(popup, SIGNAL(selected(const QColor &)), SLOT(setCurrentColor(const QColor &))); connect(popup, SIGNAL(hid()), SLOT(popupClosed())); // Connect this push button's pressed() signal. @@ -316,14 +314,14 @@ void QtColorPicker::buttonPressed(bool toggled) // Make sure the popup is inside the desktop. QPoint pos = rect().bottomLeft(); if (pos.x() < desktop.left()) - pos.setX(desktop.left()); + pos.setX(desktop.left()); if (pos.y() < desktop.top()) - pos.setY(desktop.top()); + pos.setY(desktop.top()); if ((pos.x() + popup->sizeHint().width()) > desktop.width()) - pos.setX(desktop.width() - popup->sizeHint().width()); + pos.setX(desktop.width() - popup->sizeHint().width()); if ((pos.y() + popup->sizeHint().height()) > desktop.bottom()) - pos.setY(desktop.bottom() - popup->sizeHint().height()); + pos.setY(desktop.bottom() - popup->sizeHint().height()); popup->move(mapToGlobal(pos)); if (ColorPickerItem *item = popup->find(col)) @@ -347,15 +345,16 @@ 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()); QPainter p(&pix); - int w = pix.width(); // width of cell in pixels - int h = pix.height(); // height of cell in pixels + int w = pix.width(); // width of cell in pixels + int h = pix.height(); // height of cell in pixels p.setPen(QPen(Qt::gray)); p.setBrush(col); p.drawRect(2, 2, w - 5, h - 5); @@ -442,7 +441,6 @@ auto QtColorPicker::CustomColors() const -> QVector return customColor; } - /*! Makes \a color current. If \a color is not already in the color grid, it is inserted with the text "Custom". @@ -453,13 +451,13 @@ auto QtColorPicker::CustomColors() const -> QVector void QtColorPicker::setCurrentColor(const QColor &color) { if (col == color || !color.isValid()) - return; + return; ColorPickerItem *item = popup->find(color); if (!item) { - insertColor(color, tr("Custom")); - item = popup->find(color); + insertColor(color, tr("Custom")); + item = popup->find(color); } col = color; @@ -483,10 +481,11 @@ void QtColorPicker::setCurrentColor(const QColor &color) void QtColorPicker::insertColor(const QColor &color, const QString &text, int index) { popup->insertColor(color, text, index); - if (!firstInserted) { - col = color; - setText(text); - firstInserted = true; + if (!firstInserted) + { + col = color; + setText(text); + firstInserted = true; } } @@ -517,7 +516,7 @@ auto QtColorPicker::colorDialogEnabled() const -> bool \code void Drawer::mouseReleaseEvent(QMouseEvent *e) { - if (e->button() & RightButton) { + if (e->button() & RightButton) { QColor color = QtColorPicker::getColor(mapToGlobal(e->pos())); } } @@ -555,8 +554,8 @@ auto QtColorPicker::getColor(const QPoint &point, bool allowCustomColors) -> QCo Constructs the popup widget. */ ColorPickerPopup::ColorPickerPopup(int width, bool withColorDialog, QWidget *parent) - : QFrame(parent, Qt::Popup), - cols(width) + : QFrame(parent, Qt::Popup), + cols(width) { setFrameStyle(QFrame::StyledPanel); setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); @@ -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(), - [col](ColorPickerItem *item){return item && item->color() == col;}); + auto item = + 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 (items.count() - 1)) + if (index < 0 || index > static_cast(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 +auto ColorPickerPopup::CustomItems() const -> QVector { QVector 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,15 +808,16 @@ void ColorPickerPopup::keyPressEvent(QKeyEvent *e) { ++curRow; } - else for (int i = 1; i < grid->columnCount(); ++i) - { - if (!widgetAt[curRow + 1][i]) + else + for (int i = 1; i < grid->columnCount(); ++i) { - curCol = i - 1; - ++curRow; - break; + if (!widgetAt[curRow + 1][i]) + { + curCol = i - 1; + ++curRow; + break; + } } - } } break; case Qt::Key_Space: @@ -878,9 +880,9 @@ void ColorPickerPopup::keyPressEvent(QKeyEvent *e) case Qt::Key_Escape: hide(); break; - default: - e->ignore(); - break; + default: + e->ignore(); + break; } widgetAt[curRow][curCol]->setFocus(); @@ -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, - QWidget *parent) - : QFrame(parent), c(color), t(text), sel(false) +ColorPickerItem::ColorPickerItem(const QColor &color, const QString &text, QWidget *parent) + : QFrame(parent), + c(color), + t(text), + sel(false) { setToolTip(t); setFixedWidth(24); @@ -1111,17 +1116,17 @@ void ColorPickerItem::mousePressEvent(QMouseEvent *) void ColorPickerItem::paintEvent(QPaintEvent *) { QPainter p(this); - int w = width(); // width of cell in pixels - int h = height(); // height of cell in pixels + 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)); @@ -1135,7 +1140,7 @@ void ColorPickerItem::paintEvent(QPaintEvent *) */ ColorPickerButton::ColorPickerButton(QWidget *parent) - : QFrame(parent) + : QFrame(parent) { setFrameStyle(StyledPanel); } @@ -1176,10 +1181,7 @@ void ColorPickerButton::mouseReleaseEvent(QMouseEvent *e) */ void ColorPickerButton::keyPressEvent(QKeyEvent *e) { - if (e->key() == Qt::Key_Up - || e->key() == Qt::Key_Down - || e->key() == Qt::Key_Left - || e->key() == Qt::Key_Right) + if (e->key() == Qt::Key_Up || 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 - || e->key() == Qt::Key_Down - || e->key() == Qt::Key_Left - || e->key() == Qt::Key_Right) + if (e->key() == Qt::Key_Up || 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" diff --git a/src/libs/vwidgets/qtcolorpicker.h b/src/libs/vwidgets/qtcolorpicker.h index 96a09dd30..f9306f30b 100644 --- a/src/libs/vwidgets/qtcolorpicker.h +++ b/src/libs/vwidgets/qtcolorpicker.h @@ -1,17 +1,17 @@ /**************************************************************************** -** +** ** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) -** +** ** This file is part of a Qt Solutions component. ** -** Commercial Usage +** Commercial Usage ** Licensees holding valid Qt Commercial licenses may use this file in ** accordance with the Qt Solutions Commercial License Agreement provided ** with the Software or, alternatively, in accordance with the terms ** contained in a written agreement between you and Nokia. -** +** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser ** General Public License version 2.1 as published by the Free Software @@ -19,42 +19,44 @@ ** packaging of this file. Please review the following information to ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** +** ** In addition, as a special exception, Nokia gives you certain ** additional rights. These rights are described in the Nokia Qt LGPL ** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this ** package. -** -** GNU General Public License Usage +** +** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU ** General Public License version 3.0 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. Please review the following information to ** ensure the GNU General Public License version 3.0 requirements will be ** met: http://www.gnu.org/copyleft/gpl.html. -** +** ** Please note Third Party Software included with Qt Solutions may impose ** additional restrictions and it is the user's responsibility to ensure ** that they have met the licensing requirements of the GPL, LGPL, or Qt ** Solutions Commercial license and the relevant license of the Third ** Party Software they are using. -** +** ** If you are unsure which license is appropriate for your use, please ** contact Nokia at qt-info@nokia.com. -** +** ****************************************************************************/ #ifndef QTCOLORPICKER_H #define QTCOLORPICKER_H +#include #include #include -#include +#include #include #include -#include +#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, - int columns = -1, bool enableColorDialog = true); + QtColorPicker(QWidget *parent = 0, int columns = -1, bool enableColorDialog = true); ~QtColorPicker(); diff --git a/src/libs/vwidgets/velidedlabel.h b/src/libs/vwidgets/velidedlabel.h index 4fbacc216..c574b2fc2 100644 --- a/src/libs/vwidgets/velidedlabel.h +++ b/src/libs/vwidgets/velidedlabel.h @@ -30,7 +30,9 @@ #include +#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) #include "../vmisc/defglobal.h" +#endif class VElidedLabel : public QFrame { @@ -38,32 +40,33 @@ 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); + explicit VElidedLabel(QWidget *parent = nullptr); + explicit VElidedLabel(const QString &text, QWidget *parent = nullptr); - void setText(const QString &text); - auto text() const -> const QString &; + void setText(const QString &text); + auto text() const -> const QString &; - auto IsElided() const -> bool; + auto IsElided() const -> bool; - auto ShowElided() const -> bool; - void SetShowElided(bool showElided); + auto ShowElided() const -> bool; + void SetShowElided(bool showElided); protected: - virtual void paintEvent(QPaintEvent *event) override; + virtual void paintEvent(QPaintEvent *event) override; signals: - void ElisionChanged(bool m_elided); + void ElisionChanged(bool m_elided); private: - // cppcheck-suppress unknownMacro - Q_DISABLE_COPY_MOVE(VElidedLabel) // NOLINT - bool m_elided{false}; - bool m_showElided{true}; - QString m_content{}; + // cppcheck-suppress unknownMacro + Q_DISABLE_COPY_MOVE(VElidedLabel) // NOLINT + bool m_elided{false}; + bool m_showElided{true}; + QString m_content{}; - auto DrawParagraph(QPainter &painter, const QString ¶graph, int &y, bool &didElide) -> bool; + auto DrawParagraph(QPainter &painter, const QString ¶graph, int &y, bool &didElide) -> bool; }; //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vwidgets/vlineedit.cpp b/src/libs/vwidgets/vlineedit.cpp index 8a16b546f..741492db3 100644 --- a/src/libs/vwidgets/vlineedit.cpp +++ b/src/libs/vwidgets/vlineedit.cpp @@ -35,6 +35,8 @@ #include #include +#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); - virtual ~MultiSelectCompleter() =default; + explicit MultiSelectCompleter(QObject *parent = nullptr); + 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) -{} + : QCompleter(parent) +{ +} //--------------------------------------------------------------------------------------------------------------------- auto MultiSelectCompleter::pathFromIndex(const QModelIndex &index) const -> QString { QString path = QCompleter::pathFromIndex(index); - QString text = static_cast(widget())->text(); + QString text = static_cast(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) -{} + : QLineEdit(parent), + m_selectOnMousePress(false) +{ +} //--------------------------------------------------------------------------------------------------------------------- VLineEdit::VLineEdit(const QString &contents, QWidget *parent) - : QLineEdit(contents, parent), - m_selectOnMousePress(false) -{} + : 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; @@ -147,8 +152,8 @@ void VLineEdit::mousePressEvent(QMouseEvent *e) // VCompleterLineEdit //--------------------------------------------------------------------------------------------------------------------- VCompleterLineEdit::VCompleterLineEdit(QWidget *parent) - : VLineEdit(parent), - m_model(new QStringListModel(this)) + : VLineEdit(parent), + m_model(new QStringListModel(this)) { setCompleter(new MultiSelectCompleter()); completer()->setModel(m_model); @@ -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 diff --git a/src/libs/vwidgets/vlineedit.h b/src/libs/vwidgets/vlineedit.h index ff9211eb9..4c09023f2 100644 --- a/src/libs/vwidgets/vlineedit.h +++ b/src/libs/vwidgets/vlineedit.h @@ -31,21 +31,25 @@ #include +#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(); diff --git a/src/libs/vwidgets/vmaingraphicsview.h b/src/libs/vwidgets/vmaingraphicsview.h index 7811a1037..decf2a3b9 100644 --- a/src/libs/vwidgets/vmaingraphicsview.h +++ b/src/libs/vwidgets/vmaingraphicsview.h @@ -29,18 +29,19 @@ #ifndef VMAINGRAPHICSVIEW_H #define VMAINGRAPHICSVIEW_H - #include #include #include #include +#include #include #include #include #include -#include +#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,31 +89,32 @@ public slots: void VerticalScrollingTime(qreal x); void HorizontalScrollingTime(qreal x); void animFinished(); + protected: virtual auto eventFilter(QObject *object, QEvent *event) -> bool override; private: // cppcheck-suppress unknownMacro Q_DISABLE_COPY_MOVE(GraphicsViewZoom) // NOLINT - QGraphicsView *_view; + QGraphicsView *_view; Qt::KeyboardModifiers _modifiers; - double _zoom_factor_base; - QPointF target_scene_pos; - QPointF target_viewport_pos; - QPointer verticalScrollAnim; + double _zoom_factor_base; + QPointF target_scene_pos; + QPointF target_viewport_pos; + QPointer verticalScrollAnim; /** @brief _numScheduledVerticalScrollings keep number scheduled vertical scrollings. */ - qreal _numScheduledVerticalScrollings; - QPointer horizontalScrollAnim; + qreal _numScheduledVerticalScrollings; + QPointer horizontalScrollAnim; /** @brief _numScheduledHorizontalScrollings keep number scheduled horizontal scrollings. */ - qreal _numScheduledHorizontalScrollings; + qreal _numScheduledHorizontalScrollings; void FictiveSceneRect(QGraphicsScene *sc, QGraphicsView *view); - void StartVerticalScrollings(QWheelEvent* wheel_event); - void StartHorizontalScrollings(QWheelEvent* wheel_event); + void StartVerticalScrollings(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); @@ -150,17 +154,18 @@ signals: * * Usefull when you need show dialog after working with tool visualization. */ - void MouseRelease(); - void itemClicked(QGraphicsItem *item); - void ScaleChanged(qreal scale); - void ZoomFitBestCurrent(); + void MouseRelease(); + void itemClicked(QGraphicsItem *item); + void ScaleChanged(qreal scale); + void ZoomFitBestCurrent(); public slots: - void Zoom(qreal scale); - void ZoomIn(); - void ZoomOut(); - void ZoomOriginal(); - void ZoomFitBest(); - void ResetScrollingAnimation(); + void Zoom(qreal scale); + void ZoomIn(); + void ZoomOut(); + void ZoomOriginal(); + void ZoomFitBest(); + void ResetScrollingAnimation(); + protected: void mousePressEvent(QMouseEvent *event) override; void mouseMoveEvent(QMouseEvent *event) override; @@ -169,14 +174,15 @@ 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; - bool showToolOptions; - bool isAllowRubberBand; - QPoint m_ptStartPos; - QCursor m_oldCursor; - Qt::CursorShape m_currentCursor; + GraphicsViewZoom *zoom; + bool showToolOptions; + bool isAllowRubberBand; + QPoint m_ptStartPos; + QCursor m_oldCursor; + Qt::CursorShape m_currentCursor; }; #endif // VMAINGRAPHICSVIEW_H diff --git a/src/libs/vwidgets/vwidgetpopup.h b/src/libs/vwidgets/vwidgetpopup.h index 86f60a1cf..453eb08d8 100644 --- a/src/libs/vwidgets/vwidgetpopup.h +++ b/src/libs/vwidgets/vwidgetpopup.h @@ -35,7 +35,9 @@ #include #include +#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) #include "../vmisc/defglobal.h" +#endif /** \brief Class showing a widget as popup window. diff --git a/src/test/CollectionTest/tst_tapecommandline.h b/src/test/CollectionTest/tst_tapecommandline.h index d0c8e387d..b7317fe03 100644 --- a/src/test/CollectionTest/tst_tapecommandline.h +++ b/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 diff --git a/src/test/CollectionTest/tst_valentinacommandline.h b/src/test/CollectionTest/tst_valentinacommandline.h index e2bdbe3cc..4cc98f0f0 100644 --- a/src/test/CollectionTest/tst_valentinacommandline.h +++ b/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); diff --git a/src/test/TranslationsTest/tst_abstractregexp.h b/src/test/TranslationsTest/tst_abstractregexp.h index 54c3a8c62..0ba145dde 100644 --- a/src/test/TranslationsTest/tst_abstractregexp.h +++ b/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 @@ -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 m_vTranslator; VTranslateVars *m_trMs; - virtual void PrepareData()=0; + virtual void PrepareData() = 0; virtual auto AllNames() -> QStringList = 0; auto LoadVariables(const QString &checkedLocale) -> int; diff --git a/src/test/TranslationsTest/tst_abstracttranslation.h b/src/test/TranslationsTest/tst_abstracttranslation.h index d5479c2b8..faf97484c 100644 --- a/src/test/TranslationsTest/tst_abstracttranslation.h +++ b/src/test/TranslationsTest/tst_abstracttranslation.h @@ -28,17 +28,20 @@ #ifndef TST_ABSTRACTTRANSLATION_H #define TST_ABSTRACTTRANSLATION_H -#include -#include -#include #include +#include +#include +#include #include +#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); diff --git a/src/test/TranslationsTest/tst_measurementregexp.h b/src/test/TranslationsTest/tst_measurementregexp.h index 5cb8e3a0d..33caca96c 100644 --- a/src/test/TranslationsTest/tst_measurementregexp.h +++ b/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 +#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; diff --git a/src/test/ValentinaTest/tst_misc.h b/src/test/ValentinaTest/tst_misc.h index da4f310d0..cde2aeb47 100644 --- a/src/test/ValentinaTest/tst_misc.h +++ b/src/test/ValentinaTest/tst_misc.h @@ -31,11 +31,14 @@ #include +#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); diff --git a/src/test/ValentinaTest/tst_qmutokenparser.h b/src/test/ValentinaTest/tst_qmutokenparser.h index 87aa0c402..628fce45e 100644 --- a/src/test/ValentinaTest/tst_qmutokenparser.h +++ b/src/test/ValentinaTest/tst_qmutokenparser.h @@ -32,11 +32,14 @@ #include #include +#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 diff --git a/src/test/ValentinaTest/tst_vcommandline.h b/src/test/ValentinaTest/tst_vcommandline.h index 191a9f81b..3fb104771 100644 --- a/src/test/ValentinaTest/tst_vcommandline.h +++ b/src/test/ValentinaTest/tst_vcommandline.h @@ -31,11 +31,14 @@ #include +#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); diff --git a/src/test/ValentinaTest/tst_vcubicbezierpath.h b/src/test/ValentinaTest/tst_vcubicbezierpath.h index 984358393..6f04e5782 100644 --- a/src/test/ValentinaTest/tst_vcubicbezierpath.h +++ b/src/test/ValentinaTest/tst_vcubicbezierpath.h @@ -31,11 +31,14 @@ #include +#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 diff --git a/src/test/ValentinaTest/tst_vdomdocument.h b/src/test/ValentinaTest/tst_vdomdocument.h index 75f25a6d6..36fa99bca 100644 --- a/src/test/ValentinaTest/tst_vdomdocument.h +++ b/src/test/ValentinaTest/tst_vdomdocument.h @@ -30,17 +30,21 @@ #include +#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 }; diff --git a/src/test/ValentinaTest/tst_vellipticalarc.h b/src/test/ValentinaTest/tst_vellipticalarc.h index 12289dc36..f03567506 100644 --- a/src/test/ValentinaTest/tst_vellipticalarc.h +++ b/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); diff --git a/src/test/ValentinaTest/tst_vpiece.h b/src/test/ValentinaTest/tst_vpiece.h index 2f715a223..42797a766 100644 --- a/src/test/ValentinaTest/tst_vpiece.h +++ b/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); diff --git a/src/test/ValentinaTest/tst_vpointf.h b/src/test/ValentinaTest/tst_vpointf.h index cf57369cb..2c8382eb5 100644 --- a/src/test/ValentinaTest/tst_vpointf.h +++ b/src/test/ValentinaTest/tst_vpointf.h @@ -32,16 +32,20 @@ #include #include +#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 }; diff --git a/src/test/ValentinaTest/tst_vspline.h b/src/test/ValentinaTest/tst_vspline.h index a79aaa803..0b6198b65 100644 --- a/src/test/ValentinaTest/tst_vspline.h +++ b/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); diff --git a/src/test/ValentinaTest/tst_vsplinepath.h b/src/test/ValentinaTest/tst_vsplinepath.h index b2d6a1d4b..9f6907dd6 100644 --- a/src/test/ValentinaTest/tst_vsplinepath.h +++ b/src/test/ValentinaTest/tst_vsplinepath.h @@ -31,11 +31,14 @@ #include +#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 }; diff --git a/src/test/ValentinaTest/tst_vtooluniondetails.h b/src/test/ValentinaTest/tst_vtooluniondetails.h index 4fa905168..7ebbfeba2 100644 --- a/src/test/ValentinaTest/tst_vtooluniondetails.h +++ b/src/test/ValentinaTest/tst_vtooluniondetails.h @@ -31,16 +31,20 @@ #include +#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 }; diff --git a/src/test/ValentinaTest/tst_vtranslatevars.h b/src/test/ValentinaTest/tst_vtranslatevars.h index 032eae33a..ac2952745 100644 --- a/src/test/ValentinaTest/tst_vtranslatevars.h +++ b/src/test/ValentinaTest/tst_vtranslatevars.h @@ -29,17 +29,20 @@ #ifndef TST_VTRANSLATEVARS_H #define TST_VTRANSLATEVARS_H -#include #include #include +#include +#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