summaryrefslogtreecommitdiff
path: root/src/gui/popups
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-22 14:21:27 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-22 14:21:27 +0300
commit48646db55005a0da079bd2c945875dc8225e2f86 (patch)
tree4d7b18cb201682cbb32f1f1677a0935a8e7928a4 /src/gui/popups
parent9c12fcdfe590f34543fcecc2691b625c408f1746 (diff)
downloadmv-48646db55005a0da079bd2c945875dc8225e2f86.tar.gz
mv-48646db55005a0da079bd2c945875dc8225e2f86.tar.bz2
mv-48646db55005a0da079bd2c945875dc8225e2f86.tar.xz
mv-48646db55005a0da079bd2c945875dc8225e2f86.zip
Move color into gui dir.
Diffstat (limited to 'src/gui/popups')
-rw-r--r--src/gui/popups/speechbubble.cpp4
-rw-r--r--src/gui/popups/speechbubble.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/popups/speechbubble.cpp b/src/gui/popups/speechbubble.cpp
index 9bb6157bc..3d0250a78 100644
--- a/src/gui/popups/speechbubble.cpp
+++ b/src/gui/popups/speechbubble.cpp
@@ -57,8 +57,8 @@ void SpeechBubble::postInit()
}
void SpeechBubble::setCaption(const std::string &name,
- const gcn::Color *const color1,
- const gcn::Color *const color2)
+ const Color *const color1,
+ const Color *const color2)
{
mCaption->setCaption(name);
mCaption->adjustSize();
diff --git a/src/gui/popups/speechbubble.h b/src/gui/popups/speechbubble.h
index 62da9b146..1bc5385a4 100644
--- a/src/gui/popups/speechbubble.h
+++ b/src/gui/popups/speechbubble.h
@@ -47,9 +47,9 @@ class SpeechBubble final : public Popup
* Sets the name displayed for the speech bubble, and in what color.
*/
void setCaption(const std::string &name,
- const gcn::Color *const color1 =
+ const Color *const color1 =
&Theme::getThemeColor(Theme::BUBBLE_NAME),
- const gcn::Color *const color2 =
+ const Color *const color2 =
&Theme::getThemeColor(Theme::BUBBLE_NAME_OUTLINE));
/**