diff options
Diffstat (limited to 'src/declarative/util')
-rw-r--r-- | src/declarative/util/qdeclarativelistmodelworkeragent_p.h | 3 | ||||
-rw-r--r-- | src/declarative/util/qdeclarativepropertymap.h | 2 | ||||
-rw-r--r-- | src/declarative/util/qdeclarativeview.h | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h b/src/declarative/util/qdeclarativelistmodelworkeragent_p.h index cb3e56d5..bf2d0c7c 100644 --- a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h +++ b/src/declarative/util/qdeclarativelistmodelworkeragent_p.h @@ -95,7 +95,8 @@ public: VariantRef &operator=(const VariantRef &o) { if (o.a) o.a->addref(); - if (a) a->release(); a = o.a; + if (a) a->release(); + a = o.a; return *this; } diff --git a/src/declarative/util/qdeclarativepropertymap.h b/src/declarative/util/qdeclarativepropertymap.h index 41073254..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 = 0); + 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 aa0caa11..fb623b7f 100644 --- a/src/declarative/util/qdeclarativeview.h +++ b/src/declarative/util/qdeclarativeview.h @@ -59,8 +59,8 @@ class Q_DECLARATIVE_EXPORT QDeclarativeView : public QGraphicsView Q_PROPERTY(QUrl source READ source WRITE setSource DESIGNABLE true) Q_ENUMS(ResizeMode Status) public: - explicit QDeclarativeView(QWidget *parent = 0); - QDeclarativeView(const QUrl &source, QWidget *parent = 0); + explicit QDeclarativeView(QWidget *parent = Q_NULLPTR); + explicit QDeclarativeView(const QUrl &source, QWidget *parent = Q_NULLPTR); virtual ~QDeclarativeView(); QUrl source() const; |