X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.hpp;h=458f5cac0af186f08f7c4b3fa47e851bb815a68e;hp=aacc7d8c2b3272144be7fd6f9a7930a2d10ca129;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=3204525355165f3d5994a5d17d044da19e29e1c5

diff --git a/pv/view/cursorpair.hpp b/pv/view/cursorpair.hpp
index aacc7d8c..458f5cac 100644
--- a/pv/view/cursorpair.hpp
+++ b/pv/view/cursorpair.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_CURSORPAIR_H
-#define PULSEVIEW_PV_VIEW_CURSORPAIR_H
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP
 
 #include "cursor.hpp"
 
@@ -27,10 +26,14 @@
 
 #include <QPainter>
 
+using std::pair;
+using std::shared_ptr;
+
 class QPainter;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 class CursorPair : public TimeItem
 {
@@ -49,31 +52,31 @@ public:
 	/**
 	 * Returns true if the item is visible and enabled.
 	 */
-	bool enabled() const;
+	bool enabled() const override;
 
 	/**
 	 * Returns a pointer to the first cursor.
 	 */
-	std::shared_ptr<Cursor> first() const;
+	shared_ptr<Cursor> first() const;
 
 	/**
 	 * Returns a pointer to the second cursor.
 	 */
-	std::shared_ptr<Cursor> second() const;
+	shared_ptr<Cursor> second() const;
 
 	/**
 	 * Sets the time of the marker.
 	 */
-	void set_time(double time);
+	void set_time(const pv::util::Timestamp& time) override;
 
-	float get_x() const;
+	float get_x() const override;
 
-	QPoint point(const QRect &rect) const;
+	QPoint point(const QRect &rect) const override;
 
-	pv::widgets::Popup* create_popup(QWidget *parent);
+	pv::widgets::Popup* create_popup(QWidget *parent) override;
 
 public:
-	QRectF label_rect(const QRectF &rect) const;
+	QRectF label_rect(const QRectF &rect) const override;
 
 	/**
 	 * Paints the marker's label to the ruler.
@@ -81,14 +84,14 @@ 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 background 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_back(QPainter &p, const ViewItemPaintParams &pp);
+	 */
+	void paint_back(QPainter &p, const ViewItemPaintParams &pp) override;
 
 	/**
 	 * Constructs the string to display.
@@ -97,15 +100,16 @@ public:
 
 	void compute_text_size(QPainter &p);
 
-	std::pair<float, float> get_cursor_offsets() const;
+	pair<float, float> get_cursor_offsets() const;
 
 private:
-	std::shared_ptr<Cursor> first_, second_;
+	shared_ptr<Cursor> first_, second_;
 
 	QSizeF text_size_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_CURSORPAIR_H
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP