Merge tag 'v2.1.6' into debian/sid

1 files changed, 18 insertions, 1 deletions

diff --git a/src/data/tikzassembler.h b/src/data/tikzassembler.h
index 7b32224..f86abcd 100644
--- a/src/data/tikzassembler.h
+++ b/src/data/tikzassembler.h
@@ -23,7 +23,6 @@
 #ifndef TIKZASSEMBLER_H

 #define TIKZASSEMBLER_H

 

-#include "node.h"

 #include "graph.h"

 #include "tikzstyles.h"

 

@@ -46,6 +45,20 @@ public:
     bool isTikzStyles() const;

 

 

+    Node *currentEdgeSource() const;

+    void setCurrentEdgeSource(Node *currentEdgeSource);

+

+    Node *currentPathSource() const;

+

+    GraphElementData *currentEdgeData() const;

+    void setCurrentEdgeData(GraphElementData *currentEdgeData);

+

+    QString currentEdgeSourceAnchor() const;

+    void setCurrentEdgeSourceAnchor(const QString &currentEdgeSourceAnchor);

+

+    void addEdge(Edge *e);

+    void finishCurrentPath();

+

 signals:

 

 public slots:

@@ -54,6 +67,10 @@ private:
     QHash<QString,Node*> _nodeMap;

     Graph *_graph;

     TikzStyles *_tikzStyles;

+    Path *_currentPath;

+    Node *_currentEdgeSource;

+    GraphElementData *_currentEdgeData;

+    QString _currentEdgeSourceAnchor;

     void *scanner;

 };