diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2018-12-02 14:18:38 +0100 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-01-28 19:37:43 +0000 |
| commit | 004d7168a335219b19805badae0590b0f5dcfad0 (patch) | |
| tree | 7a92a04e2b0c9da73fab51c3e7c7ad4ea59be864 /examples/widgets/widgets/elidedlabel | |
| parent | 64b2eb7490f502feececec314eb215bbb7832858 (diff) | |
Cleanup Widgets examples - includes
Cleanup the Widgets examples - adjust includes to Qt coding style and
remove unused includes and formward declarations
Change-Id: I9f2e513284ad631337ff52ec9c0b98645055dcca
Reviewed-by: Konstantin Shegunov <kshegunov@gmail.com>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'examples/widgets/widgets/elidedlabel')
5 files changed, 13 insertions, 18 deletions
diff --git a/examples/widgets/widgets/elidedlabel/elidedlabel.cpp b/examples/widgets/widgets/elidedlabel/elidedlabel.cpp index b12bf118f6..e80f7a9894 100644 --- a/examples/widgets/widgets/elidedlabel/elidedlabel.cpp +++ b/examples/widgets/widgets/elidedlabel/elidedlabel.cpp @@ -51,8 +51,8 @@ #include "elidedlabel.h" #include <QPainter> +#include <QSizePolicy> #include <QTextLayout> -#include <QDebug> //! [0] ElidedLabel::ElidedLabel(const QString &text, QWidget *parent) diff --git a/examples/widgets/widgets/elidedlabel/elidedlabel.h b/examples/widgets/widgets/elidedlabel/elidedlabel.h index 9d4fe5fef3..0c8d96834e 100644 --- a/examples/widgets/widgets/elidedlabel/elidedlabel.h +++ b/examples/widgets/widgets/elidedlabel/elidedlabel.h @@ -51,11 +51,8 @@ #ifndef ELIDEDLABEL_H #define ELIDEDLABEL_H -#include <QtWidgets/QFrame> -#include <QtCore/QRect> -#include <QtGui/QResizeEvent> -#include <QtCore/QString> -#include <QtWidgets/QWidget> +#include <QFrame> +#include <QString> //! [0] class ElidedLabel : public QFrame diff --git a/examples/widgets/widgets/elidedlabel/main.cpp b/examples/widgets/widgets/elidedlabel/main.cpp index f692db0efc..1c620c1d41 100644 --- a/examples/widgets/widgets/elidedlabel/main.cpp +++ b/examples/widgets/widgets/elidedlabel/main.cpp @@ -50,7 +50,7 @@ #include "testwidget.h" -#include <QtWidgets/QApplication> +#include <QApplication> //! [0] int main( int argc, char *argv[] ) diff --git a/examples/widgets/widgets/elidedlabel/testwidget.cpp b/examples/widgets/widgets/elidedlabel/testwidget.cpp index 6392a4b4fa..4e013cc5de 100644 --- a/examples/widgets/widgets/elidedlabel/testwidget.cpp +++ b/examples/widgets/widgets/elidedlabel/testwidget.cpp @@ -51,14 +51,13 @@ #include "testwidget.h" #include "elidedlabel.h" -#include <QtWidgets/QLabel> -#include <QtWidgets/QPushButton> -#include <QtWidgets/QSizePolicy> -#include <QtWidgets/QGridLayout> +#include <QGridLayout> +#include <QLabel> +#include <QPushButton> //! [0] -TestWidget::TestWidget(QWidget *parent): - QWidget(parent) +TestWidget::TestWidget(QWidget *parent) + : QWidget(parent) { const QString romeo = tr( "But soft, what light through yonder window breaks? / " @@ -116,7 +115,7 @@ TestWidget::TestWidget(QWidget *parent): //! [3] //! [4] - QGridLayout *layout = new QGridLayout(); + QGridLayout *layout = new QGridLayout; layout->addWidget(label, 0, 1, Qt::AlignCenter); layout->addWidget(switchButton, 0, 2); layout->addWidget(exitButton, 0, 3); diff --git a/examples/widgets/widgets/elidedlabel/testwidget.h b/examples/widgets/widgets/elidedlabel/testwidget.h index cd309d2316..bcb2f33044 100644 --- a/examples/widgets/widgets/elidedlabel/testwidget.h +++ b/examples/widgets/widgets/elidedlabel/testwidget.h @@ -51,10 +51,9 @@ #ifndef TESTWIDGET_H #define TESTWIDGET_H -#include <QtWidgets/QWidget> -#include <QtCore/QStringList> -#include <QtWidgets/QSlider> -#include <QtWidgets/QComboBox> +#include <QSlider> +#include <QStringList> +#include <QWidget> class ElidedLabel; |