diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-02 20:06:58 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-02 20:06:58 +0300 |
| commit | 45a9bbd34cda3c784b935860a4cc616a0314a57c (patch) | |
| tree | e4cee8daa007c727e3ce4511e24aebbbcc6bc9d8 /src/gui | |
| parent | 506bf9c3bd1ddeb70529876148140c6f7c91acf2 (diff) | |
| download | manaplus-45a9bbd34cda3c784b935860a4cc616a0314a57c.tar.gz manaplus-45a9bbd34cda3c784b935860a4cc616a0314a57c.tar.bz2 manaplus-45a9bbd34cda3c784b935860a4cc616a0314a57c.tar.xz manaplus-45a9bbd34cda3c784b935860a4cc616a0314a57c.zip | |
Replace guichan iterators to const_iterator if need.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/container.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/container.h | 4 | ||||
| -rw-r--r-- | src/gui/widgets/window.cpp | 2 |
3 files changed, 6 insertions, 2 deletions
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 <guichan/widget.hpp> #include <guichan/widgets/container.hpp> +#if !defined USE_INTERNALGUICHAN +typedef std::list<gcn::Widget *>::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; |