summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-12-23 19:10:51 +0300
committerAndrei Karas <akaras@inbox.ru>2016-12-23 19:10:51 +0300
commit9336f9ccd10f25f737cad530e8aec841d858c350 (patch)
treec5b98bb3c390eaea648095b2250516824d9904e7 /src
parent85c2332abec927c17d7396bf736da8333073fc97 (diff)
downloadmv-9336f9ccd10f25f737cad530e8aec841d858c350.tar.gz
mv-9336f9ccd10f25f737cad530e8aec841d858c350.tar.bz2
mv-9336f9ccd10f25f737cad530e8aec841d858c350.tar.xz
mv-9336f9ccd10f25f737cad530e8aec841d858c350.zip
Fix style issues.
Diffstat (limited to 'src')
-rw-r--r--src/being/being.cpp2
-rw-r--r--src/gui/onlineplayer.h2
-rw-r--r--src/gui/widgets/textbox.cpp2
-rw-r--r--src/gui/windows/chatwindow.cpp9
-rw-r--r--src/gui/windows/inventorywindow.cpp10
-rw-r--r--src/test/testlauncher.cpp4
6 files changed, 13 insertions, 16 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 578679f42..56d6aa9c6 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -2730,7 +2730,7 @@ void Being::unSetSprite(const unsigned int slot) restrict2
removeItemParticles(id1);
beingSlot.spriteId = 0;
- beingSlot.color = std::string();
+ beingSlot.color.clear();
beingSlot.colorId = ItemColor_one;
beingSlot.cardsId = CardsList(nullptr);
recalcSpritesOrder();
diff --git a/src/gui/onlineplayer.h b/src/gui/onlineplayer.h
index cbc58be8f..bda860af3 100644
--- a/src/gui/onlineplayer.h
+++ b/src/gui/onlineplayer.h
@@ -37,7 +37,7 @@ class OnlinePlayer final
const GenderT gender,
const signed char version) :
mNick(nick),
- mText(""),
+ mText(),
mStatus(status),
mLevel(level),
mVersion(version),
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp
index edf360b62..daa13a3e2 100644
--- a/src/gui/widgets/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -494,7 +494,7 @@ void TextBox::setForegroundColorAll(const Color &color1,
std::string TextBox::getText() const
{
if (mTextRows.empty())
- return std::string("");
+ return std::string();
int i;
std::string text;
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 726774cdf..7087d563b 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -719,12 +719,9 @@ void ChatWindow::mousePressed(MouseEvent &event)
}
else
{
- if (cTab)
- {
- popupMenu->showChatPopup(viewport->mMouseX,
- viewport->mMouseY,
- cTab);
- }
+ popupMenu->showChatPopup(viewport->mMouseX,
+ viewport->mMouseY,
+ cTab);
}
}
}
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index 05bcda0ae..4ac19daaa 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -172,11 +172,6 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) :
mItems->addSelectionListener(this);
- ScrollArea *const invenScroll = new ScrollArea(this, mItems,
- fromBool(getOptionBool("showbackground"), Opaque),
- "inventory_background.xml");
- invenScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
-
const int size = config.getIntValue("fontSize");
mFilter = new TabStrip(this, "filter_" + getWindowName(), size + 16);
mFilter->addActionListener(this);
@@ -194,6 +189,11 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) :
return;
}
+ ScrollArea *const invenScroll = new ScrollArea(this, mItems,
+ fromBool(getOptionBool("showbackground"), Opaque),
+ "inventory_background.xml");
+ invenScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
+
switch (mInventory->getType())
{
case InventoryType::Inventory:
diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp
index e20721a07..2a3df56de 100644
--- a/src/test/testlauncher.cpp
+++ b/src/test/testlauncher.cpp
@@ -489,9 +489,9 @@ static void initBuffer(uint32_t *const buf,
static void calcTime(const char *const msg1,
const char *const msg2,
- timespec &time1,
+ const timespec &time1,
timespec &time2,
- uint32_t *const buf)
+ const uint32_t *const buf)
{
clock_gettime(CLOCK_MONOTONIC, &time2);
long diff = ((static_cast<long int>(time2.tv_sec) * 1000000000L