aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix GCC warning.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2020-12-25 09:31:34 +02:00
parent 26457152cd
commit b8c899bbf5
2 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/valentina/mainwindowsnogui.cpp
View File

@ -127,22 +127,10 @@ void InsertGlobalContours(const QList<QGraphicsScene *> &scenes, const QList<QGr
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
MainWindowsNoGUI::MainWindowsNoGUI(QWidget *parent) MainWindowsNoGUI::MainWindowsNoGUI(QWidget *parent)
: VAbstractMainWindow(parent), : VAbstractMainWindow(parent),
listDetails(), pattern(new VContainer(qApp->TrVars(), qApp->patternUnitsP(), valentinaNamespace))
currentScene(nullptr),
tempSceneLayout(nullptr),
pattern(new VContainer(qApp->TrVars(), qApp->patternUnitsP(), valentinaNamespace)),
doc(nullptr),
undoAction(nullptr),
redoAction(nullptr),
actionDockWidgetToolOptions(nullptr),
actionDockWidgetGroups(nullptr),
isNoScaling(false),
isNeedAutosave(false),
#if defined(Q_OS_WIN32) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) #if defined(Q_OS_WIN32) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
m_taskbarButton(new QWinTaskbarButton(this)), ,m_taskbarButton(new QWinTaskbarButton(this))
m_taskbarProgress(nullptr),
#endif #endif
m_dialogSaveLayout()
{ {
InitTempLayoutScene(); InitTempLayoutScene();

26
src/app/valentina/mainwindowsnogui.h
View File

@ -86,41 +86,41 @@ public slots:
protected slots: protected slots:
void ExportFMeasurementsToCSV(); void ExportFMeasurementsToCSV();
protected: protected:
QVector<VLayoutPiece> listDetails; QVector<VLayoutPiece> listDetails{};
/** @brief currentScene pointer to current scene. */ /** @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) */ /** @brief pattern container with data (points, arcs, splines, spline paths, variables) */
VContainer *pattern; VContainer *pattern;
/** @brief doc dom document container */ /** @brief doc dom document container */
VPattern *doc; VPattern *doc{nullptr};
QList<QGraphicsItem *> gcontours{}; QList<QGraphicsItem *> gcontours{};
QVector<QVector<VLayoutPiece> > detailsOnLayout{}; QVector<QVector<VLayoutPiece> > detailsOnLayout{};
QAction *undoAction; QAction *undoAction{nullptr};
QAction *redoAction; QAction *redoAction{nullptr};
QAction *actionDockWidgetToolOptions; QAction *actionDockWidgetToolOptions{nullptr};
QAction *actionDockWidgetGroups; QAction *actionDockWidgetGroups{nullptr};
bool isNoScaling; bool isNoScaling{false};
bool isNeedAutosave; bool isNeedAutosave{false};
VPrintLayout *m_layoutSettings{new VPrintLayout(this)}; VPrintLayout *m_layoutSettings{new VPrintLayout(this)};
QSharedPointer<DialogSaveLayout> m_dialogSaveLayout;
/** @brief mouseCoordinate pointer to label who show mouse coordinate. */ /** @brief mouseCoordinate pointer to label who show mouse coordinate. */
QPointer<QLabel> m_mouseCoordinate{nullptr}; QPointer<QLabel> m_mouseCoordinate{nullptr};
QPointer<QLabel> m_unreadPatternMessage{nullptr}; QPointer<QLabel> m_unreadPatternMessage{nullptr};
QSharedPointer<DialogSaveLayout> m_dialogSaveLayout{};
#if defined(Q_OS_WIN) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) #if defined(Q_OS_WIN) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
QWinTaskbarButton *m_taskbarButton; QWinTaskbarButton *m_taskbarButton;
QWinTaskbarProgress *m_taskbarProgress; QWinTaskbarProgress *m_taskbarProgress{nullptr};
#endif #endif
static QVector<VLayoutPiece> PrepareDetailsForLayout(const QVector<DetailForLayout> &details); static QVector<VLayoutPiece> PrepareDetailsForLayout(const QVector<DetailForLayout> &details);