diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-03-01 19:13:11 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-03-01 19:13:11 +0300 |
| commit | a260aeab234704ace8ba672b1d1ce57e18425e07 (patch) | |
| tree | e215c6eeeae7e6c2ca4f4453718cef6ca9a8af6a /src/gui/windows/questswindow.h | |
| parent | 382067b05c4fe97bcf0da0143405375ec295f7c6 (diff) | |
| parent | 2c62286a7ecf246e8a445dd7d00f618efae2a96a (diff) | |
| download | plus-a260aeab234704ace8ba672b1d1ce57e18425e07.tar.gz plus-a260aeab234704ace8ba672b1d1ce57e18425e07.tar.bz2 plus-a260aeab234704ace8ba672b1d1ce57e18425e07.tar.xz plus-a260aeab234704ace8ba672b1d1ce57e18425e07.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/gui/windows/questswindow.h')
| -rw-r--r-- | src/gui/windows/questswindow.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/windows/questswindow.h b/src/gui/windows/questswindow.h index 7ecc86c84..9000fcaa9 100644 --- a/src/gui/windows/questswindow.h +++ b/src/gui/windows/questswindow.h @@ -27,7 +27,7 @@ #include "utils/xml.h" -#include <guichan/actionlistener.hpp> +#include "listeners/actionlistener.h" #include <map> #include <vector> @@ -48,7 +48,7 @@ typedef std::map<int, const QuestEffect*> NpcQuestEffectMap; typedef NpcQuestEffectMap::const_iterator NpcQuestEffectMapCIter; class QuestsWindow final : public Window, - public gcn::ActionListener + public ActionListener { public: QuestsWindow(); @@ -57,7 +57,7 @@ class QuestsWindow final : public Window, ~QuestsWindow(); - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void updateQuest(const int var, const int val); |