From 549acdd072b732135dfa7b79015abf7340bef585 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 19 Dec 2014 16:05:51 +0300 Subject: Fix code style. --- src/gui/windows/charcreatedialog.cpp | 2 ++ src/gui/windows/inventorywindow.cpp | 4 ++-- src/gui/windows/updaterwindow.cpp | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/gui/windows') diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index 05dfb2171..2380c694e 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -52,6 +52,8 @@ #include "debug.h" +#undef ERROR + static const BeingAction::Action actions[] = { BeingAction::STAND, diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index 7cf268b0f..3f2414e9f 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -763,14 +763,14 @@ InventoryWindow *InventoryWindow::getFirstVisible() void InventoryWindow::nextTab() { - InventoryWindow *const window = getFirstVisible(); + const InventoryWindow *const window = getFirstVisible(); if (window) window->mFilter->nextTab(); } void InventoryWindow::prevTab() { - InventoryWindow *const window = getFirstVisible(); + const InventoryWindow *const window = getFirstVisible(); if (window) window->mFilter->prevTab(); } diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index 5fc5420ee..827bd3550 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -1044,7 +1044,7 @@ bool UpdaterWindow::validateFile(const std::string &filePath, unsigned long UpdaterWindow::getFileHash(const std::string &filePath) { int size = 0; - char *const buf = static_cast(PhysFs::loadFile(filePath, size)); + const char *const buf = static_cast(PhysFs::loadFile(filePath, size)); if (!buf) return 0; return Net::Download::adlerBuffer(buf, size); -- cgit v1.2.3-70-g09d2