From 55410fd6d12c3022afb63288d95cd0e6afa7247c Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 22 Oct 2012 08:24:53 +0200 Subject: QtWidgets: add some explicit Change-Id: I0650db3d47b506c67074c526ab9857f8159fd599 Reviewed-by: Friedemann Kleint Reviewed-by: Konstantin Ritt Reviewed-by: Lars Knoll --- src/widgets/dialogs/qwizard.h | 2 +- src/widgets/graphicsview/qgraphicsitem.h | 48 ++++++++++++++++---------------- src/widgets/kernel/qgesture.h | 11 ++++---- src/widgets/widgets/qcommandlinkbutton.h | 3 +- src/widgets/widgets/qdatetimeedit.h | 8 +++--- src/widgets/widgets/qsplitter.h | 3 +- 6 files changed, 39 insertions(+), 36 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/dialogs/qwizard.h b/src/widgets/dialogs/qwizard.h index 9d7f28dc41..2fa428f79b 100644 --- a/src/widgets/dialogs/qwizard.h +++ b/src/widgets/dialogs/qwizard.h @@ -217,7 +217,7 @@ class Q_WIDGETS_EXPORT QWizardPage : public QWidget Q_PROPERTY(QString subTitle READ subTitle WRITE setSubTitle) public: - QWizardPage(QWidget *parent = 0); + explicit QWizardPage(QWidget *parent = 0); void setTitle(const QString &title); QString title() const; diff --git a/src/widgets/graphicsview/qgraphicsitem.h b/src/widgets/graphicsview/qgraphicsitem.h index ce7adfcfad..cf9c6cf42e 100644 --- a/src/widgets/graphicsview/qgraphicsitem.h +++ b/src/widgets/graphicsview/qgraphicsitem.h @@ -162,7 +162,7 @@ public: SceneModal }; - QGraphicsItem(QGraphicsItem *parent = 0); + explicit QGraphicsItem(QGraphicsItem *parent = 0); virtual ~QGraphicsItem(); QGraphicsScene *scene() const; @@ -562,7 +562,7 @@ class Q_WIDGETS_EXPORT QGraphicsObject : public QObject, public QGraphicsItem Q_CLASSINFO("DefaultProperty", "children") Q_INTERFACES(QGraphicsItem) public: - QGraphicsObject(QGraphicsItem *parent = 0); + explicit QGraphicsObject(QGraphicsItem *parent = 0); #ifdef Q_NO_USING_KEYWORD const QObjectList &children() const { return QObject::children(); } @@ -607,7 +607,7 @@ class QAbstractGraphicsShapeItemPrivate; class Q_WIDGETS_EXPORT QAbstractGraphicsShapeItem : public QGraphicsItem { public: - QAbstractGraphicsShapeItem(QGraphicsItem *parent = 0); + explicit QAbstractGraphicsShapeItem(QGraphicsItem *parent = 0); ~QAbstractGraphicsShapeItem(); QPen pen() const; @@ -632,8 +632,8 @@ class QGraphicsPathItemPrivate; class Q_WIDGETS_EXPORT QGraphicsPathItem : public QAbstractGraphicsShapeItem { public: - QGraphicsPathItem(QGraphicsItem *parent = 0); - QGraphicsPathItem(const QPainterPath &path, QGraphicsItem *parent = 0); + explicit QGraphicsPathItem(QGraphicsItem *parent = 0); + explicit QGraphicsPathItem(const QPainterPath &path, QGraphicsItem *parent = 0); ~QGraphicsPathItem(); QPainterPath path() const; @@ -665,9 +665,9 @@ class QGraphicsRectItemPrivate; class Q_WIDGETS_EXPORT QGraphicsRectItem : public QAbstractGraphicsShapeItem { public: - QGraphicsRectItem(QGraphicsItem *parent = 0); - QGraphicsRectItem(const QRectF &rect, QGraphicsItem *parent = 0); - QGraphicsRectItem(qreal x, qreal y, qreal w, qreal h, QGraphicsItem *parent = 0); + explicit QGraphicsRectItem(QGraphicsItem *parent = 0); + explicit QGraphicsRectItem(const QRectF &rect, QGraphicsItem *parent = 0); + explicit QGraphicsRectItem(qreal x, qreal y, qreal w, qreal h, QGraphicsItem *parent = 0); ~QGraphicsRectItem(); QRectF rect() const; @@ -703,9 +703,9 @@ class QGraphicsEllipseItemPrivate; class Q_WIDGETS_EXPORT QGraphicsEllipseItem : public QAbstractGraphicsShapeItem { public: - QGraphicsEllipseItem(QGraphicsItem *parent = 0); - QGraphicsEllipseItem(const QRectF &rect, QGraphicsItem *parent = 0); - QGraphicsEllipseItem(qreal x, qreal y, qreal w, qreal h, QGraphicsItem *parent = 0); + explicit QGraphicsEllipseItem(QGraphicsItem *parent = 0); + explicit QGraphicsEllipseItem(const QRectF &rect, QGraphicsItem *parent = 0); + explicit QGraphicsEllipseItem(qreal x, qreal y, qreal w, qreal h, QGraphicsItem *parent = 0); ~QGraphicsEllipseItem(); QRectF rect() const; @@ -747,9 +747,9 @@ class QGraphicsPolygonItemPrivate; class Q_WIDGETS_EXPORT QGraphicsPolygonItem : public QAbstractGraphicsShapeItem { public: - QGraphicsPolygonItem(QGraphicsItem *parent = 0); - QGraphicsPolygonItem(const QPolygonF &polygon, - QGraphicsItem *parent = 0); + explicit QGraphicsPolygonItem(QGraphicsItem *parent = 0); + explicit QGraphicsPolygonItem(const QPolygonF &polygon, + QGraphicsItem *parent = 0); ~QGraphicsPolygonItem(); QPolygonF polygon() const; @@ -784,9 +784,9 @@ class QGraphicsLineItemPrivate; class Q_WIDGETS_EXPORT QGraphicsLineItem : public QGraphicsItem { public: - QGraphicsLineItem(QGraphicsItem *parent = 0); - QGraphicsLineItem(const QLineF &line, QGraphicsItem *parent = 0); - QGraphicsLineItem(qreal x1, qreal y1, qreal x2, qreal y2, QGraphicsItem *parent = 0); + explicit QGraphicsLineItem(QGraphicsItem *parent = 0); + explicit QGraphicsLineItem(const QLineF &line, QGraphicsItem *parent = 0); + explicit QGraphicsLineItem(qreal x1, qreal y1, qreal x2, qreal y2, QGraphicsItem *parent = 0); ~QGraphicsLineItem(); QPen pen() const; @@ -829,8 +829,8 @@ public: HeuristicMaskShape }; - QGraphicsPixmapItem(QGraphicsItem *parent = 0); - QGraphicsPixmapItem(const QPixmap &pixmap, QGraphicsItem *parent = 0); + explicit QGraphicsPixmapItem(QGraphicsItem *parent = 0); + explicit QGraphicsPixmapItem(const QPixmap &pixmap, QGraphicsItem *parent = 0); ~QGraphicsPixmapItem(); QPixmap pixmap() const; @@ -881,8 +881,8 @@ class Q_WIDGETS_EXPORT QGraphicsTextItem : public QGraphicsObject QDOC_PROPERTY(QTextCursor textCursor READ textCursor WRITE setTextCursor) public: - QGraphicsTextItem(QGraphicsItem *parent = 0); - QGraphicsTextItem(const QString &text, QGraphicsItem *parent = 0); + explicit QGraphicsTextItem(QGraphicsItem *parent = 0); + explicit QGraphicsTextItem(const QString &text, QGraphicsItem *parent = 0); ~QGraphicsTextItem(); QString toHtml() const; @@ -972,8 +972,8 @@ class QGraphicsSimpleTextItemPrivate; class Q_WIDGETS_EXPORT QGraphicsSimpleTextItem : public QAbstractGraphicsShapeItem { public: - QGraphicsSimpleTextItem(QGraphicsItem *parent = 0); - QGraphicsSimpleTextItem(const QString &text, QGraphicsItem *parent = 0); + explicit QGraphicsSimpleTextItem(QGraphicsItem *parent = 0); + explicit QGraphicsSimpleTextItem(const QString &text, QGraphicsItem *parent = 0); ~QGraphicsSimpleTextItem(); void setText(const QString &text); @@ -1008,7 +1008,7 @@ class QGraphicsItemGroupPrivate; class Q_WIDGETS_EXPORT QGraphicsItemGroup : public QGraphicsItem { public: - QGraphicsItemGroup(QGraphicsItem *parent = 0); + explicit QGraphicsItemGroup(QGraphicsItem *parent = 0); ~QGraphicsItemGroup(); void addToGroup(QGraphicsItem *item); diff --git a/src/widgets/kernel/qgesture.h b/src/widgets/kernel/qgesture.h index a289622276..b8a719383a 100644 --- a/src/widgets/kernel/qgesture.h +++ b/src/widgets/kernel/qgesture.h @@ -117,7 +117,7 @@ class Q_WIDGETS_EXPORT QPanGesture : public QGesture Q_PRIVATE_PROPERTY(QPanGesture::d_func(), qreal verticalVelocity READ verticalVelocity WRITE setVerticalVelocity) public: - QPanGesture(QObject *parent = 0); + explicit QPanGesture(QObject *parent = 0); QPointF lastOffset() const; QPointF offset() const; @@ -163,7 +163,7 @@ public: Q_PROPERTY(QPointF centerPoint READ centerPoint WRITE setCenterPoint) public: - QPinchGesture(QObject *parent = 0); + explicit QPinchGesture(QObject *parent = 0); ChangeFlags totalChangeFlags() const; void setTotalChangeFlags(ChangeFlags value); @@ -217,7 +217,8 @@ class Q_WIDGETS_EXPORT QSwipeGesture : public QGesture public: enum SwipeDirection { NoDirection, Left, Right, Up, Down }; - QSwipeGesture(QObject *parent = 0); + + explicit QSwipeGesture(QObject *parent = 0); SwipeDirection horizontalDirection() const; SwipeDirection verticalDirection() const; @@ -237,7 +238,7 @@ class Q_WIDGETS_EXPORT QTapGesture : public QGesture Q_PROPERTY(QPointF position READ position WRITE setPosition) public: - QTapGesture(QObject *parent = 0); + explicit QTapGesture(QObject *parent = 0); QPointF position() const; void setPosition(const QPointF &pos); @@ -254,7 +255,7 @@ class Q_WIDGETS_EXPORT QTapAndHoldGesture : public QGesture Q_PROPERTY(QPointF position READ position WRITE setPosition) public: - QTapAndHoldGesture(QObject *parent = 0); + explicit QTapAndHoldGesture(QObject *parent = 0); QPointF position() const; void setPosition(const QPointF &pos); diff --git a/src/widgets/widgets/qcommandlinkbutton.h b/src/widgets/widgets/qcommandlinkbutton.h index 731d02a60c..50707d82fc 100644 --- a/src/widgets/widgets/qcommandlinkbutton.h +++ b/src/widgets/widgets/qcommandlinkbutton.h @@ -61,7 +61,8 @@ class Q_WIDGETS_EXPORT QCommandLinkButton: public QPushButton public: explicit QCommandLinkButton(QWidget *parent=0); explicit QCommandLinkButton(const QString &text, QWidget *parent=0); - QCommandLinkButton(const QString &text, const QString &description, QWidget *parent=0); + explicit QCommandLinkButton(const QString &text, const QString &description, QWidget *parent=0); + QString description() const; void setDescription(const QString &description); diff --git a/src/widgets/widgets/qdatetimeedit.h b/src/widgets/widgets/qdatetimeedit.h index 7ce7037dd0..77e038cab8 100644 --- a/src/widgets/widgets/qdatetimeedit.h +++ b/src/widgets/widgets/qdatetimeedit.h @@ -207,8 +207,8 @@ class Q_WIDGETS_EXPORT QTimeEdit : public QDateTimeEdit Q_OBJECT Q_PROPERTY(QTime time READ time WRITE setTime NOTIFY userTimeChanged USER true) public: - QTimeEdit(QWidget *parent = 0); - QTimeEdit(const QTime &time, QWidget *parent = 0); + explicit QTimeEdit(QWidget *parent = 0); + explicit QTimeEdit(const QTime &time, QWidget *parent = 0); Q_SIGNALS: void userTimeChanged(const QTime &time); @@ -219,8 +219,8 @@ class Q_WIDGETS_EXPORT QDateEdit : public QDateTimeEdit Q_OBJECT Q_PROPERTY(QDate date READ date WRITE setDate NOTIFY userDateChanged USER true) public: - QDateEdit(QWidget *parent = 0); - QDateEdit(const QDate &date, QWidget *parent = 0); + explicit QDateEdit(QWidget *parent = 0); + explicit QDateEdit(const QDate &date, QWidget *parent = 0); Q_SIGNALS: void userDateChanged(const QDate &date); diff --git a/src/widgets/widgets/qsplitter.h b/src/widgets/widgets/qsplitter.h index 18d3bae3e2..147fcff0ff 100644 --- a/src/widgets/widgets/qsplitter.h +++ b/src/widgets/widgets/qsplitter.h @@ -140,7 +140,8 @@ class Q_WIDGETS_EXPORT QSplitterHandle : public QWidget { Q_OBJECT public: - QSplitterHandle(Qt::Orientation o, QSplitter *parent); + explicit QSplitterHandle(Qt::Orientation o, QSplitter *parent); + void setOrientation(Qt::Orientation o); Qt::Orientation orientation() const; bool opaqueResize() const; -- cgit v1.2.3