X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fview.hpp;h=47f1b8dc29cbeea4c4860e9c134eea8e21b2bcb7;hb=bf0edd2b0cbb5f4bd5d69b0f00bcea7d037e2287;hp=42fa322cc50b7e47f42ee51e1145a60ecf97c19b;hpb=925763b09cd26608cf4b38ce7b44800948a0e5aa;p=pulseview.git

diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index 42fa322..47f1b8d 100644
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -214,8 +214,6 @@ public:
 
 	const QPoint& hover_point() const;
 
-	void update_viewport();
-
 	void restack_all_trace_tree_items();
 
 Q_SIGNALS:
@@ -273,30 +271,15 @@ private:
 
 	void update_layout();
 
-	/**
-	 * Satisfies TraceTreeItem functionality.
-	 * @param p the QPainter to paint into.
-	 * @param rect the rectangle of the header area.
-	 * @param hover true if the label is being hovered over by the mouse.
-	 */
-	void paint_label(QPainter &p, const QRect &rect, bool hover);
-
-	/**
-	 * Computes the outline rectangle of a label.
-	 * @param rect the rectangle of the header area.
-	 * @return Returns the rectangle of the signal label.
-	 */
-	QRectF label_rect(const QRectF &rect);
-
 	TraceTreeItemOwner* find_prevalent_trace_group(
 		const std::shared_ptr<sigrok::ChannelGroup> &group,
-		const std::unordered_map<std::shared_ptr<sigrok::Channel>,
+		const std::unordered_map<std::shared_ptr<data::SignalBase>,
 			std::shared_ptr<Signal> > &signal_map);
 
 	static std::vector< std::shared_ptr<Trace> >
 		extract_new_traces_for_channels(
 		const std::vector< std::shared_ptr<sigrok::Channel> > &channels,
-		const std::unordered_map<std::shared_ptr<sigrok::Channel>,
+		const std::unordered_map<std::shared_ptr<data::SignalBase>,
 			std::shared_ptr<Signal> > &signal_map,
 		std::set< std::shared_ptr<Trace> > &add_list);