Change namespace for the trace view and implement ViewBase

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

diff --git a/pv/view/flag.hpp b/pv/view/flag.hpp
index c4e4cbb2c211b8b11e7ba96cebcfe274d6651f23..1311d4a9eec3dd831d36d3de28af39bed538d353 100644 (file)
--- a/pv/view/flag.hpp
+++ b/pv/view/flag.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_FLAG_H
-#define PULSEVIEW_PV_VIEW_FLAG_H
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_FLAG_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_FLAG_HPP
 
 #include <memory>
 
@@ -28,10 +28,11 @@
 class QMenu;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 class Flag : public TimeMarker,
-       public std::enable_shared_from_this<pv::view::Flag>
+       public std::enable_shared_from_this<Flag>
 {
        Q_OBJECT
 
@@ -45,7 +46,7 @@ public:
         * @param time The time to set the flag to.
         * @param text The text of the marker.
         */
-       Flag(View &view, double time, const QString &text);
+       Flag(View &view, const pv::util::Timestamp& time, const QString &text);
 
        /**
         * Copy constructor.
@@ -77,7 +78,8 @@ private:
        QString text_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_FLAG_H
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_FLAG_HPP