Commit 6e3ef903 authored by Thorbjørn Lindeijer's avatar Thorbjørn Lindeijer

QmlJSDebugger: Finished the renaming

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

Fixes compile of QML Observer and QMLJSDEBUGGER-enabled QtQuick
Applications.
parent f9e65028
...@@ -96,7 +96,7 @@ protected: ...@@ -96,7 +96,7 @@ protected:
QDeclarativeViewObserver *observer() const; QDeclarativeViewObserver *observer() const;
QDeclarativeView *view() const; QDeclarativeView *view() const;
QGraphicsScene* scene() const; QGraphicsScene *scene() const;
private: private:
QDeclarativeViewObserver *m_observer; QDeclarativeViewObserver *m_observer;
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#ifndef BOUNDINGRECTHIGHLIGHTER_H #ifndef BOUNDINGRECTHIGHLIGHTER_H
#define BOUNDINGRECTHIGHLIGHTER_H #define BOUNDINGRECTHIGHLIGHTER_H
#include "layeritem.h" #include "livelayeritem.h"
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QWeakPointer> #include <QtCore/QWeakPointer>
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#define RUBBERBANDSELECTIONMANIPULATOR_H #define RUBBERBANDSELECTIONMANIPULATOR_H
#include "selectionrectangle.h" #include "liveselectionrectangle.h"
#include <QtCore/QPointF> #include <QtCore/QPointF>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
**************************************************************************/ **************************************************************************/
#include "liveselectiontool.h" #include "liveselectiontool.h"
#include "layeritem.h" #include "livelayeritem.h"
#include "../qdeclarativeviewobserver_p.h" #include "../qdeclarativeviewobserver_p.h"
...@@ -74,15 +74,15 @@ void LiveSelectionTool::setRubberbandSelectionMode(bool value) ...@@ -74,15 +74,15 @@ void LiveSelectionTool::setRubberbandSelectionMode(bool value)
m_rubberbandSelectionMode = value; m_rubberbandSelectionMode = value;
} }
SingleSelectionManipulator::SelectionType LiveSelectionTool::getSelectionType(Qt::KeyboardModifiers LiveSingleSelectionManipulator::SelectionType LiveSelectionTool::getSelectionType(Qt::KeyboardModifiers
modifiers) modifiers)
{ {
SingleSelectionManipulator::SelectionType selectionType LiveSingleSelectionManipulator::SelectionType selectionType
= SingleSelectionManipulator::ReplaceSelection; = LiveSingleSelectionManipulator::ReplaceSelection;
if (modifiers.testFlag(Qt::ControlModifier)) { if (modifiers.testFlag(Qt::ControlModifier)) {
selectionType = SingleSelectionManipulator::RemoveFromSelection; selectionType = LiveSingleSelectionManipulator::RemoveFromSelection;
} else if (modifiers.testFlag(Qt::ShiftModifier)) { } else if (modifiers.testFlag(Qt::ShiftModifier)) {
selectionType = SingleSelectionManipulator::AddToSelection; selectionType = LiveSingleSelectionManipulator::AddToSelection;
} }
return selectionType; return selectionType;
} }
...@@ -110,7 +110,7 @@ void LiveSelectionTool::mousePressEvent(QMouseEvent *event) ...@@ -110,7 +110,7 @@ void LiveSelectionTool::mousePressEvent(QMouseEvent *event)
QDeclarativeViewObserverPrivate *observerPrivate QDeclarativeViewObserverPrivate *observerPrivate
= QDeclarativeViewObserverPrivate::get(observer()); = QDeclarativeViewObserverPrivate::get(observer());
QList<QGraphicsItem*> itemList = observerPrivate->selectableItems(event->pos()); QList<QGraphicsItem*> itemList = observerPrivate->selectableItems(event->pos());
SingleSelectionManipulator::SelectionType selectionType = getSelectionType(event->modifiers()); LiveSingleSelectionManipulator::SelectionType selectionType = getSelectionType(event->modifiers());
if (event->buttons() & Qt::LeftButton) { if (event->buttons() & Qt::LeftButton) {
m_mousePressTimer.start(); m_mousePressTimer.start();
...@@ -182,7 +182,7 @@ void LiveSelectionTool::contextMenuElementSelected() ...@@ -182,7 +182,7 @@ void LiveSelectionTool::contextMenuElementSelected()
QPointF updatePt(0, 0); QPointF updatePt(0, 0);
QGraphicsItem *item = m_contextMenuItemList.at(itemListIndex); QGraphicsItem *item = m_contextMenuItemList.at(itemListIndex);
m_singleSelectionManipulator.begin(updatePt); m_singleSelectionManipulator.begin(updatePt);
m_singleSelectionManipulator.select(SingleSelectionManipulator::InvertSelection, m_singleSelectionManipulator.select(LiveSingleSelectionManipulator::InvertSelection,
QList<QGraphicsItem*>() << item, QList<QGraphicsItem*>() << item,
false); false);
m_singleSelectionManipulator.end(updatePt); m_singleSelectionManipulator.end(updatePt);
...@@ -275,13 +275,13 @@ void LiveSelectionTool::mouseReleaseEvent(QMouseEvent *event) ...@@ -275,13 +275,13 @@ void LiveSelectionTool::mouseReleaseEvent(QMouseEvent *event)
m_singleSelectionManipulator.begin(event->pos()); m_singleSelectionManipulator.begin(event->pos());
if (event->modifiers().testFlag(Qt::ControlModifier)) if (event->modifiers().testFlag(Qt::ControlModifier))
m_singleSelectionManipulator.select(SingleSelectionManipulator::RemoveFromSelection, m_singleSelectionManipulator.select(LiveSingleSelectionManipulator::RemoveFromSelection,
m_selectOnlyContentItems); m_selectOnlyContentItems);
else if (event->modifiers().testFlag(Qt::ShiftModifier)) else if (event->modifiers().testFlag(Qt::ShiftModifier))
m_singleSelectionManipulator.select(SingleSelectionManipulator::AddToSelection, m_singleSelectionManipulator.select(LiveSingleSelectionManipulator::AddToSelection,
m_selectOnlyContentItems); m_selectOnlyContentItems);
else else
m_singleSelectionManipulator.select(SingleSelectionManipulator::InvertSelection, m_singleSelectionManipulator.select(LiveSingleSelectionManipulator::InvertSelection,
m_selectOnlyContentItems); m_selectOnlyContentItems);
m_singleSelectionManipulator.end(event->pos()); m_singleSelectionManipulator.end(event->pos());
...@@ -359,7 +359,7 @@ void LiveSelectionTool::wheelEvent(QWheelEvent *event) ...@@ -359,7 +359,7 @@ void LiveSelectionTool::wheelEvent(QWheelEvent *event)
QPointF updatePt(0, 0); QPointF updatePt(0, 0);
m_singleSelectionManipulator.begin(updatePt); m_singleSelectionManipulator.begin(updatePt);
m_singleSelectionManipulator.select(SingleSelectionManipulator::ReplaceSelection, m_singleSelectionManipulator.select(LiveSingleSelectionManipulator::ReplaceSelection,
QList<QGraphicsItem*>() << itemList.at(selectedIdx), QList<QGraphicsItem*>() << itemList.at(selectedIdx),
false); false);
m_singleSelectionManipulator.end(updatePt); m_singleSelectionManipulator.end(updatePt);
...@@ -423,13 +423,13 @@ void LiveSelectionTool::selectUnderPoint(QMouseEvent *event) ...@@ -423,13 +423,13 @@ void LiveSelectionTool::selectUnderPoint(QMouseEvent *event)
m_singleSelectionManipulator.begin(event->pos()); m_singleSelectionManipulator.begin(event->pos());
if (event->modifiers().testFlag(Qt::ControlModifier)) if (event->modifiers().testFlag(Qt::ControlModifier))
m_singleSelectionManipulator.select(SingleSelectionManipulator::RemoveFromSelection, m_singleSelectionManipulator.select(LiveSingleSelectionManipulator::RemoveFromSelection,
m_selectOnlyContentItems); m_selectOnlyContentItems);
else if (event->modifiers().testFlag(Qt::ShiftModifier)) else if (event->modifiers().testFlag(Qt::ShiftModifier))
m_singleSelectionManipulator.select(SingleSelectionManipulator::AddToSelection, m_singleSelectionManipulator.select(LiveSingleSelectionManipulator::AddToSelection,
m_selectOnlyContentItems); m_selectOnlyContentItems);
else else
m_singleSelectionManipulator.select(SingleSelectionManipulator::InvertSelection, m_singleSelectionManipulator.select(LiveSingleSelectionManipulator::InvertSelection,
m_selectOnlyContentItems); m_selectOnlyContentItems);
m_singleSelectionManipulator.end(event->pos()); m_singleSelectionManipulator.end(event->pos());
......
...@@ -35,10 +35,10 @@ ...@@ -35,10 +35,10 @@
#define LIVESELECTIONTOOL_H #define LIVESELECTIONTOOL_H
#include "abstractformeditortool.h" #include "abstractliveedittool.h"
#include "rubberbandselectionmanipulator.h" #include "liverubberbandselectionmanipulator.h"
#include "singleselectionmanipulator.h" #include "livesingleselectionmanipulator.h"
#include "selectionindicator.h" #include "liveselectionindicator.h"
#include <QtCore/QList> #include <QtCore/QList>
#include <QtCore/QTime> #include <QtCore/QTime>
...@@ -91,13 +91,13 @@ private slots: ...@@ -91,13 +91,13 @@ private slots:
private: private:
void createContextMenu(QList<QGraphicsItem*> itemList, QPoint globalPos); 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; bool alreadySelected(const QList<QGraphicsItem*> &itemList) const;
private: private:
bool m_rubberbandSelectionMode; bool m_rubberbandSelectionMode;
LiveRubberBandSelectionManipulator m_rubberbandSelectionManipulator; LiveRubberBandSelectionManipulator m_rubberbandSelectionManipulator;
SingleSelectionManipulator m_singleSelectionManipulator; LiveSingleSelectionManipulator m_singleSelectionManipulator;
LiveSelectionIndicator m_selectionIndicator; LiveSelectionIndicator m_selectionIndicator;
//ResizeIndicator m_resizeIndicator; //ResizeIndicator m_resizeIndicator;
QTime m_mousePressTimer; QTime m_mousePressTimer;
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "subcomponenteditortool.h" #include "subcomponenteditortool.h"
#include "../qdeclarativeviewobserver_p.h" #include "../qdeclarativeviewobserver_p.h"
#include "subcomponentmasklayeritem.h" #include "subcomponentmasklayeritem.h"
#include "layeritem.h" #include "livelayeritem.h"
#include <QtGui/QGraphicsItem> #include <QtGui/QGraphicsItem>
#include <QtGui/QGraphicsObject> #include <QtGui/QGraphicsObject>
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#ifndef SUBCOMPONENTEDITORTOOL_H #ifndef SUBCOMPONENTEDITORTOOL_H
#define SUBCOMPONENTEDITORTOOL_H #define SUBCOMPONENTEDITORTOOL_H
#include "abstractformeditortool.h" #include "abstractliveedittool.h"
#include <QtCore/QStack> #include <QtCore/QStack>
#include <QtCore/QStringList> #include <QtCore/QStringList>
......
...@@ -34,10 +34,10 @@ ...@@ -34,10 +34,10 @@
#ifndef ZOOMTOOL_H #ifndef ZOOMTOOL_H
#define ZOOMTOOL_H #define ZOOMTOOL_H
#include "abstractformeditortool.h" #include "abstractliveedittool.h"
#include "rubberbandselectionmanipulator.h" #include "liverubberbandselectionmanipulator.h"
QT_FORWARD_DECLARE_CLASS(QAction); QT_FORWARD_DECLARE_CLASS(QAction)
namespace QmlJSDebugger { namespace QmlJSDebugger {
......
...@@ -130,8 +130,7 @@ private: ...@@ -130,8 +130,7 @@ private:
inline QDeclarativeViewObserverPrivate *d_func() { return data.data(); } inline QDeclarativeViewObserverPrivate *d_func() { return data.data(); }
QScopedPointer<QDeclarativeViewObserverPrivate> data; QScopedPointer<QDeclarativeViewObserverPrivate> data;
friend class QDeclarativeViewObserverPrivate; friend class QDeclarativeViewObserverPrivate;
friend class AbstractFormEditorTool; friend class AbstractLiveEditTool;
}; };
} //namespace QmlJSDebugger } //namespace QmlJSDebugger
......
...@@ -34,10 +34,10 @@ ...@@ -34,10 +34,10 @@
#include "qdeclarativeviewobserver.h" #include "qdeclarativeviewobserver.h"
#include "qdeclarativeviewobserver_p.h" #include "qdeclarativeviewobserver_p.h"
#include "qdeclarativeobserverservice.h" #include "qdeclarativeobserverservice.h"
#include "editor/selectiontool.h" #include "editor/liveselectiontool.h"
#include "editor/zoomtool.h" #include "editor/zoomtool.h"
#include "editor/colorpickertool.h" #include "editor/colorpickertool.h"
#include "editor/layeritem.h" #include "editor/livelayeritem.h"
#include "editor/boundingrecthighlighter.h" #include "editor/boundingrecthighlighter.h"
#include "editor/subcomponenteditortool.h" #include "editor/subcomponenteditortool.h"
#include "editor/qmltoolbar.h" #include "editor/qmltoolbar.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment