# HG changeset patch # User Chris Cannam # Date 1483444529 0 # Node ID 67f437277069ed83664691fc179421fdbfe9ad70 # Parent 42217d9c592061231b6f0e1c2001715e082e8ef3 Fix some compiler warnings diff -r 42217d9c5920 -r 67f437277069 view/Pane.h --- a/view/Pane.h Tue Dec 20 11:53:14 2016 +0000 +++ b/view/Pane.h Tue Jan 03 11:55:29 2017 +0000 @@ -84,20 +84,22 @@ void regionOutlined(QRect rect); public slots: - virtual void toolModeChanged(); - virtual void zoomWheelsEnabledChanged(); - virtual void viewZoomLevelChanged(View *v, int z, bool locked); - virtual void modelAlignmentCompletionChanged(); + // view slots + virtual void toolModeChanged() override; + virtual void zoomWheelsEnabledChanged() override; + virtual void viewZoomLevelChanged(View *v, int z, bool locked) override; + virtual void modelAlignmentCompletionChanged() override; + // local slots, not overrides virtual void horizontalThumbwheelMoved(int value); virtual void verticalThumbwheelMoved(int value); virtual void verticalZoomChanged(); virtual void verticalPannerMoved(float x, float y, float w, float h); virtual void editVerticalPannerExtents(); - virtual void layerParametersChanged(); + virtual void layerParametersChanged() override; - virtual void propertyContainerSelected(View *, PropertyContainer *pc); + virtual void propertyContainerSelected(View *, PropertyContainer *pc) override; void zoomToRegion(QRect r); @@ -108,17 +110,17 @@ void playbackScheduleTimerElapsed(); protected: - virtual void paintEvent(QPaintEvent *e); - virtual void mousePressEvent(QMouseEvent *e); - virtual void mouseReleaseEvent(QMouseEvent *e); - virtual void mouseMoveEvent(QMouseEvent *e); - virtual void mouseDoubleClickEvent(QMouseEvent *e); - virtual void enterEvent(QEvent *e); - virtual void leaveEvent(QEvent *e); - virtual void wheelEvent(QWheelEvent *e); - virtual void resizeEvent(QResizeEvent *e); - virtual void dragEnterEvent(QDragEnterEvent *e); - virtual void dropEvent(QDropEvent *e); + virtual void paintEvent(QPaintEvent *e) override; + virtual void mousePressEvent(QMouseEvent *e) override; + virtual void mouseReleaseEvent(QMouseEvent *e) override; + virtual void mouseMoveEvent(QMouseEvent *e) override; + virtual void mouseDoubleClickEvent(QMouseEvent *e) override; + virtual void enterEvent(QEvent *e) override; + virtual void leaveEvent(QEvent *e) override; + virtual void wheelEvent(QWheelEvent *e) override; + virtual void resizeEvent(QResizeEvent *e) override; + virtual void dragEnterEvent(QDragEnterEvent *e) override; + virtual void dropEvent(QDropEvent *e) override; void wheelVertical(int sign, Qt::KeyboardModifiers); void wheelHorizontal(int sign, Qt::KeyboardModifiers); @@ -134,7 +136,7 @@ void drawEditingSelection(QPainter &); void drawAlignmentStatus(QRect, QPainter &, const Model *, bool down); - virtual bool render(QPainter &paint, int x0, sv_frame_t f0, sv_frame_t f1); + virtual bool render(QPainter &paint, int x0, sv_frame_t f0, sv_frame_t f1) override; Selection getSelectionAt(int x, bool &closeToLeft, bool &closeToRight) const;