diff options
| author | Øystein Heskestad <oystein.heskestad@qt.io> | 2021-03-23 09:19:05 +0100 |
|---|---|---|
| committer | Øystein Heskestad <oystein.heskestad@qt.io> | 2021-03-23 12:32:33 +0100 |
| commit | 37d15b2f0bcda4918b0788d7b2c3cd96bb5eb1ce (patch) | |
| tree | 87931cd22aa6fc9f68544eaf9d71430f75084fb4 /src/webchannel/qwebchannel.h | |
| parent | 892dfeeff0fd3c17cfeb3cbb887f7a80e436aa17 (diff) | |
Replace Q_NULLPTR with nullptr and fix a warning
* The warning was that a QJsonValue reference was used when iterating over a QJsonArray
Task-number: QTBUG-91757
Change-Id: I72fefb0b1d119da565b6dd1bcbada4fa874fd94e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/webchannel/qwebchannel.h')
| -rw-r--r-- | src/webchannel/qwebchannel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webchannel/qwebchannel.h b/src/webchannel/qwebchannel.h index 44dd8b6..19d2862 100644 --- a/src/webchannel/qwebchannel.h +++ b/src/webchannel/qwebchannel.h @@ -57,7 +57,7 @@ class Q_WEBCHANNEL_EXPORT QWebChannel : public QObject Q_DISABLE_COPY(QWebChannel) Q_PROPERTY(bool blockUpdates READ blockUpdates WRITE setBlockUpdates NOTIFY blockUpdatesChanged) public: - explicit QWebChannel(QObject *parent = Q_NULLPTR); + explicit QWebChannel(QObject *parent = nullptr); ~QWebChannel(); void registerObjects(const QHash<QString, QObject*> &objects); @@ -78,7 +78,7 @@ public Q_SLOTS: private: Q_DECLARE_PRIVATE(QWebChannel) - QWebChannel(QWebChannelPrivate &dd, QObject *parent = Q_NULLPTR); + QWebChannel(QWebChannelPrivate &dd, QObject *parent = nullptr); Q_PRIVATE_SLOT(d_func(), void _q_transportDestroyed(QObject*)) friend class QMetaObjectPublisher; |