projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow: Fix dock nesting
[pulseview.git]
/
pv
/
view
/
tracegroup.cpp
diff --git
a/pv/view/tracegroup.cpp
b/pv/view/tracegroup.cpp
index 9c1d49ff2b6645b5ae186b900b2fccf058b6f813..5abcc86a5ec9d3253581a6da6d2c948f95bbb8c5 100644
(file)
--- a/
pv/view/tracegroup.cpp
+++ b/
pv/view/tracegroup.cpp
@@
-33,7
+33,8
@@
using std::shared_ptr;
using std::vector;
namespace pv {
using std::vector;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const int TraceGroup::Padding = 8;
const int TraceGroup::Width = 12;
const int TraceGroup::Padding = 8;
const int TraceGroup::Width = 12;
@@
-64,13
+65,13
@@
const pv::Session& TraceGroup::session() const
return owner_->session();
}
return owner_->session();
}
-
pv::view::
View* TraceGroup::view()
+View* TraceGroup::view()
{
assert(owner_);
return owner_->view();
}
{
assert(owner_);
return owner_->view();
}
-const
pv::view::
View* TraceGroup::view() const
+const View* TraceGroup::view() const
{
assert(owner_);
return owner_->view();
{
assert(owner_);
return owner_->view();
@@
-222,5
+223,6
@@
void TraceGroup::extents_changed(bool horz, bool vert)
owner_->extents_changed(horz, vert);
}
owner_->extents_changed(horz, vert);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv