OSDN Git Service

QmlJSInspector: Renamed Observer to Inspector
authorThorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
Mon, 30 May 2011 14:32:25 +0000 (16:32 +0200)
committerKai Koehne <kai.koehne@nokia.com>
Tue, 31 May 2011 07:44:09 +0000 (09:44 +0200)
commit335f6ad0f7f81a2bd928346d30949bee646cebe7
tree2d3b50d3c3ef2fb52521633fa82716bba1ab1d78
parente0f79761f3a3d43bcff2b46736c0cf6aa4572bac
QmlJSInspector: Renamed Observer to Inspector

Manually redid Qt 4.8 commit 206ebd5af21d94c3f3b49d2cb645105a63e6f5fb,
to make future code synchronization easier.

In order not to have to change the QmlApplicationViewer again, a
compatibility class QDeclarativeViewObserver is retained that subclasses
QDeclarativeViewInspector.

Change-Id: Ief87ae2f8f76b1db0c9d65085e4832424b277603
Reviewed-on: http://codereview.qt.nokia.com/242
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
51 files changed:
share/qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.cpp
share/qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.h
share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.cpp
share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.h
share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.cpp
share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.h
share/qtcreator/qml/qmljsdebugger/editor/editor.qrc
share/qtcreator/qml/qmljsdebugger/editor/images/inspectormode-24.png [moved from share/qtcreator/qml/qmljsdebugger/editor/images/observermode-24.png with 100% similarity]
share/qtcreator/qml/qmljsdebugger/editor/images/inspectormode.png [moved from share/qtcreator/qml/qmljsdebugger/editor/images/observermode.png with 100% similarity]
share/qtcreator/qml/qmljsdebugger/editor/livelayeritem.cpp
share/qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.cpp
share/qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.h
share/qtcreator/qml/qmljsdebugger/editor/liveselectionindicator.cpp
share/qtcreator/qml/qmljsdebugger/editor/liveselectionindicator.h
share/qtcreator/qml/qmljsdebugger/editor/liveselectionrectangle.cpp
share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.cpp
share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.h
share/qtcreator/qml/qmljsdebugger/editor/livesingleselectionmanipulator.cpp
share/qtcreator/qml/qmljsdebugger/editor/livesingleselectionmanipulator.h
share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.cpp
share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.h
share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.cpp
share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.h
share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.cpp
share/qtcreator/qml/qmljsdebugger/editor/zoomtool.cpp
share/qtcreator/qml/qmljsdebugger/editor/zoomtool.h
share/qtcreator/qml/qmljsdebugger/include/qdeclarativeinspectorservice.h [moved from share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h with 94% similarity]
share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewinspector.h [new file with mode: 0644]
share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h
share/qtcreator/qml/qmljsdebugger/include/qmlinspectorconstants.h [moved from share/qtcreator/qml/qmljsdebugger/include/qmlobserverconstants.h with 95% similarity]
share/qtcreator/qml/qmljsdebugger/protocol/inspectorprotocol.h [moved from share/qtcreator/qml/qmljsdebugger/protocol/observerprotocol.h with 77% similarity]
share/qtcreator/qml/qmljsdebugger/protocol/protocol.pri
share/qtcreator/qml/qmljsdebugger/qdeclarativeinspectorservice.cpp [moved from share/qtcreator/qml/qmljsdebugger/qdeclarativeobserverservice.cpp with 70% similarity]
share/qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector.cpp [moved from share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp with 85% similarity]
share/qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector_p.h [moved from share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver_p.h with 87% similarity]
share/qtcreator/qml/qmljsdebugger/qmljsdebugger-src.pri
share/qtcreator/qml/qmlobserver/qmlruntime.cpp
share/qtcreator/qml/qmlobserver/qmlruntime.h
src/plugins/qmljsinspector/images/inspectormode.png [moved from src/plugins/qmljsinspector/images/observermode.png with 100% similarity]
src/plugins/qmljsinspector/qmlinspectortoolbar.cpp
src/plugins/qmljsinspector/qmlinspectortoolbar.h
src/plugins/qmljsinspector/qmljsclientproxy.cpp
src/plugins/qmljsinspector/qmljsclientproxy.h
src/plugins/qmljsinspector/qmljsinspector.cpp
src/plugins/qmljsinspector/qmljsinspector.h
src/plugins/qmljsinspector/qmljsinspector.pro
src/plugins/qmljsinspector/qmljsinspector.qrc
src/plugins/qmljsinspector/qmljsinspectorclient.cpp [moved from src/plugins/qmljsinspector/qmljsobserverclient.cpp with 73% similarity]
src/plugins/qmljsinspector/qmljsinspectorclient.h [moved from src/plugins/qmljsinspector/qmljsobserverclient.h with 94% similarity]
src/plugins/qmljsinspector/qmljslivetextpreview.cpp
src/plugins/qmljsinspector/qmljslivetextpreview.h