diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-08 00:07:56 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-08 00:07:56 +0300 |
| commit | b3f70d8d46199524edc590269a73c262899763c7 (patch) | |
| tree | af8e20371f2cc825c0b2dbe0c0e5c392a926c46d /src/gui/npcdialog.cpp | |
| parent | 3f84fc198131ff706e18c56f612e38ff147b0005 (diff) | |
| download | plus-b3f70d8d46199524edc590269a73c262899763c7.tar.gz plus-b3f70d8d46199524edc590269a73c262899763c7.tar.bz2 plus-b3f70d8d46199524edc590269a73c262899763c7.tar.xz plus-b3f70d8d46199524edc590269a73c262899763c7.zip | |
Replace most iterator to const_iterator.
Some other minor changes.
Diffstat (limited to 'src/gui/npcdialog.cpp')
| -rw-r--r-- | src/gui/npcdialog.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp index 0db618d69..d941153b7 100644 --- a/src/gui/npcdialog.cpp +++ b/src/gui/npcdialog.cpp @@ -362,12 +362,12 @@ bool NpcDialog::isInputFocused() const bool NpcDialog::isAnyInputFocused() { - DialogList::iterator it = instances.begin(); - DialogList::iterator it_end = instances.end(); + DialogList::const_iterator it = instances.begin(); + DialogList::const_iterator it_end = instances.end(); for (; it != it_end; ++it) { - if ((*it)->isInputFocused()) + if ((*it) && (*it)->isInputFocused()) return true; } @@ -430,12 +430,12 @@ NpcDialog *NpcDialog::getActive() if (instances.size() == 1) return instances.front(); - DialogList::iterator it = instances.begin(); - DialogList::iterator it_end = instances.end(); + DialogList::const_iterator it = instances.begin(); + DialogList::const_iterator it_end = instances.end(); for (; it != it_end; ++it) { - if ((*it)->isFocused()) + if ((*it) && (*it)->isFocused()) return (*it); } @@ -444,8 +444,8 @@ NpcDialog *NpcDialog::getActive() void NpcDialog::closeAll() { - DialogList::iterator it = instances.begin(); - DialogList::iterator it_end = instances.end(); + DialogList::const_iterator it = instances.begin(); + DialogList::const_iterator it_end = instances.end(); for (; it != it_end; ++it) { |