Merge scrollarea classes into one.

11 files changed, 33 insertions, 33 deletions

diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp
index c2514a15d..7b1a1f6c0 100644
--- a/src/gui/windows/buydialog.cpp
+++ b/src/gui/windows/buydialog.cpp
@@ -209,7 +209,7 @@ void BuyDialog::init()
     mShopItemList->postInit();
     mScrollArea = new ScrollArea(this, mShopItemList,
         getOptionBool("showbackground"), "buy_background.xml");
-    mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
 
     mSlider = new Slider(this, 1.0);
     mQuantityLabel = new Label(this, strprintf(
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index ee8c85f06..a12dca882 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -151,9 +151,9 @@ InventoryWindow::InventoryWindow(Inventory *const inventory):
 
     mItems->addSelectionListener(this);
 
-    gcn::ScrollArea *const invenScroll = new ScrollArea(this, mItems,
+    ScrollArea *const invenScroll = new ScrollArea(this, mItems,
         getOptionBool("showbackground"), "inventory_background.xml");
-    invenScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    invenScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
 
     const int size = config.getIntValue("fontSize");
     mFilter = new TabStrip(this, "filter_" + getWindowName(), size + 16);
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index a1b2109fb..1956a8da3 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -147,8 +147,8 @@ NpcDialog::NpcDialog(const int npcId) :
     mTextBox->setEnableKeys(true);
     mTextBox->setEnableTabs(true);
 
-    mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-    mScrollArea->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
+    mScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
+    mScrollArea->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS);
 
     // Setup listbox
     mItemList->setWrappingEnabled(true);
@@ -162,8 +162,8 @@ NpcDialog::NpcDialog(const int npcId) :
         mItemList->setRowHeight(gui->getNpcFont()->getHeight());
 
     setContentSize(260, 175);
-    mListScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-    mItemScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mListScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
+    mItemScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
     mItemList->setVisible(true);
     mTextField->setVisible(true);
     mIntField->setVisible(true);
diff --git a/src/gui/windows/npcpostdialog.cpp b/src/gui/windows/npcpostdialog.cpp
index 3c63775fe..48324cb40 100644
--- a/src/gui/windows/npcpostdialog.cpp
+++ b/src/gui/windows/npcpostdialog.cpp
@@ -75,7 +75,7 @@ void NpcPostDialog::postInit()
 
     // create scroll box for letter text
     ScrollArea *const scrollArea = new ScrollArea(this, mText);
-    scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    scrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
     scrollArea->setDimension(Rect(
                 5, mSender->getHeight() + 5,
                 380, 140 - (mSender->getHeight() + sendButton->getHeight())));
diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp
index eee3e4259..e22bcf243 100644
--- a/src/gui/windows/questswindow.cpp
+++ b/src/gui/windows/questswindow.cpp
@@ -149,10 +149,10 @@ QuestsWindow::QuestsWindow() :
     mQuestsListBox->setActionEventId("select");
     mQuestsListBox->addActionListener(this);
 
-    mQuestScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mQuestScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
     mText->setOpaque(false);
     mText->setLinkHandler(mItemLinkHandler);
-    mTextScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mTextScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
     mQuestsListBox->setWidth(500);
     if (gui && gui->getNpcFont()->getHeight() < 20)
         mQuestsListBox->setRowHeight(20);
diff --git a/src/gui/windows/selldialog.cpp b/src/gui/windows/selldialog.cpp
index 8bfcc6728..1607733a4 100644
--- a/src/gui/windows/selldialog.cpp
+++ b/src/gui/windows/selldialog.cpp
@@ -89,7 +89,7 @@ void SellDialog::init()
     mShopItemList->setProtectItems(true);
     mScrollArea = new ScrollArea(this, mShopItemList,
         getOptionBool("showbackground"), "sell_background.xml");
-    mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
 
     mSlider = new Slider(this, 1.0);
 
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index af29da656..a7e384cbd 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -240,7 +240,7 @@ ServerDialog::ServerDialog(ServerInfo *const serverInfo,
 
     ScrollArea *const usedScroll = new ScrollArea(this, mServersList,
         getOptionBool("showbackground"), "server_background.xml");
-    usedScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    usedScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
 
     mServersList->addSelectionListener(this);
     usedScroll->setVerticalScrollAmount(0);
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index 32e249d35..e21fa914c 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -138,8 +138,8 @@ ShopWindow::ShopWindow():
     mBuyShopItemList->setPriceCheck(false);
     mSellShopItemList->setPriceCheck(false);
 
-    mBuyScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-    mSellScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mBuyScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
+    mSellScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
 
     mBuyShopItemList->addSelectionListener(this);
     mSellShopItemList->addSelectionListener(this);
diff --git a/src/gui/windows/shortcutwindow.cpp b/src/gui/windows/shortcutwindow.cpp
index 5b3c03e90..6ec442cd5 100644
--- a/src/gui/windows/shortcutwindow.cpp
+++ b/src/gui/windows/shortcutwindow.cpp
@@ -97,7 +97,7 @@ ShortcutWindow::ShortcutWindow(const std::string &restrict title,
     mBoxesWidth += bw + border;
 
     mScrollArea->setPosition(SCROLL_PADDING, SCROLL_PADDING);
-    mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
 
     place(0, 0, mScrollArea, 5, 5).setPadding(0);
 
@@ -163,7 +163,7 @@ void ShortcutWindow::addTab(const std::string &name,
 {
     ScrollArea *const scroll = new ScrollArea(this, content, false);
     scroll->setPosition(SCROLL_PADDING, SCROLL_PADDING);
-    scroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    scroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
     content->setWidget2(this);
     Tab *const tab = new ShortcutTab(this, name, content);
     mTabs->addTab(tab, scroll);
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index f33534a85..607be4f3b 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -198,8 +198,8 @@ public:
         mScroll = new ScrollArea(this, mList, showBackground,
             "social_background.xml");
 
-        mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
-        mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
+        mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO);
+        mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS);
     }
 
     A_DELETE_COPY(SocialGuildTab)
@@ -334,8 +334,8 @@ public:
         mScroll = new ScrollArea(this, mList, showBackground,
             "social_background.xml");
 
-        mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
-        mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
+        mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO);
+        mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS);
     }
 
     A_DELETE_COPY(SocialGuildTab2)
