diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-11-15 13:33:45 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-11-20 14:05:02 +0000 |
| commit | d29e7a03715ffd8e20a3047b9221d4863605fcd0 (patch) | |
| tree | b9cd8929ae401b172a89bf8cc3b28529d6859319 /src/libs/qmldebug | |
| parent | d5888363613274a269f4b05f18986b0f0f154b00 (diff) | |
QML Inspector: Simplify
Since we don't need to support the Qt Quick 1 clients anymore, we can
drop some code.
Change-Id: I7afcad8024392f058a35b3ed0d28d2172587552a
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/libs/qmldebug')
| -rw-r--r-- | src/libs/qmldebug/basetoolsclient.h | 5 | ||||
| -rw-r--r-- | src/libs/qmldebug/qmltoolsclient.cpp | 6 | ||||
| -rw-r--r-- | src/libs/qmldebug/qmltoolsclient.h | 5 |
3 files changed, 3 insertions, 13 deletions
diff --git a/src/libs/qmldebug/basetoolsclient.h b/src/libs/qmldebug/basetoolsclient.h index cb8d86cb19..095d60b69e 100644 --- a/src/libs/qmldebug/basetoolsclient.h +++ b/src/libs/qmldebug/basetoolsclient.h @@ -41,10 +41,7 @@ public: virtual void changeToSelectMarqueeTool() = 0; virtual void changeToZoomTool() = 0; virtual void showAppOnTop(bool showOnTop) = 0; - - // ### Qt 4.8: remove if we can have access to qdeclarativecontextdata or id's - virtual void setObjectIdList( - const QList<ObjectReference> &objectRoots) = 0; + virtual void selectObjects(const QList<int> &debugIds) = 0; signals: void newState(QmlDebug::QmlDebugClient::State status); diff --git a/src/libs/qmldebug/qmltoolsclient.cpp b/src/libs/qmldebug/qmltoolsclient.cpp index 1f22e36b74..9212957cdd 100644 --- a/src/libs/qmldebug/qmltoolsclient.cpp +++ b/src/libs/qmldebug/qmltoolsclient.cpp @@ -90,15 +90,11 @@ void QmlToolsClient::messageReceived(const QByteArray &message) } } -void QmlToolsClient::setObjectIdList(const QList<ObjectReference> &objectRoots) +void QmlToolsClient::selectObjects(const QList<int> &debugIds) { if (!m_connection || !m_connection->isConnected()) return; - QList<int> debugIds; - foreach (const ObjectReference &object, objectRoots) - debugIds << object.debugId(); - QPacket ds(dataStreamVersion()); ds << QByteArray(REQUEST) << m_requestId++ << QByteArray(SELECT) << debugIds; sendMessage(ds.data()); diff --git a/src/libs/qmldebug/qmltoolsclient.h b/src/libs/qmldebug/qmltoolsclient.h index 0a3aba6bd4..8599f5d48f 100644 --- a/src/libs/qmldebug/qmltoolsclient.h +++ b/src/libs/qmldebug/qmltoolsclient.h @@ -40,10 +40,7 @@ public: void changeToSelectMarqueeTool() override; void changeToZoomTool() override; void showAppOnTop(bool showOnTop) override; - - // ### Qt 4.8: remove if we can have access to qdeclarativecontextdata or id's - void setObjectIdList(const QList<ObjectReference> &objectRoots) override; - + void selectObjects(const QList<int> &debugIds) override; void messageReceived(const QByteArray &) override; private: |