From f120519edef2a624eaadf9e815c8b54392d3885e Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 20 Feb 2024 11:39:25 +0200 Subject: [PATCH] Default construct doesn't initialize constructor. --- src/app/puzzle/carousel/vpcarrousel.cpp | 1 + src/app/puzzle/carousel/vpcarrousel.h | 2 +- .../dialogs/configpages/puzzlepreferencesconfigurationpage.cpp | 3 ++- .../dialogs/configpages/puzzlepreferencesconfigurationpage.h | 2 +- .../puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.cpp | 3 ++- .../puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.h | 2 +- .../puzzle/dialogs/configpages/puzzlepreferencespathpage.cpp | 3 ++- src/app/puzzle/dialogs/configpages/puzzlepreferencespathpage.h | 2 +- src/app/puzzle/dialogs/dialogpuzzlepreferences.cpp | 1 + src/app/puzzle/dialogs/dialogpuzzlepreferences.h | 2 +- src/app/puzzle/dialogs/dialogsavemanuallayout.cpp | 1 + src/app/puzzle/dialogs/dialogsavemanuallayout.h | 2 +- src/app/puzzle/dialogs/vpdialogabout.cpp | 1 + src/app/puzzle/dialogs/vpdialogabout.h | 2 +- src/app/puzzle/vpmainwindow.cpp | 1 + src/app/puzzle/vpmainwindow.h | 2 +- .../dialogs/configpages/tapepreferencesconfigurationpage.cpp | 1 + .../dialogs/configpages/tapepreferencesconfigurationpage.h | 2 +- src/app/tape/dialogs/configpages/tapepreferencespathpage.cpp | 3 ++- src/app/tape/dialogs/configpages/tapepreferencespathpage.h | 2 +- src/app/tape/dialogs/dialogabouttape.cpp | 1 + src/app/tape/dialogs/dialogabouttape.h | 2 +- src/app/tape/dialogs/dialogdimensioncustomnames.cpp | 3 ++- src/app/tape/dialogs/dialogdimensioncustomnames.h | 2 +- src/app/tape/dialogs/dialogdimensionlabels.cpp | 1 + src/app/tape/dialogs/dialogdimensionlabels.h | 2 +- src/app/tape/dialogs/dialogknownmeasurementscsvcolumns.cpp | 1 + src/app/tape/dialogs/dialogknownmeasurementscsvcolumns.h | 2 +- 28 files changed, 33 insertions(+), 19 deletions(-) diff --git a/src/app/puzzle/carousel/vpcarrousel.cpp b/src/app/puzzle/carousel/vpcarrousel.cpp index b8725b4fb..dd6a505bc 100644 --- a/src/app/puzzle/carousel/vpcarrousel.cpp +++ b/src/app/puzzle/carousel/vpcarrousel.cpp @@ -56,6 +56,7 @@ QT_WARNING_POP //--------------------------------------------------------------------------------------------------------------------- VPCarrousel::VPCarrousel(const VPLayoutPtr &layout, QWidget *parent) : QWidget(parent), + ui(std::make_unique()), m_layout(layout) { SCASSERT(not layout.isNull()) diff --git a/src/app/puzzle/carousel/vpcarrousel.h b/src/app/puzzle/carousel/vpcarrousel.h index f40416258..581e0dc75 100644 --- a/src/app/puzzle/carousel/vpcarrousel.h +++ b/src/app/puzzle/carousel/vpcarrousel.h @@ -103,7 +103,7 @@ private slots: private: // cppcheck-suppress unknownMacro Q_DISABLE_COPY_MOVE(VPCarrousel) // NOLINT - std::unique_ptr ui{}; + std::unique_ptr ui; VPLayoutWeakPtr m_layout{}; diff --git a/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.cpp b/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.cpp index c5be30bbb..4744e1e05 100644 --- a/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.cpp +++ b/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.cpp @@ -39,7 +39,8 @@ //--------------------------------------------------------------------------------------------------------------------- PuzzlePreferencesConfigurationPage::PuzzlePreferencesConfigurationPage(QWidget *parent) - : QWidget(parent) + : QWidget(parent), + ui(std::make_unique()) { ui->setupUi(this); diff --git a/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.h b/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.h index ced465d6d..d0d364e66 100644 --- a/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.h +++ b/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.h @@ -55,7 +55,7 @@ private slots: private: // cppcheck-suppress unknownMacro Q_DISABLE_COPY_MOVE(PuzzlePreferencesConfigurationPage) // NOLINT - std::unique_ptr ui{}; + std::unique_ptr ui; bool m_langChanged{false}; QList m_transientShortcuts{}; diff --git a/src/app/puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.cpp b/src/app/puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.cpp index 1031df067..f3366e488 100644 --- a/src/app/puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.cpp +++ b/src/app/puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.cpp @@ -31,7 +31,8 @@ //--------------------------------------------------------------------------------------------------------------------- PuzzlePreferencesLayoutPage::PuzzlePreferencesLayoutPage(QWidget *parent) - : QWidget(parent) + : QWidget(parent), + ui(std::make_unique()) { ui->setupUi(this); diff --git a/src/app/puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.h b/src/app/puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.h index ad195b0b1..b5aa24408 100644 --- a/src/app/puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.h +++ b/src/app/puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.h @@ -65,7 +65,7 @@ private slots: private: // cppcheck-suppress unknownMacro Q_DISABLE_COPY_MOVE(PuzzlePreferencesLayoutPage) // NOLINT - std::unique_ptr ui{}; + std::unique_ptr ui; Unit m_oldLayoutUnit{Unit::Mm}; bool m_settingsChanged{false}; diff --git a/src/app/puzzle/dialogs/configpages/puzzlepreferencespathpage.cpp b/src/app/puzzle/dialogs/configpages/puzzlepreferencespathpage.cpp index 2a66fe357..6f9ba5d00 100644 --- a/src/app/puzzle/dialogs/configpages/puzzlepreferencespathpage.cpp +++ b/src/app/puzzle/dialogs/configpages/puzzlepreferencespathpage.cpp @@ -31,7 +31,8 @@ //--------------------------------------------------------------------------------------------------------------------- PuzzlePreferencesPathPage::PuzzlePreferencesPathPage(QWidget *parent) - : QWidget(parent) + : QWidget(parent), + ui(std::make_unique()) { ui->setupUi(this); diff --git a/src/app/puzzle/dialogs/configpages/puzzlepreferencespathpage.h b/src/app/puzzle/dialogs/configpages/puzzlepreferencespathpage.h index 490e19d05..03959d1f7 100644 --- a/src/app/puzzle/dialogs/configpages/puzzlepreferencespathpage.h +++ b/src/app/puzzle/dialogs/configpages/puzzlepreferencespathpage.h @@ -56,7 +56,7 @@ private slots: private: // cppcheck-suppress unknownMacro Q_DISABLE_COPY_MOVE(PuzzlePreferencesPathPage) // NOLINT - std::unique_ptr ui{}; + std::unique_ptr ui; void InitTable(); }; diff --git a/src/app/puzzle/dialogs/dialogpuzzlepreferences.cpp b/src/app/puzzle/dialogs/dialogpuzzlepreferences.cpp index 822e270b8..3b7dfb1b6 100644 --- a/src/app/puzzle/dialogs/dialogpuzzlepreferences.cpp +++ b/src/app/puzzle/dialogs/dialogpuzzlepreferences.cpp @@ -46,6 +46,7 @@ using namespace Qt::Literals::StringLiterals; //--------------------------------------------------------------------------------------------------------------------- DialogPuzzlePreferences::DialogPuzzlePreferences(QWidget *parent) : QDialog(parent), + ui(std::make_unique()), m_configurationPage(new PuzzlePreferencesConfigurationPage), m_layoutPage(new PuzzlePreferencesLayoutPage), m_pathPage(new PuzzlePreferencesPathPage) diff --git a/src/app/puzzle/dialogs/dialogpuzzlepreferences.h b/src/app/puzzle/dialogs/dialogpuzzlepreferences.h index 4f8e4b1d2..9bb8956db 100644 --- a/src/app/puzzle/dialogs/dialogpuzzlepreferences.h +++ b/src/app/puzzle/dialogs/dialogpuzzlepreferences.h @@ -65,7 +65,7 @@ private slots: private: // cppcheck-suppress unknownMacro Q_DISABLE_COPY_MOVE(DialogPuzzlePreferences) // NOLINT - std::unique_ptr ui{}; + std::unique_ptr ui; bool m_isInitialized{false}; PuzzlePreferencesConfigurationPage *m_configurationPage; PuzzlePreferencesLayoutPage *m_layoutPage; diff --git a/src/app/puzzle/dialogs/dialogsavemanuallayout.cpp b/src/app/puzzle/dialogs/dialogsavemanuallayout.cpp index bcbb421a0..75e0ca801 100644 --- a/src/app/puzzle/dialogs/dialogsavemanuallayout.cpp +++ b/src/app/puzzle/dialogs/dialogsavemanuallayout.cpp @@ -59,6 +59,7 @@ QT_WARNING_POP DialogSaveManualLayout::DialogSaveManualLayout(vsizetype count, bool consoleExport, const QString &fileName, QWidget *parent) : VAbstractLayoutDialog(parent), + ui(std::make_unique()), m_count(count), m_consoleExport(consoleExport) { diff --git a/src/app/puzzle/dialogs/dialogsavemanuallayout.h b/src/app/puzzle/dialogs/dialogsavemanuallayout.h index fd50d2a05..851331b50 100644 --- a/src/app/puzzle/dialogs/dialogsavemanuallayout.h +++ b/src/app/puzzle/dialogs/dialogsavemanuallayout.h @@ -82,7 +82,7 @@ private slots: private: // cppcheck-suppress unknownMacro Q_DISABLE_COPY_MOVE(DialogSaveManualLayout) // NOLINT - std::unique_ptr ui{}; + std::unique_ptr ui; vsizetype m_count; bool m_isInitialized{false}; bool m_scaleConnected{true}; diff --git a/src/app/puzzle/dialogs/vpdialogabout.cpp b/src/app/puzzle/dialogs/vpdialogabout.cpp index dd841a70f..dd5928808 100644 --- a/src/app/puzzle/dialogs/vpdialogabout.cpp +++ b/src/app/puzzle/dialogs/vpdialogabout.cpp @@ -53,6 +53,7 @@ using namespace Qt::Literals::StringLiterals; //--------------------------------------------------------------------------------------------------------------------- VPDialogAbout::VPDialogAbout(QWidget *parent) : QDialog(parent), + ui(std::make_unique()), m_isInitialized(false) { ui->setupUi(this); diff --git a/src/app/puzzle/dialogs/vpdialogabout.h b/src/app/puzzle/dialogs/vpdialogabout.h index 7c34249d5..2c816f26f 100644 --- a/src/app/puzzle/dialogs/vpdialogabout.h +++ b/src/app/puzzle/dialogs/vpdialogabout.h @@ -52,7 +52,7 @@ protected: private: // cppcheck-suppress unknownMacro Q_DISABLE_COPY_MOVE(VPDialogAbout) // NOLINT - std::unique_ptr ui{}; + std::unique_ptr ui; bool m_isInitialized; static void FontPointSize(QWidget *w, int pointSize); diff --git a/src/app/puzzle/vpmainwindow.cpp b/src/app/puzzle/vpmainwindow.cpp index 49d22f26e..1f2b19bb1 100644 --- a/src/app/puzzle/vpmainwindow.cpp +++ b/src/app/puzzle/vpmainwindow.cpp @@ -323,6 +323,7 @@ struct VPExportData //--------------------------------------------------------------------------------------------------------------------- VPMainWindow::VPMainWindow(const VPCommandLinePtr &cmd, QWidget *parent) : VAbstractMainWindow(parent), + ui(std::make_unique()), m_cmd(cmd), m_undoStack(new QUndoStack(this)), m_layout{VPLayout::CreateLayout(m_undoStack)}, diff --git a/src/app/puzzle/vpmainwindow.h b/src/app/puzzle/vpmainwindow.h index f513ae7a1..a52514f61 100644 --- a/src/app/puzzle/vpmainwindow.h +++ b/src/app/puzzle/vpmainwindow.h @@ -303,7 +303,7 @@ private slots: private: Q_DISABLE_COPY_MOVE(VPMainWindow) // NOLINT - std::unique_ptr ui{}; + std::unique_ptr ui; std::unique_ptr m_carrousel{nullptr}; VPMainGraphicsView *m_graphicsView{nullptr}; diff --git a/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp b/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp index bae025159..64fac52f2 100644 --- a/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp +++ b/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp @@ -44,6 +44,7 @@ //--------------------------------------------------------------------------------------------------------------------- TapePreferencesConfigurationPage::TapePreferencesConfigurationPage(QWidget *parent) : QWidget(parent), + ui(std::make_unique()), m_langChanged(false), m_systemChanged(false) { diff --git a/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.h b/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.h index 144e73e13..6e22f9734 100644 --- a/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.h +++ b/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.h @@ -58,7 +58,7 @@ private slots: private: // cppcheck-suppress unknownMacro Q_DISABLE_COPY_MOVE(TapePreferencesConfigurationPage) // NOLINT - std::unique_ptr ui{}; + std::unique_ptr ui; bool m_langChanged; bool m_systemChanged; QList m_transientShortcuts{}; diff --git a/src/app/tape/dialogs/configpages/tapepreferencespathpage.cpp b/src/app/tape/dialogs/configpages/tapepreferencespathpage.cpp index 5438f1b1f..d67b14938 100644 --- a/src/app/tape/dialogs/configpages/tapepreferencespathpage.cpp +++ b/src/app/tape/dialogs/configpages/tapepreferencespathpage.cpp @@ -32,7 +32,8 @@ //--------------------------------------------------------------------------------------------------------------------- TapePreferencesPathPage::TapePreferencesPathPage(QWidget *parent) - : QWidget(parent) + : QWidget(parent), + ui(std::make_unique()) { ui->setupUi(this); diff --git a/src/app/tape/dialogs/configpages/tapepreferencespathpage.h b/src/app/tape/dialogs/configpages/tapepreferencespathpage.h index 34bb6d4b5..b7b8986d9 100644 --- a/src/app/tape/dialogs/configpages/tapepreferencespathpage.h +++ b/src/app/tape/dialogs/configpages/tapepreferencespathpage.h @@ -56,7 +56,7 @@ private slots: private: // cppcheck-suppress unknownMacro Q_DISABLE_COPY_MOVE(TapePreferencesPathPage) // NOLINT - std::unique_ptr ui{}; + std::unique_ptr ui; void InitTable(); }; diff --git a/src/app/tape/dialogs/dialogabouttape.cpp b/src/app/tape/dialogs/dialogabouttape.cpp index a231695f1..2f7be5cc7 100644 --- a/src/app/tape/dialogs/dialogabouttape.cpp +++ b/src/app/tape/dialogs/dialogabouttape.cpp @@ -47,6 +47,7 @@ //--------------------------------------------------------------------------------------------------------------------- DialogAboutTape::DialogAboutTape(QWidget *parent) : QDialog(parent), + ui(std::make_unique()), m_isInitialized(false) { ui->setupUi(this); diff --git a/src/app/tape/dialogs/dialogabouttape.h b/src/app/tape/dialogs/dialogabouttape.h index 5f736bbf8..1470ef603 100644 --- a/src/app/tape/dialogs/dialogabouttape.h +++ b/src/app/tape/dialogs/dialogabouttape.h @@ -52,7 +52,7 @@ protected: private: // cppcheck-suppress unknownMacro Q_DISABLE_COPY_MOVE(DialogAboutTape) // NOLINT - std::unique_ptr ui{}; + std::unique_ptr ui; bool m_isInitialized; static void FontPointSize(QWidget *w, int pointSize); diff --git a/src/app/tape/dialogs/dialogdimensioncustomnames.cpp b/src/app/tape/dialogs/dialogdimensioncustomnames.cpp index 2c626d6de..aebaaa656 100644 --- a/src/app/tape/dialogs/dialogdimensioncustomnames.cpp +++ b/src/app/tape/dialogs/dialogdimensioncustomnames.cpp @@ -31,7 +31,8 @@ //--------------------------------------------------------------------------------------------------------------------- DialogDimensionCustomNames::DialogDimensionCustomNames( const QMap &dimensions, QWidget *parent) - : QDialog(parent) + : QDialog(parent), + ui(std::make_unique()) { ui->setupUi(this); diff --git a/src/app/tape/dialogs/dialogdimensioncustomnames.h b/src/app/tape/dialogs/dialogdimensioncustomnames.h index df8a014d9..c9bff2ab9 100644 --- a/src/app/tape/dialogs/dialogdimensioncustomnames.h +++ b/src/app/tape/dialogs/dialogdimensioncustomnames.h @@ -52,7 +52,7 @@ public: private: // cppcheck-suppress unknownMacro Q_DISABLE_COPY_MOVE(DialogDimensionCustomNames) // NOLINT - std::unique_ptr ui{}; + std::unique_ptr ui; void InitTable(const QMap &dimensions); }; diff --git a/src/app/tape/dialogs/dialogdimensionlabels.cpp b/src/app/tape/dialogs/dialogdimensionlabels.cpp index e59611877..159bea96f 100644 --- a/src/app/tape/dialogs/dialogdimensionlabels.cpp +++ b/src/app/tape/dialogs/dialogdimensionlabels.cpp @@ -32,6 +32,7 @@ DialogDimensionLabels::DialogDimensionLabels(const QMap &dimensions, bool fullCircumference, QWidget *parent) : QDialog(parent), + ui(std::make_unique()), m_dimensions(dimensions), m_fullCircumference(fullCircumference) { diff --git a/src/app/tape/dialogs/dialogdimensionlabels.h b/src/app/tape/dialogs/dialogdimensionlabels.h index a417f9080..453e82707 100644 --- a/src/app/tape/dialogs/dialogdimensionlabels.h +++ b/src/app/tape/dialogs/dialogdimensionlabels.h @@ -62,7 +62,7 @@ private slots: private: // cppcheck-suppress unknownMacro Q_DISABLE_COPY_MOVE(DialogDimensionLabels) // NOLINT - std::unique_ptr ui{}; + std::unique_ptr ui; QMap m_dimensions; QMap m_labels{}; diff --git a/src/app/tape/dialogs/dialogknownmeasurementscsvcolumns.cpp b/src/app/tape/dialogs/dialogknownmeasurementscsvcolumns.cpp index be105f974..4179434b2 100644 --- a/src/app/tape/dialogs/dialogknownmeasurementscsvcolumns.cpp +++ b/src/app/tape/dialogs/dialogknownmeasurementscsvcolumns.cpp @@ -51,6 +51,7 @@ using namespace Qt::Literals::StringLiterals; //--------------------------------------------------------------------------------------------------------------------- DialogKnownMeasurementsCSVColumns::DialogKnownMeasurementsCSVColumns(QString filename, QWidget *parent) : QDialog(parent), + ui(std::make_unique()), m_fileName{std::move(filename)} { ui->setupUi(this); diff --git a/src/app/tape/dialogs/dialogknownmeasurementscsvcolumns.h b/src/app/tape/dialogs/dialogknownmeasurementscsvcolumns.h index 222de3749..bf4d4db83 100644 --- a/src/app/tape/dialogs/dialogknownmeasurementscsvcolumns.h +++ b/src/app/tape/dialogs/dialogknownmeasurementscsvcolumns.h @@ -80,7 +80,7 @@ private slots: private: // cppcheck-suppress unknownMacro Q_DISABLE_COPY_MOVE(DialogKnownMeasurementsCSVColumns) // NOLINT - std::unique_ptr ui{}; + std::unique_ptr ui; bool m_isInitialized{false}; QString m_fileName; bool m_withHeader{false};