diff options
author | Andre de la Rocha <andre.rocha@qt.io> | 2017-08-21 13:23:48 +0200 |
---|---|---|
committer | Andre de la Rocha <andre.rocha@qt.io> | 2017-08-23 11:01:43 +0000 |
commit | c2751b1d664748cfbd05d2e397f95f2cc0bec13f (patch) | |
tree | 6a7a884caf28250927ee66f395e0634470ac0851 /examples/activeqt/hierarchy/objects.cpp | |
parent | b3e88744f36144db7cda0b85c161cdb10026eb65 (diff) | |
download | qtactiveqt-c2751b1d664748cfbd05d2e397f95f2cc0bec13f.tar.gz |
Active Qt Examples: Brush up to C++ 11
Use nullptr, member initialization, new connect syntax, QStringLiteral, etc.
Change-Id: Ia79473ca302216f91eec6a32f670cf606761ed0d
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'examples/activeqt/hierarchy/objects.cpp')
-rw-r--r-- | examples/activeqt/hierarchy/objects.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/examples/activeqt/hierarchy/objects.cpp b/examples/activeqt/hierarchy/objects.cpp index 1cb59ae..c0d0f0d 100644 --- a/examples/activeqt/hierarchy/objects.cpp +++ b/examples/activeqt/hierarchy/objects.cpp @@ -45,16 +45,16 @@ /* Implementation of QParentWidget */ //! [0] QParentWidget::QParentWidget(QWidget *parent) -: QWidget(parent) +: QWidget(parent), + m_vbox(new QVBoxLayout(this)) { - vbox = new QVBoxLayout(this); } //! [0] //! [1] void QParentWidget::createSubWidget(const QString &name) { QSubWidget *sw = new QSubWidget(this, name); - vbox->addWidget(sw); + m_vbox->addWidget(sw); sw->setLabel(name); sw->show(); } @@ -62,7 +62,7 @@ void QParentWidget::createSubWidget(const QString &name) //! [1] //! [2] QSubWidget *QParentWidget::subWidget(const QString &name) { - return findChild<QSubWidget*>(name); + return findChild<QSubWidget *>(name); } //! [2] @@ -81,27 +81,27 @@ QSubWidget::QSubWidget(QWidget *parent, const QString &name) void QSubWidget::setLabel(const QString &text) { - lbl = text; + m_label = text; setObjectName(text); update(); } QString QSubWidget::label() const { - return lbl; + return m_label; } QSize QSubWidget::sizeHint() const { QFontMetrics fm(font()); - return QSize(fm.width(lbl), fm.height()); + return QSize(fm.width(m_label), fm.height()); } void QSubWidget::paintEvent(QPaintEvent *) { QPainter painter(this); painter.setPen(palette().text().color()); - painter.drawText(rect(), Qt::AlignCenter, lbl); + painter.drawText(rect(), Qt::AlignCenter, m_label); //! [3] //! [4] } //! [4] |