From 8c6a37d4b41e5ffae265f79365f7dd88f030a902 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 17 Dec 2011 22:35:22 +0000 Subject: (svn r23583) -Codechange: prevent name collision with strgen variable --- src/error_gui.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/error_gui.cpp b/src/error_gui.cpp index 47e27f24c..afbf3ee43 100644 --- a/src/error_gui.cpp +++ b/src/error_gui.cpp @@ -134,7 +134,7 @@ public: /** Define a queue with errors. */ typedef std::list ErrorList; /** The actual queue with errors. */ -ErrorList _errors; +ErrorList _error_list; /** Whether the window system is initialized or not. */ bool _window_system_initialized = false; @@ -297,16 +297,16 @@ public: void ClearErrorMessages() { UnshowCriticalError(); - _errors.clear(); + _error_list.clear(); } /** Show the first error of the queue. */ void ShowFirstError() { _window_system_initialized = true; - if (!_errors.empty()) { - new ErrmsgWindow(_errors.front()); - _errors.pop_front(); + if (!_error_list.empty()) { + new ErrmsgWindow(_error_list.front()); + _error_list.pop_front(); } } @@ -319,7 +319,7 @@ void UnshowCriticalError() { ErrmsgWindow *w = (ErrmsgWindow*)FindWindowById(WC_ERRMSG, 0); if (_window_system_initialized && w != NULL) { - if (w->IsCritical()) _errors.push_front(*w); + if (w->IsCritical()) _error_list.push_front(*w); _window_system_initialized = false; delete w; } @@ -372,7 +372,7 @@ void ShowErrorMessage(StringID summary_msg, StringID detailed_msg, WarningLevel if (wl == WL_CRITICAL) { /* Push another critical error in the queue of errors, * but do not put other errors in the queue. */ - _errors.push_back(data); + _error_list.push_back(data); } } else { /* Nothing or a non-critical error was shown. */ -- cgit v1.2.3-70-g09d2