revamped scene drawing in preparation for octree

[chaz/yoink] / src / Moof / Dispatcher.cc

diff --git a/src/Moof/Dispatcher.cc b/src/Moof/Dispatcher.cc
index fa7b3281818ca6a06a4f07753638c4509209d04a..e0d3d21bb839668593629818e281c7ff1f5ed9b3 100644 (file)
--- a/src/Moof/Dispatcher.cc
+++ b/src/Moof/Dispatcher.cc
@@ -94,18 +94,18 @@ void Dispatcher::removeHandler(Handler id)
        std::pair<Dispatcher::DispatcherImpl::HandlerIter,Dispatcher::DispatcherImpl::HandlerIter>
                handlers(impl_->handlers.equal_range(id));
 
-       Dispatcher::DispatcherImpl::HandlerIter i;
-       for (i = handlers.first; i != handlers.second; i++)
+       Dispatcher::DispatcherImpl::HandlerIter it;
+       for (it = handlers.first; it != handlers.second; ++it)
        {
-               Dispatcher::DispatcherImpl::CallbackIter it = impl_->callbacks.find((*i).second);
+               Dispatcher::DispatcherImpl::CallbackIter first = impl_->callbacks.find((*it).second);
                Dispatcher::DispatcherImpl::CallbackIter last = impl_->callbacks.end();
 
-               Dispatcher::DispatcherImpl::CallbackIter j;
-               for (j = it; j != last; j++)
+               Dispatcher::DispatcherImpl::CallbackIter jt;
+               for (jt = first; jt != last; ++jt)
                {
-                       if (((*j).second).first == id)
+                       if (((*jt).second).first == id)
                        {
-                               impl_->callbacks.erase(j);
+                               impl_->callbacks.erase(jt);
                                break;
                        }
                }
@@ -125,10 +125,10 @@ void Dispatcher::dispatch(const std::string& message, const Notification& param)
        std::pair<Dispatcher::DispatcherImpl::CallbackIter,Dispatcher::DispatcherImpl::CallbackIter>
                callbacks(impl_->callbacks.equal_range(message));
 
-       Dispatcher::DispatcherImpl::CallbackIter i;
-       for (i = callbacks.first; i != callbacks.second; i++)
+       Dispatcher::DispatcherImpl::CallbackIter it;
+       for (it = callbacks.first; it != callbacks.second; ++it)
        {
-               Function callback = ((*i).second).second;
+               Function callback = ((*it).second).second;
                callback(param);
        }
 }