aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmldebug
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2018-02-21 10:41:54 +0100
committerShawn Rutledge <shawn.rutledge@qt.io>2018-02-26 07:13:18 +0000
commit499ec43937e926e4f2fa57a9baa455fcb3862262 (patch)
tree206c90d47387f8322b68f5e3db613189397e1af3 /src/qmldebug
parent53d1e9ed21d25e65a2f13606af479838f5f21fe7 (diff)
use nullptr consistently (clang-tidy)
From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qmldebug')
-rw-r--r--src/qmldebug/qqmldebugclient.cpp2
-rw-r--r--src/qmldebug/qqmldebugconnection.cpp4
-rw-r--r--src/qmldebug/qqmldebugconnection_p.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/qmldebug/qqmldebugclient.cpp b/src/qmldebug/qqmldebugclient.cpp
index 7f1e8c637c..d412b7b267 100644
--- a/src/qmldebug/qqmldebugclient.cpp
+++ b/src/qmldebug/qqmldebugclient.cpp
@@ -77,7 +77,7 @@ void QQmlDebugClientPrivate::addToConnection()
Q_Q(QQmlDebugClient);
if (connection && !connection->addClient(name, q)) {
qWarning() << "QQmlDebugClient: Conflicting plugin name" << name;
- connection = 0;
+ connection = nullptr;
}
}
diff --git a/src/qmldebug/qqmldebugconnection.cpp b/src/qmldebug/qqmldebugconnection.cpp
index 73ccd7c854..1f40cab049 100644
--- a/src/qmldebug/qqmldebugconnection.cpp
+++ b/src/qmldebug/qqmldebugconnection.cpp
@@ -82,7 +82,7 @@ public:
};
QQmlDebugConnectionPrivate::QQmlDebugConnectionPrivate() :
- protocol(0), device(0), server(0), gotHello(false),
+ protocol(nullptr), device(nullptr), server(nullptr), gotHello(false),
currentDataStreamVersion(QDataStream::Qt_4_7),
maximumDataStreamVersion(QDataStream::Qt_DefaultCompiledVersion)
{
@@ -303,7 +303,7 @@ void QQmlDebugConnection::close()
if (d->device) {
d->device->deleteLater();
- d->device = 0;
+ d->device = nullptr;
}
}
diff --git a/src/qmldebug/qqmldebugconnection_p.h b/src/qmldebug/qqmldebugconnection_p.h
index be425b6cbf..ad9376886c 100644
--- a/src/qmldebug/qqmldebugconnection_p.h
+++ b/src/qmldebug/qqmldebugconnection_p.h
@@ -64,7 +64,7 @@ class QQmlDebugConnection : public QObject
Q_DISABLE_COPY(QQmlDebugConnection)
Q_DECLARE_PRIVATE(QQmlDebugConnection)
public:
- QQmlDebugConnection(QObject *parent = 0);
+ QQmlDebugConnection(QObject *parent = nullptr);
~QQmlDebugConnection();
void connectToHost(const QString &hostName, quint16 port);