QmlJSDebugger: Finished the renaming

Some things forgotten as part of commit f9e65028fd2227b7d1560ed793 since
these files are not compiled together with Qt Creator.

Fixes compile of QML Observer and QMLJSDEBUGGER-enabled QtQuick
Applications.

diff --git a/share/qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.h b/share/qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.h
index cade09f..0bec66b 100644 (file)
--- a/share/qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.h
+++ b/share/qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.h
@@ -96,7 +96,7 @@ protected:
 
     QDeclarativeViewObserver *observer() const;
     QDeclarativeView *view() const;
-    QGraphicsScene* scene() const;
+    QGraphicsScene *scene() const;
 
 private:
     QDeclarativeViewObserver *m_observer;

diff --git a/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.h b/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.h
index 23b3f10..f857be5 100644 (file)
--- a/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.h
+++ b/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.h
@@ -34,7 +34,7 @@
 #ifndef BOUNDINGRECTHIGHLIGHTER_H
 #define BOUNDINGRECTHIGHLIGHTER_H
 
-#include "layeritem.h"
+#include "livelayeritem.h"
 
 #include <QtCore/QObject>
 #include <QtCore/QWeakPointer>

diff --git a/share/qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.h b/share/qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.h
index 7ead472..a9363d7 100644 (file)
--- a/share/qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.h
+++ b/share/qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.h
@@ -35,7 +35,7 @@
 #define RUBBERBANDSELECTIONMANIPULATOR_H
 
 
-#include "selectionrectangle.h"
+#include "liveselectionrectangle.h"
 
 #include <QtCore/QPointF>
 

diff --git a/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.cpp b/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.cpp
index be6e692..cad84b0 100644 (file)
--- a/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.cpp
+++ b/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.cpp
@@ -32,7 +32,7 @@
 **************************************************************************/
 
 #include "liveselectiontool.h"
-#include "layeritem.h"
+#include "livelayeritem.h"
 
 #include "../qdeclarativeviewobserver_p.h"
 
@@ -74,15 +74,15 @@ void LiveSelectionTool::setRubberbandSelectionMode(bool value)
     m_rubberbandSelectionMode = value;
 }
 
