Author: craig
Date: Mon Apr 15 21:27:38 2019
New Revision: 22951
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22951
Log:
C++11 virtual to override for canvasmodes
Modified:
trunk/Scribus/scribus/canvasmode.h
trunk/Scribus/scribus/canvasmode_copyproperties.h
trunk/Scribus/scribus/canvasmode_create.h
trunk/Scribus/scribus/canvasmode_drawbezier.h
trunk/Scribus/scribus/canvasmode_drawcalligraphic.h
trunk/Scribus/scribus/canvasmode_drawfreehand.h
trunk/Scribus/scribus/canvasmode_edit.h
trunk/Scribus/scribus/canvasmode_editarc.h
trunk/Scribus/scribus/canvasmode_editgradient.h
trunk/Scribus/scribus/canvasmode_editmeshgradient.h
trunk/Scribus/scribus/canvasmode_editmeshpatch.h
trunk/Scribus/scribus/canvasmode_editpolygon.h
trunk/Scribus/scribus/canvasmode_editspiral.h
trunk/Scribus/scribus/canvasmode_edittable.h
trunk/Scribus/scribus/canvasmode_editweldpoint.h
trunk/Scribus/scribus/canvasmode_eyedropper.h
trunk/Scribus/scribus/canvasmode_framelinks.h
trunk/Scribus/scribus/canvasmode_imageimport.h
trunk/Scribus/scribus/canvasmode_magnifier.h
trunk/Scribus/scribus/canvasmode_measurements.h
trunk/Scribus/scribus/canvasmode_nodeedit.h
trunk/Scribus/scribus/canvasmode_normal.h
trunk/Scribus/scribus/canvasmode_objimport.h
trunk/Scribus/scribus/canvasmode_panning.h
trunk/Scribus/scribus/canvasmode_rotate.h
Modified: trunk/Scribus/scribus/canvasmode.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22951&path=/trunk/Scribus/scribus/canvasmode.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode.h (original)
+++ trunk/Scribus/scribus/canvasmode.h Mon Apr 15 21:27:38 2019
@@ -144,7 +144,7 @@
/** main canvas modes don't have a delegate */
virtual CanvasMode* delegate() { return nullptr; }
ScribusView* view() const { return m_view; }
- virtual ~CanvasMode();
+ ~CanvasMode() override;
protected:
Modified: trunk/Scribus/scribus/canvasmode_copyproperties.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22951&path=/trunk/Scribus/scribus/canvasmode_copyproperties.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_copyproperties.h (original)
+++ trunk/Scribus/scribus/canvasmode_copyproperties.h Mon Apr 15 21:27:38 2019
@@ -30,18 +30,18 @@
{
public:
explicit CanvasMode_CopyProperties(ScribusView* view);
- virtual ~CanvasMode_CopyProperties() {}
+ ~CanvasMode_CopyProperties() override {}
- virtual void enterEvent(QEvent *);
- virtual void leaveEvent(QEvent *);
+ void enterEvent(QEvent *) override ;
+ void leaveEvent(QEvent *) override ;
- virtual void activate(bool);
- virtual void deactivate(bool);
- virtual void mouseDoubleClickEvent(QMouseEvent *m);
- virtual void mouseReleaseEvent(QMouseEvent *m);
- virtual void mouseMoveEvent(QMouseEvent *m);
- virtual void mousePressEvent(QMouseEvent *m);
- virtual void drawControls(QPainter* p);
+ void activate(bool) override ;
+ void deactivate(bool) override ;
+ void mouseDoubleClickEvent(QMouseEvent *m) override ;
+ void mouseReleaseEvent(QMouseEvent *m) override ;
+ void mouseMoveEvent(QMouseEvent *m) override ;
+ void mousePressEvent(QMouseEvent *m) override ;
+ void drawControls(QPainter* p) override ;
// protected:
// void setResizeCursor(int);
Modified: trunk/Scribus/scribus/canvasmode_create.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22951&path=/trunk/Scribus/scribus/canvasmode_create.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_create.h (original)
+++ trunk/Scribus/scribus/canvasmode_create.h Mon Apr 15 21:27:38 2019
@@ -36,18 +36,18 @@
public:
explicit CreateMode(ScribusView* view);
- virtual ~CreateMode() {}
+ ~CreateMode() override {}
- virtual void enterEvent(QEvent *);
- virtual void leaveEvent(QEvent *);
+ void enterEvent(QEvent *) override ;
+ void leaveEvent(QEvent *) override ;
- virtual void activate(bool);
- virtual void deactivate(bool);
- virtual void mouseDoubleClickEvent(QMouseEvent *m);
- virtual void mouseReleaseEvent(QMouseEvent *m);
- virtual void mouseMoveEvent(QMouseEvent *m);
- virtual void mousePressEvent(QMouseEvent *m);
- virtual void drawControls(QPainter* p);
+ void activate(bool) override ;
+ void deactivate(bool) override ;
+ void mouseDoubleClickEvent(QMouseEvent *m) override ;
+ void mouseReleaseEvent(QMouseEvent *m) override ;
+ void mouseMoveEvent(QMouseEvent *m) override ;
+ void mousePressEvent(QMouseEvent *m) override ;
+ void drawControls(QPainter* p) override ;
// protected:
// void setResizeCursor(int);
Modified: trunk/Scribus/scribus/canvasmode_drawbezier.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22951&path=/trunk/Scribus/scribus/canvasmode_drawbezier.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawbezier.h (original)
+++ trunk/Scribus/scribus/canvasmode_drawbezier.h Mon Apr 15 21:27:38 2019
@@ -33,18 +33,18 @@
{
public:
explicit BezierMode(ScribusView* view);
- virtual ~BezierMode() {}
+ ~BezierMode() override {}
- virtual void enterEvent(QEvent *);
- virtual void leaveEvent(QEvent *);
+ void enterEvent(QEvent *) override;
+ void leaveEvent(QEvent *) override;
- virtual void activate(bool);
- virtual void deactivate(bool);
- virtual void mouseDoubleClickEvent(QMouseEvent *m);
- virtual void mouseReleaseEvent(QMouseEvent *m);
- virtual void mouseMoveEvent(QMouseEvent *m);
- virtual void mousePressEvent(QMouseEvent *m);
- virtual void drawControls(QPainter* p);
+ void activate(bool) override;
+ void deactivate(bool) override;
+ void mouseDoubleClickEvent(QMouseEvent *m) override;
+ void mouseReleaseEvent(QMouseEvent *m) override;
+ void mouseMoveEvent(QMouseEvent *m) override;
+ void mousePressEvent(QMouseEvent *m) override;
+ void drawControls(QPainter* p) override;
private:
inline bool GetItem(PageItem** pi);
Modified: trunk/Scribus/scribus/canvasmode_drawcalligraphic.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22951&path=/trunk/Scribus/scribus/canvasmode_drawcalligraphic.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawcalligraphic.h (original)
+++ trunk/Scribus/scribus/canvasmode_drawcalligraphic.h Mon Apr 15 21:27:38 2019
@@ -33,18 +33,18 @@
{
public:
explicit CalligraphicMode(ScribusView* view);
- virtual ~CalligraphicMode() {}
+ ~CalligraphicMode() override {}
- virtual void enterEvent(QEvent *);
- virtual void leaveEvent(QEvent *);
+ void enterEvent(QEvent *) override;
+ void leaveEvent(QEvent *) override;
- virtual void activate(bool);
- virtual void deactivate(bool);
- virtual void mouseDoubleClickEvent(QMouseEvent *m);
- virtual void mouseReleaseEvent(QMouseEvent *m);
- virtual void mouseMoveEvent(QMouseEvent *m);
- virtual void mousePressEvent(QMouseEvent *m);
- virtual void drawControls(QPainter* p);
+ void activate(bool) override;
+ void deactivate(bool) override;
+ void mouseDoubleClickEvent(QMouseEvent *m) override;
+ void mouseReleaseEvent(QMouseEvent *m) override;
+ void mouseMoveEvent(QMouseEvent *m) override;
+ void mousePressEvent(QMouseEvent *m) override;
+ void drawControls(QPainter* p) override;
private:
inline bool GetItem(PageItem** pi);
Modified: trunk/Scribus/scribus/canvasmode_drawfreehand.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22951&path=/trunk/Scribus/scribus/canvasmode_drawfreehand.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawfreehand.h (original)
+++ trunk/Scribus/scribus/canvasmode_drawfreehand.h Mon Apr 15 21:27:38 2019
@@ -33,18 +33,18 @@
{
public:
explicit FreehandMode(ScribusView* view);
- virtual ~FreehandMode() {}
+ ~FreehandMode() {}
- virtual void enterEvent(QEvent *);
- virtual void leaveEvent(QEvent *);
+ void enterEvent(QEvent *) override;
+ void leaveEvent(QEvent *) override;
- virtual void activate(bool);
- virtual void deactivate(bool);
- virtual void mouseDoubleClickEvent(QMouseEvent *m);
- virtual void mouseReleaseEvent(QMouseEvent *m);
- virtual void mouseMoveEvent(QMouseEvent *m);
- virtual void mousePressEvent(QMouseEvent *m);
- virtual void drawControls(QPainter* p);
+ void activate(bool) override;
+ void deactivate(bool) override;
+ void mouseDoubleClickEvent(QMouseEvent *m) override;
+ void mouseReleaseEvent(QMouseEvent *m) override;
+ void mouseMoveEvent(QMouseEvent *m) override;
+ void mousePressEvent(QMouseEvent *m) override;
+ void drawControls(QPainter* p) override;
private:
inline bool GetItem(PageItem** pi);
Modified: trunk/Scribus/scribus/canvasmode_edit.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22951&path=/trunk/Scribus/scribus/canvasmode_edit.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_edit.h (original)
+++ trunk/Scribus/scribus/canvasmode_edit.h Mon Apr 15 21:27:38 2019
@@ -38,23 +38,23 @@
public:
explicit CanvasMode_Edit(ScribusView* view);
- virtual ~CanvasMode_Edit() {}
+ ~CanvasMode_Edit() {}
- virtual void enterEvent(QEvent *);
- virtual void leaveEvent(QEvent *);
+ void enterEvent(QEvent *) override;
+ void leaveEvent(QEvent *) override;
- virtual void activate(bool);
- virtual void deactivate(bool);
+ void activate(bool) override;
+ void deactivate(bool) override;
- virtual void mouseDoubleClickEvent(QMouseEvent *m);
- virtual void mouseReleaseEvent(QMouseEvent *m);
- virtual void mouseMoveEvent(QMouseEvent *m);
- virtual void mousePressEvent(QMouseEvent *m);
+ void mouseDoubleClickEvent(QMouseEvent *m) override;
+ void mouseReleaseEvent(QMouseEvent *m) override;
+ void mouseMoveEvent(QMouseEvent *m) override;
+ void mousePressEvent(QMouseEvent *m) override;
- virtual bool handleKeyEvents() { return true; }
- virtual void keyPressEvent(QKeyEvent *e);
+ bool handleKeyEvents() override { return true; }
+ void keyPressEvent(QKeyEvent *e) override;
- virtual void drawControls(QPainter* p);
+ void drawControls(QPainter* p) override;
// protected:
// void setResizeCursor(int how, double rot = 0.0);
Modified: trunk/Scribus/scribus/canvasmode_editarc.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22951&path=/trunk/Scribus/scribus/canvasmode_editarc.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editarc.h (original)
+++ trunk/Scribus/scribus/canvasmode_editarc.h Mon Apr 15 21:27:38 2019
@@ -43,18 +43,18 @@
public:
explicit CanvasMode_EditArc(ScribusView* view);
- virtual ~CanvasMode_EditArc() {}
+ ~CanvasMode_EditArc() override {}
- virtual void enterEvent(QEvent *);
- virtual void leaveEvent(QEvent *);
+ void enterEvent(QEvent *) override;
+ void leaveEvent(QEvent *) override;
- virtual void activate(bool);
- virtual void deactivate(bool);
- virtual void mouseDoubleClickEvent(QMouseEvent *m);
- virtual void mouseReleaseEvent(QMouseEvent *m);
- virtual void mouseMoveEvent(QMouseEvent *m);
- virtual void mousePressEvent(QMouseEvent *m);
- virtual void drawControls(QPainter* p);
+ void activate(bool) override;
+ void deactivate(bool) override;
+ void mouseDoubleClickEvent(QMouseEvent *m) override;
+ void mouseReleaseEvent(QMouseEvent *m) override;
+ void mouseMoveEvent(QMouseEvent *m) override;
+ void mousePressEvent(QMouseEvent *m) override;
+ void drawControls(QPainter* p) override;
void drawControlsArc(QPainter* pp, PageItem* currItem);
private:
Modified: trunk/Scribus/scribus/canvasmode_editgradient.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22951&path=/trunk/Scribus/scribus/canvasmode_editgradient.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editgradient.h (original)
+++ trunk/Scribus/scribus/canvasmode_editgradient.h Mon Apr 15 21:27:38 2019
@@ -36,18 +36,18 @@
{
public:
explicit CanvasMode_EditGradient(ScribusView* view);
- virtual ~CanvasMode_EditGradient() {}
+ ~CanvasMode_EditGradient() override {}
- virtual void enterEvent(QEvent *);
- virtual void leaveEvent(QEvent *);
+ void enterEvent(QEvent *) override;
+ void leaveEvent(QEvent *) override;
- virtual void activate(bool);
- virtual void deactivate(bool);
- virtual void mouseDoubleClickEvent(QMouseEvent *m);
- virtual void mouseReleaseEvent(QMouseEvent *m);
- virtual void mouseMoveEvent(QMouseEvent *m);
- virtual void mousePressEvent(QMouseEvent *m);
- virtual void drawControls(QPainter* p);
+ void activate(bool) override;
+ void deactivate(bool) override;
+ void mouseDoubleClickEvent(QMouseEvent *m) override;
+ void mouseReleaseEvent(QMouseEvent *m) override;
+ void mouseMoveEvent(QMouseEvent *m) override;
+ void mousePressEvent(QMouseEvent *m) override;
+ void drawControls(QPainter* p) override;
void drawControlsGradientVectors(QPainter* psx, PageItem *currItem);
private:
Modified: trunk/Scribus/scribus/canvasmode_editmeshgradient.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22951&path=/trunk/Scribus/scribus/canvasmode_editmeshgradient.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editmeshgradient.h (original)
+++ trunk/Scribus/scribus/canvasmode_editmeshgradient.h Mon Apr 15 21:27:38 2019
@@ -42,20 +42,20 @@
{
public:
explicit CanvasMode_EditMeshGradient(ScribusView* view);
- virtual ~CanvasMode_EditMeshGradient();
+ ~CanvasMode_EditMeshGradient() override;
- virtual void enterEvent(QEvent *);
- virtual void leaveEvent(QEvent *);
+ void enterEvent(QEvent *) override;
+ void leaveEvent(QEvent *) override;
- virtual void activate(bool);
- virtual void deactivate(bool);
- virtual void mouseDoubleClickEvent(QMouseEvent *m);
- virtual void mouseReleaseEvent(QMouseEvent *m);
- virtual void mouseMoveEvent(QMouseEvent *m);
- virtual void mousePressEvent(QMouseEvent *m);
- virtual void keyPressEvent(QKeyEvent *e);
- virtual bool handleKeyEvents() { return true; }
- virtual void drawControls(QPainter* p);
+ void activate(bool) override;
+ void deactivate(bool) override;
+ void mouseDoubleClickEvent(QMouseEvent *m) override;
+ void mouseReleaseEvent(QMouseEvent *m) override;
+ void mouseMoveEvent(QMouseEvent *m) override;
+ void mousePressEvent(QMouseEvent *m) override;
+ void keyPressEvent(QKeyEvent *e) override;
+ bool handleKeyEvents() override { return true; }
+ void drawControls(QPainter* p) override;
void drawControlsMeshGradient(QPainter* pp, PageItem* currItem);
private:
Modified: trunk/Scribus/scribus/canvasmode_editmeshpatch.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22951&path=/trunk/Scribus/scribus/canvasmode_editmeshpatch.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editmeshpatch.h (original)
+++ trunk/Scribus/scribus/canvasmode_editmeshpatch.h Mon Apr 15 21:27:38 2019
@@ -43,20 +43,20 @@
{
public:
explicit CanvasMode_EditMeshPatch(ScribusView* view);
- virtual ~CanvasMode_EditMeshPatch();
+ ~CanvasMode_EditMeshPatch() override;
- virtual void enterEvent(QEvent *);
- virtual void leaveEvent(QEvent *);
+ void enterEvent(QEvent *) override;
+ void leaveEvent(QEvent *) override;
- virtual void activate(bool);
- virtual void deactivate(bool);
- virtual void mouseDoubleClickEvent(QMouseEvent *m);
- virtual void mouseReleaseEvent(QMouseEvent *m);
- virtual void mouseMoveEvent(QMouseEvent *m);
- virtual void mousePressEvent(QMouseEvent *m);
- virtual void keyPressEvent(QKeyEvent *e);
- virtual bool handleKeyEvents() { return true; }
- virtual void drawControls(QPainter* p);
+ void activate(bool) override;
+ void deactivate(bool) override;
+ void mouseDoubleClickEvent(QMouseEvent *m) override;
+ void mouseReleaseEvent(QMouseEvent *m) override;
+ void mouseMoveEvent(QMouseEvent *m) override;
+ void mousePressEvent(QMouseEvent *m) override;
+ void keyPressEvent(QKeyEvent *e) override;
+ bool handleKeyEvents() override { return true; }
+ void drawControls(QPainter* p) override;
void drawControlsMeshPoint(QPainter* psx, const MeshPoint& mp, bool
isSelected);
void drawControlsMeshPatch(QPainter* pp, PageItem* currItem);
Modified: trunk/Scribus/scribus/canvasmode_editpolygon.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22951&path=/trunk/Scribus/scribus/canvasmode_editpolygon.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editpolygon.h (original)
+++ trunk/Scribus/scribus/canvasmode_editpolygon.h Mon Apr 15 21:27:38 2019
@@ -43,18 +43,18 @@
Q_OBJECT
public:
explicit CanvasMode_EditPolygon(ScribusView* view);
- virtual ~CanvasMode_EditPolygon() {}
+ ~CanvasMode_EditPolygon() override {}
- virtual void enterEvent(QEvent *);
- virtual void leaveEvent(QEvent *);
+ void enterEvent(QEvent *) override;
+ void leaveEvent(QEvent *) override;
- virtual void activate(bool);
- virtual void deactivate(bool);
- virtual void mouseDoubleClickEvent(QMouseEvent *m);
- virtual void mouseReleaseEvent(QMouseEvent *m);
- virtual void mouseMoveEvent(QMouseEvent *m);
- virtual void mousePressEvent(QMouseEvent *m);
- virtual void drawControls(QPainter* p);
+ void activate(bool) override;
+ void deactivate(bool) override;
+ void mouseDoubleClickEvent(QMouseEvent *m) override;
+ void mouseReleaseEvent(QMouseEvent *m) override;
+ void mouseMoveEvent(QMouseEvent *m) override;
+ void mousePressEvent(QMouseEvent *m) override;
+ void drawControls(QPainter* p) override;
void drawControlsPolygon(QPainter* pp, PageItem* currItem);
private:
Modified: trunk/Scribus/scribus/canvasmode_editspiral.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22951&path=/trunk/Scribus/scribus/canvasmode_editspiral.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editspiral.h (original)
+++ trunk/Scribus/scribus/canvasmode_editspiral.h Mon Apr 15 21:27:38 2019
@@ -43,18 +43,18 @@
Q_OBJECT
public:
explicit CanvasMode_EditSpiral(ScribusView* view);
- virtual ~CanvasMode_EditSpiral() {}
+ ~CanvasMode_EditSpiral() override {}
- virtual void enterEvent(QEvent *);
- virtual void leaveEvent(QEvent *);
+ void enterEvent(QEvent *) override;
+ void leaveEvent(QEvent *) override;
- virtual void activate(bool);
- virtual void deactivate(bool);
- virtual void mouseDoubleClickEvent(QMouseEvent *m);
- virtual void mouseReleaseEvent(QMouseEvent *m);
- virtual void mouseMoveEvent(QMouseEvent *m);
- virtual void mousePressEvent(QMouseEvent *m);
- virtual void drawControls(QPainter* p);
+ void activate(bool) override;
+ void deactivate(bool) override;
+ void mouseDoubleClickEvent(QMouseEvent *m) override;
+ void mouseReleaseEvent(QMouseEvent *m) override;
+ void mouseMoveEvent(QMouseEvent *m) override;
+ void mousePressEvent(QMouseEvent *m) override;
+ void drawControls(QPainter* p) override;
void drawControlsSpiral(QPainter* pp, PageItem* currItem);
private:
Modified: trunk/Scribus/scribus/canvasmode_edittable.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22951&path=/trunk/Scribus/scribus/canvasmode_edittable.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_edittable.h (original)
+++ trunk/Scribus/scribus/canvasmode_edittable.h Mon Apr 15 21:27:38 2019
@@ -37,17 +37,17 @@
public:
explicit CanvasMode_EditTable(ScribusView* view);
- virtual ~CanvasMode_EditTable();
+ ~CanvasMode_EditTable() override;
- virtual void activate(bool fromGesture);
- virtual void deactivate(bool forGesture);
- virtual bool handleKeyEvents() { return true; }
- virtual void keyPressEvent(QKeyEvent* event);
- virtual void mouseMoveEvent(QMouseEvent* event);
- virtual void mousePressEvent(QMouseEvent* event);
- virtual void mouseReleaseEvent(QMouseEvent* event);
- virtual void mouseDoubleClickEvent(QMouseEvent* event);
- virtual void drawControls(QPainter* p);
+ void activate(bool fromGesture) override;
+ void deactivate(bool forGesture) override;
+ bool handleKeyEvents() override { return true; }
+ void keyPressEvent(QKeyEvent* event) override;
+ void mouseMoveEvent(QMouseEvent* event) override;
+ void mousePressEvent(QMouseEvent* event) override;
+ void mouseReleaseEvent(QMouseEvent* event) override;
+ void mouseDoubleClickEvent(QMouseEvent* event) override;
+ void drawControls(QPainter* p) override;
protected:
/**
Modified: trunk/Scribus/scribus/canvasmode_editweldpoint.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22951&path=/trunk/Scribus/scribus/canvasmode_editweldpoint.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editweldpoint.h (original)
+++ trunk/Scribus/scribus/canvasmode_editweldpoint.h Mon Apr 15 21:27:38 2019
@@ -43,20 +43,20 @@
Q_OBJECT
public:
explicit CanvasMode_EditWeldPoint(ScribusView* view);
- virtual ~CanvasMode_EditWeldPoint() {}
+ ~CanvasMode_EditWeldPoint() override {}
- virtual void enterEvent(QEvent *);
- virtual void leaveEvent(QEvent *);
+ void enterEvent(QEvent *) override;
+ void leaveEvent(QEvent *) override;
- virtual void activate(bool);
- virtual void deactivate(bool);
- virtual void mouseDoubleClickEvent(QMouseEvent *m);
- virtual void mouseReleaseEvent(QMouseEvent *m);
- virtual void mouseMoveEvent(QMouseEvent *m);
- virtual void mousePressEvent(QMouseEvent *m);
- virtual void keyPressEvent(QKeyEvent *e);
- virtual bool handleKeyEvents() { return true; }
- virtual void drawControls(QPainter* p);
+ void activate(bool) override;
+ void deactivate(bool) override;
+ void mouseDoubleClickEvent(QMouseEvent *m) override;
+ void mouseReleaseEvent(QMouseEvent *m) override;
+ void mouseMoveEvent(QMouseEvent *m) override;
+ void mousePressEvent(QMouseEvent *m) override;
+ void keyPressEvent(QKeyEvent *e) override;
+ bool handleKeyEvents() override { return true; }
+ void drawControls(QPainter* p) override;
void drawControlsWeldPoint(QPainter* pp, PageItem* currItem);
private:
Modified: trunk/Scribus/scribus/canvasmode_eyedropper.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22951&path=/trunk/Scribus/scribus/canvasmode_eyedropper.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_eyedropper.h (original)
+++ trunk/Scribus/scribus/canvasmode_eyedropper.h Mon Apr 15 21:27:38 2019
@@ -30,18 +30,18 @@
public:
explicit CanvasMode_EyeDropper(ScribusView* view);
- virtual ~CanvasMode_EyeDropper() {}
+ ~CanvasMode_EyeDropper() override {}
- virtual void enterEvent(QEvent *);
- virtual void leaveEvent(QEvent *);
+ void enterEvent(QEvent *) override;
+ void leaveEvent(QEvent *) override;
- virtual void activate(bool);
- virtual void deactivate(bool);
- virtual void mouseDoubleClickEvent(QMouseEvent *m);
- virtual void mouseReleaseEvent(QMouseEvent *m);
- virtual void mouseMoveEvent(QMouseEvent *m);
- virtual void mousePressEvent(QMouseEvent *m);
- virtual void drawControls(QPainter* p);
+ void activate(bool) override;
+ void deactivate(bool) override;
+ void mouseDoubleClickEvent(QMouseEvent *m) override;
+ void mouseReleaseEvent(QMouseEvent *m) override;
+ void mouseMoveEvent(QMouseEvent *m) override;
+ void mousePressEvent(QMouseEvent *m) override;
+ void drawControls(QPainter* p) override;
// protected:
// void setResizeCursor(int);
Modified: trunk/Scribus/scribus/canvasmode_framelinks.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22951&path=/trunk/Scribus/scribus/canvasmode_framelinks.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_framelinks.h (original)
+++ trunk/Scribus/scribus/canvasmode_framelinks.h Mon Apr 15 21:27:38 2019
@@ -41,18 +41,18 @@
public:
explicit CanvasMode_FrameLinks(ScribusView* view);
- virtual ~CanvasMode_FrameLinks() {}
+ ~CanvasMode_FrameLinks() override {}
- virtual void enterEvent(QEvent *);
- virtual void leaveEvent(QEvent *);
+ void enterEvent(QEvent *) override;
+ void leaveEvent(QEvent *) override;
- virtual void activate(bool);
- virtual void deactivate(bool);
- virtual void mouseDoubleClickEvent(QMouseEvent *m);
- virtual void mouseReleaseEvent(QMouseEvent *m);
- virtual void mouseMoveEvent(QMouseEvent *m);
- virtual void mousePressEvent(QMouseEvent *m);
- virtual void drawControls(QPainter* p);
+ void activate(bool) override;
+ void deactivate(bool) override;
+ void mouseDoubleClickEvent(QMouseEvent *m) override;
+ void mouseReleaseEvent(QMouseEvent *m) override;
+ void mouseMoveEvent(QMouseEvent *m) override;
+ void mousePressEvent(QMouseEvent *m) override;
+ void drawControls(QPainter* p) override;
// protected:
// void setResizeCursor(int);
Modified: trunk/Scribus/scribus/canvasmode_imageimport.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22951&path=/trunk/Scribus/scribus/canvasmode_imageimport.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_imageimport.h (original)
+++ trunk/Scribus/scribus/canvasmode_imageimport.h Mon Apr 15 21:27:38 2019
@@ -35,20 +35,20 @@
public:
explicit CanvasMode_ImageImport(ScribusView* view);
- virtual ~CanvasMode_ImageImport() {}
+ ~CanvasMode_ImageImport() override {}
- virtual void enterEvent(QEvent *);
- virtual void leaveEvent(QEvent *);
+ void enterEvent(QEvent *) override;
+ void leaveEvent(QEvent *) override;
- virtual void activate(bool);
- virtual void deactivate(bool);
- virtual void keyPressEvent(QKeyEvent *e);
- virtual bool handleKeyEvents() { return true; }
- virtual void mouseDoubleClickEvent(QMouseEvent *m);
- virtual void mouseReleaseEvent(QMouseEvent *m);
- virtual void mouseMoveEvent(QMouseEvent *m);
- virtual void mousePressEvent(QMouseEvent *m);
- virtual void drawControls(QPainter* p);
+ void activate(bool) override;
+ void deactivate(bool) override;
+ void keyPressEvent(QKeyEvent *e) override;
+ bool handleKeyEvents() override { return true; }
+ void mouseDoubleClickEvent(QMouseEvent *m) override;
+ void mouseReleaseEvent(QMouseEvent *m) override;
+ void mouseMoveEvent(QMouseEvent *m) override;
+ void mousePressEvent(QMouseEvent *m) override;
+ void drawControls(QPainter* p) override;
void setImageList(QStringList l);
void setImage(PageItem* item);
Modified: trunk/Scribus/scribus/canvasmode_magnifier.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22951&path=/trunk/Scribus/scribus/canvasmode_magnifier.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_magnifier.h (original)
+++ trunk/Scribus/scribus/canvasmode_magnifier.h Mon Apr 15 21:27:38 2019
@@ -38,18 +38,18 @@
{
public:
explicit CanvasMode_Magnifier(ScribusView* view);
- virtual ~CanvasMode_Magnifier() {}
+ ~CanvasMode_Magnifier() override {}
- virtual void enterEvent(QEvent *);
- virtual void leaveEvent(QEvent *);
+ void enterEvent(QEvent *) override;
+ void leaveEvent(QEvent *) override;
- virtual void activate(bool);
- virtual void deactivate(bool);
- virtual void mouseDoubleClickEvent(QMouseEvent *m);
- virtual void mouseReleaseEvent(QMouseEvent *m);
- virtual void mouseMoveEvent(QMouseEvent *m);
- virtual void mousePressEvent(QMouseEvent *m);
- virtual void drawControls(QPainter* p);
+ void activate(bool) override;
+ void deactivate(bool) override;
+ void mouseDoubleClickEvent(QMouseEvent *m) override;
+ void mouseReleaseEvent(QMouseEvent *m) override;
+ void mouseMoveEvent(QMouseEvent *m) override;
+ void mousePressEvent(QMouseEvent *m) override;
+ void drawControls(QPainter* p) override;
// protected:
// void setResizeCursor(int);
Modified: trunk/Scribus/scribus/canvasmode_measurements.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22951&path=/trunk/Scribus/scribus/canvasmode_measurements.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_measurements.h (original)
+++ trunk/Scribus/scribus/canvasmode_measurements.h Mon Apr 15 21:27:38 2019
@@ -36,17 +36,17 @@
public:
explicit MeasurementsMode(ScribusView* view);
- virtual ~MeasurementsMode() {}
+ ~MeasurementsMode() override {}
- virtual void enterEvent(QEvent *);
- virtual void leaveEvent(QEvent *);
+ void enterEvent(QEvent *) override;
+ void leaveEvent(QEvent *) override;
- virtual void activate(bool);
- virtual void deactivate(bool);
- virtual void mouseReleaseEvent(QMouseEvent *m);
- virtual void mouseMoveEvent(QMouseEvent *m);
- virtual void mousePressEvent(QMouseEvent *m);
- virtual void drawControls(QPainter* p);
+ void activate(bool) override;
+ void deactivate(bool) override;
+ void mouseReleaseEvent(QMouseEvent *m) override;
+ void mouseMoveEvent(QMouseEvent *m) override;
+ void mousePressEvent(QMouseEvent *m) override;
+ void drawControls(QPainter* p) override;
public slots:
void setActive(bool);
Modified: trunk/Scribus/scribus/canvasmode_nodeedit.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22951&path=/trunk/Scribus/scribus/canvasmode_nodeedit.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_nodeedit.h (original)
+++ trunk/Scribus/scribus/canvasmode_nodeedit.h Mon Apr 15 21:27:38 2019
@@ -34,21 +34,21 @@
public:
explicit CanvasMode_NodeEdit (ScribusView* view);
- virtual void activate(bool fromgesture);
- virtual void deactivate(bool forGesture);
+ void activate(bool fromgesture) override;
+ void deactivate(bool forGesture) override;
- virtual void enterEvent(QEvent *);
- virtual void leaveEvent(QEvent *);
+ void enterEvent(QEvent *) override;
+ void leaveEvent(QEvent *) override;
- virtual void mouseDoubleClickEvent(QMouseEvent *m);
- virtual void mouseReleaseEvent(QMouseEvent *m);
- virtual void mouseMoveEvent(QMouseEvent *m);
- virtual void mousePressEvent(QMouseEvent *m);
+ void mouseDoubleClickEvent(QMouseEvent *m) override;
+ void mouseReleaseEvent(QMouseEvent *m) override;
+ void mouseMoveEvent(QMouseEvent *m) override;
+ void mousePressEvent(QMouseEvent *m) override;
- virtual void keyPressEvent(QKeyEvent *e);
- virtual void keyReleaseEvent(QKeyEvent *e);
+ void keyPressEvent(QKeyEvent *e) override;
+ void keyReleaseEvent(QKeyEvent *e) override;
- virtual bool handleKeyEvents() { return true; }
+ bool handleKeyEvents() override { return true; }
/**
Modified: trunk/Scribus/scribus/canvasmode_normal.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22951&path=/trunk/Scribus/scribus/canvasmode_normal.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_normal.h (original)
+++ trunk/Scribus/scribus/canvasmode_normal.h Mon Apr 15 21:27:38 2019
@@ -40,23 +40,23 @@
public:
explicit CanvasMode_Normal(ScribusView* view);
- virtual ~CanvasMode_Normal() {}
+ ~CanvasMode_Normal() override {}
- virtual void enterEvent(QEvent *);
- virtual void leaveEvent(QEvent *);
+ void enterEvent(QEvent *) override;
+ void leaveEvent(QEvent *) override;
- virtual void activate(bool);
- virtual void deactivate(bool);
- virtual void mouseDoubleClickEvent(QMouseEvent *m);
- virtual void mouseReleaseEvent(QMouseEvent *m);
- virtual void mouseMoveEvent(QMouseEvent *m);
- virtual void mousePressEvent(QMouseEvent *m);
- virtual void drawControls(QPainter* p);
+ void activate(bool) override;
+ void deactivate(bool) override;
+ void mouseDoubleClickEvent(QMouseEvent *m) override;
+ void mouseReleaseEvent(QMouseEvent *m) override;
+ void mouseMoveEvent(QMouseEvent *m) override;
+ void mousePressEvent(QMouseEvent *m) override;
+ void drawControls(QPainter* p) override;
- virtual void keyPressEvent(QKeyEvent *e);
- virtual void keyReleaseEvent(QKeyEvent *e);
+ void keyPressEvent(QKeyEvent *e) override;
+ void keyReleaseEvent(QKeyEvent *e) override;
- virtual bool handleKeyEvents() { return true; }
+ bool handleKeyEvents() override { return true; }
private:
inline bool GetItem(PageItem** pi);
Modified: trunk/Scribus/scribus/canvasmode_objimport.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22951&path=/trunk/Scribus/scribus/canvasmode_objimport.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_objimport.h (original)
+++ trunk/Scribus/scribus/canvasmode_objimport.h Mon Apr 15 21:27:38 2019
@@ -40,21 +40,21 @@
public:
explicit CanvasMode_ObjImport(ScribusView* view);
- virtual ~CanvasMode_ObjImport();
+ ~CanvasMode_ObjImport() override;
void setMimeData(QMimeData* mimeData);
void setTransactionSettings(TransactionSettings* settings);
- virtual void enterEvent(QEvent *);
- virtual void leaveEvent(QEvent *);
+ void enterEvent(QEvent *) override;
+ void leaveEvent(QEvent *) override;
- virtual void activate(bool);
- virtual void deactivate(bool);
- virtual void mouseDoubleClickEvent(QMouseEvent *m);
- virtual void mouseReleaseEvent(QMouseEvent *m);
- virtual void mouseMoveEvent(QMouseEvent *m);
- virtual void mousePressEvent(QMouseEvent *m);
- virtual void drawControls(QPainter* p);
+ void activate(bool) override;
+ void deactivate(bool) override;
+ void mouseDoubleClickEvent(QMouseEvent *m) override;
+ void mouseReleaseEvent(QMouseEvent *m) override;
+ void mouseMoveEvent(QMouseEvent *m) override;
+ void mousePressEvent(QMouseEvent *m) override;
+ void drawControls(QPainter* p) override;
// protected:
// void setResizeCursor(int);
Modified: trunk/Scribus/scribus/canvasmode_panning.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22951&path=/trunk/Scribus/scribus/canvasmode_panning.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_panning.h (original)
+++ trunk/Scribus/scribus/canvasmode_panning.h Mon Apr 15 21:27:38 2019
@@ -35,16 +35,16 @@
{
public:
explicit CanvasMode_Panning(ScribusView* view);
- virtual ~CanvasMode_Panning() {}
+ ~CanvasMode_Panning() override {}
- virtual void enterEvent(QEvent *);
- virtual void leaveEvent(QEvent *);
+ void enterEvent(QEvent *) override;
+ void leaveEvent(QEvent *) override;
- virtual void activate(bool);
- virtual void deactivate(bool);
- virtual void mouseDoubleClickEvent(QMouseEvent *m);
- virtual void mousePressEvent(QMouseEvent *m);
- virtual void drawControls(QPainter* p);
+ void activate(bool) override;
+ void deactivate(bool) override;
+ void mouseDoubleClickEvent(QMouseEvent *m) override;
+ void mousePressEvent(QMouseEvent *m) override;
+ void drawControls(QPainter* p) override;
};
Modified: trunk/Scribus/scribus/canvasmode_rotate.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22951&path=/trunk/Scribus/scribus/canvasmode_rotate.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_rotate.h (original)
+++ trunk/Scribus/scribus/canvasmode_rotate.h Mon Apr 15 21:27:38 2019
@@ -36,18 +36,18 @@
{
public:
explicit CanvasMode_Rotate(ScribusView* view);
- virtual ~CanvasMode_Rotate() {}
+ ~CanvasMode_Rotate() override {}
- virtual void enterEvent(QEvent *);
- virtual void leaveEvent(QEvent *);
+ void enterEvent(QEvent *) override;
+ void leaveEvent(QEvent *) override;
- virtual void drawControls(QPainter* p);
- virtual void activate(bool);
- virtual void deactivate(bool);
+ void drawControls(QPainter* p) override;
+ void activate(bool) override;
+ void deactivate(bool) override;
- virtual void mousePressEvent(QMouseEvent *m);
- virtual void mouseReleaseEvent(QMouseEvent *m);
- virtual void mouseMoveEvent(QMouseEvent *m);
+ void mousePressEvent(QMouseEvent *m) override;
+ void mouseReleaseEvent(QMouseEvent *m) override;
+ void mouseMoveEvent(QMouseEvent *m) override;
private:
inline bool GetItem(PageItem** pi);
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