@@ -403,8 +403,8 @@ public:
         mScroll = new ScrollArea(this, mList, showBackground,
             "social_background.xml");
 
-        mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
-        mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
+        mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO);
+        mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS);
     }
 
     A_DELETE_COPY(SocialPartyTab)
@@ -519,8 +519,8 @@ public:
         mScroll = new ScrollArea(this, mList, showBackground,
             "social_background.xml");
 
-        mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
-        mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
+        mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO);
+        mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS);
 
         getPlayersAvatars();
         setCaption(name);
@@ -685,8 +685,8 @@ public:
         mScroll = new ScrollArea(this, mList, showBackground,
             "social_background.xml");
 
-        mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
-        mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
+        mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO);
+        mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS);
 
         // TRANSLATORS: Navigation tab name in social window. Should be small
         setCaption(_("Nav"));
@@ -1014,8 +1014,8 @@ public:
         mScroll = new ScrollArea(this, mList, showBackground,
             "social_background.xml");
 
-        mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
-        mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
+        mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO);
+        mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS);
 
         // TRANSLATORS: Attack filter tab name in social window. Should be small
         setCaption(_("Atk"));
@@ -1061,8 +1061,8 @@ public:
         mScroll = new ScrollArea(this, mList, showBackground,
             "social_background.xml");
 
-        mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
-        mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
+        mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO);
+        mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS);
 
         // TRANSLATORS: Pickup filter tab name in social window. Should be small
         setCaption(_("Pik"));
@@ -1108,8 +1108,8 @@ public:
         mScroll = new ScrollArea(this, mList, showBackground,
             "social_background.xml");
 
-        mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
-        mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
+        mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO);
+        mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS);
 
         getPlayersAvatars();
         setCaption(name);
diff --git a/src/gui/windows/worldselectdialog.cpp b/src/gui/windows/worldselectdialog.cpp
index 77d167c82..58c1aaee8 100644
--- a/src/gui/windows/worldselectdialog.cpp
+++ b/src/gui/windows/worldselectdialog.cpp
@@ -60,7 +60,7 @@ WorldSelectDialog::WorldSelectDialog(Worlds worlds):
     ScrollArea *const worldsScroll = new ScrollArea(this, mWorldList,
         getOptionBool("showbackground"), "world_background.xml");
 
-    worldsScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    worldsScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
 
     place(0, 0, worldsScroll, 3, 5).setPadding(2);
     place(1, 5, mChangeLoginButton);