Make member variable underscores a suffix instead of a prefix

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

diff --git a/pv/view/trace.h b/pv/view/trace.h
index 2d8c7cf1f17d35bafec31ac567c3ba66d94bc56a..f99e01aa74e1d782f1d73b1a5034a654f0dfdf27 100644 (file)
--- a/pv/view/trace.h
+++ b/pv/view/trace.h
@@ -29,19 +29,19 @@
 
 #include <stdint.h>
 
-#include "selectableitem.h"
+#include "rowitem.h"
 
 class QFormLayout;
 
 namespace pv {
 
-class SigSession;
+namespace widgets {
+class Popup;
+}
 
 namespace view {
 
-class View;
-
-class Trace : public SelectableItem
+class Trace : public RowItem
 {
        Q_OBJECT
 
@@ -50,13 +50,13 @@ private:
        static const int LabelHitPadding;
 
 protected:
-       Trace(SigSession &session, QString name);
+       Trace(QString name);
 
 public:
        /**
         * Gets the name of this signal.
         */
-       QString get_name() const;
+       QString name() const;
 
        /**
         * Sets the name of the signal.
@@ -66,7 +66,7 @@ public:
        /**
         * Get the colour of the signal.
         */
-       QColor get_colour() const;
+       QColor colour() const;
 
        /**
         * Set the colour of the signal.
@@ -74,48 +74,7 @@ public:
        void set_colour(QColor colour);
 
        /**
-        * Gets the vertical layout offset of this signal.
-        */
-       int get_v_offset() const;
-
-       /**
-        * Sets the vertical layout offset of this signal.
-        */
-       void set_v_offset(int v_offset);
-
-       /**
-        * Returns true if the trace is visible and enabled.
-        */
-       virtual bool enabled() const = 0;
-
-       virtual void set_view(pv::view::View *view);
-
-       /**
-        * Paints the background layer of the trace 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
-        **/
-       virtual void paint_back(QPainter &p, int left, int right);
-
-       /**
-        * Paints the mid-layer of the trace 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
-        **/
-       virtual void paint_mid(QPainter &p, int left, int right);
-
-       /**
-        * Paints the foreground layer of the trace 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
-        **/
-       virtual void paint_fore(QPainter &p, int left, int right);
-
-       /**
-        * Paints the signal label into a QGLWidget.
+        * Paints the signal label.
         * @param p the QPainter to paint into.
         * @param right the x-coordinate of the right edge of the header
         *      area.
@@ -123,33 +82,17 @@ public:
         */
        virtual void paint_label(QPainter &p, int right, bool hover);
 
-       /**
-        * Determines if a point is in the header label rect.
-        * @param left the x-coordinate of the left edge of the header
-        *      area.
-        * @param right the x-coordinate of the right edge of the header
-        *      area.
-        * @param point the point to test.
-        */
-       bool pt_in_label_rect(int left, int right, const QPoint &point);
-
        virtual QMenu* create_context_menu(QWidget *parent);
 
        pv::widgets::Popup* create_popup(QWidget *parent);
 
-       /**
-        * Gets the y-offset of the axis.
-        */
-       int get_y() const;
-
        /**
         * Computes the outline rectangle of a label.
-        * @param p the QPainter to lay out text with.
         * @param right the x-coordinate of the right edge of the header
         *      area.
         * @return Returns the rectangle of the signal label.
         */
-       QRectF get_label_rect(int right);
+       QRectF label_rect(int right) const;
 
 protected:
 
@@ -176,29 +119,20 @@ protected:
 
        virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
-private slots:
+private Q_SLOTS:
        void on_text_changed(const QString &text);
 
        void on_colour_changed(const QColor &colour);
 
        void on_popup_closed();
 
-signals:
-       void visibility_changed();
-       void text_changed();    
-       void colour_changed();
-
 protected:
-       pv::SigSession &_session;
-       pv::view::View *_view;
-
-       QString _name;
-       QColor _colour;
-       int _v_offset;
+       QString name_;
+       QColor colour_;
 
 private:
-       pv::widgets::Popup *_popup;
-       QFormLayout *_popup_form;
+       pv::widgets::Popup *popup_;
+       QFormLayout *popup_form_;
 };
 
 } // namespace view