X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftracegroup.hpp;h=6407f1b2fa72f77056f635b9864275ffeae9ec0c;hp=960a15d9a23105bd314ae090bee1bc680792c816;hb=37b9fed4c6b2878c814130cc11013ec918fb8ded;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329

diff --git a/pv/view/tracegroup.hpp b/pv/view/tracegroup.hpp
index 960a15d9..6407f1b2 100644
--- a/pv/view/tracegroup.hpp
+++ b/pv/view/tracegroup.hpp
@@ -18,16 +18,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_TRACEGROUP_H
-#define PULSEVIEW_PV_VIEW_TRACEGROUP_H
+#ifndef PULSEVIEW_PV_VIEW_TRACEGROUP_HPP
+#define PULSEVIEW_PV_VIEW_TRACEGROUP_HPP
 
-#include "rowitem.hpp"
-#include "rowitemowner.hpp"
+#include "tracetreeitem.hpp"
+#include "tracetreeitemowner.hpp"
 
 namespace pv {
 namespace view {
 
-class TraceGroup : public RowItem, public RowItemOwner
+class TraceGroup : public TraceTreeItem, public TraceTreeItemOwner
 {
 	Q_OBJECT
 
@@ -51,12 +51,12 @@ public:
 	/**
 	 * Returns the session of the onwer.
 	 */
-	pv::SigSession& session();
+	pv::Session& session();
 
 	/**
 	 * Returns the session of the onwer.
 	 */
-	const pv::SigSession& session() const;
+	const pv::Session& session() const;
 
 	/**
 	 * Returns the view of the owner.
@@ -81,15 +81,14 @@ public:
 	 * 	area.
 	 * @param hover true if the label is being hovered over by the mouse.
 	 */
-	void paint_label(QPainter &p, int right, bool hover);
+	void paint_label(QPainter &p, const QRect &rect, bool hover);
 
 	/**
 	 * Computes the outline rectangle of a label.
-	 * @param right the x-coordinate of the right edge of the header
-	 * 	area.
+	 * @param rect the rectangle of the header area.
 	 * @return Returns the rectangle of the signal label.
 	 */
-	QRectF label_rect(int right) const;
+	QRectF label_rect(const QRectF &rect) const;
 
 	/**
 	 * Determines if a point is in the header label rect.
@@ -120,7 +119,7 @@ public:
 	void ungroup();
 
 public:
-	void appearance_changed(bool label, bool content);
+	void row_item_appearance_changed(bool label, bool content);
 
 	void extents_changed(bool horz, bool vert);
 
@@ -131,4 +130,4 @@ private Q_SLOTS:
 } // view
 } // pv
 
-#endif // PULSEVIEW_PV_VIEW_TRACEGROUP_H
+#endif // PULSEVIEW_PV_VIEW_TRACEGROUP_HPP