diff options
author | Andrei Karas <akaras@inbox.ru> | 2011-06-30 23:14:59 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2011-07-01 02:08:53 +0300 |
commit | 32014de9008efe051a1a8b05e5e976a4629b34d2 (patch) | |
tree | 694b93739685b8b8462c7f602b8ae693be5e65bf /src/gui/widgets | |
parent | 5c260f683e26529d7cf02c12c1fff70a7a7e5eb8 (diff) | |
download | manaplus-32014de9008efe051a1a8b05e5e976a4629b34d2.tar.gz manaplus-32014de9008efe051a1a8b05e5e976a4629b34d2.tar.bz2 manaplus-32014de9008efe051a1a8b05e5e976a4629b34d2.tar.xz manaplus-32014de9008efe051a1a8b05e5e976a4629b34d2.zip |
Replace some lists to vectors.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r-- | src/gui/widgets/browserbox.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/vertcontainer.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/vertcontainer.h | 4 | ||||
-rw-r--r-- | src/gui/widgets/windowcontainer.h | 4 |
4 files changed, 8 insertions, 4 deletions
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<LinePart> LinePartList; + typedef std::vector<LinePart> 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<gcn::Widget*>::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 <guichan/widgetlistener.hpp> +#include <vector> + #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<gcn::Widget*> mResizableWidgets; + std::vector<gcn::Widget*> 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 <vector> + /** * 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<gcn::Widget*> Widgets; + typedef std::vector<gcn::Widget*> Widgets; typedef Widgets::iterator WidgetIterator; Widgets mDeathList; }; |