amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-12 13:37:00 -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/data/field/choice.hpp
+7 -7
View File
@@ -41,8 +41,8 @@ public:
map<String,Color> choice_colors; ///< Colors for the various choices (when color_cardlist)
map<String,Color> choice_colors_cardlist; ///< Colors for the various choices, for in the card list
virtual void initDependencies(Context&, const Dependency&) const;
virtual void after_reading(Version ver);
void initDependencies(Context&, const Dependency&) const override;
void after_reading(Version ver) override;
};
@@ -174,10 +174,10 @@ public:
/// Initialize image from choice_images
void initImage();
virtual int update(Context&);
virtual void initDependencies(Context&, const Dependency&) const;
virtual void checkContentDependencies(Context&, const Dependency&) const;
virtual void invalidate();
int update(Context&) override;
void initDependencies(Context&, const Dependency&) const override;
void checkContentDependencies(Context&, const Dependency&) const override;
void invalidate() override;
};
// ----------------------------------------------------------------------------- : ChoiceValue
@@ -194,6 +194,6 @@ public:
ValueType value; /// The name of the selected choice
virtual bool update(Context&);
bool update(Context&) override;
};