X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.hpp;h=4f737aaad640c3226ce365625bcf78e150d30e1a;hp=c048371eeadd1973149017bd7f21f06abf79a1a7;hb=7a01bd3654ed046216308fa64edfd79be7cd525f;hpb=3eb29afdb641606c2e2e059289d8cc103d027a25

diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index c048371..4f737aa 100644
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H
-#define PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP
+#define PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP
 
 #include "signal.hpp"
 
@@ -29,7 +29,7 @@ namespace pv {
 
 namespace data {
 class Analog;
-class AnalogSnapshot;
+class AnalogSegment;
 }
 
 namespace view {
@@ -66,23 +66,23 @@ 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 signal 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);
 
 private:
 	void paint_trace(QPainter &p,
-		const std::shared_ptr<pv::data::AnalogSnapshot> &snapshot,
+		const std::shared_ptr<pv::data::AnalogSegment> &segment,
 		int y, int left, const int64_t start, const int64_t end,
 		const double pixels_offset, const double samples_per_pixel);
 
 	void paint_envelope(QPainter &p,
-		const std::shared_ptr<pv::data::AnalogSnapshot> &snapshot,
+		const std::shared_ptr<pv::data::AnalogSegment> &segment,
 		int y, int left, const int64_t start, const int64_t end,
 		const double pixels_offset, const double samples_per_pixel);
 
@@ -94,4 +94,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP