whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Christian Ehrlicher 2018-12-02 14:18:38 +01:00
parent 64b2eb7490
commit 004d7168a3
36 changed files with 66 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/widgets/widgets/analogclock/analogclock.cpp
View File

@ -48,10 +48,10 @@
**
****************************************************************************/
#include <QtWidgets>
#include "analogclock.h"
#include <QtWidgets>
//! [0] //! [1]
AnalogClock::AnalogClock(QWidget *parent)
//! [0] //! [2]

4
examples/widgets/widgets/calculator/button.cpp
View File

@ -48,10 +48,10 @@
**
****************************************************************************/
#include <QtWidgets>
#include "button.h"
#include <QtWidgets>
//! [0]
Button::Button(const QString &text, QWidget *parent)
: QToolButton(parent)

6
examples/widgets/widgets/calculator/calculator.cpp
View File

@ -48,13 +48,13 @@
**
****************************************************************************/
#include "button.h"
#include "calculator.h"
#include <QtWidgets>
#include <cmath>
#include "button.h"
#include "calculator.h"
//! [0]
Calculator::Calculator(QWidget *parent)
: QWidget(parent)

4
examples/widgets/widgets/charactermap/characterwidget.cpp
View File

@ -48,10 +48,10 @@
**
****************************************************************************/
#include <QtWidgets>
#include "characterwidget.h"
#include <QtWidgets>
//! [0]
CharacterWidget::CharacterWidget(QWidget *parent)
: QWidget(parent), columns(16), lastKey(-1)

1
examples/widgets/widgets/charactermap/characterwidget.h
View File

@ -52,7 +52,6 @@
#define CHARACTERWIDGET_H
#include <QFont>
#include <QPoint>
#include <QSize>
#include <QString>
#include <QWidget>

1
examples/widgets/widgets/codeeditor/codeeditor.h
View File

@ -52,7 +52,6 @@
#define CODEEDITOR_H
#include <QPlainTextEdit>
#include <QObject>
QT_BEGIN_NAMESPACE
class QPaintEvent;

4
examples/widgets/widgets/digitalclock/digitalclock.cpp
View File

@ -48,10 +48,10 @@
**
****************************************************************************/
#include <QtWidgets>
#include "digitalclock.h"
#include <QtWidgets>
//! [0]
DigitalClock::DigitalClock(QWidget *parent)
: QLCDNumber(parent)

2
examples/widgets/widgets/elidedlabel/elidedlabel.cpp
View File

@ -51,8 +51,8 @@
#include "elidedlabel.h"
#include <QPainter>
#include <QSizePolicy>
#include <QTextLayout>
#include <QDebug>
//! [0]
ElidedLabel::ElidedLabel(const QString &text, QWidget *parent)

7
examples/widgets/widgets/elidedlabel/elidedlabel.h
View File

@ -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

2
examples/widgets/widgets/elidedlabel/main.cpp
View File

@ -50,7 +50,7 @@
#include "testwidget.h"
#include <QtWidgets/QApplication>
#include <QApplication>
//! [0]
int main( int argc, char *argv[] )

13
examples/widgets/widgets/elidedlabel/testwidget.cpp
View File

@ -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);

7
examples/widgets/widgets/elidedlabel/testwidget.h
View File

@ -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;

4
examples/widgets/widgets/icons/iconpreviewarea.cpp
View File

@ -48,10 +48,10 @@
**
****************************************************************************/
#include <QtWidgets>
#include "iconpreviewarea.h"
#include <QtWidgets>
//! [0]
IconPreviewArea::IconPreviewArea(QWidget *parent)
: QWidget(parent)

4
examples/widgets/widgets/icons/iconsizespinbox.cpp
View File

@ -48,10 +48,10 @@
**
****************************************************************************/
#include <QtWidgets>
#include "iconsizespinbox.h"
#include <QtWidgets>
//! [0]
IconSizeSpinBox::IconSizeSpinBox(QWidget *parent)
: QSpinBox(parent)

4
examples/widgets/widgets/icons/imagedelegate.cpp
View File

@ -48,11 +48,11 @@
**
****************************************************************************/
#include <QtWidgets>
#include "imagedelegate.h"
#include "iconpreviewarea.h"
#include <QtWidgets>
//! [0]
ImageDelegate::ImageDelegate(QObject *parent)
: QItemDelegate(parent)

2
examples/widgets/widgets/icons/mainwindow.h
View File

@ -60,8 +60,6 @@ QT_BEGIN_NAMESPACE
class QAction;
class QActionGroup;
class QLabel;
class QMenu;
class QRadioButton;
class QButtonGroup;
class QTableWidget;
QT_END_NAMESPACE

4
examples/widgets/widgets/imageviewer/imageviewer.cpp
View File

@ -48,6 +48,8 @@
**
****************************************************************************/
#include "imageviewer.h"
#include <QtWidgets>
#if defined(QT_PRINTSUPPORT_LIB)
#include <QtPrintSupport/qtprintsupportglobal.h>
@ -56,8 +58,6 @@
#endif
#endif
#include "imageviewer.h"
//! [0]
ImageViewer::ImageViewer(QWidget *parent)
: QMainWindow(parent), imageLabel(new QLabel),

1
examples/widgets/widgets/lineedits/window.h
View File

@ -54,7 +54,6 @@
#include <QWidget>
QT_BEGIN_NAMESPACE
class QComboBox;
class QLineEdit;
QT_END_NAMESPACE

4
examples/widgets/widgets/movie/movieplayer.cpp
View File

