Merge tag 'v2.1.6' into debian/sid

1 files changed, 5 insertions, 0 deletions

diff --git a/src/data/graphelementdata.h b/src/data/graphelementdata.h
index dce0d46..8022a14 100644
--- a/src/data/graphelementdata.h
+++ b/src/data/graphelementdata.h
@@ -49,6 +49,7 @@ public:
     bool hasProperty(QString key);

     bool atom(QString atom);

     int indexOfKey(QString key);

+    void mergeData(GraphElementData *d);

     bool removeRows(int row, int count, const QModelIndex &parent) override;

     bool moveRows(const QModelIndex &sourceParent,

                   int sourceRow, int,

@@ -77,12 +78,16 @@ public:
     bool isEmpty();

     QVector<GraphElementProperty> properties() const;

 

+    GraphElementData *pathData() const;

+    GraphElementData *nonPathData() const;

+

 signals:

 

 public slots:

 

 private:

     QVector<GraphElementProperty> _properties;

+    static bool isPathProperty(QString key);

 };

 

 #endif // GRAPHELEMENTDATA_H