From 45a9bbd34cda3c784b935860a4cc616a0314a57c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 2 Sep 2011 20:06:58 +0300 Subject: Replace guichan iterators to const_iterator if need. --- src/gui/widgets/container.cpp | 2 +- src/gui/widgets/container.h | 4 ++++ src/gui/widgets/window.cpp | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/gui/widgets') diff --git a/src/gui/widgets/container.cpp b/src/gui/widgets/container.cpp index 96cea7119..558257507 100644 --- a/src/gui/widgets/container.cpp +++ b/src/gui/widgets/container.cpp @@ -37,7 +37,7 @@ Container::~Container() bool Container::safeRemove(gcn::Widget* widget) { - WidgetListIterator iter; + WidgetListConstIterator iter; for (iter = mWidgets.begin(); iter != mWidgets.end(); ++iter) { if (*iter == widget) diff --git a/src/gui/widgets/container.h b/src/gui/widgets/container.h index 1d8872477..c011b8925 100644 --- a/src/gui/widgets/container.h +++ b/src/gui/widgets/container.h @@ -26,6 +26,10 @@ #include #include +#if !defined USE_INTERNALGUICHAN +typedef std::list::const_iterator WidgetListConstIterator; +#endif + /** * A widget container. * diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index 0a3779307..4435496a7 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -368,7 +368,7 @@ void Window::widgetHidden(const gcn::Event &event A_UNUSED) if (gui) gui->setCursorType(Gui::CURSOR_POINTER); - WidgetListIterator it; + WidgetListConstIterator it; if (!mFocusHandler) return; -- cgit v1.2.3-70-g09d2