From 8e19f9b9d792cf4d3d3b022fd26a258c3d3d97bf Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 25 Apr 2012 02:26:22 +0300 Subject: Improve iterators part 1. --- src/gui/ministatuswindow.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'src/gui/ministatuswindow.cpp') diff --git a/src/gui/ministatuswindow.cpp b/src/gui/ministatuswindow.cpp index 219c319a5..9ac37a413 100644 --- a/src/gui/ministatuswindow.cpp +++ b/src/gui/ministatuswindow.cpp @@ -134,8 +134,8 @@ MiniStatusWindow::~MiniStatusWindow() if (inv) inv->removeInventoyListener(this); - std::vector ::const_iterator it, it_end; - for (it = mBars.begin(), it_end = mBars.end(); it != it_end; ++it) + for (std::vector ::const_iterator it = mBars.begin(), + it_end = mBars.end(); it != it_end; ++it) { ProgressBar *bar = *it; if (!bar) @@ -160,11 +160,14 @@ ProgressBar *MiniStatusWindow::createBar(float progress, int width, int height, void MiniStatusWindow::updateBars() { int x = 0; - std::vector ::const_iterator it, it_end; ProgressBar* lastBar = nullptr; - for (it = mBars.begin(), it_end = mBars.end(); it != it_end; ++it) + for (std::vector ::const_iterator it = mBars.begin(), + it_end = mBars.end(); it != it_end; ++it) + { safeRemove(*it); - for (it = mBars.begin(), it_end = mBars.end(); it != it_end; ++it) + } + for (std::vector ::const_iterator it = mBars.begin(), + it_end = mBars.end(); it != it_end; ++it) { ProgressBar *bar = *it; if (!bar) @@ -439,10 +442,9 @@ void MiniStatusWindow::loadBars() void MiniStatusWindow::saveBars() { - std::vector ::const_iterator it, it_end; int i = 0; - for (it = mBars.begin(), it_end = mBars.end(); - it != it_end; ++it) + for (std::vector ::const_iterator it = mBars.begin(), + it_end = mBars.end(); it != it_end; ++it) { ProgressBar *bar = *it; if (!bar->isVisible()) -- cgit v1.2.3-70-g09d2