Merge tag 'v2.1' into debian/sid

1 files changed, 6 insertions, 2 deletions

diff --git a/src/data/graphelementdata.h b/src/data/graphelementdata.h
index 23f0466..dce0d46 100644
--- a/src/data/graphelementdata.h
+++ b/src/data/graphelementdata.h
@@ -16,6 +16,12 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.

 */

 

+/*!

+ * A list of GraphElementProperty objects, which convenience methods

+ * for lookup, deletion, re-ordering, etc. It inherits QAbstractItemModel

+ * so it can be used as the model for a QTreeView in the StyleEditor.

+ */

+

 #ifndef GRAPHELEMENTDATA_H

 #define GRAPHELEMENTDATA_H

 

@@ -34,7 +40,6 @@ public:
     explicit GraphElementData(QVector<GraphElementProperty> init,

                               QObject *parent = 0);

     explicit GraphElementData(QObject *parent = 0);

-    ~GraphElementData();

     GraphElementData *copy();

     void setProperty(QString key, QString value);

     void unsetProperty(QString key);

@@ -78,7 +83,6 @@ public slots:
 

 private:

     QVector<GraphElementProperty> _properties;

-    GraphElementProperty *root;

 };

 

 #endif // GRAPHELEMENTDATA_H