From d8abec8cfce526f9b4779b674b172514100d01a2 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 24 Dec 2017 01:21:54 +0300
Subject: Remove default parameters from scrollarea.

---
 src/gui/widgets/popuplist.cpp            | 2 +-
 src/gui/widgets/scrollarea.h             | 4 ++--
 src/gui/widgets/statspage.cpp            | 2 +-
 src/gui/widgets/statspagebasic.cpp       | 2 +-
 src/gui/widgets/tabs/chat/chattab.cpp    | 3 ++-
 src/gui/widgets/tabs/setup_relations.cpp | 3 ++-
 src/gui/widgets/tabs/setuptabscroll.cpp  | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'src/gui/widgets')

diff --git a/src/gui/widgets/popuplist.cpp b/src/gui/widgets/popuplist.cpp
index 0260945ce..2a1dd95c7 100644
--- a/src/gui/widgets/popuplist.cpp
+++ b/src/gui/widgets/popuplist.cpp
@@ -42,7 +42,7 @@ PopupList::PopupList(DropDown *const widget,
         widget, listModel, "extendedlistbox.xml", 0) :
         CREATEWIDGETR(ListBox,
         widget, listModel, "popuplistbox.xml")),
-    mScrollArea(new ScrollArea(this, mListBox, Opaque_false)),
+    mScrollArea(new ScrollArea(this, mListBox, Opaque_false, std::string())),
     mDropDown(widget),
     mPressedIndex(-2),
     mModal(modal)
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h
index 50b194d28..a2b6e0b78 100644
--- a/src/gui/widgets/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
@@ -110,8 +110,8 @@ class ScrollArea final : public BasicContainer,
 
         ScrollArea(Widget2 *const widget2,
                    Widget *const widget,
-                   const Opaque opaque = Opaque_true,
-                   const std::string &skin = "");
+                   const Opaque opaque,
+                   const std::string &skin);
 
         A_DELETE_COPY(ScrollArea)
 
diff --git a/src/gui/widgets/statspage.cpp b/src/gui/widgets/statspage.cpp
index b09e4c563..1bb78a381 100644
--- a/src/gui/widgets/statspage.cpp
+++ b/src/gui/widgets/statspage.cpp
@@ -39,7 +39,7 @@ StatsPage::StatsPage(const Widget2 *const widget,
     StatListener(),
     mAttrs(),
     mAttrCont(new VertContainer(this, 32, true, 0)),
-    mAttrScroll(new ScrollArea(this, mAttrCont, Opaque_false))
+    mAttrScroll(new ScrollArea(this, mAttrCont, Opaque_false, std::string()))
 {
     addWidgetListener(this);
     setSelectable(false);
diff --git a/src/gui/widgets/statspagebasic.cpp b/src/gui/widgets/statspagebasic.cpp
index c55991565..b155b4829 100644
--- a/src/gui/widgets/statspagebasic.cpp
+++ b/src/gui/widgets/statspagebasic.cpp
@@ -42,7 +42,7 @@ StatsPageBasic::StatsPageBasic(const Widget2 *const widget) :
     StatListener(),
     mAttrs(),
     mAttrCont(new VertContainer(this, 32, true, 0)),
-    mAttrScroll(new ScrollArea(this, mAttrCont, Opaque_false)),
+    mAttrScroll(new ScrollArea(this, mAttrCont, Opaque_false, std::string())),
     mCharacterPointsLabel(new Label(this, "C"))
 {
     addWidgetListener(this);
diff --git a/src/gui/widgets/tabs/chat/chattab.cpp b/src/gui/widgets/tabs/chat/chattab.cpp
index 3fc6fb252..64cae0ed3 100644
--- a/src/gui/widgets/tabs/chat/chattab.cpp
+++ b/src/gui/widgets/tabs/chat/chattab.cpp
@@ -71,7 +71,8 @@ ChatTab::ChatTab(const Widget2 *const widget,
     Tab(widget),
     mTextOutput(new BrowserBox(this, Opaque_true,
        "browserbox.xml")),
-    mScrollArea(new ScrollArea(this, mTextOutput, Opaque_false)),
+    mScrollArea(new ScrollArea(this,
+        mTextOutput, Opaque_false, std::string())),
     mChannelName(channel),
     mLogName(logName),
     mType(type),
diff --git a/src/gui/widgets/tabs/setup_relations.cpp b/src/gui/widgets/tabs/setup_relations.cpp
index 4cc81a300..095277a75 100644
--- a/src/gui/widgets/tabs/setup_relations.cpp
+++ b/src/gui/widgets/tabs/setup_relations.cpp
@@ -67,7 +67,8 @@ Setup_Relations::Setup_Relations(const Widget2 *const widget) :
     mPlayerTableModel(new PlayerTableModel(this)),
     mPlayerTable(new GuiTable(this, mPlayerTableModel)),
     mPlayerTitleTable(new GuiTable(this, mPlayerTableTitleModel)),
-    mPlayerScrollArea(new ScrollArea(this, mPlayerTable)),
+    mPlayerScrollArea(new ScrollArea(this,
+        mPlayerTable, Opaque_true, std::string())),
     // TRANSLATORS: relation dialog button
     mDefaultTrading(new CheckBox(this, _("Allow trading"),
         (playerRelations.getDefault() & PlayerRelation::TRADE) != 0u)),
diff --git a/src/gui/widgets/tabs/setuptabscroll.cpp b/src/gui/widgets/tabs/setuptabscroll.cpp
index 0cb623687..6f44b17b8 100644
--- a/src/gui/widgets/tabs/setuptabscroll.cpp
+++ b/src/gui/widgets/tabs/setuptabscroll.cpp
@@ -31,7 +31,7 @@
 SetupTabScroll::SetupTabScroll(const Widget2 *const widget) :
     SetupTab(widget),
     mContainer(new VertContainer(this, 25, false, 8)),
-    mScroll(new ScrollArea(this, mContainer, Opaque_false)),
+    mScroll(new ScrollArea(this, mContainer, Opaque_false, std::string())),
     mItems(),
     mAllItems(),
     mPreferredFirstItemSize(200)
-- 
cgit v1.2.3-70-g09d2