X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.hpp;h=731ed5dbd5980b38a26477b55920ddffc165069a;hb=eae3bbbbfd35aef309c186e278ff7ab2d90f362a;hp=0a6735f59d0787539fec1ef1cdac4e5eb91c645c;hpb=73a25a6e488f1813c1cd12da085a16e4f91ed4da;p=pulseview.git

diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index 0a6735f5..731ed5db 100644
--- a/pv/view/trace.hpp
+++ b/pv/view/trace.hpp
@@ -14,12 +14,11 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEW_TRACE_HPP
-#define PULSEVIEW_PV_VIEW_TRACE_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
 
 #include <QColor>
 #include <QPainter>
@@ -27,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 {
@@ -41,7 +42,8 @@ namespace widgets {
 class Popup;
 }
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class Trace : public TraceTreeItem
 {
@@ -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,15 +124,15 @@ 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_;
 	QFormLayout *popup_form_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_TRACE_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP