X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Ftracetreeitemowner.cpp;h=e62608851b4e76121b8d21791128a4c3341ac24f;hb=aca9aa834c742ba70f49d1ac3eb2d1e02e759416;hp=b570c0386c3ef556e4e9cd41927749e212fcb5b6;hpb=efdec55aec1a137460fa362a381ed1904182bfed;p=pulseview.git diff --git a/pv/view/tracetreeitemowner.cpp b/pv/view/tracetreeitemowner.cpp index b570c03..e626088 100644 --- a/pv/view/tracetreeitemowner.cpp +++ b/pv/view/tracetreeitemowner.cpp @@ -20,15 +20,14 @@ #include #include "tracetreeitem.hpp" -#include "tracetreeitemowner.hpp" #include "trace.hpp" +#include "tracetreeitemowner.hpp" -using std::dynamic_pointer_cast; -using std::max; +using std::find; using std::make_pair; +using std::max; using std::min; using std::pair; -using std::set; using std::shared_ptr; using std::static_pointer_cast; using std::vector; @@ -42,7 +41,7 @@ const ViewItemOwner::item_list& TraceTreeItemOwner::child_items() const return items_; } -vector< std::shared_ptr > +vector< shared_ptr > TraceTreeItemOwner::trace_tree_child_items() const { vector< shared_ptr > items; @@ -65,7 +64,7 @@ void TraceTreeItemOwner::clear_child_items() items_.clear(); } -void TraceTreeItemOwner::add_child_item(std::shared_ptr item) +void TraceTreeItemOwner::add_child_item(shared_ptr item) { assert(!item->owner()); item->set_owner(this); @@ -74,11 +73,11 @@ void TraceTreeItemOwner::add_child_item(std::shared_ptr item) extents_changed(true, true); } -void TraceTreeItemOwner::remove_child_item(std::shared_ptr item) +void TraceTreeItemOwner::remove_child_item(shared_ptr item) { assert(item->owner() == this); item->set_owner(nullptr); - auto iter = std::find(items_.begin(), items_.end(), item); + auto iter = find(items_.begin(), items_.end(), item); assert(iter != items_.end()); items_.erase(iter);