From ec92b3b2c0f67f7ee5f7e284c21b239545c75b7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Thu, 24 Feb 2011 17:52:35 +0100 Subject: [PATCH] QmlJSDebugger: Code cosmetics --- .../editor/abstractliveedittool.cpp | 3 +-- .../include/qdeclarativeviewobserver.h | 2 +- .../qmljsinspector/qmljsobserverclient.cpp | 16 +++++++--------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/share/qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.cpp b/share/qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.cpp index c742d04cd9d..433e18227aa 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.cpp @@ -51,7 +51,6 @@ AbstractLiveEditTool::AbstractLiveEditTool(QDeclarativeViewObserver *editorView) AbstractLiveEditTool::~AbstractLiveEditTool() { - } QDeclarativeViewObserver *AbstractLiveEditTool::observer() const @@ -196,4 +195,4 @@ QString AbstractLiveEditTool::titleForItem(QGraphicsItem *item) } -} +} // namespace QmlJSDebugger diff --git a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h index a78272c2dc1..68c99fbb862 100644 --- a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h +++ b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h @@ -119,6 +119,6 @@ private: friend class AbstractLiveEditTool; }; -} //namespace QmlJSDebugger +} // namespace QmlJSDebugger #endif // QDECLARATIVEVIEWOBSERVER_H diff --git a/src/plugins/qmljsinspector/qmljsobserverclient.cpp b/src/plugins/qmljsinspector/qmljsobserverclient.cpp index bd19fbb0644..4be4171baa0 100644 --- a/src/plugins/qmljsinspector/qmljsobserverclient.cpp +++ b/src/plugins/qmljsinspector/qmljsobserverclient.cpp @@ -51,7 +51,7 @@ namespace QmlJSInspector { namespace Internal { QmlJSObserverClient::QmlJSObserverClient(QDeclarativeDebugConnection *client, - QObject * /*parent*/) + QObject * /*parent*/) : QDeclarativeDebugClient(QLatin1String("QDeclarativeObserverMode"), client) , m_connection(client) { @@ -78,12 +78,11 @@ void QmlJSObserverClient::messageReceived(const QByteArray &message) m_currentDebugIds.clear(); - for(int i = 0; i < objectCount; ++i) { + for (int i = 0; i < objectCount; ++i) { int debugId; ds >> debugId; - if (debugId != -1) { + if (debugId != -1) m_currentDebugIds << debugId; - } } emit currentObjectsChanged(m_currentDebugIds); @@ -166,7 +165,8 @@ QList QmlJSObserverClient::currentObjects() const return m_currentDebugIds; } -void QmlJSObserverClient::setCurrentObjects(const QList &debugIds) { +void QmlJSObserverClient::setCurrentObjects(const QList &debugIds) +{ if (!m_connection || !m_connection->isConnected()) return; @@ -195,9 +195,8 @@ void recurseObjectIdList(const QDeclarativeDebugObjectReference &ref, QList { debugIds << ref.debugId(); objectIds << ref.idString(); - foreach(const QDeclarativeDebugObjectReference &child, ref.children()) { + foreach (const QDeclarativeDebugObjectReference &child, ref.children()) recurseObjectIdList(child, debugIds, objectIds); - } } void QmlJSObserverClient::setObjectIdList(const QList &objectRoots) @@ -208,9 +207,8 @@ void QmlJSObserverClient::setObjectIdList(const QList debugIds; QList objectIds; - foreach(const QDeclarativeDebugObjectReference &ref, objectRoots) { + foreach (const QDeclarativeDebugObjectReference &ref, objectRoots) recurseObjectIdList(ref, debugIds, objectIds); - } ObserverProtocol::Message cmd = ObserverProtocol::ObjectIdList; ds << cmd