168492376
/
qt-material-widgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add override compiler macro

This commit is contained in:
laserpants 2016-03-26 13:37:26 +03:00
parent 0271eb0df7
commit c0ceddafa4
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
components/slider.h
View File

@ -14,6 +14,7 @@ public:
explicit Handle(Slider *slider); explicit Handle(Slider *slider);
~Handle(); ~Handle();
Q_DECL_OVERRIDE
inline QSize sizeHint() const { return QSize(16, 16); } inline QSize sizeHint() const { return QSize(16, 16); }
inline void setRelativePosition(const QPoint &pos) { setPosition(_offset + pos); } inline void setRelativePosition(const QPoint &pos) { setPosition(_offset + pos); }
@ -27,9 +28,9 @@ public:
void refreshGeometry(); void refreshGeometry();
protected: protected:
void paintEvent(QPaintEvent *event); void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE;
void mousePressEvent(QMouseEvent *event); void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
void mouseMoveEvent(QMouseEvent *event); void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
private: private:
Slider *const _slider; Slider *const _slider;
@ -50,10 +51,10 @@ public:
inline Qt::Orientation orientation() const { return _orientation; } inline Qt::Orientation orientation() const { return _orientation; }
protected: protected:
void paintEvent(QPaintEvent *event); void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE;
void mousePressEvent(QMouseEvent *event); void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
void mouseMoveEvent(QMouseEvent *event); void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
void resizeEvent(QResizeEvent *event); void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE;
private: private:
inline bool touchesRail(int p, int x) const { return (p >= x-2 && p < x+2); } inline bool touchesRail(int p, int x) const { return (p >= x-2 && p < x+2); }