diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-02-19 12:45:58 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-02-19 12:46:48 +0300 |
| commit | 1ffd8b1ac9b99a15fd1af58d46d59bcb84bae0e9 (patch) | |
| tree | 84cdd514c90bb04332129ddfcf70350fb6372ad7 | |
| parent | 46fc225f65f7d11348fc9e94feb0cb6484b27cab (diff) | |
| download | manaplus-1ffd8b1ac9b99a15fd1af58d46d59bcb84bae0e9.tar.gz manaplus-1ffd8b1ac9b99a15fd1af58d46d59bcb84bae0e9.tar.bz2 manaplus-1ffd8b1ac9b99a15fd1af58d46d59bcb84bae0e9.tar.xz manaplus-1ffd8b1ac9b99a15fd1af58d46d59bcb84bae0e9.zip | |
Fix overload virtual function SetupItem::action.
| -rw-r--r-- | src/gui/widgets/setupitem.cpp | 4 | ||||
| -rw-r--r-- | src/gui/widgets/setupitem.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp index 110bf895c..ff1370c0b 100644 --- a/src/gui/widgets/setupitem.cpp +++ b/src/gui/widgets/setupitem.cpp @@ -163,10 +163,10 @@ void SetupItem::action(const ActionEvent &event) return; if (event.getId() == mWidget->getActionEventId()) - action(); + doAction(); } -void SetupItem::action() +void SetupItem::doAction() { fromWidget(); } diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h index cebf061ea..f5657c48e 100644 --- a/src/gui/widgets/setupitem.h +++ b/src/gui/widgets/setupitem.h @@ -78,7 +78,7 @@ class SetupItem notfinal : public ActionListener, virtual void action(const ActionEvent &event) override; - virtual void action(); + virtual void doAction(); virtual void apply(const std::string &eventName); |