amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-12 05:36:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup: use override specifier everywhere, and enable gcc warning to check for it.

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-05-16 00:23:18 +02:00
parent a7c47729c1
commit 5deaeeeb3e
113 changed files with 710 additions and 714 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/symbol/basic_shape_editor.hpp
+12 -12
View File
@@ -16,33 +16,33 @@ class wxSpinCtrl;
// ----------------------------------------------------------------------------- : SymbolBasicShapeEditor
/// Editor for drawing basic shapes such as rectangles and polygons
class SymbolBasicShapeEditor : public SymbolEditorBase {
class SymbolBasicShapeEditor final : public SymbolEditorBase {
public:
SymbolBasicShapeEditor(SymbolControl* control);
// --------------------------------------------------- : Drawing
virtual void draw(DC& dc);
void draw(DC& dc) override;
// --------------------------------------------------- : UI
virtual void initUI (wxToolBar* tb, wxMenuBar* mb);
virtual void destroyUI(wxToolBar* tb, wxMenuBar* mb);
virtual void onUpdateUI(wxUpdateUIEvent&);
virtual void onCommand(int id);
virtual int modeToolId();
void initUI (wxToolBar* tb, wxMenuBar* mb) override;
void destroyUI(wxToolBar* tb, wxMenuBar* mb) override;
void onUpdateUI(wxUpdateUIEvent&) override;
void onCommand(int id) override;
int modeToolId() override;
// --------------------------------------------------- : Mouse events
virtual void onLeftDown (const Vector2D& pos, wxMouseEvent& ev);
virtual void onLeftUp (const Vector2D& pos, wxMouseEvent& ev);
virtual void onMouseDrag (const Vector2D& from, const Vector2D& to, wxMouseEvent& ev);
void onLeftDown (const Vector2D& pos, wxMouseEvent& ev) override;
void onLeftUp (const Vector2D& pos, wxMouseEvent& ev) override;
void onMouseDrag (const Vector2D& from, const Vector2D& to, wxMouseEvent& ev) override;
// --------------------------------------------------- : Other events
virtual void onKeyChange(wxKeyEvent& ev);
void onKeyChange(wxKeyEvent& ev) override;
virtual bool isEditing();
bool isEditing() override;
// --------------------------------------------------- : Data
private:
src/gui/symbol/control.hpp
+2 -2
View File
@@ -26,9 +26,9 @@ class SymbolControl : public wxControl, public SymbolViewer {
public:
SymbolControl(SymbolWindow* parent, int id, const SymbolP& symbol);
virtual void onChangeSymbol();
void onChangeSymbol() override;
virtual void onAction(const Action&, bool undone);
void onAction(const Action&, bool undone) override;
// Forward command to editor
void onExtraTool(wxCommandEvent& ev);
src/gui/symbol/part_list.hpp
+4 -4
View File
@@ -31,9 +31,9 @@ public:
SymbolPartList(Window* parent, int id, SymbolPartsSelection& selection, SymbolP symbol = SymbolP());
/// Another symbol is being viewed
virtual void onChangeSymbol();
void onChangeSymbol() override;
/// Event handler for changes to the symbol
virtual void onAction(const Action&, bool);
void onAction(const Action&, bool) override;
/// Update the control
void update();
@@ -41,7 +41,7 @@ public:
void updateParts(const set<SymbolPartP>& parts);
protected:
virtual wxSize DoGetBestSize() const;
wxSize DoGetBestSize() const override;
private:
SymbolPartsSelection& selection; ///< Store selection here
int number_of_items;
@@ -75,7 +75,7 @@ private:
void onChar(wxKeyEvent& ev);
void onPaint(wxPaintEvent&);
void onSize(wxSizeEvent&);
void OnDraw(DC& dc);
void OnDraw(DC& dc) override;
void sendEvent(int type);
src/gui/symbol/point_editor.cpp
+1 -1
View File
@@ -284,7 +284,7 @@ void SymbolPointEditor::onMouseDrag(const Vector2D& from, const Vector2D& to, wx
Vector2D delta = to - from;
if (selection == SELECTED_LINE && ev.AltDown()) {
// Drag the curve
if (controlPointMoveAction) controlPointMoveAction = 0;
if (controlPointMoveAction) controlPointMoveAction = nullptr;
if (!curveDragAction) {
auto action = make_unique<CurveDragAction>(selected_line1, selected_line2);
curveDragAction = action.get();
src/gui/symbol/point_editor.hpp
+15 -15
View File
@@ -19,13 +19,13 @@ class CurveDragAction;
// Symbol editor for editing control points and handles
class SymbolPointEditor : public SymbolEditorBase {
class SymbolPointEditor final : public SymbolEditorBase {
public:
SymbolPointEditor(SymbolControl* control, const SymbolShapeP& part);
// --------------------------------------------------- : Drawing
virtual void draw(DC& dc);
void draw(DC& dc) override;
private:
/// Draws a gradient on the selected line to indicate curve dragging
@@ -56,25 +56,25 @@ private:
public:
// --------------------------------------------------- : UI
virtual void initUI (wxToolBar* tb, wxMenuBar* mb);
virtual void destroyUI(wxToolBar* tb, wxMenuBar* mb);
virtual void onUpdateUI(wxUpdateUIEvent&);
virtual void onCommand(int id);
virtual int modeToolId();
void initUI (wxToolBar* tb, wxMenuBar* mb) override;
void destroyUI(wxToolBar* tb, wxMenuBar* mb) override;
void onUpdateUI(wxUpdateUIEvent&) override;
void onCommand(int id) override;
int modeToolId() override;
// --------------------------------------------------- : Mouse events
virtual void onLeftDown (const Vector2D& pos, wxMouseEvent& ev);
virtual void onLeftUp (const Vector2D& pos, wxMouseEvent& ev);
virtual void onLeftDClick(const Vector2D& pos, wxMouseEvent& ev);
virtual void onMouseMove(const Vector2D& from, const Vector2D& to, wxMouseEvent& ev);
virtual void onMouseDrag(const Vector2D& from, const Vector2D& to, wxMouseEvent& ev);
void onLeftDown (const Vector2D& pos, wxMouseEvent& ev) override;
void onLeftUp (const Vector2D& pos, wxMouseEvent& ev) override;
void onLeftDClick(const Vector2D& pos, wxMouseEvent& ev) override;
void onMouseMove(const Vector2D& from, const Vector2D& to, wxMouseEvent& ev) override;
void onMouseDrag(const Vector2D& from, const Vector2D& to, wxMouseEvent& ev) override;
// --------------------------------------------------- : Other events
virtual void onKeyChange(wxKeyEvent& ev);
virtual void onChar(wxKeyEvent& ev);
virtual bool isEditing();
void onKeyChange(wxKeyEvent& ev) override;
void onChar(wxKeyEvent& ev) override;
bool isEditing() override;
private:
// --------------------------------------------------- : Data
src/gui/symbol/select_editor.hpp
+15 -15
View File
@@ -19,13 +19,13 @@ DECLARE_POINTER_TYPE(SymbolPartShearAction);
// ----------------------------------------------------------------------------- : SymbolSelectEditor
/// Editor that allows the user to select symbol parts
class SymbolSelectEditor : public SymbolEditorBase {
class SymbolSelectEditor final : public SymbolEditorBase {
public:
SymbolSelectEditor(SymbolControl* control, bool rotate);
// --------------------------------------------------- : Drawing
virtual void draw(DC& dc);
void draw(DC& dc) override;
private:
/// Draw handles on all sides
@@ -39,26 +39,26 @@ private:
public:
// --------------------------------------------------- : UI
virtual void initUI (wxToolBar* tb, wxMenuBar* mb);
virtual void destroyUI(wxToolBar* tb, wxMenuBar* mb);
virtual void onUpdateUI(wxUpdateUIEvent&);
virtual void onCommand(int id);
virtual int modeToolId();
void initUI (wxToolBar* tb, wxMenuBar* mb) override;
void destroyUI(wxToolBar* tb, wxMenuBar* mb) override;
void onUpdateUI(wxUpdateUIEvent&) override;
void onCommand(int id) override;
int modeToolId() override;
// --------------------------------------------------- : Mouse events
virtual void onLeftDown (const Vector2D& pos, wxMouseEvent& ev);
virtual void onLeftDClick (const Vector2D& pos, wxMouseEvent& ev);
virtual void onLeftUp (const Vector2D& pos, wxMouseEvent& ev);
virtual void onMouseMove (const Vector2D& from, const Vector2D& to, wxMouseEvent& ev);
virtual void onMouseDrag (const Vector2D& from, const Vector2D& to, wxMouseEvent& ev);
void onLeftDown (const Vector2D& pos, wxMouseEvent& ev) override;
void onLeftDClick (const Vector2D& pos, wxMouseEvent& ev) override;
void onLeftUp (const Vector2D& pos, wxMouseEvent& ev) override;
void onMouseMove (const Vector2D& from, const Vector2D& to, wxMouseEvent& ev) override;
void onMouseDrag (const Vector2D& from, const Vector2D& to, wxMouseEvent& ev) override;
// --------------------------------------------------- : Other events
virtual void onKeyChange (wxKeyEvent& ev);
virtual void onChar (wxKeyEvent& ev);
void onKeyChange (wxKeyEvent& ev) override;
void onChar (wxKeyEvent& ev) override;
virtual bool isEditing();
bool isEditing() override;
private:
// The part under the mouse cursor
src/gui/symbol/symmetry_editor.hpp
+13 -13
View File
@@ -17,35 +17,35 @@ class SymmetryMoveAction;
// ----------------------------------------------------------------------------- : SymbolSymmetryEditor
/// Editor for adding symmetries
class SymbolSymmetryEditor : public SymbolEditorBase {
class SymbolSymmetryEditor final : public SymbolEditorBase {
public:
/** The symmetry parameter is optional, if it is not set, then only new ones can be created */
SymbolSymmetryEditor(SymbolControl* control, const SymbolSymmetryP& symmetry);
// --------------------------------------------------- : Drawing
virtual void draw(DC& dc);
void draw(DC& dc) override;
// --------------------------------------------------- : UI
virtual void initUI (wxToolBar* tb, wxMenuBar* mb);
virtual void destroyUI(wxToolBar* tb, wxMenuBar* mb);
virtual void onUpdateUI(wxUpdateUIEvent&);
virtual void onCommand(int id);
virtual int modeToolId();
void initUI (wxToolBar* tb, wxMenuBar* mb) override;
void destroyUI(wxToolBar* tb, wxMenuBar* mb) override;
void onUpdateUI(wxUpdateUIEvent&) override;
void onCommand(int id) override;
int modeToolId() override;
// --------------------------------------------------- : Mouse events
virtual void onLeftDown (const Vector2D& pos, wxMouseEvent& ev);
virtual void onLeftUp (const Vector2D& pos, wxMouseEvent& ev);
virtual void onMouseMove (const Vector2D& from, const Vector2D& to, wxMouseEvent& ev);
virtual void onMouseDrag (const Vector2D& from, const Vector2D& to, wxMouseEvent& ev);
void onLeftDown (const Vector2D& pos, wxMouseEvent& ev) override;
void onLeftUp (const Vector2D& pos, wxMouseEvent& ev) override;
void onMouseMove (const Vector2D& from, const Vector2D& to, wxMouseEvent& ev) override;
void onMouseDrag (const Vector2D& from, const Vector2D& to, wxMouseEvent& ev) override;
// --------------------------------------------------- : Other events
virtual void onKeyChange(wxKeyEvent& ev);
void onKeyChange(wxKeyEvent& ev) override;
virtual bool isEditing();
bool isEditing() override;
// --------------------------------------------------- : Data
private: