X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftracegroup.cpp;h=265bc27547c6c525607860a79707509ae12d490f;hb=64a21e782d6c9081f13f8398e6408c13648d1d14;hp=9c1d49ff2b6645b5ae186b900b2fccf058b6f813;hpb=3d79f521396c8e908fd237f5328153165099f5c3;p=pulseview.git

diff --git a/pv/view/tracegroup.cpp b/pv/view/tracegroup.cpp
index 9c1d49ff..265bc275 100644
--- a/pv/view/tracegroup.cpp
+++ b/pv/view/tracegroup.cpp
@@ -14,26 +14,27 @@
  * 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 <extdef.h>
-#include <assert.h>
 
 #include <algorithm>
+#include <cassert>
 
 #include <QMenu>
 #include <QPainter>
 
 #include "tracegroup.hpp"
 
+using std::any_of;
 using std::pair;
 using std::shared_ptr;
 using std::vector;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const int TraceGroup::Padding = 8;
 const int TraceGroup::Width = 12;
@@ -48,7 +49,7 @@ TraceGroup::~TraceGroup()
 
 bool TraceGroup::enabled() const
 {
-	return std::any_of(child_items().begin(), child_items().end(),
+	return any_of(child_items().begin(), child_items().end(),
 		[](const shared_ptr<ViewItem> &r) { return r->enabled(); });
 }
 
@@ -64,13 +65,13 @@ const pv::Session& TraceGroup::session() const
 	return owner_->session();
 }
 
-pv::view::View* TraceGroup::view()
+View* TraceGroup::view()
 {
 	assert(owner_);
 	return owner_->view();
 }
 
-const pv::view::View* TraceGroup::view() const
+const View* TraceGroup::view() const
 {
 	assert(owner_);
 	return owner_->view();
@@ -222,5 +223,6 @@ void TraceGroup::extents_changed(bool horz, bool vert)
 		owner_->extents_changed(horz, vert);
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv