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/npcdialog.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'src/gui/npcdialog.cpp') 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(); -- cgit v1.2.3-60-g2f50