summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-08-12 20:53:30 +0300
committerAndrei Karas <akaras@inbox.ru>2016-08-12 20:53:30 +0300
commit387493ed0772f266dc323816d2e124c32fcae931 (patch)
tree16eaa9d38099c38d98d5390c6661028f551d7c60 /src/gui
parentc029c05437d0a730494600edf2304caf3b1eead5 (diff)
downloadmv-387493ed0772f266dc323816d2e124c32fcae931.tar.gz
mv-387493ed0772f266dc323816d2e124c32fcae931.tar.bz2
mv-387493ed0772f266dc323816d2e124c32fcae931.tar.xz
mv-387493ed0772f266dc323816d2e124c32fcae931.zip
Fix code style.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/popups/statuspopup.cpp3
-rw-r--r--src/gui/windows/serverdialog.cpp4
2 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/popups/statuspopup.cpp b/src/gui/popups/statuspopup.cpp
index 0947e8882..7ffe8d0ce 100644
--- a/src/gui/popups/statuspopup.cpp
+++ b/src/gui/popups/statuspopup.cpp
@@ -46,7 +46,8 @@
}
StatusPopup::StatusPopup() :
- Popup("StatusPopup", "statuspopup.xml")
+ Popup("StatusPopup", "statuspopup.xml"),
+ mLabels()
{
for (int f = 0; f < STATUSPOPUP_NUM_LABELS; f ++)
mLabels[f] = new Label(this);
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 5299d4fd1..509b04fda 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -49,6 +49,10 @@
#include "debug.h"
+#ifdef WIN32
+#undef ERROR
+#endif
+
static const int MAX_SERVERLIST = 15;
static std::string serverTypeToString(const ServerTypeT type)