From fa60cc6025fad1e6b62a7841b7a9f54d1d70ca7c Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 31 May 2019 01:32:44 +0200 Subject: [PATCH] Style --- src/blackgui/components/marginsinput.cpp | 12 ++++++------ src/blackgui/components/marginsinput.h | 9 ++++----- src/blackmisc/aviation/livery.h | 6 +++--- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/blackgui/components/marginsinput.cpp b/src/blackgui/components/marginsinput.cpp index f66f22c3f..05d649863 100644 --- a/src/blackgui/components/marginsinput.cpp +++ b/src/blackgui/components/marginsinput.cpp @@ -20,11 +20,11 @@ namespace BlackGui ui(new Ui::CMarginsInput) { ui->setupUi(this); - connect(ui->pb_Ok, &QPushButton::clicked, this, &CMarginsInput::ps_Confirmed); - connect(ui->le_Bottom, &QLineEdit::returnPressed, this, &CMarginsInput::ps_Confirmed); - connect(ui->le_Left, &QLineEdit::returnPressed, this, &CMarginsInput::ps_Confirmed); - connect(ui->le_Right, &QLineEdit::returnPressed, this, &CMarginsInput::ps_Confirmed); - connect(ui->le_Top, &QLineEdit::returnPressed, this, &CMarginsInput::ps_Confirmed); + connect(ui->pb_Ok, &QPushButton::clicked, this, &CMarginsInput::confirmed); + connect(ui->le_Bottom, &QLineEdit::returnPressed, this, &CMarginsInput::confirmed); + connect(ui->le_Left, &QLineEdit::returnPressed, this, &CMarginsInput::confirmed); + connect(ui->le_Right, &QLineEdit::returnPressed, this, &CMarginsInput::confirmed); + connect(ui->le_Top, &QLineEdit::returnPressed, this, &CMarginsInput::confirmed); QIntValidator *v = new QIntValidator(0, 100, this); ui->le_Bottom->setValidator(v); @@ -65,7 +65,7 @@ namespace BlackGui return m; } - void CMarginsInput::ps_Confirmed() + void CMarginsInput::confirmed() { const QMargins m(this->getMargins()); emit this->changedMargins(m); diff --git a/src/blackgui/components/marginsinput.h b/src/blackgui/components/marginsinput.h index 2338916e2..39b172e4a 100644 --- a/src/blackgui/components/marginsinput.h +++ b/src/blackgui/components/marginsinput.h @@ -33,7 +33,7 @@ namespace BlackGui explicit CMarginsInput(QWidget *parent = nullptr); //! Destructor - ~CMarginsInput(); + virtual ~CMarginsInput() override; //! Set margins void setMargins(const QMargins &margins); @@ -45,11 +45,10 @@ namespace BlackGui //! Margins changed void changedMargins(const QMargins &margins); - private slots: - //! Ok - void ps_Confirmed(); - private: + //! Ok + void confirmed(); + QScopedPointer ui; }; } // ns diff --git a/src/blackmisc/aviation/livery.h b/src/blackmisc/aviation/livery.h index c9ceae623..c769380d0 100644 --- a/src/blackmisc/aviation/livery.h +++ b/src/blackmisc/aviation/livery.h @@ -207,7 +207,7 @@ namespace BlackMisc //! Standard livery marker string static const QString &standardLiveryMarker(); - //! Standard code for + //! Standard code for airline static QString getStandardCode(const Aviation::CAirlineIcaoCode &airline); //! Color livery marker @@ -218,8 +218,8 @@ namespace BlackMisc private: CAirlineIcaoCode m_airline; //!< corresponding airline, if any - QString m_combinedCode; //!< livery code and pseudo airline ICAO code - QString m_description; //!< describes the livery + QString m_combinedCode; //!< livery code and pseudo airline ICAO code + QString m_description; //!< describes the livery CRgbColor m_colorFuselage; //!< color of fuselage CRgbColor m_colorTail; //!< color of tail bool m_military = false; //!< military livery?