diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-08-18 15:14:18 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-09-15 13:08:34 +0000 |
| commit | 79adf5e2da6a22c908620f67a894be92c02c886d (patch) | |
| tree | 10df7c8175bf32f5c90d86ee7553106dc7b53580 /src/plugins/qmltooling | |
| parent | 92ae853c16b7daef06b339968073af32484b067e (diff) | |
V4 Debugger: Eliminate extra "version" member
It's enough to have one of them.
Change-Id: I7970ad78e1e478455fc4a403f50954b8d572baac
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/plugins/qmltooling')
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp index b4957513ba..a4ed570927 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp +++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp @@ -591,7 +591,7 @@ V8CommandHandler *QV4DebugServiceImpl::v8CommandHandler(const QString &command) QV4DebugServiceImpl::QV4DebugServiceImpl(QObject *parent) : QQmlConfigurableDebugService<QV4DebugService>(1, parent), - debuggerAgent(this), version(1), theSelectedFrame(0), + debuggerAgent(this), theSelectedFrame(0), unknownV8CommandHandler(new UnknownV8CommandHandler) { addHandler(new V8VersionRequest); @@ -706,7 +706,7 @@ void QV4DebugServiceImpl::sendSomethingToSomebody(const char *type, int magicNum QByteArray response; QQmlDebugStream rs(&response, QIODevice::WriteOnly); rs << QByteArray(type) - << QByteArray::number(version) << QByteArray::number(magicNumber); + << QByteArray::number(int(version())) << QByteArray::number(magicNumber); emit messageToClient(name(), packMessage(type, response)); } diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h index fc3a20973e..dbf41ac363 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h +++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h @@ -108,7 +108,6 @@ private: QStringList breakOnSignals; static int sequence; - const int version; QV4DataCollector::Refs collectedRefs; QScopedPointer<QV4DataCollector> theCollector; |