summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-12-27 01:55:25 +0300
committerAndrei Karas <akaras@inbox.ru>2017-12-27 01:55:25 +0300
commit916a3d76da98d078a807044c43d1a70bc146ba70 (patch)
tree88d7381a5b27c085e4f31363b50c6fe444372741 /src
parent4048cb70745cb872d020603614e077c92e0d01b8 (diff)
downloadplus-916a3d76da98d078a807044c43d1a70bc146ba70.tar.gz
plus-916a3d76da98d078a807044c43d1a70bc146ba70.tar.bz2
plus-916a3d76da98d078a807044c43d1a70bc146ba70.tar.xz
plus-916a3d76da98d078a807044c43d1a70bc146ba70.zip
Remove default parameters from speechbubble.
Diffstat (limited to 'src')
-rw-r--r--src/being/being.cpp4
-rw-r--r--src/gui/popups/speechbubble.h9
2 files changed, 7 insertions, 6 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 769c0d93f..d51b45fbd 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -656,7 +656,9 @@ void Being::setSpeech(const std::string &restrict text) restrict2
createSpeechBubble();
if (mSpeechBubble != nullptr)
{
- mSpeechBubble->setCaption(isShowName ? mName : "");
+ mSpeechBubble->setCaption(isShowName ? mName : "",
+ &theme->getColor(ThemeColorId::BUBBLE_NAME, 255),
+ &theme->getColor(ThemeColorId::BUBBLE_NAME_OUTLINE, 255));
mSpeechBubble->setText(mSpeech, isShowName);
}
}
diff --git a/src/gui/popups/speechbubble.h b/src/gui/popups/speechbubble.h
index 694a6eb2a..bd8b79cf4 100644
--- a/src/gui/popups/speechbubble.h
+++ b/src/gui/popups/speechbubble.h
@@ -45,15 +45,14 @@ class SpeechBubble final : public Popup
* Sets the name displayed for the speech bubble, and in what color.
*/
void setCaption(const std::string &name,
- const Color *const color1 = &theme->getColor(
- ThemeColorId::BUBBLE_NAME, 255),
- const Color *const color2 = &theme->getColor(
- ThemeColorId::BUBBLE_NAME_OUTLINE, 255));
+ const Color *const color1,
+ const Color *const color2);
/**
* Sets the text to be displayed.
*/
- void setText(const std::string &text, const bool showName = true);
+ void setText(const std::string &text,
+ const bool showName);
void requestMoveToBackground();