-SingleSelectionManipulator::SelectionType LiveSelectionTool::getSelectionType(Qt::KeyboardModifiers
+LiveSingleSelectionManipulator::SelectionType LiveSelectionTool::getSelectionType(Qt::KeyboardModifiers
                                                                           modifiers)
 {
-    SingleSelectionManipulator::SelectionType selectionType
-            = SingleSelectionManipulator::ReplaceSelection;
+   LiveSingleSelectionManipulator::SelectionType selectionType
+            = LiveSingleSelectionManipulator::ReplaceSelection;
     if (modifiers.testFlag(Qt::ControlModifier)) {
-        selectionType = SingleSelectionManipulator::RemoveFromSelection;
+        selectionType = LiveSingleSelectionManipulator::RemoveFromSelection;
     } else if (modifiers.testFlag(Qt::ShiftModifier)) {
-        selectionType = SingleSelectionManipulator::AddToSelection;
+        selectionType = LiveSingleSelectionManipulator::AddToSelection;
     }
     return selectionType;
 }
@@ -110,7 +110,7 @@ void LiveSelectionTool::mousePressEvent(QMouseEvent *event)
     QDeclarativeViewObserverPrivate *observerPrivate
             = QDeclarativeViewObserverPrivate::get(observer());
     QList<QGraphicsItem*> itemList = observerPrivate->selectableItems(event->pos());
-    SingleSelectionManipulator::SelectionType selectionType = getSelectionType(event->modifiers());
+    LiveSingleSelectionManipulator::SelectionType selectionType = getSelectionType(event->modifiers());
 
     if (event->buttons() & Qt::LeftButton) {
         m_mousePressTimer.start();
@@ -182,7 +182,7 @@ void LiveSelectionTool::contextMenuElementSelected()
         QPointF updatePt(0, 0);
         QGraphicsItem *item = m_contextMenuItemList.at(itemListIndex);
         m_singleSelectionManipulator.begin(updatePt);
-        m_singleSelectionManipulator.select(SingleSelectionManipulator::InvertSelection,
+        m_singleSelectionManipulator.select(LiveSingleSelectionManipulator::InvertSelection,
                                             QList<QGraphicsItem*>() << item,
                                             false);
         m_singleSelectionManipulator.end(updatePt);
@@ -275,13 +275,13 @@ void LiveSelectionTool::mouseReleaseEvent(QMouseEvent *event)
             m_singleSelectionManipulator.begin(event->pos());
 
             if (event->modifiers().testFlag(Qt::ControlModifier))
-                m_singleSelectionManipulator.select(SingleSelectionManipulator::RemoveFromSelection,
+                m_singleSelectionManipulator.select(LiveSingleSelectionManipulator::RemoveFromSelection,
                                                     m_selectOnlyContentItems);
             else if (event->modifiers().testFlag(Qt::ShiftModifier))
-                m_singleSelectionManipulator.select(SingleSelectionManipulator::AddToSelection,
+                m_singleSelectionManipulator.select(LiveSingleSelectionManipulator::AddToSelection,
                                                     m_selectOnlyContentItems);
             else
-                m_singleSelectionManipulator.select(SingleSelectionManipulator::InvertSelection,
+                m_singleSelectionManipulator.select(LiveSingleSelectionManipulator::InvertSelection,
                                                     m_selectOnlyContentItems);
 
             m_singleSelectionManipulator.end(event->pos());
@@ -359,7 +359,7 @@ void LiveSelectionTool::wheelEvent(QWheelEvent *event)
 
     QPointF updatePt(0, 0);
     m_singleSelectionManipulator.begin(updatePt);
-    m_singleSelectionManipulator.select(SingleSelectionManipulator::ReplaceSelection,
+    m_singleSelectionManipulator.select(LiveSingleSelectionManipulator::ReplaceSelection,
                                         QList<QGraphicsItem*>() << itemList.at(selectedIdx),
                                         false);
     m_singleSelectionManipulator.end(updatePt);
@@ -423,13 +423,13 @@ void LiveSelectionTool::selectUnderPoint(QMouseEvent *event)
     m_singleSelectionManipulator.begin(event->pos());
 
     if (event->modifiers().testFlag(Qt::ControlModifier))
-        m_singleSelectionManipulator.select(SingleSelectionManipulator::RemoveFromSelection,
+        m_singleSelectionManipulator.select(LiveSingleSelectionManipulator::RemoveFromSelection,
                                             m_selectOnlyContentItems);
     else if (event->modifiers().testFlag(Qt::ShiftModifier))
-        m_singleSelectionManipulator.select(SingleSelectionManipulator::AddToSelection,
+        m_singleSelectionManipulator.select(LiveSingleSelectionManipulator::AddToSelection,
                                             m_selectOnlyContentItems);
     else
-        m_singleSelectionManipulator.select(SingleSelectionManipulator::InvertSelection,
+        m_singleSelectionManipulator.select(LiveSingleSelectionManipulator::InvertSelection,
                                             m_selectOnlyContentItems);
 
     m_singleSelectionManipulator.end(event->pos());

diff --git a/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.h b/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.h
index 4248df5..abf3950 100644 (file)
--- a/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.h
+++ b/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.h
@@ -35,10 +35,10 @@
 #define LIVESELECTIONTOOL_H
 
 
-#include "abstractformeditortool.h"
-#include "rubberbandselectionmanipulator.h"
-#include "singleselectionmanipulator.h"
-#include "selectionindicator.h"
+#include "abstractliveedittool.h"
+#include "liverubberbandselectionmanipulator.h"
+#include "livesingleselectionmanipulator.h"
+#include "liveselectionindicator.h"
 
 #include <QtCore/QList>
 #include <QtCore/QTime>
@@ -91,13 +91,13 @@ private slots:
 
 private:
     void createContextMenu(QList<QGraphicsItem*> itemList, QPoint globalPos);
-    SingleSelectionManipulator::SelectionType getSelectionType(Qt::KeyboardModifiers modifiers);
+    LiveSingleSelectionManipulator::SelectionType getSelectionType(Qt::KeyboardModifiers modifiers);
     bool alreadySelected(const QList<QGraphicsItem*> &itemList) const;
 
 private:
     bool m_rubberbandSelectionMode;
     LiveRubberBandSelectionManipulator m_rubberbandSelectionManipulator;
-    SingleSelectionManipulator m_singleSelectionManipulator;
+    LiveSingleSelectionManipulator m_singleSelectionManipulator;
     LiveSelectionIndicator m_selectionIndicator;
     //ResizeIndicator m_resizeIndicator;
     QTime m_mousePressTimer;

diff --git a/share/qtcreator/qml/qmljsdebugger/editor/subcomponenteditortool.cpp b/share/qtcreator/qml/qmljsdebugger/editor/subcomponenteditortool.cpp
index 8c10b8b..45a4823 100644 (file)
--- a/share/qtcreator/qml/qmljsdebugger/editor/subcomponenteditortool.cpp
+++ b/share/qtcreator/qml/qmljsdebugger/editor/subcomponenteditortool.cpp
@@ -34,7 +34,7 @@
 #include "subcomponenteditortool.h"
 #include "../qdeclarativeviewobserver_p.h"
 #include "subcomponentmasklayeritem.h"
-#include "layeritem.h"
+#include "livelayeritem.h"
 
 #include <QtGui/QGraphicsItem>
 #include <QtGui/QGraphicsObject>

diff --git a/share/qtcreator/qml/qmljsdebugger/editor/subcomponenteditortool.h b/share/qtcreator/qml/qmljsdebugger/editor/subcomponenteditortool.h
index ba064cb..0e922f0 100644 (file)
--- a/share/qtcreator/qml/qmljsdebugger/editor/subcomponenteditortool.h
+++ b/share/qtcreator/qml/qmljsdebugger/editor/subcomponenteditortool.h
@@ -34,7 +34,7 @@
 #ifndef SUBCOMPONENTEDITORTOOL_H
 #define SUBCOMPONENTEDITORTOOL_H
 
-#include "abstractformeditortool.h"
+#include "abstractliveedittool.h"
 #include <QtCore/QStack>
 #include <QtCore/QStringList>
 

diff --git a/share/qtcreator/qml/qmljsdebugger/editor/zoomtool.h b/share/qtcreator/qml/qmljsdebugger/editor/zoomtool.h
index 0cdd5e1..63f887f 100644 (file)
--- a/share/qtcreator/qml/qmljsdebugger/editor/zoomtool.h
+++ b/share/qtcreator/qml/qmljsdebugger/editor/zoomtool.h
@@ -34,10 +34,10 @@
 #ifndef ZOOMTOOL_H
 #define ZOOMTOOL_H
 
-#include "abstractformeditortool.h"
-#include "rubberbandselectionmanipulator.h"
+#include "abstractliveedittool.h"
+#include "liverubberbandselectionmanipulator.h"
 
-QT_FORWARD_DECLARE_CLASS(QAction);
+QT_FORWARD_DECLARE_CLASS(QAction)
 
 namespace QmlJSDebugger {
 

diff --git a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h
index df65555..13ad30e 100644 (file)
--- a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h
+++ b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h
@@ -130,8 +130,7 @@ private:
     inline QDeclarativeViewObserverPrivate *d_func() { return data.data(); }
     QScopedPointer<QDeclarativeViewObserverPrivate> data;
     friend class QDeclarativeViewObserverPrivate;
-    friend class AbstractFormEditorTool;
-
+    friend class AbstractLiveEditTool;
 };
 
 } //namespace QmlJSDebugger

diff --git a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp
index 6987721..47eb483 100644 (file)
--- a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp
+++ b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp
@@ -34,10 +34,10 @@
 #include "qdeclarativeviewobserver.h"
 #include "qdeclarativeviewobserver_p.h"
 #include "qdeclarativeobserverservice.h"
-#include "editor/selectiontool.h"
+#include "editor/liveselectiontool.h"
 #include "editor/zoomtool.h"
 #include "editor/colorpickertool.h"
-#include "editor/layeritem.h"
+#include "editor/livelayeritem.h"
 #include "editor/boundingrecthighlighter.h"
 #include "editor/subcomponenteditortool.h"
 #include "editor/qmltoolbar.h"