aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmldebug/qqmldebugconnection.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/qmldebug/qqmldebugconnection.cpp')
-rw-r--r--src/qmldebug/qqmldebugconnection.cpp19
1 files changed, 8 insertions, 11 deletions
diff --git a/src/qmldebug/qqmldebugconnection.cpp b/src/qmldebug/qqmldebugconnection.cpp
index 73ccd7c854..67bad8d812 100644
--- a/src/qmldebug/qqmldebugconnection.cpp
+++ b/src/qmldebug/qqmldebugconnection.cpp
@@ -63,15 +63,15 @@ class QQmlDebugConnectionPrivate : public QObjectPrivate
public:
QQmlDebugConnectionPrivate();
- QPacketProtocol *protocol;
- QIODevice *device;
- QLocalServer *server;
+ QPacketProtocol *protocol = nullptr;
+ QIODevice *device = nullptr;
+ QLocalServer *server = nullptr;
QEventLoop handshakeEventLoop;
QTimer handshakeTimer;
- bool gotHello;
- int currentDataStreamVersion;
- int maximumDataStreamVersion;
+ bool gotHello = false;
+ int currentDataStreamVersion = QDataStream::Qt_4_7;
+ int maximumDataStreamVersion = QDataStream::Qt_DefaultCompiledVersion;
QHash <QString, float> serverPlugins;
QHash<QString, QQmlDebugClient *> plugins;
QStringList removedPlugins;
@@ -81,10 +81,7 @@ public:
void flush();
};
-QQmlDebugConnectionPrivate::QQmlDebugConnectionPrivate() :
- protocol(0), device(0), server(0), gotHello(false),
- currentDataStreamVersion(QDataStream::Qt_4_7),
- maximumDataStreamVersion(QDataStream::Qt_DefaultCompiledVersion)
+QQmlDebugConnectionPrivate::QQmlDebugConnectionPrivate()
{
handshakeTimer.setSingleShot(true);
handshakeTimer.setInterval(3000);
@@ -303,7 +300,7 @@ void QQmlDebugConnection::close()
if (d->device) {
d->device->deleteLater();
- d->device = 0;
+ d->device = nullptr;
}
}