X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fflag.hpp;h=092a4b5a05966e7ec30126cd278fac9e99617d14;hp=c4e4cbb2c211b8b11e7ba96cebcfe274d6651f23;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=97430d7726c69e1710aef223c39c760c79721ff5

diff --git a/pv/view/flag.hpp b/pv/view/flag.hpp
index c4e4cbb..092a4b5 100644
--- a/pv/view/flag.hpp
+++ b/pv/view/flag.hpp
@@ -14,12 +14,11 @@
  * 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/>.
  */
 
-#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 +27,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 +45,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 +77,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