Mercurial > hg > svgui

diff layer/TimeRulerLayer.h @ 1486:ac0a8addabcf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch by-id
author Chris Cannam
date Wed, 17 Jul 2019 14:25:16 +0100
parents 696e569ff21b
children e6362cf5ff1d
line wrap: on
line diff
--- a/layer/TimeRulerLayer.h	Thu Jun 13 15:35:01 2019 +0100
+++ b/layer/TimeRulerLayer.h	Wed Jul 17 14:25:16 2019 +0100
@@ -34,8 +34,8 @@
 
     void paint(LayerGeometryProvider *v, QPainter &paint, QRect rect) const override;
 
-    void setModel(Model *);
-    const Model *getModel() const override { return m_model; }
+    void setModel(ModelId);
+    ModelId getModel() const override { return m_model; }
 
     enum LabelHeight { LabelTop, LabelMiddle, LabelBottom };
     void setLabelHeight(LabelHeight h) { m_labelHeight = h; }
@@ -63,7 +63,7 @@
     bool canExistWithoutModel() const override { return true; }
 
 protected:
-    Model *m_model;
+    ModelId m_model;
     LabelHeight m_labelHeight;
 
     int getDefaultColourHint(bool dark, bool &impose) override;