Merge tag 'v2.1.6' into debian/sid

1 files changed, 6 insertions, 0 deletions

diff --git a/src/gui/tikzscene.h b/src/gui/tikzscene.h
index 2e7baa5..e1d30d2 100644
--- a/src/gui/tikzscene.h
+++ b/src/gui/tikzscene.h
@@ -27,6 +27,7 @@
 #include "graph.h"
 #include "nodeitem.h"
 #include "edgeitem.h"
+#include "pathitem.h"
 #include "tikzdocument.h"
 #include "toolpalette.h"
 #include "stylepalette.h"
@@ -48,6 +49,7 @@ public:
     Graph *graph();
     QMap<Node*,NodeItem*> &nodeItems();
     QMap<Edge*,EdgeItem*> &edgeItems();
+    QMap<Path*,PathItem*> &pathItems();
     void refreshAdjacentEdges(QList<Node*> nodes);
 //    void setBounds(QRectF bounds);
 
@@ -81,6 +83,8 @@ public:
 
     void reverseSelectedEdges();
 
+    void makePath(bool duplicateEdges);
+    void splitPath();
 
     void getSelection(QSet<Node*> &selNodes, QSet<Edge*> &selEdges) const;
     QSet<Node*> getSelectedNodes() const;
@@ -110,9 +114,11 @@ private:
     StylePalette *_styles;
     QMap<Node*,NodeItem*> _nodeItems;
     QMap<Edge*,EdgeItem*> _edgeItems;
+    QMap<Path*,PathItem*> _pathItems;
     QGraphicsLineItem *_drawEdgeItem;
     QGraphicsRectItem *_rubberBandItem;
     EdgeItem *_modifyEdgeItem;
+    Edge *_selectingEdge;
     NodeItem *_edgeStartNodeItem;
     NodeItem *_edgeEndNodeItem;
     bool _firstControlPoint;