From 387493ed0772f266dc323816d2e124c32fcae931 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 12 Aug 2016 20:53:30 +0300 Subject: Fix code style. --- src/gui/popups/statuspopup.cpp | 3 ++- src/gui/windows/serverdialog.cpp | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src/gui') 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) -- cgit v1.2.3-60-g2f50