summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-09 20:30:47 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-09 20:30:47 +0300
commit407de0a8d0898b28a587962e997df816cb17b6a9 (patch)
tree99a0184bb44950a900a9f093afb8887bdd148548 /src/gui
parent972fdcbd1ed61e2528c8b4c733f21a70d7f674b1 (diff)
downloadplus-407de0a8d0898b28a587962e997df816cb17b6a9.tar.gz
plus-407de0a8d0898b28a587962e997df816cb17b6a9.tar.bz2
plus-407de0a8d0898b28a587962e997df816cb17b6a9.tar.xz
plus-407de0a8d0898b28a587962e997df816cb17b6a9.zip
Fix code style.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/browserbox_unittest.cc2
-rw-r--r--src/gui/widgets/itemshortcutcontainer.cpp1
-rw-r--r--src/gui/windows/shopwindow.cpp3
3 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/widgets/browserbox_unittest.cc b/src/gui/widgets/browserbox_unittest.cc
index b3f536452..1be712783 100644
--- a/src/gui/widgets/browserbox_unittest.cc
+++ b/src/gui/widgets/browserbox_unittest.cc
@@ -47,8 +47,6 @@
#include "debug.h"
-
-
TEST_CASE("BrowserBox leak test1", "")
{
logger = new Logger();
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index 400ae0d88..3990137e0 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -485,7 +485,6 @@ void ItemShortcutContainer::mousePressed(MouseEvent &event)
{
event.consume();
if (popupMenu != nullptr &&
- selShortcut != nullptr &&
viewport != nullptr)
{
popupMenu->showItemPopup(viewport->mMouseX,
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index 5dbc0bec9..9f4872e62 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -532,7 +532,8 @@ void ShopWindow::loadList()
const std::string shopListName = settings.serverConfigDir
+ "/shoplist.txt";
- if ((stat(shopListName.c_str(), &statbuf) == 0) && S_ISREG(statbuf.st_mode))
+ if (stat(shopListName.c_str(), &statbuf) == 0 &&
+ S_ISREG(statbuf.st_mode))
{
shopFile.open(shopListName.c_str(), std::ios::in);
if (!shopFile.is_open())