diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-30 15:46:03 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-30 15:46:03 +0000 |
| commit | 3cb676a1c13680f2b6695f871d857e2dd060fa8c (patch) | |
| tree | edb4a79fa006b4887e1f48d3fd9e7886e8c8a89b /ui/base/models | |
| parent | 96e839e18c3b0b89599273e5dea23a4efffadbb5 (diff) | |
| download | chromium_src-3cb676a1c13680f2b6695f871d857e2dd060fa8c.zip chromium_src-3cb676a1c13680f2b6695f871d857e2dd060fa8c.tar.gz chromium_src-3cb676a1c13680f2b6695f871d857e2dd060fa8c.tar.bz2 | |
base: Remove dereference structure operator (i.e ->) from ScopedVector.
BUG=128663
R=brettw@chromium.org,willchan@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10669038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145073 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/models')
| -rw-r--r-- | ui/base/models/list_model.h | 6 | ||||
| -rw-r--r-- | ui/base/models/tree_node_model.h | 25 |
2 files changed, 15 insertions, 16 deletions
diff --git a/ui/base/models/list_model.h b/ui/base/models/list_model.h index 754d6eb..16d0d81 100644 --- a/ui/base/models/list_model.h +++ b/ui/base/models/list_model.h @@ -26,7 +26,7 @@ class ListModel { // Adds |item| to the model at given |index|. void AddAt(size_t index, ItemType* item) { DCHECK_LE(index, item_count()); - items_->insert(items_.begin() + index, item); + items_.insert(items_.begin() + index, item); NotifyItemsAdded(index, 1); } @@ -40,7 +40,7 @@ class ListModel { ItemType* RemoveAt(size_t index) { DCHECK_LT(index, item_count()); ItemType* item = items_[index]; - items_->erase(items_.begin() + index); + items_.weak_erase(items_.begin() + index); NotifyItemsRemoved(index, 1); return item; } @@ -48,7 +48,7 @@ class ListModel { // Removes all items from the model. This does NOT delete the items. void RemoveAll() { size_t count = item_count(); - items_->clear(); + items_.clear(); NotifyItemsRemoved(0, count); } diff --git a/ui/base/models/tree_node_model.h b/ui/base/models/tree_node_model.h index e11d1f0..1af826f 100644 --- a/ui/base/models/tree_node_model.h +++ b/ui/base/models/tree_node_model.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -81,25 +81,25 @@ class TreeNode : public TreeModelNode { if (parent) parent->Remove(node); node->parent_ = static_cast<NodeType*>(this); - children_->insert(children_->begin() + index, node); + children_.insert(children_.begin() + index, node); } // Removes |node| from this node and returns it. It's up to the caller to // delete it. virtual NodeType* Remove(NodeType* node) { typename std::vector<NodeType*>::iterator i = - std::find(children_->begin(), children_->end(), node); - DCHECK(i != children_->end()); + std::find(children_.begin(), children_.end(), node); + DCHECK(i != children_.end()); node->parent_ = NULL; - children_->erase(i); + children_.weak_erase(i); return node; } // Removes all the children from this node. This does NOT delete the nodes. void RemoveAll() { - for (size_t i = 0; i < children_->size(); ++i) + for (size_t i = 0; i < children_.size(); ++i) children_[i]->parent_ = NULL; - children_->clear(); + children_.clear(); } // Returns the parent node, or NULL if this is the root node. @@ -110,16 +110,16 @@ class TreeNode : public TreeModelNode { bool is_root() const { return parent_ == NULL; } // Returns the number of children. - int child_count() const { return static_cast<int>(children_->size()); } + int child_count() const { return static_cast<int>(children_.size()); } // Returns true if this node has no children. - bool empty() const { return children_->empty(); } + bool empty() const { return children_.empty(); } // Returns the number of all nodes in the subtree rooted at this node, // including this node. int GetTotalNodeCount() const { int count = 1; // Start with one to include the node itself. - for (size_t i = 0; i < children_->size(); ++i) + for (size_t i = 0; i < children_.size(); ++i) count += children_[i]->GetTotalNodeCount(); return count; } @@ -139,9 +139,8 @@ class TreeNode : public TreeModelNode { int GetIndexOf(const NodeType* node) const { DCHECK(node); typename std::vector<NodeType*>::const_iterator i = - std::find(children_->begin(), children_->end(), node); - return - i != children_->end() ? static_cast<int>(i - children_->begin()) : -1; + std::find(children_.begin(), children_.end(), node); + return i != children_.end() ? static_cast<int>(i - children_.begin()) : -1; } // Sets the title of the node. |