X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftracetreeitemowner.cpp;h=c87619524574e02f7039ae60b4d8434a592d74f6;hb=fe7d6661d5f520279e9d54067ad096fa4a6424c5;hp=1449d813dac5e808bef25ac18253cf08500b760f;hpb=d9177e6cfafcbb3bdca8f8529e7c74f6a56d0a1a;p=pulseview.git
diff --git a/pv/view/tracetreeitemowner.cpp b/pv/view/tracetreeitemowner.cpp
index 1449d813..c8761952 100644
--- a/pv/view/tracetreeitemowner.cpp
+++ b/pv/view/tracetreeitemowner.cpp
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
@@ -25,8 +24,9 @@
#include "trace.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;
@@ -35,14 +35,15 @@ using std::static_pointer_cast;
using std::vector;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
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 +66,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 +75,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);
@@ -132,5 +133,6 @@ void TraceTreeItemOwner::restack_items()
{
}
-} // view
-} // pv
+} // namespace TraceView
+} // namespace views
+} // namespace pv