Fix missing override annotations

This commit is contained in:
2022-07-05 09:28:41 -04:00
parent 8d31c27d11
commit f5be1d9706
4 changed files with 26 additions and 26 deletions

View File

@@ -52,15 +52,15 @@ public:
/// Create a button outside of a dialog
/// @param parent The parent window
explicit cButton(sf::RenderWindow& parent);
bool isClickable();
bool isFocusable();
bool isScrollable();
bool isClickable() override;
bool isFocusable() override;
bool isScrollable() override;
virtual ~cButton();
void draw();
void draw() override;
/// @copydoc cControl::getSupportedHandlers
///
/// @todo Document possible handlers
const std::set<eDlogEvt> getSupportedHandlers() const {
const std::set<eDlogEvt> getSupportedHandlers() const override {
return {EVT_CLICK};
}
cButton& operator=(cButton& other) = delete;

View File

@@ -26,23 +26,23 @@ public:
bool parseAttribute(ticpp::Attribute& attr, std::string tagName, std::string fname) override;
bool parseContent(ticpp::Node& content, int n, std::string tagName, std::string fname, std::string& text) override;
void validatePostParse(ticpp::Element& who, std::string fname, const std::set<std::string>& attrs, const std::multiset<std::string>& nodes) override;
bool manageFormat(eFormat prop, bool set, boost::any* val);
bool manageFormat(eFormat prop, bool set, boost::any* val) override;
/// Create a new text message.
/// @param parent The parent dialog.
explicit cTextMsg(cDialog& parent);
/// Create a new text message without a parent dialog.
/// @param parent The parent window.
explicit cTextMsg(sf::RenderWindow& parent);
bool isClickable();
bool isFocusable();
bool isScrollable();
bool isClickable() override;
bool isFocusable() override;
bool isScrollable() override;
virtual ~cTextMsg();
void draw();
void draw() override;
void recalcRect() override;
/// @copydoc cControl::getSupportedHandlers
///
/// @todo Document possible handlers
const std::set<eDlogEvt> getSupportedHandlers() const {
const std::set<eDlogEvt> getSupportedHandlers() const override {
return {EVT_CLICK};
}
cTextMsg& operator=(cTextMsg& other) = delete;

View File

@@ -28,9 +28,9 @@ public:
static void init();
bool parseAttribute(ticpp::Attribute& attr, std::string tagName, std::string fname) override;
void validatePostParse(ticpp::Element& who, std::string fname, const std::set<std::string>& attrs, const std::multiset<std::string>& nodes) override;
bool manageFormat(eFormat prop, bool set, boost::any* val);
storage_t store();
void restore(storage_t to);
bool manageFormat(eFormat prop, bool set, boost::any* val) override;
storage_t store() override;
void restore(storage_t to) override;
/// @copydoc setPict(pic_num_t)
/// @param type The type of the new icon
/// @note Calling this function automatically adjusts the bounding rect so that the picture fits perfectly.
@@ -61,14 +61,14 @@ public:
/// Create a new icon without a parent dialog.
/// @param parent The parent window.
explicit cPict(sf::RenderWindow& parent);
bool isClickable();
bool isFocusable();
bool isScrollable();
bool isClickable() override;
bool isFocusable() override;
bool isScrollable() override;
/// Advance the current animation frame.
/// Should be called at predictable intervals if the dialog might contain an animated graphic.
static void advanceAnim();
virtual ~cPict();
void draw();
void draw() override;
/// A utility function to draw an icon into an arbitrary window.
/// @param win The window to draw in.
/// @param dest The bounding rect to draw in (ignored for drawing the actual, but used for background fill and framing)
@@ -82,7 +82,7 @@ public:
/// @copydoc cControl::getSupportedHandlers
///
/// @todo Document possible handlers
const std::set<eDlogEvt> getSupportedHandlers() const {
const std::set<eDlogEvt> getSupportedHandlers() const override {
return {EVT_CLICK};
}
cPict& operator=(cPict& other) = delete;

View File

@@ -73,16 +73,16 @@ public:
/// Create a new scrollbar.
/// @param parent The parent dialog.
explicit cScrollbar(cDialog& parent);
bool handleClick(location where);
bool handleClick(location where) override;
void setFormat(eFormat prop, short val);
short getFormat(eFormat prop);
void setColour(sf::Color clr);
sf::Color getColour();
storage_t store();
void restore(storage_t to);
bool isClickable();
bool isFocusable();
bool isScrollable();
storage_t store() override;
void restore(storage_t to) override;
bool isClickable() override;
bool isFocusable() override;
bool isScrollable() override;
/// Get the scrollbar thumb's current position.
/// @return The current position.
long getPosition();
@@ -137,7 +137,7 @@ public:
/// @copydoc cControl::getSupportedHandlers
///
/// @todo Document possible handlers
const std::set<eDlogEvt> getSupportedHandlers() const {
const std::set<eDlogEvt> getSupportedHandlers() const override {
return {EVT_CLICK, EVT_SCROLL};
}
cScrollbar& operator=(cScrollbar& other) = delete;