Change namespace for the trace view and implement ViewBase

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

diff --git a/pv/view/flag.cpp b/pv/view/flag.cpp
index 1dc38a5741b0cafd357b6c965caa504217fae707..3afd255fc7ac05eba350c331d0731a129c4277e1 100644 (file)
--- a/pv/view/flag.cpp
+++ b/pv/view/flag.cpp
@@ -33,11 +33,12 @@
 using std::shared_ptr;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const QColor Flag::FillColour(0x73, 0xD2, 0x16);
 
-Flag::Flag(View &view, double time, const QString &text) :
+Flag::Flag(View &view, const pv::util::Timestamp& time, const QString &text) :
        TimeMarker(view, FillColour, time),
        text_(text)
 {
@@ -45,7 +46,7 @@ Flag::Flag(View &view, double time, const QString &text) :
 
 Flag::Flag(const Flag &flag) :
        TimeMarker(flag.view_, FillColour, flag.time_),
-       std::enable_shared_from_this<pv::view::Flag>(flag)
+       std::enable_shared_from_this<Flag>(flag)
 {
 }
 
@@ -108,5 +109,6 @@ void Flag::on_text_changed(const QString &text)
        view_.time_item_appearance_changed(true, false);
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv