Default construct doesn't initialize constructor.
This commit is contained in:
parent
6df0ca7fca
commit
f120519ede
|
@ -56,6 +56,7 @@ QT_WARNING_POP
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
VPCarrousel::VPCarrousel(const VPLayoutPtr &layout, QWidget *parent)
|
VPCarrousel::VPCarrousel(const VPLayoutPtr &layout, QWidget *parent)
|
||||||
: QWidget(parent),
|
: QWidget(parent),
|
||||||
|
ui(std::make_unique<Ui::VPCarrousel>()),
|
||||||
m_layout(layout)
|
m_layout(layout)
|
||||||
{
|
{
|
||||||
SCASSERT(not layout.isNull())
|
SCASSERT(not layout.isNull())
|
||||||
|
|
|
@ -103,7 +103,7 @@ private slots:
|
||||||
private:
|
private:
|
||||||
// cppcheck-suppress unknownMacro
|
// cppcheck-suppress unknownMacro
|
||||||
Q_DISABLE_COPY_MOVE(VPCarrousel) // NOLINT
|
Q_DISABLE_COPY_MOVE(VPCarrousel) // NOLINT
|
||||||
std::unique_ptr<Ui::VPCarrousel> ui{};
|
std::unique_ptr<Ui::VPCarrousel> ui;
|
||||||
|
|
||||||
VPLayoutWeakPtr m_layout{};
|
VPLayoutWeakPtr m_layout{};
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,8 @@
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
PuzzlePreferencesConfigurationPage::PuzzlePreferencesConfigurationPage(QWidget *parent)
|
PuzzlePreferencesConfigurationPage::PuzzlePreferencesConfigurationPage(QWidget *parent)
|
||||||
: QWidget(parent)
|
: QWidget(parent),
|
||||||
|
ui(std::make_unique<Ui::PuzzlePreferencesConfigurationPage>())
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
|
|
@ -55,7 +55,7 @@ private slots:
|
||||||
private:
|
private:
|
||||||
// cppcheck-suppress unknownMacro
|
// cppcheck-suppress unknownMacro
|
||||||
Q_DISABLE_COPY_MOVE(PuzzlePreferencesConfigurationPage) // NOLINT
|
Q_DISABLE_COPY_MOVE(PuzzlePreferencesConfigurationPage) // NOLINT
|
||||||
std::unique_ptr<Ui::PuzzlePreferencesConfigurationPage> ui{};
|
std::unique_ptr<Ui::PuzzlePreferencesConfigurationPage> ui;
|
||||||
bool m_langChanged{false};
|
bool m_langChanged{false};
|
||||||
QList<QStringList> m_transientShortcuts{};
|
QList<QStringList> m_transientShortcuts{};
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,8 @@
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
PuzzlePreferencesLayoutPage::PuzzlePreferencesLayoutPage(QWidget *parent)
|
PuzzlePreferencesLayoutPage::PuzzlePreferencesLayoutPage(QWidget *parent)
|
||||||
: QWidget(parent)
|
: QWidget(parent),
|
||||||
|
ui(std::make_unique<Ui::PuzzlePreferencesLayoutPage>())
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,7 @@ private slots:
|
||||||
private:
|
private:
|
||||||
// cppcheck-suppress unknownMacro
|
// cppcheck-suppress unknownMacro
|
||||||
Q_DISABLE_COPY_MOVE(PuzzlePreferencesLayoutPage) // NOLINT
|
Q_DISABLE_COPY_MOVE(PuzzlePreferencesLayoutPage) // NOLINT
|
||||||
std::unique_ptr<Ui::PuzzlePreferencesLayoutPage> ui{};
|
std::unique_ptr<Ui::PuzzlePreferencesLayoutPage> ui;
|
||||||
Unit m_oldLayoutUnit{Unit::Mm};
|
Unit m_oldLayoutUnit{Unit::Mm};
|
||||||
bool m_settingsChanged{false};
|
bool m_settingsChanged{false};
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,8 @@
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
PuzzlePreferencesPathPage::PuzzlePreferencesPathPage(QWidget *parent)
|
PuzzlePreferencesPathPage::PuzzlePreferencesPathPage(QWidget *parent)
|
||||||
: QWidget(parent)
|
: QWidget(parent),
|
||||||
|
ui(std::make_unique<Ui::PuzzlePreferencesPathPage>())
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
|
|
@ -56,7 +56,7 @@ private slots:
|
||||||
private:
|
private:
|
||||||
// cppcheck-suppress unknownMacro
|
// cppcheck-suppress unknownMacro
|
||||||
Q_DISABLE_COPY_MOVE(PuzzlePreferencesPathPage) // NOLINT
|
Q_DISABLE_COPY_MOVE(PuzzlePreferencesPathPage) // NOLINT
|
||||||
std::unique_ptr<Ui::PuzzlePreferencesPathPage> ui{};
|
std::unique_ptr<Ui::PuzzlePreferencesPathPage> ui;
|
||||||
|
|
||||||
void InitTable();
|
void InitTable();
|
||||||
};
|
};
|
||||||
|
|
|
@ -46,6 +46,7 @@ using namespace Qt::Literals::StringLiterals;
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
DialogPuzzlePreferences::DialogPuzzlePreferences(QWidget *parent)
|
DialogPuzzlePreferences::DialogPuzzlePreferences(QWidget *parent)
|
||||||
: QDialog(parent),
|
: QDialog(parent),
|
||||||
|
ui(std::make_unique<Ui::DialogPuzzlePreferences>()),
|
||||||
m_configurationPage(new PuzzlePreferencesConfigurationPage),
|
m_configurationPage(new PuzzlePreferencesConfigurationPage),
|
||||||
m_layoutPage(new PuzzlePreferencesLayoutPage),
|
m_layoutPage(new PuzzlePreferencesLayoutPage),
|
||||||
m_pathPage(new PuzzlePreferencesPathPage)
|
m_pathPage(new PuzzlePreferencesPathPage)
|
||||||
|
|
|
@ -65,7 +65,7 @@ private slots:
|
||||||
private:
|
private:
|
||||||
// cppcheck-suppress unknownMacro
|
// cppcheck-suppress unknownMacro
|
||||||
Q_DISABLE_COPY_MOVE(DialogPuzzlePreferences) // NOLINT
|
Q_DISABLE_COPY_MOVE(DialogPuzzlePreferences) // NOLINT
|
||||||
std::unique_ptr<Ui::DialogPuzzlePreferences> ui{};
|
std::unique_ptr<Ui::DialogPuzzlePreferences> ui;
|
||||||
bool m_isInitialized{false};
|
bool m_isInitialized{false};
|
||||||
PuzzlePreferencesConfigurationPage *m_configurationPage;
|
PuzzlePreferencesConfigurationPage *m_configurationPage;
|
||||||
PuzzlePreferencesLayoutPage *m_layoutPage;
|
PuzzlePreferencesLayoutPage *m_layoutPage;
|
||||||
|
|
|
@ -59,6 +59,7 @@ QT_WARNING_POP
|
||||||
DialogSaveManualLayout::DialogSaveManualLayout(vsizetype count, bool consoleExport, const QString &fileName,
|
DialogSaveManualLayout::DialogSaveManualLayout(vsizetype count, bool consoleExport, const QString &fileName,
|
||||||
QWidget *parent)
|
QWidget *parent)
|
||||||
: VAbstractLayoutDialog(parent),
|
: VAbstractLayoutDialog(parent),
|
||||||
|
ui(std::make_unique<Ui::DialogSaveManualLayout>()),
|
||||||
m_count(count),
|
m_count(count),
|
||||||
m_consoleExport(consoleExport)
|
m_consoleExport(consoleExport)
|
||||||
{
|
{
|
||||||
|
|
|
@ -82,7 +82,7 @@ private slots:
|
||||||
private:
|
private:
|
||||||
// cppcheck-suppress unknownMacro
|
// cppcheck-suppress unknownMacro
|
||||||
Q_DISABLE_COPY_MOVE(DialogSaveManualLayout) // NOLINT
|
Q_DISABLE_COPY_MOVE(DialogSaveManualLayout) // NOLINT
|
||||||
std::unique_ptr<Ui::DialogSaveManualLayout> ui{};
|
std::unique_ptr<Ui::DialogSaveManualLayout> ui;
|
||||||
vsizetype m_count;
|
vsizetype m_count;
|
||||||
bool m_isInitialized{false};
|
bool m_isInitialized{false};
|
||||||
bool m_scaleConnected{true};
|
bool m_scaleConnected{true};
|
||||||
|
|
|
@ -53,6 +53,7 @@ using namespace Qt::Literals::StringLiterals;
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
VPDialogAbout::VPDialogAbout(QWidget *parent)
|
VPDialogAbout::VPDialogAbout(QWidget *parent)
|
||||||
: QDialog(parent),
|
: QDialog(parent),
|
||||||
|
ui(std::make_unique<Ui::VPDialogAbout>()),
|
||||||
m_isInitialized(false)
|
m_isInitialized(false)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
|
@ -52,7 +52,7 @@ protected:
|
||||||
private:
|
private:
|
||||||
// cppcheck-suppress unknownMacro
|
// cppcheck-suppress unknownMacro
|
||||||
Q_DISABLE_COPY_MOVE(VPDialogAbout) // NOLINT
|
Q_DISABLE_COPY_MOVE(VPDialogAbout) // NOLINT
|
||||||
std::unique_ptr<Ui::VPDialogAbout> ui{};
|
std::unique_ptr<Ui::VPDialogAbout> ui;
|
||||||
bool m_isInitialized;
|
bool m_isInitialized;
|
||||||
|
|
||||||
static void FontPointSize(QWidget *w, int pointSize);
|
static void FontPointSize(QWidget *w, int pointSize);
|
||||||
|
|
|
@ -323,6 +323,7 @@ struct VPExportData
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
VPMainWindow::VPMainWindow(const VPCommandLinePtr &cmd, QWidget *parent)
|
VPMainWindow::VPMainWindow(const VPCommandLinePtr &cmd, QWidget *parent)
|
||||||
: VAbstractMainWindow(parent),
|
: VAbstractMainWindow(parent),
|
||||||
|
ui(std::make_unique<Ui::VPMainWindow>()),
|
||||||
m_cmd(cmd),
|
m_cmd(cmd),
|
||||||
m_undoStack(new QUndoStack(this)),
|
m_undoStack(new QUndoStack(this)),
|
||||||
m_layout{VPLayout::CreateLayout(m_undoStack)},
|
m_layout{VPLayout::CreateLayout(m_undoStack)},
|
||||||
|
|
|
@ -303,7 +303,7 @@ private slots:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Q_DISABLE_COPY_MOVE(VPMainWindow) // NOLINT
|
Q_DISABLE_COPY_MOVE(VPMainWindow) // NOLINT
|
||||||
std::unique_ptr<Ui::VPMainWindow> ui{};
|
std::unique_ptr<Ui::VPMainWindow> ui;
|
||||||
|
|
||||||
std::unique_ptr<VPCarrousel> m_carrousel{nullptr};
|
std::unique_ptr<VPCarrousel> m_carrousel{nullptr};
|
||||||
VPMainGraphicsView *m_graphicsView{nullptr};
|
VPMainGraphicsView *m_graphicsView{nullptr};
|
||||||
|
|
|
@ -44,6 +44,7 @@
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
TapePreferencesConfigurationPage::TapePreferencesConfigurationPage(QWidget *parent)
|
TapePreferencesConfigurationPage::TapePreferencesConfigurationPage(QWidget *parent)
|
||||||
: QWidget(parent),
|
: QWidget(parent),
|
||||||
|
ui(std::make_unique<Ui::TapePreferencesConfigurationPage>()),
|
||||||
m_langChanged(false),
|
m_langChanged(false),
|
||||||
m_systemChanged(false)
|
m_systemChanged(false)
|
||||||
{
|
{
|
||||||
|
|
|
@ -58,7 +58,7 @@ private slots:
|
||||||
private:
|
private:
|
||||||
// cppcheck-suppress unknownMacro
|
// cppcheck-suppress unknownMacro
|
||||||
Q_DISABLE_COPY_MOVE(TapePreferencesConfigurationPage) // NOLINT
|
Q_DISABLE_COPY_MOVE(TapePreferencesConfigurationPage) // NOLINT
|
||||||
std::unique_ptr<Ui::TapePreferencesConfigurationPage> ui{};
|
std::unique_ptr<Ui::TapePreferencesConfigurationPage> ui;
|
||||||
bool m_langChanged;
|
bool m_langChanged;
|
||||||
bool m_systemChanged;
|
bool m_systemChanged;
|
||||||
QList<QStringList> m_transientShortcuts{};
|
QList<QStringList> m_transientShortcuts{};
|
||||||
|
|
|
@ -32,7 +32,8 @@
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
TapePreferencesPathPage::TapePreferencesPathPage(QWidget *parent)
|
TapePreferencesPathPage::TapePreferencesPathPage(QWidget *parent)
|
||||||
: QWidget(parent)
|
: QWidget(parent),
|
||||||
|
ui(std::make_unique<Ui::TapePreferencesPathPage>())
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
|
|
@ -56,7 +56,7 @@ private slots:
|
||||||
private:
|
private:
|
||||||
// cppcheck-suppress unknownMacro
|
// cppcheck-suppress unknownMacro
|
||||||
Q_DISABLE_COPY_MOVE(TapePreferencesPathPage) // NOLINT
|
Q_DISABLE_COPY_MOVE(TapePreferencesPathPage) // NOLINT
|
||||||
std::unique_ptr<Ui::TapePreferencesPathPage> ui{};
|
std::unique_ptr<Ui::TapePreferencesPathPage> ui;
|
||||||
|
|
||||||
void InitTable();
|
void InitTable();
|
||||||
};
|
};
|
||||||
|
|
|
@ -47,6 +47,7 @@
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
DialogAboutTape::DialogAboutTape(QWidget *parent)
|
DialogAboutTape::DialogAboutTape(QWidget *parent)
|
||||||
: QDialog(parent),
|
: QDialog(parent),
|
||||||
|
ui(std::make_unique<Ui::DialogAboutTape>()),
|
||||||
m_isInitialized(false)
|
m_isInitialized(false)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
|
@ -52,7 +52,7 @@ protected:
|
||||||
private:
|
private:
|
||||||
// cppcheck-suppress unknownMacro
|
// cppcheck-suppress unknownMacro
|
||||||
Q_DISABLE_COPY_MOVE(DialogAboutTape) // NOLINT
|
Q_DISABLE_COPY_MOVE(DialogAboutTape) // NOLINT
|
||||||
std::unique_ptr<Ui::DialogAboutTape> ui{};
|
std::unique_ptr<Ui::DialogAboutTape> ui;
|
||||||
bool m_isInitialized;
|
bool m_isInitialized;
|
||||||
|
|
||||||
static void FontPointSize(QWidget *w, int pointSize);
|
static void FontPointSize(QWidget *w, int pointSize);
|
||||||
|
|
|
@ -31,7 +31,8 @@
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
DialogDimensionCustomNames::DialogDimensionCustomNames(
|
DialogDimensionCustomNames::DialogDimensionCustomNames(
|
||||||
const QMap<MeasurementDimension, MeasurementDimension_p> &dimensions, QWidget *parent)
|
const QMap<MeasurementDimension, MeasurementDimension_p> &dimensions, QWidget *parent)
|
||||||
: QDialog(parent)
|
: QDialog(parent),
|
||||||
|
ui(std::make_unique<Ui::DialogDimensionCustomNames>())
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,7 @@ public:
|
||||||
private:
|
private:
|
||||||
// cppcheck-suppress unknownMacro
|
// cppcheck-suppress unknownMacro
|
||||||
Q_DISABLE_COPY_MOVE(DialogDimensionCustomNames) // NOLINT
|
Q_DISABLE_COPY_MOVE(DialogDimensionCustomNames) // NOLINT
|
||||||
std::unique_ptr<Ui::DialogDimensionCustomNames> ui{};
|
std::unique_ptr<Ui::DialogDimensionCustomNames> ui;
|
||||||
|
|
||||||
void InitTable(const QMap<MeasurementDimension, MeasurementDimension_p> &dimensions);
|
void InitTable(const QMap<MeasurementDimension, MeasurementDimension_p> &dimensions);
|
||||||
};
|
};
|
||||||
|
|
|
@ -32,6 +32,7 @@
|
||||||
DialogDimensionLabels::DialogDimensionLabels(const QMap<MeasurementDimension, MeasurementDimension_p> &dimensions,
|
DialogDimensionLabels::DialogDimensionLabels(const QMap<MeasurementDimension, MeasurementDimension_p> &dimensions,
|
||||||
bool fullCircumference, QWidget *parent)
|
bool fullCircumference, QWidget *parent)
|
||||||
: QDialog(parent),
|
: QDialog(parent),
|
||||||
|
ui(std::make_unique<Ui::DialogDimensionLabels>()),
|
||||||
m_dimensions(dimensions),
|
m_dimensions(dimensions),
|
||||||
m_fullCircumference(fullCircumference)
|
m_fullCircumference(fullCircumference)
|
||||||
{
|
{
|
||||||
|
|
|
@ -62,7 +62,7 @@ private slots:
|
||||||
private:
|
private:
|
||||||
// cppcheck-suppress unknownMacro
|
// cppcheck-suppress unknownMacro
|
||||||
Q_DISABLE_COPY_MOVE(DialogDimensionLabels) // NOLINT
|
Q_DISABLE_COPY_MOVE(DialogDimensionLabels) // NOLINT
|
||||||
std::unique_ptr<Ui::DialogDimensionLabels> ui{};
|
std::unique_ptr<Ui::DialogDimensionLabels> ui;
|
||||||
|
|
||||||
QMap<MeasurementDimension, MeasurementDimension_p> m_dimensions;
|
QMap<MeasurementDimension, MeasurementDimension_p> m_dimensions;
|
||||||
QMap<MeasurementDimension, DimesionLabels> m_labels{};
|
QMap<MeasurementDimension, DimesionLabels> m_labels{};
|
||||||
|
|
|
@ -51,6 +51,7 @@ using namespace Qt::Literals::StringLiterals;
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
DialogKnownMeasurementsCSVColumns::DialogKnownMeasurementsCSVColumns(QString filename, QWidget *parent)
|
DialogKnownMeasurementsCSVColumns::DialogKnownMeasurementsCSVColumns(QString filename, QWidget *parent)
|
||||||
: QDialog(parent),
|
: QDialog(parent),
|
||||||
|
ui(std::make_unique<Ui::DialogKnownMeasurementsCSVColumns>()),
|
||||||
m_fileName{std::move(filename)}
|
m_fileName{std::move(filename)}
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
|
@ -80,7 +80,7 @@ private slots:
|
||||||
private:
|
private:
|
||||||
// cppcheck-suppress unknownMacro
|
// cppcheck-suppress unknownMacro
|
||||||
Q_DISABLE_COPY_MOVE(DialogKnownMeasurementsCSVColumns) // NOLINT
|
Q_DISABLE_COPY_MOVE(DialogKnownMeasurementsCSVColumns) // NOLINT
|
||||||
std::unique_ptr<Ui::DialogKnownMeasurementsCSVColumns> ui{};
|
std::unique_ptr<Ui::DialogKnownMeasurementsCSVColumns> ui;
|
||||||
bool m_isInitialized{false};
|
bool m_isInitialized{false};
|
||||||
QString m_fileName;
|
QString m_fileName;
|
||||||
bool m_withHeader{false};
|
bool m_withHeader{false};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user