X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Frowitem.hpp;h=6688bc5c90602a7dfd48d15a17acc873a233882e;hb=5b5fa4da3b7112414b9f51e6626ae7f4bf606f02;hp=39c6f04030d1d214b688aa7ffedbbb0a8530f023;hpb=3eb29afdb641606c2e2e059289d8cc103d027a25;p=pulseview.git

diff --git a/pv/view/rowitem.hpp b/pv/view/rowitem.hpp
index 39c6f04..6688bc5 100644
--- a/pv/view/rowitem.hpp
+++ b/pv/view/rowitem.hpp
@@ -25,15 +25,15 @@
 
 #include <QPropertyAnimation>
 
-#include "rowitempaintparams.hpp"
-#include "selectableitem.hpp"
+#include "viewitempaintparams.hpp"
+#include "viewitem.hpp"
 
 namespace pv {
 namespace view {
 
 class RowItemOwner;
 
-class RowItem : public SelectableItem,
+class RowItem : public ViewItem,
 	public std::enable_shared_from_this<pv::view::RowItem>
 {
 	Q_OBJECT
@@ -47,11 +47,6 @@ public:
 	 */
 	RowItem();
 
-	/**
-	 * Returns true if the item is visible and enabled.
-	 */
-	virtual bool enabled() const = 0;
-
 	/**
 	 * Gets the vertical layout offset of this signal.
 	 */
@@ -115,38 +110,29 @@ public:
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with.
 	 **/
-	virtual void paint_back(QPainter &p, const RowItemPaintParams &pp);
+	virtual void paint_back(QPainter &p, const ViewItemPaintParams &pp);
 
 	/**
 	 * Paints the mid-layer of the trace with a QPainter
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with.
 	 **/
-	virtual void paint_mid(QPainter &p, const RowItemPaintParams &pp);
+	virtual void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
 
 	/**
 	 * Paints the foreground layer of the trace with a QPainter
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with.
 	 **/
-	virtual void paint_fore(QPainter &p, const RowItemPaintParams &pp);
+	virtual void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
 
 	/**
 	 * Paints the signal label.
 	 * @param p the QPainter to paint into.
-	 * @param right the x-coordinate of the right edge of the header
-	 * 	area.
+	 * @param rect the rectangle of the header area.
 	 * @param hover true if the label is being hovered over by the mouse.
 	 */
-	virtual void paint_label(QPainter &p, int right, bool hover) = 0;
-
-	/**
-	 * Computes the outline rectangle of a label.
-	 * @param right the x-coordinate of the right edge of the header
-	 * 	area.
-	 * @return Returns the rectangle of the signal label.
-	 */
-	virtual QRectF label_rect(int right) const = 0;
+	virtual void paint_label(QPainter &p, const QRect &rect, bool hover) = 0;
 
 public:
 	virtual void hover_point_changed();