diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-10-11 21:18:01 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-10-11 21:18:01 +0300 |
| commit | 0acc9ba58666df977e0251e4a9a721dc29645f6f (patch) | |
| tree | 4f915d3edf7230c9289be743053e164554b371f7 | |
| parent | 52c7195a8ee91f95ef134d9798a47ea313df16c8 (diff) | |
| download | manaplus-0acc9ba58666df977e0251e4a9a721dc29645f6f.tar.gz manaplus-0acc9ba58666df977e0251e4a9a721dc29645f6f.tar.bz2 manaplus-0acc9ba58666df977e0251e4a9a721dc29645f6f.tar.xz manaplus-0acc9ba58666df977e0251e4a9a721dc29645f6f.zip | |
fix code style
| -rw-r--r-- | src/animatedsprite.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/browserbox_unittest.cc | 2 | ||||
| -rw-r--r-- | src/utils/langs.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp index 38f1a297b..abb4ea96f 100644 --- a/src/animatedsprite.cpp +++ b/src/animatedsprite.cpp @@ -210,7 +210,7 @@ bool AnimatedSprite::updateCurrentAnimation(const unsigned int time) fail = true; } else if ((mFrame->type == Frame::LABEL - && !mFrame->nextAction.empty())) + && !mFrame->nextAction.empty())) { fail = false; } diff --git a/src/gui/widgets/browserbox_unittest.cc b/src/gui/widgets/browserbox_unittest.cc index 2d45e507f..87d31e900 100644 --- a/src/gui/widgets/browserbox_unittest.cc +++ b/src/gui/widgets/browserbox_unittest.cc @@ -53,7 +53,7 @@ TEST(browserbox, test1) Theme *theme = Theme::instance(); gcn::Widget::setGlobalFont(new SDLFont("/usr/share/fonts/truetype/" "ttf-dejavu/DejaVuSans-Oblique.ttf", 18)); - BrowserBox *box = new BrowserBox(nullptr, BrowserBox::AUTO_WRAP, ""); + BrowserBox *box = new BrowserBox(nullptr, BrowserBox::AUTO_WRAP, true, ""); box->setWidth(100); std::string row = "test"; box->addRow(row); diff --git a/src/utils/langs.cpp b/src/utils/langs.cpp index 7c514ac9c..e7a72a692 100644 --- a/src/utils/langs.cpp +++ b/src/utils/langs.cpp @@ -24,7 +24,7 @@ #include "debug.h" -static char *getLangName() +static const char *getLangName() { const char *const lang = getenv("LANG"); if (lang && strlen(lang) > 1000) |