summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2011-12-17 22:35:22 +0000
committerrubidium <rubidium@openttd.org>2011-12-17 22:35:22 +0000
commit8c6a37d4b41e5ffae265f79365f7dd88f030a902 (patch)
tree3ae4f5ddaeb302e46867f133ed33078e90c63014
parentab974bee978332647c2917f8aec8a77b8dabd9c7 (diff)
downloadopenttd-8c6a37d4b41e5ffae265f79365f7dd88f030a902.tar.xz
(svn r23583) -Codechange: prevent name collision with strgen variable
-rw-r--r--src/error_gui.cpp14
1 files changed, 7 insertions, 7 deletions
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<ErrorMessageData> 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. */