1 files changed, 5 insertions, 18 deletions
diff --git a/src/plugins/qmltooling/declarativeobserver/qdeclarativeviewobserver_p_p.h b/src/plugins/qmltooling/declarativeobserver/qdeclarativeviewobserver_p_p.h
index 57dae45..19e4898 100644
--- a/src/plugins/qmltooling/declarativeobserver/qdeclarativeviewobserver_p_p.h
+++ b/src/plugins/qmltooling/declarativeobserver/qdeclarativeviewobserver_p_p.h
@@ -61,7 +61,6 @@ class ZoomTool;
 class ColorPickerTool;
 class LiveLayerItem;
 class BoundingRectHighlighter;
-class SubcomponentEditorTool;
 class ToolBox;
 class AbstractLiveEditTool;
 
@@ -69,11 +68,6 @@ class QDeclarativeViewObserverPrivate : public QObject
 {
     Q_OBJECT
 public:
-    enum ContextFlags {
-        IgnoreContext,
-        ContextSensitive
-    };
-
     QDeclarativeViewObserverPrivate(QDeclarativeViewObserver *);
     ~QDeclarativeViewObserverPrivate();
 
@@ -92,7 +86,6 @@ public:
     LiveSelectionTool *selectionTool;
     ZoomTool *zoomTool;
     ColorPickerTool *colorPickerTool;
-    SubcomponentEditorTool *subcomponentEditorTool;
     LiveLayerItem *manipulatorLayer;
 
     BoundingRectHighlighter *boundingRectHighlighter;
@@ -110,31 +103,26 @@ public:
     void clearEditorItems();
     void createToolBox();
     void changeToSelectTool();
-    QList<QGraphicsItem*> filterForCurrentContext(QList<QGraphicsItem*> &itemlist) const;
     QList<QGraphicsItem*> filterForSelection(QList<QGraphicsItem*> &itemlist) const;
 
     QList<QGraphicsItem*> selectableItems(const QPoint &pos) const;
     QList<QGraphicsItem*> selectableItems(const QPointF &scenePos) const;
     QList<QGraphicsItem*> selectableItems(const QRectF &sceneRect, Qt::ItemSelectionMode selectionMode) const;
 
-    void setSelectedItemsForTools(QList<QGraphicsItem *> items);
-    void setSelectedItems(QList<QGraphicsItem *> items);
+    void setSelectedItemsForTools(const QList<QGraphicsItem *> &items);
+    void setSelectedItems(const QList<QGraphicsItem *> &items);
     QList<QGraphicsItem *> selectedItems() const;
 
     void changeTool(Constants::DesignTool tool,
                     Constants::ToolFlags flags = Constants::NoToolFlags);
 
     void clearHighlight();
-    void highlight(QList<QGraphicsObject *> item, ContextFlags flags = ContextSensitive);
-    void highlight(QGraphicsObject *item, ContextFlags flags = ContextSensitive);
+    void highlight(const QList<QGraphicsObject *> &item);
+    inline void highlight(QGraphicsObject *item)
+    { highlight(QList<QGraphicsObject*>() << item); }
 
-    bool mouseInsideContextItem() const;
     bool isEditorItem(QGraphicsItem *item) const;
 
-    QGraphicsItem *currentRootItem() const;
-
-    void enterContext(QGraphicsItem *itemToEnter);
-
 public slots:
     void _q_setToolBoxVisible(bool visible);
 
@@ -150,7 +138,6 @@ public slots:
     void _q_changeToMarqueeSelectTool();
     void _q_changeToZoomTool();
     void _q_changeToColorPickerTool();
-    void _q_changeContextPathIndex(int index);
     void _q_clearComponentCache();
     void _q_removeFromSelection(QObject *);