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/npcdialog.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/npcdialog.cpp')
| -rw-r--r-- | src/gui/npcdialog.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp index 24d94dc3f..c5143a136 100644 --- a/src/gui/npcdialog.cpp +++ b/src/gui/npcdialog.cpp @@ -384,10 +384,8 @@ bool NpcDialog::isInputFocused() const bool NpcDialog::isAnyInputFocused() { - DialogList::const_iterator it = instances.begin(); - DialogList::const_iterator it_end = instances.end(); - - for (; it != it_end; ++it) + for (DialogList::const_iterator it = instances.begin(), + it_end = instances.end(); it != it_end; ++it) { if ((*it) && (*it)->isInputFocused()) return true; @@ -445,10 +443,8 @@ NpcDialog *NpcDialog::getActive() if (instances.size() == 1) return instances.front(); - DialogList::const_iterator it = instances.begin(); - DialogList::const_iterator it_end = instances.end(); - - for (; it != it_end; ++it) + for (DialogList::const_iterator it = instances.begin(), + it_end = instances.end(); it != it_end; ++it) { if ((*it) && (*it)->isFocused()) return (*it); @@ -459,10 +455,8 @@ NpcDialog *NpcDialog::getActive() void NpcDialog::closeAll() { - DialogList::const_iterator it = instances.begin(); - DialogList::const_iterator it_end = instances.end(); - - for (; it != it_end; ++it) + for (DialogList::const_iterator it = instances.begin(), + it_end = instances.end(); it != it_end; ++it) { if (*it) (*it)->close(); |