X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.hpp;h=968ebf9569672a92e76640bc7a88039603a235ee;hp=a0f8e8000cbf66e5dc3b2d4b277f75970ce68d0f;hb=0ce3d18c04b989eeae55d5a82d133a2d154ad6c1;hpb=ebdfa0942aeed7b314da24a2e572103a50d056bc

diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index a0f8e800..968ebf95 100644
--- a/pv/view/decodetrace.hpp
+++ b/pv/view/decodetrace.hpp
@@ -101,21 +101,21 @@ public:
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with..
 	 **/
-	void paint_back(QPainter &p, const RowItemPaintParams &pp);
+	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.
 	 **/
-	void paint_mid(QPainter &p, const RowItemPaintParams &pp);
+	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.
 	 **/
-	void paint_fore(QPainter &p, const RowItemPaintParams &pp);
+	void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
 
 	void populate_popup_form(QWidget *parent, QFormLayout *form);
 
@@ -125,7 +125,7 @@ public:
 
 private:
 	void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
-		int text_height, const RowItemPaintParams &pp, int y,
+		int text_height, const ViewItemPaintParams &pp, int y,
 		size_t base_colour) const;
 
 	void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
@@ -136,7 +136,7 @@ private:
 		double end, int y) const;
 
 	void draw_error(QPainter &p, const QString &message,
-		const RowItemPaintParams &pp);
+		const ViewItemPaintParams &pp);
 
 	void draw_unresolved_period(QPainter &p, int h, int left,
 		int right) const;
@@ -198,7 +198,7 @@ private:
 	std::vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
 
 	std::vector<data::decode::Row> visible_rows_;
-	int text_height_, row_height_;
+	int row_height_;
 
 	QSignalMapper delete_mapper_, show_hide_mapper_;
 };