From b0a8cbf325bf42ababb51918a66dbb554759de66 2017-06-08 09:14:01 From: Alexandre Leroux Date: 2017-06-08 09:14:01 Subject: [PATCH] Merge branch 'develop' of https://hephaistos.lpp.polytechnique.fr/rhodecode/GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation into develop --- diff --git a/app/src/MainWindow.cpp b/app/src/MainWindow.cpp index 8911e2a..a8a7605 100644 --- a/app/src/MainWindow.cpp +++ b/app/src/MainWindow.cpp @@ -45,7 +45,7 @@ #include #include #include -MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), m_Ui(new Ui::MainWindow) +MainWindow::MainWindow(QWidget *parent) : QMainWindow{parent}, m_Ui{new Ui::MainWindow} { m_Ui->setupUi(this); diff --git a/gui/src/sidepane/SqpSidePane.cpp b/gui/src/sidepane/SqpSidePane.cpp index 9214834..612d842 100644 --- a/gui/src/sidepane/SqpSidePane.cpp +++ b/gui/src/sidepane/SqpSidePane.cpp @@ -22,7 +22,7 @@ static const QString SQPSIDEPANESTYLESHEET " }"; } -SqpSidePane::SqpSidePane(QWidget *parent) : QWidget(parent), ui(new Ui::SqpSidePane) +SqpSidePane::SqpSidePane(QWidget *parent) : QWidget{parent}, ui{new Ui::SqpSidePane} { QVBoxLayout *sidePaneLayout = new QVBoxLayout(this); sidePaneLayout->setContentsMargins(0, 0, 0, 0); diff --git a/gui/src/visualization/VisualizationTabWidget.cpp b/gui/src/visualization/VisualizationTabWidget.cpp index ec83c62..d5634ba 100644 --- a/gui/src/visualization/VisualizationTabWidget.cpp +++ b/gui/src/visualization/VisualizationTabWidget.cpp @@ -2,7 +2,7 @@ #include "ui_VisualizationTabWidget.h" VisualizationTabWidget::VisualizationTabWidget(QWidget *parent) - : QWidget(parent), ui(new Ui::VisualizationTabWidget) + : QWidget{parent}, ui{new Ui::VisualizationTabWidget} { ui->setupUi(this); } diff --git a/gui/src/visualization/VisualizationWidget.cpp b/gui/src/visualization/VisualizationWidget.cpp index 4ce2803..1748a13 100644 --- a/gui/src/visualization/VisualizationWidget.cpp +++ b/gui/src/visualization/VisualizationWidget.cpp @@ -10,12 +10,12 @@ Q_LOGGING_CATEGORY(LOG_VisualizationWidget, "VisualizationWidget") VisualizationWidget::VisualizationWidget(QWidget *parent) - : QWidget(parent), ui(new Ui::VisualizationWidget) + : QWidget{parent}, ui{new Ui::VisualizationWidget} { ui->setupUi(this); - auto *addTabViewButton = new QToolButton(ui->tabWidget); - addTabViewButton->setText("Add View"); + auto addTabViewButton = new QToolButton{ui->tabWidget}; + addTabViewButton->setText(tr("Add View")); addTabViewButton->setCursor(Qt::ArrowCursor); addTabViewButton->setAutoRaise(true); ui->tabWidget->setCornerWidget(addTabViewButton, Qt::TopRightCorner); diff --git a/gui/src/visualization/VisualizationZoneWidget.cpp b/gui/src/visualization/VisualizationZoneWidget.cpp index 2d213c9..60bfd10 100644 --- a/gui/src/visualization/VisualizationZoneWidget.cpp +++ b/gui/src/visualization/VisualizationZoneWidget.cpp @@ -2,7 +2,7 @@ #include "ui_VisualizationZoneWidget.h" VisualizationZoneWidget::VisualizationZoneWidget(QWidget *parent) - : QWidget(parent), ui(new Ui::VisualizationZoneWidget) + : QWidget{parent}, ui{new Ui::VisualizationZoneWidget} { ui->setupUi(this); }