X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.hpp;h=ee91ff427ee11dfae8737f9f28dde0bc4d870b4d;hb=80067e4944e111bfa8d6b399812dddaa29d5a4ab;hp=345700fa3c96c557dd4b36697af4e8091a2906ad;hpb=223d0c3748033130e9f11ff9af3dc29661f380e9;p=pulseview.git
diff --git a/pv/view/cursorpair.hpp b/pv/view/cursorpair.hpp
index 345700f..ee91ff4 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 .
*/
-#ifndef PULSEVIEW_PV_VIEW_CURSORPAIR_HPP
-#define PULSEVIEW_PV_VIEW_CURSORPAIR_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP
#include "cursor.hpp"
@@ -27,10 +26,14 @@
#include
+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 first() const;
+ shared_ptr first() const;
/**
* Returns a pointer to the second cursor.
*/
- std::shared_ptr second() const;
+ shared_ptr second() const;
/**
* Sets the time of the marker.
*/
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, ViewItemPaintParams &pp) override;
/**
* Constructs the string to display.
@@ -97,15 +100,16 @@ public:
void compute_text_size(QPainter &p);
- std::pair get_cursor_offsets() const;
+ pair get_cursor_offsets() const;
private:
- std::shared_ptr first_, second_;
+ shared_ptr first_, second_;
QSizeF text_size_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_CURSORPAIR_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP