X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftracetreeitemowner.cpp;h=31f4cb8331927133bca9073a34d16b24ac9fecbb;hp=1449d813dac5e808bef25ac18253cf08500b760f;hb=c063290ac7189bdd15221450f598504f43286b43;hpb=d9177e6cfafcbb3bdca8f8529e7c74f6a56d0a1a

diff --git a/pv/view/tracetreeitemowner.cpp b/pv/view/tracetreeitemowner.cpp
index 1449d813..31f4cb83 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 <http://www.gnu.org/licenses/>.
  */
 
 #include <cassert>
@@ -24,25 +23,25 @@
 #include "tracetreeitemowner.hpp"
 #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;
 using std::shared_ptr;
 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<TraceTreeItem> >
+vector< shared_ptr<TraceTreeItem> >
 TraceTreeItemOwner::trace_tree_child_items() const
 {
 	vector< shared_ptr<TraceTreeItem> > items;
@@ -65,7 +64,7 @@ void TraceTreeItemOwner::clear_child_items()
 	items_.clear();
 }
 
-void TraceTreeItemOwner::add_child_item(std::shared_ptr<TraceTreeItem> item)
+void TraceTreeItemOwner::add_child_item(shared_ptr<TraceTreeItem> item)
 {
 	assert(!item->owner());
 	item->set_owner(this);
@@ -74,11 +73,11 @@ void TraceTreeItemOwner::add_child_item(std::shared_ptr<TraceTreeItem> item)
 	extents_changed(true, true);
 }
 
-void TraceTreeItemOwner::remove_child_item(std::shared_ptr<TraceTreeItem> item)
+void TraceTreeItemOwner::remove_child_item(shared_ptr<TraceTreeItem> 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 +131,6 @@ void TraceTreeItemOwner::restack_items()
 {
 }
 
-} // view
-} // pv
+} // namespace TraceView
+} // namespace views
+} // namespace pv