diff layer/WaveformLayer.h @ 156:b32282fefccd

* Tidy up inheritance hierarchy of model classes -- remove ZoomConstraint as a base class (make it a member instead) and remove virtual inheritances of QObject (no longer necessary).
author Chris Cannam
date Thu, 05 Oct 2006 11:03:06 +0000
parents 9e6b3e239b9d
children 53b9c7656798
line wrap: on
line diff
--- a/layer/WaveformLayer.h	Wed Oct 04 14:01:28 2006 +0000
+++ b/layer/WaveformLayer.h	Thu Oct 05 11:03:06 2006 +0000
@@ -35,7 +35,9 @@
     WaveformLayer();
     ~WaveformLayer();
 
-    virtual const ZoomConstraint *getZoomConstraint() const { return m_model; }
+    virtual const ZoomConstraint *getZoomConstraint() const {
+        return m_model ? m_model->getZoomConstraint() : 0;
+    }
     virtual const Model *getModel() const { return m_model; }
     virtual void paint(View *v, QPainter &paint, QRect rect) const;