@ -48,10 +48,10 @@
**
****************************************************************************/
#include <QtWidgets>
#include "movieplayer.h"
#include <QtWidgets>
MoviePlayer::MoviePlayer(QWidget *parent)
: QWidget(parent)
{

4
examples/widgets/widgets/scribble/scribblearea.cpp
View File

@ -48,6 +48,8 @@
**
****************************************************************************/
#include "scribblearea.h"
#include <QtWidgets>
#if defined(QT_PRINTSUPPORT_LIB)
#include <QtPrintSupport/qtprintsupportglobal.h>
@ -57,8 +59,6 @@
#endif
#endif
#include "scribblearea.h"
//! [0]
ScribbleArea::ScribbleArea(QWidget *parent)
: QWidget(parent)

4
examples/widgets/widgets/sliders/slidersgroup.cpp
View File

@ -48,10 +48,10 @@
**
****************************************************************************/
#include <QtWidgets>
#include "slidersgroup.h"
#include <QtWidgets>
//! [0]
SlidersGroup::SlidersGroup(Qt::Orientation orientation, const QString &title,
QWidget *parent)

4
examples/widgets/widgets/styles/norwegianwoodstyle.cpp
View File

@ -48,10 +48,10 @@
**
****************************************************************************/
#include <QtWidgets>
#include "norwegianwoodstyle.h"
#include <QtWidgets>
NorwegianWoodStyle::NorwegianWoodStyle() :
QProxyStyle(QStyleFactory::create("windows"))
{

6
examples/widgets/widgets/styles/widgetgallery.cpp
View File

@ -48,10 +48,10 @@
**
****************************************************************************/
#include <QtWidgets>
#include "norwegianwoodstyle.h"
#include "widgetgallery.h"
#include "norwegianwoodstyle.h"
#include <QtWidgets>
//! [0]
WidgetGallery::WidgetGallery(QWidget *parent)

4
examples/widgets/widgets/stylesheet/stylesheeteditor.cpp
View File

@ -48,10 +48,10 @@
**
****************************************************************************/
#include <QtWidgets>
#include "stylesheeteditor.h"
#include <QtWidgets>
StyleSheetEditor::StyleSheetEditor(QWidget *parent)
: QDialog(parent)
{

4
examples/widgets/widgets/tablet/tabletapplication.cpp
View File

@ -48,10 +48,10 @@
**
****************************************************************************/
#include <QtWidgets>
#include "tabletapplication.h"
#include <QtWidgets>
//! [0]
bool TabletApplication::event(QEvent *event)
{

6
examples/widgets/widgets/tetrix/main.cpp
View File

@ -48,12 +48,10 @@
**
****************************************************************************/
#include <QtWidgets>
#include <stdlib.h>
#include "tetrixwindow.h"
#include <QApplication>
int main(int argc, char *argv[])
{
QApplication app(argc, argv);

4
examples/widgets/widgets/tetrix/tetrixboard.cpp
View File

@ -48,10 +48,10 @@
**
****************************************************************************/
#include <QtWidgets>
#include "tetrixboard.h"
#include <QtWidgets>
//! [0]
TetrixBoard::TetrixBoard(QWidget *parent)
: QFrame(parent)

6
examples/widgets/widgets/tetrix/tetrixpiece.cpp
View File

@ -48,12 +48,10 @@
**
****************************************************************************/
#include <QtCore>
#include <stdlib.h>
#include "tetrixpiece.h"
#include <QtCore>
//! [0]
void TetrixPiece::setRandomShape()
{

1
examples/widgets/widgets/tetrix/tetrixwindow.h
View File

@ -51,7 +51,6 @@
#ifndef TETRIXWINDOW_H
#define TETRIXWINDOW_H
#include <QFrame>
#include <QWidget>
QT_BEGIN_NAMESPACE

2
examples/widgets/widgets/tooltips/shapeitem.cpp
View File

@ -48,8 +48,6 @@
**
****************************************************************************/
#include <QtWidgets>
#include "shapeitem.h"
//! [0]

6
examples/widgets/widgets/tooltips/sortingbox.cpp
View File

@ -48,12 +48,10 @@
**
****************************************************************************/
#include <QtWidgets>
#include <stdlib.h>
#include "sortingbox.h"
#include <QtWidgets>
//! [0]
SortingBox::SortingBox(QWidget *parent)
: QWidget(parent)

4
examples/widgets/widgets/tooltips/sortingbox.h
View File

@ -51,10 +51,10 @@
#ifndef SORTINGBOX_H
#define SORTINGBOX_H
#include <QWidget>
#include "shapeitem.h"
#include <QWidget>
QT_BEGIN_NAMESPACE
class QAction;
class QPoint;

6
examples/widgets/widgets/wiggly/dialog.cpp
View File

@ -48,12 +48,12 @@
**
****************************************************************************/
#include <QLineEdit>
#include <QVBoxLayout>
#include "dialog.h"
#include "wigglywidget.h"
#include <QLineEdit>
#include <QVBoxLayout>
//! [0]
Dialog::Dialog(QWidget *parent)
: QDialog(parent)

4
examples/widgets/widgets/wiggly/main.cpp
View File

@ -48,10 +48,10 @@
**
****************************************************************************/
#include <QApplication>
#include "dialog.h"
#include <QApplication>
int main(int argc, char *argv[])
{
QApplication app(argc, argv);

4
examples/widgets/widgets/wiggly/wigglywidget.cpp
View File

@ -48,10 +48,10 @@
**
****************************************************************************/
#include <QtWidgets>
#include "wigglywidget.h"
#include <QtWidgets>
//! [0]
WigglyWidget::WigglyWidget(QWidget *parent)
: QWidget(parent)

4
examples/widgets/widgets/windowflags/previewwindow.cpp
View File

@ -48,10 +48,10 @@
**
****************************************************************************/
#include <QtWidgets>
#include "previewwindow.h"
#include <QtWidgets>
//! [0]
PreviewWindow::PreviewWindow(QWidget *parent)
: QWidget(parent)