summaryrefslogtreecommitdiff
path: root/src/gui/npcdialog.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-19 15:15:19 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-19 16:39:56 +0300
commit10badd2c0e099c7611f6d23b3973e54f210bc172 (patch)
tree3689c22c252c2fed2f7e3d4cbd57d330fc2bf839 /src/gui/npcdialog.h
parent876e370925a021bb6731703c3db2db2945f62f85 (diff)
downloadmv-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.gz
mv-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.bz2
mv-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.xz
mv-10badd2c0e099c7611f6d23b3973e54f210bc172.zip
Fix namespace conflicts.
Diffstat (limited to 'src/gui/npcdialog.h')
-rw-r--r--src/gui/npcdialog.h14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/gui/npcdialog.h b/src/gui/npcdialog.h
index aa4fc00ac..a3e9eec9c 100644
--- a/src/gui/npcdialog.h
+++ b/src/gui/npcdialog.h
@@ -36,19 +36,15 @@
#include <list>
class Being;
+class Button;
class BrowserBox;
+class ExtendedListBox;
class ItemLinkHandler;
class IntTextField;
-class ExtendedListBox;
class PlayerBox;
+class ScrollArea;
class TextBox;
class TextField;
-class Button;
-
-namespace gcn
-{
- class ScrollArea;
-}
/**
* The npc dialog.
@@ -226,14 +222,14 @@ class NpcDialog final : public Window, public gcn::ActionListener,
// Used for the main input area
BrowserBox *mTextBox;
- gcn::ScrollArea *mScrollArea;
+ ScrollArea *mScrollArea;
//TextBox *mTextBox;
std::string mText;
std::string mNewText;
// Used for choice input
ExtendedListBox *mItemList;
- gcn::ScrollArea *mListScrollArea;
+ ScrollArea *mListScrollArea;
StringVect mItems;
std::vector<Image *> mImages;
ItemLinkHandler *mItemLinkHandler;