views: STL iterator cleanups in View class.

views/view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/view.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 855 matching lines @@
   Widget* widget = GetWidget();
   return widget ? widget->GetInputMethod() : NULL;
 }
 
 // Accelerators ----------------------------------------------------------------
 
 void View::AddAccelerator(const Accelerator& accelerator) {
   if (!accelerators_.get())
     accelerators_.reset(new std::vector<Accelerator>());
 
-  std::vector<Accelerator>::iterator iter =
-      std::find(accelerators_->begin(), accelerators_->end(), accelerator);
-  DCHECK(iter == accelerators_->end())
+  std::vector<Accelerator>::iterator i(
+      std::find(accelerators_->begin(), accelerators_->end(), accelerator));
+  DCHECK(i == accelerators_->end())

[sky, 2011/06/09 17:06:34]

move the std::find into the DCHECK, eg:
DCHECK(std::find(...) == accelerators_->end())

[tfarina, 2011/06/09 17:17:06]

Done.

       << "Registering the same accelerator multiple times";
 
   accelerators_->push_back(accelerator);
   RegisterPendingAccelerators();
 }
 
 void View::RemoveAccelerator(const Accelerator& accelerator) {
-  std::vector<Accelerator>::iterator iter;
-  if (!accelerators_.get() ||
-      ((iter = std::find(accelerators_->begin(), accelerators_->end(),
-          accelerator)) == accelerators_->end())) {
+  if (!accelerators_.get()) {
     NOTREACHED() << "Removing non-existing accelerator";
     return;
   }
 
-  size_t index = iter - accelerators_->begin();
-  accelerators_->erase(iter);
+  std::vector<Accelerator>::iterator i(
+      std::find(accelerators_->begin(), accelerators_->end(), accelerator));
+  if (i == accelerators_->end()) {
+    NOTREACHED() << "Removing non-existing accelerator";
+    return;
+  }
+
+  size_t index = i - accelerators_->begin();
+  accelerators_->erase(i);
   if (index >= registered_accelerator_count_) {
     // The accelerator is not registered to FocusManager.
     return;
   }
   --registered_accelerator_count_;
 
   // Providing we are attached to a Widget and registered with a focus manager,
   // we should de-register from that focus manager now.
   if (GetWidget() && accelerator_focus_manager_)
     accelerator_focus_manager_->UnregisterAccelerator(accelerator, this);
@@ skipping 429 matching lines @@
   start_pt = p;
 }
 
 // Tree operations -------------------------------------------------------------
 
 void View::DoRemoveChildView(View* view,
                              bool update_focus_cycle,
                              bool update_tool_tip,
                              bool delete_removed_view) {
   DCHECK(view);
-  const Views::iterator i = std::find(children_.begin(), children_.end(), view);
+  const Views::iterator i(std::find(children_.begin(), children_.end(), view));
   scoped_ptr<View> view_to_be_deleted;
   if (i != children_.end()) {
     if (update_focus_cycle) {
       // Let's remove the view from the focus traversal.
       View* next_focusable = view->next_focusable_view_;
       View* prev_focusable = view->previous_focusable_view_;
       if (prev_focusable)
         prev_focusable->next_focusable_view_ = next_focusable;
       if (next_focusable)
         next_focusable->previous_focusable_view_ = prev_focusable;
@@ skipping 116 matching lines @@
     Layout();
   }
 
   if (NeedsNotificationWhenVisibleBoundsChange()) {
     OnVisibleBoundsChanged();
   }
 
   // Notify interested Views that visible bounds within the root view may have
   // changed.
   if (descendants_to_notify_.get()) {
-    for (Views::iterator i = descendants_to_notify_->begin();
+    for (Views::iterator i(descendants_to_notify_->begin());
          i != descendants_to_notify_->end(); ++i) {
       (*i)->OnVisibleBoundsChanged();
     }
   }
 }
 
 // static
 void View::RegisterChildrenForVisibleBoundsNotification(View* view) {
   if (view->NeedsNotificationWhenVisibleBoundsChange())
     view->RegisterForVisibleBoundsNotification();
@@ skipping 34 matching lines @@
 
 void View::AddDescendantToNotify(View* view) {
   DCHECK(view);
   if (!descendants_to_notify_.get())
     descendants_to_notify_.reset(new Views);
   descendants_to_notify_->push_back(view);
 }
 
 void View::RemoveDescendantToNotify(View* view) {
   DCHECK(view && descendants_to_notify_.get());
-  Views::iterator i = std::find(descendants_to_notify_->begin(),
-                                descendants_to_notify_->end(),
-                                view);
+  Views::iterator i(std::find(
+      descendants_to_notify_->begin(), descendants_to_notify_->end(), view));
   DCHECK(i != descendants_to_notify_->end());
   descendants_to_notify_->erase(i);
   if (descendants_to_notify_->empty())
     descendants_to_notify_.reset();
 }
 
 // Transformations -------------------------------------------------------------
 
 bool View::GetTransformRelativeTo(const View* ancestor,
                                   ui::Transform* transform) const {
@@ skipping 171 matching lines @@
     //                NOTREACHED assertion and verify accelerators works as
     //                expected.
 #if defined(OS_WIN)
     NOTREACHED();
 #endif
     return;
   }
   // Only register accelerators if we are visible.
   if (!IsVisibleInRootView())
     return;
-  std::vector<Accelerator>::const_iterator iter;
-  for (iter = accelerators_->begin() + registered_accelerator_count_;
-       iter != accelerators_->end(); ++iter) {
-    accelerator_focus_manager_->RegisterAccelerator(*iter, this);
+  for (std::vector<Accelerator>::const_iterator i(
+           accelerators_->begin() + registered_accelerator_count_);
+       i != accelerators_->end(); ++i) {
+    accelerator_focus_manager_->RegisterAccelerator(*i, this);
   }
   registered_accelerator_count_ = accelerators_->size();
 }
 
 void View::UnregisterAccelerators(bool leave_data_intact) {
   if (!accelerators_.get())
     return;
 
   if (GetWidget()) {
     if (accelerator_focus_manager_) {
@@ skipping 150 matching lines @@
     result.append(GetChildViewAt(i)->PrintViewGraph(false));
 
   if (first)
     result.append("}\n");
 
   return result;
 }
 #endif
 
 }  // namespace views