LogicSignal: Tidied up forward declarations

[pulseview.git] / pv / view / logicsignal.hpp

diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index 11f81770ce174d0abbe45a063c834fe13a90a67e..7eb67dec836b1b86731177188985c2e134ab0603 100644 (file)
--- a/pv/view/logicsignal.hpp
+++ b/pv/view/logicsignal.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
-#define PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP
+#define PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP
 
 #include <QCache>
 
@@ -31,8 +31,8 @@ class QIcon;
 class QToolBar;
 
 namespace sigrok {
-       class Device;
-       class TriggerMatchType;
+class Device;
+class TriggerMatchType;
 }
 
 namespace pv {
@@ -75,6 +75,8 @@ public:
 
        std::shared_ptr<pv::data::Logic> logic_data() const;
 
+       void set_logic_data(std::shared_ptr<pv::data::Logic> data);
+
        /**
         * Computes the vertical extents of the contents of this row item.
         * @return A pair containing the minimum and maximum y-values.
@@ -84,26 +86,23 @@ public:
        /**
         * Paints the background layer of the signal with a QPainter
         * @param p the QPainter to paint into.
-        * @param left the x-coordinate of the left edge of the signal.
-        * @param right the x-coordinate of the right edge of the signal.
+        * @param pp the painting parameters object to paint with..
         **/
-       void paint_back(QPainter &p, int left, int right);
+       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 left the x-coordinate of the left edge of the signal.
-        * @param right the x-coordinate of the right edge of the signal.
+        * @param pp the painting parameters object to paint with..
         **/
-       void paint_mid(QPainter &p, int left, int right);
+       void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
 
        /**
         * Paints the foreground layer of the signal with a QPainter
         * @param p the QPainter to paint into.
-        * @param left the x-coordinate of the left edge of the signal
-        * @param right the x-coordinate of the right edge of the signal
+        * @param pp the painting parameters object to paint with.
         **/
-       virtual void paint_fore(QPainter &p, int left, int right);
+       virtual void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
 
 private:
        void paint_caps(QPainter &p, QLineF *const lines,
@@ -147,4 +146,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP