Merge tag 'v2.1' into debian/sid

1 files changed, 2 insertions, 7 deletions

diff --git a/src/data/graphelementdata.cpp b/src/data/graphelementdata.cpp
index 810ebd6..cd09a6d 100644
--- a/src/data/graphelementdata.cpp
+++ b/src/data/graphelementdata.cpp
@@ -23,18 +23,12 @@
 

 GraphElementData::GraphElementData(QVector<GraphElementProperty> init, QObject *parent) : QAbstractItemModel(parent)

 {

-    root = new GraphElementProperty();

     _properties = init;

 }

 

 GraphElementData::GraphElementData(QObject *parent) : QAbstractItemModel(parent) {

-    root = new GraphElementProperty();

 }

 

-GraphElementData::~GraphElementData()

-{

-    delete root;

-}

 

 GraphElementData *GraphElementData::copy()

 {

@@ -103,7 +97,8 @@ bool GraphElementData::hasProperty(QString key)
 

 bool GraphElementData::atom(QString atom)

 {

-    return (indexOfKey(atom) != -1);

+    int idx = indexOfKey(atom);

+    return (idx != -1 && _properties[idx].atom());

 }

 

 int GraphElementData::indexOfKey(QString key)