Fix namespace conflicts.

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;