From 643b84e1592b1588999a9750647fccf74d5cfa08 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 18 Sep 2015 18:35:26 +0300 Subject: [PATCH] Fixed build error. Fixed GCC warnings. --HG-- branch : develop --- src/app/valentina/mainwindow.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index d7dc7099d..4844554a3 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -84,12 +84,8 @@ MainWindow::MainWindow(QWidget *parent) currentToolBoxIndex(0), drawMode(true), recentFileActs(), separatorAct(nullptr), leftGoToStage(nullptr), rightGoToStage(nullptr), autoSaveTimer(nullptr), guiEnabled(true), - gradationHeights(nullptr), gradationSizes(nullptr), -#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) + gradationHeights(nullptr), gradationSizes(nullptr), gradationHeightsLabel(nullptr), gradationSizesLabel(nullptr), toolOptions(nullptr), lock(nullptr) -#else - toolOptions(nullptr) -#endif { for (int i = 0; i < MaxRecentFiles; ++i) { @@ -1214,13 +1210,15 @@ void MainWindow::ToolBarOption() gradationHeightsLabel = new QLabel(tr("Height: "), this); gradationHeights = SetGradationList(gradationHeightsLabel, listHeights); SetDefaultHeight(static_cast(pattern->height())); - connect(gradationHeights, static_cast(&QComboBox::currentIndexChanged), + connect(gradationHeights.data(), + static_cast(&QComboBox::currentIndexChanged), this, &MainWindow::ChangedHeight); gradationSizesLabel = new QLabel(tr("Size: "), this); gradationSizes = SetGradationList(gradationSizesLabel, listSizes); SetDefaultSize(static_cast(pattern->size())); - connect(gradationSizes, static_cast(&QComboBox::currentIndexChanged), + connect(gradationSizes.data(), + static_cast(&QComboBox::currentIndexChanged), this, &MainWindow::ChangedSize); ui->toolBarOption->addSeparator();