From 32014de9008efe051a1a8b05e5e976a4629b34d2 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 30 Jun 2011 23:14:59 +0300 Subject: Replace some lists to vectors. --- src/gui/widgets/browserbox.h | 2 +- src/gui/widgets/vertcontainer.cpp | 2 +- src/gui/widgets/vertcontainer.h | 4 +++- src/gui/widgets/windowcontainer.h | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) (limited to 'src/gui/widgets') diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h index 258e0bd09..2bdf31237 100644 --- a/src/gui/widgets/browserbox.h +++ b/src/gui/widgets/browserbox.h @@ -200,7 +200,7 @@ class BrowserBox : public gcn::Widget, typedef TextRows::iterator TextRowIterator; TextRows mTextRows; - typedef std::list LinePartList; + typedef std::vector LinePartList; typedef LinePartList::iterator LinePartIterator; LinePartList mLineParts; diff --git a/src/gui/widgets/vertcontainer.cpp b/src/gui/widgets/vertcontainer.cpp index 6f94df535..9920c7210 100644 --- a/src/gui/widgets/vertcontainer.cpp +++ b/src/gui/widgets/vertcontainer.cpp @@ -73,7 +73,7 @@ void VertContainer::clear() void VertContainer::widgetResized(const gcn::Event &event _UNUSED_) { - for (WidgetListIterator it = mResizableWidgets.begin(); + for (std::vector::iterator it = mResizableWidgets.begin(); it != mResizableWidgets.end(); it++) { (*it)->setWidth(getWidth()); diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h index 268c61d4f..cccd772b8 100644 --- a/src/gui/widgets/vertcontainer.h +++ b/src/gui/widgets/vertcontainer.h @@ -26,6 +26,8 @@ #include +#include + #ifdef __GNUC__ #define _UNUSED_ __attribute__ ((unused)) #else @@ -53,7 +55,7 @@ class VertContainer : public Container, public gcn::WidgetListener void widgetResized(const gcn::Event &event); private: - std::list mResizableWidgets; + std::vector mResizableWidgets; int mVerticalItemSize; int mCount; int mNextY; diff --git a/src/gui/widgets/windowcontainer.h b/src/gui/widgets/windowcontainer.h index 757f7ab5a..b27ba927f 100644 --- a/src/gui/widgets/windowcontainer.h +++ b/src/gui/widgets/windowcontainer.h @@ -25,6 +25,8 @@ #include "gui/widgets/container.h" +#include + /** * A window container. This container adds functionality for more convenient * widget (windows in particular) destruction. @@ -50,7 +52,7 @@ class WindowContainer : public Container /** * List of widgets that are scheduled to be deleted. */ - typedef std::list Widgets; + typedef std::vector Widgets; typedef Widgets::iterator WidgetIterator; Widgets mDeathList; }; -- cgit v1.2.3-70-g09d2