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/emotewindow.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/emotewindow.h')
| -rw-r--r-- | src/gui/windows/emotewindow.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/windows/emotewindow.h b/src/gui/windows/emotewindow.h index 0f15b7bc6..37a5c015f 100644 --- a/src/gui/windows/emotewindow.h +++ b/src/gui/windows/emotewindow.h @@ -59,11 +59,11 @@ class EmoteWindow final : public Window void clearFont(); - void addListeners(gcn::ActionListener *const listener); + void addListeners(ActionListener *const listener); - void widgetResized(const gcn::Event &event) override final; + void widgetResized(const Event &event) override final; - void widgetMoved(const gcn::Event &event) override final; + void widgetMoved(const Event &event) override final; private: TabbedArea *mTabs; |