Merge tag 'v2.1.6' into debian/sid

1 files changed, 5 insertions, 0 deletions

diff --git a/src/data/graph.h b/src/data/graph.h
index 286ccdc..c306bb2 100644
--- a/src/data/graph.h
+++ b/src/data/graph.h
@@ -25,6 +25,7 @@
 

 #include "node.h"

 #include "edge.h"

+#include "path.h"

 #include "graphelementdata.h"

 

 #include <QObject>

@@ -46,6 +47,8 @@ public:
     void addEdge(Edge *e);

     void addEdge(Edge *e, int index);

     void removeEdge(Edge *e);

+    void addPath(Path *p);

+    void removePath(Path *p);

     int maxIntName();

     void reorderNodes(const QVector<Node*> &newOrder);

     void reorderEdges(const QVector<Edge*> &newOrder);

@@ -64,6 +67,7 @@ public:
 

     const QVector<Node *> &nodes();

     const QVector<Edge*> &edges();

+    const QVector<Path*> &paths();

 

     QRectF bbox() const;

     void setBbox(const QRectF &bbox);

@@ -121,6 +125,7 @@ public slots:
 private:

     QVector<Node*> _nodes;

     QVector<Edge*> _edges;

+    QVector<Path*> _paths;

     //QMultiHash<Node*,Edge*> inEdges;

     //QMultiHash<Node*,Edge*> outEdges;

     GraphElementData *_data;