Merge scrollarea classes into one.

4 files changed, 7 insertions, 7 deletions

diff --git a/src/gui/widgets/tabs/chattab.cpp b/src/gui/widgets/tabs/chattab.cpp
index fe979ae5a..8fe9d707b 100644
--- a/src/gui/widgets/tabs/chattab.cpp
+++ b/src/gui/widgets/tabs/chattab.cpp
@@ -72,8 +72,8 @@ ChatTab::ChatTab(const Widget2 *const widget,
         mTextOutput->setLinkHandler(chatWindow->mItemLinkHandler);
     mTextOutput->setAlwaysUpdate(false);
 
-    mScrollArea->setScrollPolicy(gcn::ScrollArea::SHOW_NEVER,
-                                 gcn::ScrollArea::SHOW_ALWAYS);
+    mScrollArea->setScrollPolicy(ScrollArea::SHOW_NEVER,
+        ScrollArea::SHOW_ALWAYS);
     mScrollArea->setScrollAmount(0, 1);
 
     if (chatWindow)
diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp
index ac6bf2837..940d0cd3f 100644
--- a/src/gui/widgets/tabs/setup_colors.cpp
+++ b/src/gui/widgets/tabs/setup_colors.cpp
@@ -84,15 +84,15 @@ Setup_Colors::Setup_Colors(const Widget2 *const widget) :
     // TRANSLATORS: settings colors tab name
     setName(_("Colors"));
     mColorBox->addSelectionListener(this);
-    mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
     mPreview->setOpaque(false);
 
     // don't do anything with links
     mPreview->setLinkHandler(nullptr);
 
     mPreviewBox->setHeight(20);
-    mPreviewBox->setScrollPolicy(gcn::ScrollArea::SHOW_NEVER,
-                                 gcn::ScrollArea::SHOW_NEVER);
+    mPreviewBox->setScrollPolicy(ScrollArea::SHOW_NEVER,
+        ScrollArea::SHOW_NEVER);
 
     mGradTypeSlider->setWidth(180);
     mGradTypeSlider->setActionEventId("slider_grad");
diff --git a/src/gui/widgets/tabs/setup_relations.cpp b/src/gui/widgets/tabs/setup_relations.cpp
index 1458ecd25..ca060477f 100644
--- a/src/gui/widgets/tabs/setup_relations.cpp
+++ b/src/gui/widgets/tabs/setup_relations.cpp
@@ -221,7 +221,7 @@ Setup_Relations::Setup_Relations(const Widget2 *const widget) :
 
     mPlayerTitleTable->setLinewiseSelection(true);
 
-    mPlayerScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mPlayerScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
     mPlayerTable->setActionEventId(ACTION_TABLE);
     mPlayerTable->setLinewiseSelection(true);
     mPlayerTable->addActionListener(this);
diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp
index f55dceaa4..d09704203 100644
--- a/src/gui/widgets/tabs/setup_video.cpp
+++ b/src/gui/widgets/tabs/setup_video.cpp
@@ -227,7 +227,7 @@ Setup_Video::Setup_Video(const Widget2 *const widget) :
     ScrollArea *const scrollArea = new ScrollArea(this, mModeList,
         true, "setup_video_background.xml");
     scrollArea->setWidth(150);
-    scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    scrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
 
     mOpenGLDropDown->setSelected(renderToIndex[mOpenGLEnabled]);