comparison layer/TimeRulerLayer.h @ 949:e3c7da3d896e osx-retina

Merge from default branch
author Chris Cannam
date Mon, 20 Apr 2015 11:00:48 +0100
parents 4fe7a09be0fe e53a87a5efb2
children ab2cafd3a7cb
comparison
equal deleted inserted replaced
948:8bf05426d950 949:e3c7da3d896e
58 virtual void toXml(QTextStream &stream, QString indent = "", 58 virtual void toXml(QTextStream &stream, QString indent = "",
59 QString extraAttributes = "") const; 59 QString extraAttributes = "") const;
60 60
61 void setProperties(const QXmlAttributes &attributes); 61 void setProperties(const QXmlAttributes &attributes);
62 62
63 virtual bool canExistWithoutModel() const { return true; }
64
63 protected: 65 protected:
64 Model *m_model; 66 Model *m_model;
65 LabelHeight m_labelHeight; 67 LabelHeight m_labelHeight;
66 68
67 virtual int getDefaultColourHint(bool dark, bool &impose); 69 virtual int getDefaultColourHint(bool dark, bool &impose);