From 62471b26135021d75f1b9255ab613746ae2ad67a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 9 Jan 2018 04:41:50 +0300 Subject: Remove useless A_CONST attributes. --- src/gui/widgets/avatarlistbox.h | 2 +- src/gui/widgets/characterdisplay.h | 4 ++-- src/gui/widgets/characterviewnormal.h | 2 +- src/gui/widgets/dropdown.h | 2 +- src/gui/widgets/emoteshortcutcontainer.h | 2 +- src/gui/widgets/horizontcontainer.h | 2 +- src/gui/widgets/itemcontainer.h | 4 ++-- src/gui/widgets/listbox.h | 4 ++-- src/gui/widgets/setupbuttonitem.h | 16 ++++++++-------- src/gui/widgets/setupitem.h | 10 +++++----- src/gui/widgets/setupquickitem.h | 13 ++++++------- src/gui/widgets/tabs/chat/gmtab.h | 4 ++-- src/gui/widgets/tabs/setup_relations.h | 2 +- src/gui/widgets/tabs/setuptab.h | 4 ++-- src/gui/widgets/textfield.h | 4 ++-- src/gui/widgets/widgetgroup.h | 2 +- 16 files changed, 38 insertions(+), 39 deletions(-) (limited to 'src/gui/widgets') diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h index aa647a23f..4b391c54b 100644 --- a/src/gui/widgets/avatarlistbox.h +++ b/src/gui/widgets/avatarlistbox.h @@ -47,7 +47,7 @@ class AvatarListBox final : public ListBox, void mousePressed(MouseEvent &event) override final; - void mouseReleased(MouseEvent &event A_UNUSED) override final A_CONST; + void mouseReleased(MouseEvent &event A_UNUSED) override final; void optionChanged(const std::string &value) override final; diff --git a/src/gui/widgets/characterdisplay.h b/src/gui/widgets/characterdisplay.h index c8af26215..61e92d24a 100644 --- a/src/gui/widgets/characterdisplay.h +++ b/src/gui/widgets/characterdisplay.h @@ -55,9 +55,9 @@ class CharacterDisplay final : public Container, Net::Character *getCharacter() const { return mCharacter; } - void requestFocus() override final A_CONST; + void requestFocus() override final; - void setActive(const bool active) A_CONST; + void setActive(const bool active); bool isSelectFocused() const { return false; } diff --git a/src/gui/widgets/characterviewnormal.h b/src/gui/widgets/characterviewnormal.h index 9920096d7..8c36545e8 100644 --- a/src/gui/widgets/characterviewnormal.h +++ b/src/gui/widgets/characterviewnormal.h @@ -40,7 +40,7 @@ class CharacterViewNormal final : public CharacterViewBase void resize() override; - void action(const ActionEvent &event A_UNUSED) override final A_CONST; + void action(const ActionEvent &event A_UNUSED) override final; private: STD_VECTOR *mCharacterEntries; diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h index 90f72f24a..dfc6e5c26 100644 --- a/src/gui/widgets/dropdown.h +++ b/src/gui/widgets/dropdown.h @@ -100,7 +100,7 @@ class DropDown final : public ActionListener, std::string getSelectedString() const A_WARN_UNUSED; - void valueChanged(const SelectionEvent& event) override final A_CONST; + void valueChanged(const SelectionEvent& event) override final; void updateSelection(); diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h index 2c15a989a..2665bfebc 100644 --- a/src/gui/widgets/emoteshortcutcontainer.h +++ b/src/gui/widgets/emoteshortcutcontainer.h @@ -59,7 +59,7 @@ class EmoteShortcutContainer final : public ShortcutContainer * Handles mouse when dragged. */ void mouseDragged(MouseEvent &restrict event) - restrict2 override final A_CONST; + restrict2 override final; /** * Handles mouse when pressed. diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h index a967897ed..91597c844 100644 --- a/src/gui/widgets/horizontcontainer.h +++ b/src/gui/widgets/horizontcontainer.h @@ -51,7 +51,7 @@ class HorizontContainer final : public Container, void clear() override; - void widgetResized(const Event &event) override final A_CONST; + void widgetResized(const Event &event) override final; protected: int mSpacing; diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h index d78e01198..bfebad168 100644 --- a/src/gui/widgets/itemcontainer.h +++ b/src/gui/widgets/itemcontainer.h @@ -77,8 +77,8 @@ class ItemContainer final : public Widget, void safeDraw(Graphics *const graphics) override final A_NONNULL(2); // KeyListener - void keyPressed(KeyEvent &event) override final A_CONST; - void keyReleased(KeyEvent &event) override final A_CONST; + void keyPressed(KeyEvent &event) override final; + void keyReleased(KeyEvent &event) override final; // MouseListener void mousePressed(MouseEvent &event) override final; diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h index 8d4600d0d..1dac89412 100644 --- a/src/gui/widgets/listbox.h +++ b/src/gui/widgets/listbox.h @@ -123,9 +123,9 @@ class ListBox notfinal : public Widget, // Inherited from MouseListener - void mouseWheelMovedUp(MouseEvent& event) override final A_CONST; + void mouseWheelMovedUp(MouseEvent& event) override final; - void mouseWheelMovedDown(MouseEvent& event) override final A_CONST; + void mouseWheelMovedDown(MouseEvent& event) override final; void mousePressed(MouseEvent &event) override; diff --git a/src/gui/widgets/setupbuttonitem.h b/src/gui/widgets/setupbuttonitem.h index 0cc6d1cc7..266d65cbf 100644 --- a/src/gui/widgets/setupbuttonitem.h +++ b/src/gui/widgets/setupbuttonitem.h @@ -43,23 +43,23 @@ class SetupButtonItem final : public SetupItem void createControls(); - void fromWidget() override final A_CONST; + void fromWidget() override final; - void toWidget() override final A_CONST; + void toWidget() override final; - void action(const ActionEvent &event) override final A_CONST; + void action(const ActionEvent &event) override final; - void apply(const std::string &eventName) override final A_CONST; + void apply(const std::string &eventName) override final; void cancel(const std::string &eventName A_UNUSED) - override final A_CONST; + override final; void externalUpdated(const std::string &eventName A_UNUSED) - override final A_CONST; + override final; - void rereadValue() override final A_CONST; + void rereadValue() override final; - void save() override final A_CONST; + void save() override final; protected: HorizontContainer *mHorizont; diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h index e7d449d3c..b2a891eb5 100644 --- a/src/gui/widgets/setupitem.h +++ b/src/gui/widgets/setupitem.h @@ -91,7 +91,7 @@ class SetupItem notfinal : public ActionListener, virtual void externalUpdated(const std::string &eventName); - virtual void externalUnloaded(const std::string &eventName) A_CONST; + virtual void externalUnloaded(const std::string &eventName); MainConfig isMainConfig() const noexcept2 A_WARN_UNUSED { return mMainConfig; } @@ -295,13 +295,13 @@ class SetupItemLabel final : public SetupItem void createControls(); - void fromWidget() override final A_CONST; + void fromWidget() override final; - void toWidget() override final A_CONST; + void toWidget() override final; - void action(const ActionEvent &event) override final A_CONST; + void action(const ActionEvent &event) override final; - void apply(const std::string &eventName) override final A_CONST; + void apply(const std::string &eventName) override final; protected: Label *mLabel; diff --git a/src/gui/widgets/setupquickitem.h b/src/gui/widgets/setupquickitem.h index 61a7b4932..4b8444b6a 100644 --- a/src/gui/widgets/setupquickitem.h +++ b/src/gui/widgets/setupquickitem.h @@ -49,23 +49,22 @@ class SetupQuickItem final : public SetupItem, void createControls(); - void fromWidget() override final A_CONST; + void fromWidget() override final; void toWidget() override final; void action(const ActionEvent &event) override final; - void apply(const std::string &eventName) override final A_CONST; + void apply(const std::string &eventName) override final; - void cancel(const std::string &eventName A_UNUSED) override final - A_CONST; + void cancel(const std::string &eventName A_UNUSED) override final; void externalUpdated(const std::string &eventName A_UNUSED) - override final A_CONST; + override final; - void rereadValue() override final A_CONST; + void rereadValue() override final; - void save() override final A_CONST; + void save() override final; void gameModifiersChanged() override final; diff --git a/src/gui/widgets/tabs/chat/gmtab.h b/src/gui/widgets/tabs/chat/gmtab.h index 70ab7198e..1f2dff882 100644 --- a/src/gui/widgets/tabs/chat/gmtab.h +++ b/src/gui/widgets/tabs/chat/gmtab.h @@ -37,11 +37,11 @@ class GmTab final : public ChatTab protected: void getAutoCompleteList(StringVect &names) const - override final A_CONST; + override final; void handleInput(const std::string &msg) override final; - void handleCommandStr(const std::string &msg) override final A_CONST; + void handleCommandStr(const std::string &msg) override final; }; extern GmTab *gmChatTab; diff --git a/src/gui/widgets/tabs/setup_relations.h b/src/gui/widgets/tabs/setup_relations.h index 920169158..8d956c619 100644 --- a/src/gui/widgets/tabs/setup_relations.h +++ b/src/gui/widgets/tabs/setup_relations.h @@ -48,7 +48,7 @@ class Setup_Relations final : public SetupTab, void apply() override final; - void cancel() override final A_CONST; + void cancel() override final; void reset(); diff --git a/src/gui/widgets/tabs/setuptab.h b/src/gui/widgets/tabs/setuptab.h index 68c3dd191..39ec26e45 100644 --- a/src/gui/widgets/tabs/setuptab.h +++ b/src/gui/widgets/tabs/setuptab.h @@ -53,9 +53,9 @@ class SetupTab notfinal : public Container, */ virtual void cancel() = 0; - virtual void externalUpdated() A_CONST; + virtual void externalUpdated(); - virtual void externalUnloaded() A_CONST; + virtual void externalUnloaded(); protected: explicit SetupTab(const Widget2 *const widget); diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h index 217c35565..e4ac1b173 100644 --- a/src/gui/widgets/textfield.h +++ b/src/gui/widgets/textfield.h @@ -181,10 +181,10 @@ class TextField notfinal : public Widget, void focusGained(const Event &event) override final; #else // ANDROID - void focusGained(const Event &event) override final A_CONST; + void focusGained(const Event &event) override final; #endif // ANDROID - void focusLost(const Event &event) override A_CONST; + void focusLost(const Event &event) override; void moveCaretBack(); diff --git a/src/gui/widgets/widgetgroup.h b/src/gui/widgets/widgetgroup.h index cac772778..6ffdf4f0a 100644 --- a/src/gui/widgets/widgetgroup.h +++ b/src/gui/widgets/widgetgroup.h @@ -46,7 +46,7 @@ class WidgetGroup notfinal : public Container, void clear() override final; - void widgetResized(const Event &event) override final A_CONST; + void widgetResized(const Event &event) override final; virtual Widget *createWidget(const std::string &name, const bool pressed) -- cgit v1.2.3-70-g09d2