diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-04-25 02:26:22 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-04-25 02:26:22 +0300 |
commit | 8e19f9b9d792cf4d3d3b022fd26a258c3d3d97bf (patch) | |
tree | 2c95704e2de3418227faf7a52357a6fe03d5b735 /src/gui/widgets/browserbox.cpp | |
parent | e73f7da4d65e7dc61a952894cc6f0843c4da3170 (diff) | |
download | manaplus-8e19f9b9d792cf4d3d3b022fd26a258c3d3d97bf.tar.gz manaplus-8e19f9b9d792cf4d3d3b022fd26a258c3d3d97bf.tar.bz2 manaplus-8e19f9b9d792cf4d3d3b022fd26a258c3d3d97bf.tar.xz manaplus-8e19f9b9d792cf4d3d3b022fd26a258c3d3d97bf.zip |
Improve iterators part 1.
Diffstat (limited to 'src/gui/widgets/browserbox.cpp')
-rw-r--r-- | src/gui/widgets/browserbox.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 8cbeec78c..30a5e72b6 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -219,7 +219,8 @@ void BrowserBox::addRow(const std::string &row, bool atTop) int hyphenWidth = font->getWidth(hyphen); unsigned x = 0; - for (TextRowIterator i = mTextRows.begin(); i != mTextRows.end(); ++i) + for (TextRowCIter i = mTextRows.begin(), i_end = mTextRows.end(); + i != i_end; ++ i) { std::string tempRow = *i; for (unsigned int j = 0; j < tempRow.size(); j++) @@ -374,9 +375,8 @@ void BrowserBox::draw(gcn::Graphics *graphics) gcn::Font *font = getFont(); - for (LinePartIterator i = mLineParts.begin(); - i != mLineParts.end(); - ++i) + for (LinePartCIter i = mLineParts.begin(), i_end = mLineParts.end(); + i != i_end; ++i) { const LinePart &part = *i; if (part.mY + 50 < mYStart) @@ -425,7 +425,8 @@ int BrowserBox::calcHeight() mLineParts.clear(); - for (TextRowIterator i = mTextRows.begin(); i != mTextRows.end(); ++i) + for (TextRowCIter i = mTextRows.begin(), i_end = mTextRows.end(); + i != i_end; ++ i) { const std::string row = *(i); bool wrapped = false; @@ -670,9 +671,8 @@ std::string BrowserBox::getTextAtPos(const int x, const int y) int lastY = 0; - for (LinePartIterator i = mLineParts.begin(); - i != mLineParts.end(); - ++i) + for (LinePartCIter i = mLineParts.begin(), i_end = mLineParts.end(); + i != i_end; ++i) { const LinePart &part = *i; if (part.mY + 50 < mYStart) |