Random simplifications, cosmetics/whitespace/consistency fixes.

[pulseview.git] / pv / view / tracegroup.cpp

diff --git a/pv/view/tracegroup.cpp b/pv/view/tracegroup.cpp
index 9c1d49ff2b6645b5ae186b900b2fccf058b6f813..5b59eab94e8d3c3851ebac36f9e01e795d78a707 100644 (file)
--- a/pv/view/tracegroup.cpp
+++ b/pv/view/tracegroup.cpp
@@ -14,13 +14,12 @@
  * 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 <cassert>
 #include <algorithm>
 
 #include <QMenu>
@@ -28,12 +27,14 @@
 
 #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