From b8c899bbf530933a7a1e25f0840249e9b14bd58c Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 25 Dec 2020 09:31:34 +0200 Subject: [PATCH] Fix GCC warning. --- src/app/valentina/mainwindowsnogui.cpp | 16 ++-------------- src/app/valentina/mainwindowsnogui.h | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 27 deletions(-) diff --git a/src/app/valentina/mainwindowsnogui.cpp b/src/app/valentina/mainwindowsnogui.cpp index a90058f15..20f9ce3be 100644 --- a/src/app/valentina/mainwindowsnogui.cpp +++ b/src/app/valentina/mainwindowsnogui.cpp @@ -127,22 +127,10 @@ void InsertGlobalContours(const QList &scenes, const QListTrVars(), qApp->patternUnitsP(), valentinaNamespace)), - doc(nullptr), - undoAction(nullptr), - redoAction(nullptr), - actionDockWidgetToolOptions(nullptr), - actionDockWidgetGroups(nullptr), - isNoScaling(false), - isNeedAutosave(false), + pattern(new VContainer(qApp->TrVars(), qApp->patternUnitsP(), valentinaNamespace)) #if defined(Q_OS_WIN32) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) - m_taskbarButton(new QWinTaskbarButton(this)), - m_taskbarProgress(nullptr), + ,m_taskbarButton(new QWinTaskbarButton(this)) #endif - m_dialogSaveLayout() { InitTempLayoutScene(); diff --git a/src/app/valentina/mainwindowsnogui.h b/src/app/valentina/mainwindowsnogui.h index 61e48b6b3..27d25e471 100644 --- a/src/app/valentina/mainwindowsnogui.h +++ b/src/app/valentina/mainwindowsnogui.h @@ -86,41 +86,41 @@ public slots: protected slots: void ExportFMeasurementsToCSV(); protected: - QVector listDetails; + QVector listDetails{}; /** @brief currentScene pointer to current scene. */ - QGraphicsScene *currentScene; + QGraphicsScene *currentScene{nullptr}; - QGraphicsScene *tempSceneLayout; + QGraphicsScene *tempSceneLayout{nullptr}; /** @brief pattern container with data (points, arcs, splines, spline paths, variables) */ VContainer *pattern; /** @brief doc dom document container */ - VPattern *doc; + VPattern *doc{nullptr}; QList gcontours{}; QVector > detailsOnLayout{}; - QAction *undoAction; - QAction *redoAction; - QAction *actionDockWidgetToolOptions; - QAction *actionDockWidgetGroups; + QAction *undoAction{nullptr}; + QAction *redoAction{nullptr}; + QAction *actionDockWidgetToolOptions{nullptr}; + QAction *actionDockWidgetGroups{nullptr}; - bool isNoScaling; - bool isNeedAutosave; + bool isNoScaling{false}; + bool isNeedAutosave{false}; VPrintLayout *m_layoutSettings{new VPrintLayout(this)}; - QSharedPointer m_dialogSaveLayout; - /** @brief mouseCoordinate pointer to label who show mouse coordinate. */ QPointer m_mouseCoordinate{nullptr}; QPointer m_unreadPatternMessage{nullptr}; + QSharedPointer m_dialogSaveLayout{}; + #if defined(Q_OS_WIN) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) QWinTaskbarButton *m_taskbarButton; - QWinTaskbarProgress *m_taskbarProgress; + QWinTaskbarProgress *m_taskbarProgress{nullptr}; #endif static QVector PrepareDetailsForLayout(const QVector &details);