X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.hpp;h=dba52fa4efa5642a76c9c1150750d664bcadfd59;hb=303eec78f3c499cd30fc88b282aa1f336e82a806;hp=c65dab78a7006f89c98a26298d754c677c0f1ee9;hpb=b2650e6978b19c44a6fc375931bc412ad4eefa5b;p=pulseview.git
diff --git a/pv/view/timemarker.hpp b/pv/view/timemarker.hpp
index c65dab7..dba52fa 100644
--- a/pv/view/timemarker.hpp
+++ b/pv/view/timemarker.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 .
*/
-#ifndef PULSEVIEW_PV_VIEW_MARKER_HPP
-#define PULSEVIEW_PV_VIEW_MARKER_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_MARKER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_MARKER_HPP
#include
#include
@@ -37,7 +36,8 @@ namespace widgets {
class TimestampSpinBox;
}
-namespace view {
+namespace views {
+namespace TraceView {
class View;
@@ -108,7 +108,7 @@ public:
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
*/
- void paint_fore(QPainter &p, const ViewItemPaintParams &pp) override;
+ void paint_fore(QPainter &p, ViewItemPaintParams &pp) override;
virtual pv::widgets::Popup* create_popup(QWidget *parent) override;
@@ -127,7 +127,8 @@ protected:
bool updating_value_widget_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_MARKER_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_MARKER_HPP