summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-19 12:45:58 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-19 12:46:48 +0300
commit1ffd8b1ac9b99a15fd1af58d46d59bcb84bae0e9 (patch)
tree84cdd514c90bb04332129ddfcf70350fb6372ad7 /src/gui
parent46fc225f65f7d11348fc9e94feb0cb6484b27cab (diff)
downloadManaVerse-1ffd8b1ac9b99a15fd1af58d46d59bcb84bae0e9.tar.gz
ManaVerse-1ffd8b1ac9b99a15fd1af58d46d59bcb84bae0e9.tar.bz2
ManaVerse-1ffd8b1ac9b99a15fd1af58d46d59bcb84bae0e9.tar.xz
ManaVerse-1ffd8b1ac9b99a15fd1af58d46d59bcb84bae0e9.zip
Fix overload virtual function SetupItem::action.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/setupitem.cpp4
-rw-r--r--src/gui/widgets/setupitem.h2
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);