diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2016-03-06 14:11:23 +0100 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2016-03-07 09:05:08 +0000 |
commit | ce4d4941b9182bd65479e2b3f3e507aa381e3f8c (patch) | |
tree | 5c22f3807f53708149d991c4dd8394235a156508 | |
parent | a6fe61915ef46b300975faa394736344046e600c (diff) |
Make more ctors explicit
Added explicit where it was missing. This is not a source-
incompatible change, because code that breaks by this is
a bug. Let's not have this sitting around in an LTS.
One is even a protected ctor.
Change-Id: If047884d130206b8ea42148476ab449c2cbf7529
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativeitem.h | 4 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativecomponent.h | 8 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativecontext.h | 4 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativeengine.h | 2 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativeexpression.h | 2 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativelist.h | 2 | ||||
-rw-r--r-- | src/declarative/util/qdeclarativepropertymap.h | 2 | ||||
-rw-r--r-- | src/declarative/util/qdeclarativeview.h | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.h b/src/declarative/graphicsitems/qdeclarativeitem.h index b6c7da0f..d1f6e6c7 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.h +++ b/src/declarative/graphicsitems/qdeclarativeitem.h @@ -95,7 +95,7 @@ public: BottomLeft, Bottom, BottomRight }; - QDeclarativeItem(QDeclarativeItem *parent = Q_NULLPTR); + explicit QDeclarativeItem(QDeclarativeItem *parent = Q_NULLPTR); virtual ~QDeclarativeItem(); QDeclarativeItem *parentItem() const; @@ -182,7 +182,7 @@ protected: const QRectF &oldGeometry); protected: - QDeclarativeItem(QDeclarativeItemPrivate &dd, QDeclarativeItem *parent = Q_NULLPTR); + explicit QDeclarativeItem(QDeclarativeItemPrivate &dd, QDeclarativeItem *parent = Q_NULLPTR); private: Q_DISABLE_COPY(QDeclarativeItem) diff --git a/src/declarative/qml/qdeclarativecomponent.h b/src/declarative/qml/qdeclarativecomponent.h index cbba0fb5..b3c73ef8 100644 --- a/src/declarative/qml/qdeclarativecomponent.h +++ b/src/declarative/qml/qdeclarativecomponent.h @@ -60,10 +60,10 @@ class Q_DECLARATIVE_EXPORT QDeclarativeComponent : public QObject Q_PROPERTY(QUrl url READ url CONSTANT) public: - QDeclarativeComponent(QObject *parent = Q_NULLPTR); - QDeclarativeComponent(QDeclarativeEngine *, QObject *parent = Q_NULLPTR); - QDeclarativeComponent(QDeclarativeEngine *, const QString &fileName, QObject *parent = Q_NULLPTR); - QDeclarativeComponent(QDeclarativeEngine *, const QUrl &url, QObject *parent = Q_NULLPTR); + explicit QDeclarativeComponent(QObject *parent = Q_NULLPTR); + explicit QDeclarativeComponent(QDeclarativeEngine *, QObject *parent = Q_NULLPTR); + explicit QDeclarativeComponent(QDeclarativeEngine *, const QString &fileName, QObject *parent = Q_NULLPTR); + explicit QDeclarativeComponent(QDeclarativeEngine *, const QUrl &url, QObject *parent = Q_NULLPTR); virtual ~QDeclarativeComponent(); Q_ENUMS(Status) diff --git a/src/declarative/qml/qdeclarativecontext.h b/src/declarative/qml/qdeclarativecontext.h index 1d01295e..ed78da6d 100644 --- a/src/declarative/qml/qdeclarativecontext.h +++ b/src/declarative/qml/qdeclarativecontext.h @@ -58,8 +58,8 @@ class Q_DECLARATIVE_EXPORT QDeclarativeContext : public QObject Q_DECLARE_PRIVATE(QDeclarativeContext) public: - QDeclarativeContext(QDeclarativeEngine *parent, QObject *objParent = Q_NULLPTR); - QDeclarativeContext(QDeclarativeContext *parent, QObject *objParent = Q_NULLPTR); + explicit QDeclarativeContext(QDeclarativeEngine *parent, QObject *objParent = Q_NULLPTR); + explicit QDeclarativeContext(QDeclarativeContext *parent, QObject *objParent = Q_NULLPTR); virtual ~QDeclarativeContext(); bool isValid() const; diff --git a/src/declarative/qml/qdeclarativeengine.h b/src/declarative/qml/qdeclarativeengine.h index 875e000b..6cf7515d 100644 --- a/src/declarative/qml/qdeclarativeengine.h +++ b/src/declarative/qml/qdeclarativeengine.h @@ -62,7 +62,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeEngine : public QObject Q_PROPERTY(QString offlineStoragePath READ offlineStoragePath WRITE setOfflineStoragePath) Q_OBJECT public: - QDeclarativeEngine(QObject *p = Q_NULLPTR); + explicit QDeclarativeEngine(QObject *p = Q_NULLPTR); virtual ~QDeclarativeEngine(); QDeclarativeContext *rootContext() const; diff --git a/src/declarative/qml/qdeclarativeexpression.h b/src/declarative/qml/qdeclarativeexpression.h index 978bdf83..c92471db 100644 --- a/src/declarative/qml/qdeclarativeexpression.h +++ b/src/declarative/qml/qdeclarativeexpression.h @@ -55,7 +55,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeExpression : public QObject Q_OBJECT public: QDeclarativeExpression(); - QDeclarativeExpression(QDeclarativeContext *, QObject *, const QString &, QObject * = Q_NULLPTR); + explicit QDeclarativeExpression(QDeclarativeContext *, QObject *, const QString &, QObject * = Q_NULLPTR); virtual ~QDeclarativeExpression(); QDeclarativeEngine *engine() const; diff --git a/src/declarative/qml/qdeclarativelist.h b/src/declarative/qml/qdeclarativelist.h index 8653eb02..e5b8d249 100644 --- a/src/declarative/qml/qdeclarativelist.h +++ b/src/declarative/qml/qdeclarativelist.h @@ -116,7 +116,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeListReference { public: QDeclarativeListReference(); - QDeclarativeListReference(QObject *, const char *property, QDeclarativeEngine * = Q_NULLPTR); + explicit QDeclarativeListReference(QObject *, const char *property, QDeclarativeEngine * = Q_NULLPTR); QDeclarativeListReference(const QDeclarativeListReference &); QDeclarativeListReference &operator=(const QDeclarativeListReference &); ~QDeclarativeListReference(); diff --git a/src/declarative/util/qdeclarativepropertymap.h b/src/declarative/util/qdeclarativepropertymap.h index 15507edb..0ccf4ffc 100644 --- a/src/declarative/util/qdeclarativepropertymap.h +++ b/src/declarative/util/qdeclarativepropertymap.h @@ -49,7 +49,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativePropertyMap : public QObject { Q_OBJECT public: - QDeclarativePropertyMap(QObject *parent = Q_NULLPTR); + explicit QDeclarativePropertyMap(QObject *parent = Q_NULLPTR); virtual ~QDeclarativePropertyMap(); QVariant value(const QString &key) const; diff --git a/src/declarative/util/qdeclarativeview.h b/src/declarative/util/qdeclarativeview.h index e0b9742c..fb623b7f 100644 --- a/src/declarative/util/qdeclarativeview.h +++ b/src/declarative/util/qdeclarativeview.h @@ -60,7 +60,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeView : public QGraphicsView Q_ENUMS(ResizeMode Status) public: explicit QDeclarativeView(QWidget *parent = Q_NULLPTR); - QDeclarativeView(const QUrl &source, QWidget *parent = Q_NULLPTR); + explicit QDeclarativeView(const QUrl &source, QWidget *parent = Q_NULLPTR); virtual ~QDeclarativeView(); QUrl source() const; |