Fix a build issue with std::roundf() on Android.

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

diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index 11f80ccbeb6426b0d163eecd7a2b8f36d20a7a7a..731ed5dbd5980b38a26477b55920ddffc165069a 100644 (file)
--- a/pv/view/trace.hpp
+++ b/pv/view/trace.hpp
@@ -26,12 +26,14 @@
 #include <QRect>
 #include <QString>
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "tracetreeitem.hpp"
 
 #include "pv/data/signalbase.hpp"
 
+using std::shared_ptr;
+
 class QFormLayout;
 
 namespace pv {
@@ -55,7 +57,7 @@ private:
        static const QColor DarkGrayBGColour;
 
 protected:
-       Trace(std::shared_ptr<data::SignalBase> channel);
+       Trace(shared_ptr<data::SignalBase> channel);
 
 public:
        /**
@@ -68,11 +70,6 @@ public:
         */
        virtual void set_colour(QColor colour);
 
-       /**
-        * Enables or disables the coloured background for this trace.
-        */
-       void set_coloured_bg(bool state);
-
        /**
         * Paints the signal label.
         * @param p the QPainter to paint into.
@@ -98,7 +95,7 @@ protected:
         * @param p The QPainter to paint into.
         * @param pp The painting parameters object to paint with.
         */
-       virtual void paint_back(QPainter &p, const ViewItemPaintParams &pp);
+       virtual void paint_back(QPainter &p, ViewItemPaintParams &pp);
 
        /**
         * Paints a zero axis across the viewport.
@@ -106,7 +103,7 @@ protected:
         * @param pp the painting parameters object to paint with.
         * @param y the y-offset of the axis.
         */
-       void paint_axis(QPainter &p, const ViewItemPaintParams &pp, int y);
+       void paint_axis(QPainter &p, ViewItemPaintParams &pp, int y);
 
        void add_colour_option(QWidget *parent, QFormLayout *form);
 
@@ -127,8 +124,7 @@ private Q_SLOTS:
        void on_colouredit_changed(const QColor &colour);
 
 protected:
-       std::shared_ptr<data::SignalBase> base_;
-       bool coloured_bg_, coloured_bg_state_;
+       shared_ptr<data::SignalBase> base_;
 
 private:
        pv::widgets::Popup *popup_;