diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-10-19 15:15:19 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-10-19 16:39:56 +0300 |
| commit | 10badd2c0e099c7611f6d23b3973e54f210bc172 (patch) | |
| tree | 3689c22c252c2fed2f7e3d4cbd57d330fc2bf839 /src/gui/chatwindow.cpp | |
| parent | 876e370925a021bb6731703c3db2db2945f62f85 (diff) | |
| download | manaverse-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.gz manaverse-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.bz2 manaverse-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.xz manaverse-10badd2c0e099c7611f6d23b3973e54f210bc172.zip | |
Fix namespace conflicts.
Diffstat (limited to 'src/gui/chatwindow.cpp')
| -rw-r--r-- | src/gui/chatwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 9f6953d1d..b32ff190f 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -78,7 +78,7 @@ class ChatInput final : public TextField, public gcn::FocusListener public: ChatInput(ChatWindow *const window, TabbedArea *const tabs): TextField("", false), - FocusListener(), + gcn::FocusListener(), mWindow(window), mChatTabs(tabs) { @@ -157,8 +157,8 @@ static const char *const ACTION_COLOR_PICKER = "color picker"; ChatWindow::ChatWindow(): Window(_("Chat"), false, nullptr, "chat.xml"), - ActionListener(), - KeyListener(), + gcn::ActionListener(), + gcn::KeyListener(), mItemLinkHandler(new ItemLinkHandler), mChatTabs(new TabbedArea), mChatInput(new ChatInput(this, mChatTabs)), |