From 1ffd8b1ac9b99a15fd1af58d46d59bcb84bae0e9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 19 Feb 2015 12:45:58 +0300 Subject: Fix overload virtual function SetupItem::action. --- src/gui/widgets/setupitem.cpp | 4 ++-- src/gui/widgets/setupitem.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gui/widgets') 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); -- cgit v1.2.3-60-g2f50