summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-12-26 21:27:35 +0300
committerAndrei Karas <akaras@inbox.ru>2017-12-26 21:27:35 +0300
commit6d95f9aeff5dcfc791520e0ffb10cc34ecc348a0 (patch)
tree8859e06c1c6f0d5c53d9ec090b459ce464904697
parentb55ff3861d1ddc46f5ee47b442e242786f0b0742 (diff)
downloadplus-6d95f9aeff5dcfc791520e0ffb10cc34ecc348a0.tar.gz
plus-6d95f9aeff5dcfc791520e0ffb10cc34ecc348a0.tar.bz2
plus-6d95f9aeff5dcfc791520e0ffb10cc34ecc348a0.tar.xz
plus-6d95f9aeff5dcfc791520e0ffb10cc34ecc348a0.zip
Remove default parameters from playerbox.
-rw-r--r--src/gui/widgets/characterdisplay.cpp2
-rw-r--r--src/gui/widgets/playerbox.h10
-rw-r--r--src/gui/windows/npcdialog.cpp2
3 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/widgets/characterdisplay.cpp b/src/gui/widgets/characterdisplay.cpp
index 68082a687..32ffa8342 100644
--- a/src/gui/widgets/characterdisplay.cpp
+++ b/src/gui/widgets/characterdisplay.cpp
@@ -47,7 +47,7 @@ CharacterDisplay::CharacterDisplay(const Widget2 *const widget,
MouseListener(),
WidgetListener(),
mCharacter(nullptr),
- mPlayerBox(new PlayerBox(nullptr)),
+ mPlayerBox(new PlayerBox(nullptr, std::string(), std::string())),
mName(new Label(this, "wwwwwwwwwwwwwwwwwwwwwwww"))
{
mPlayerBox->setActionEventId("select");
diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h
index b223f1dcb..55f5f11fc 100644
--- a/src/gui/widgets/playerbox.h
+++ b/src/gui/widgets/playerbox.h
@@ -49,12 +49,12 @@ class PlayerBox final : public Widget,
*/
PlayerBox(Widget2 *const widget,
Being *const being,
- const std::string &skin = "",
- const std::string &selectedSkin = "");
+ const std::string &skin,
+ const std::string &selectedSkin);
- explicit PlayerBox(Widget2 *const widget,
- const std::string &skin = "",
- const std::string &selectedSkin = "");
+ PlayerBox(Widget2 *const widget,
+ const std::string &skin,
+ const std::string &selectedSkin);
A_DELETE_COPY(PlayerBox)
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index e3a8a0292..4279c57eb 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -147,7 +147,7 @@ NpcDialog::NpcDialog(const BeingId npcId) :
mActionState(NpcActionState::WAIT),
mSkinControls(),
mSkinName(),
- mPlayerBox(new PlayerBox(nullptr)),
+ mPlayerBox(new PlayerBox(nullptr, std::string(), std::string())),
mAvatarBeing(nullptr),
mDialogInfo(nullptr),
mLastNextTime(0),