X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.hpp;h=9dd43886ee4bcc7e699495ef4c3d273e73f92fa2;hb=9a267f8dec48c9a28472c1a3bb146c624819e98b;hp=371b6e4a54ce607edbdfd7dc3ead53c55e9ae447;hpb=806d3e1eb3d60e93ff95d23e79588a0486730967;p=pulseview.git
diff --git a/pv/view/timemarker.hpp b/pv/view/timemarker.hpp
index 371b6e4..9dd4388 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;
@@ -68,27 +68,27 @@ public:
*/
void set_time(const pv::util::Timestamp& time) override;
- float get_x() const;
+ float get_x() const override;
/**
* Gets the arrow-tip point of the time marker.
* @param rect the rectangle of the ruler area.
*/
- QPoint point(const QRect &rect) const;
+ QPoint point(const QRect &rect) const override;
/**
* Computes the outline rectangle of a label.
* @param rect the rectangle of the header area.
* @return Returns the rectangle of the signal label.
*/
- QRectF label_rect(const QRectF &rect) const;
+ QRectF label_rect(const QRectF &rect) const override;
/**
* Computes the outline rectangle of the viewport hit-box.
* @param rect the rectangle of the viewport area.
* @return Returns the rectangle of the hit-box.
*/
- QRectF hit_box_rect(const QRectF &rect) const;
+ QRectF hit_box_rect(const ViewItemPaintParams &pp) const override;
/**
* Gets the text to show in the marker.
@@ -101,16 +101,16 @@ public:
* @param rect The rectangle of the ruler client area.
* @param hover true if the label is being hovered over by the mouse.
*/
- void paint_label(QPainter &p, const QRect &rect, bool hover);
+ void paint_label(QPainter &p, const QRect &rect, bool hover) override;
/**
* Paints the foreground layer of the item with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
- **/
- void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
+ */
+ void paint_fore(QPainter &p, const ViewItemPaintParams &pp) override;
- virtual pv::widgets::Popup* create_popup(QWidget *parent);
+ virtual pv::widgets::Popup* create_popup(QWidget *parent) override;
private Q_SLOTS:
void on_value_changed(const pv::util::Timestamp& value);
@@ -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