Backport recent changes from mainline.

[pulseview.git] / pv / views / trace / tracegroup.hpp

diff --git a/pv/views/trace/tracegroup.hpp b/pv/views/trace/tracegroup.hpp
index 6a72318abf87d79edb272ad242ad95258fcd587e..4a793665886856971b52e56d8647a96ab6fc92af 100644 (file)
--- a/pv/views/trace/tracegroup.hpp
+++ b/pv/views/trace/tracegroup.hpp
@@ -37,7 +37,7 @@ private:
        static const int Padding;
        static const int Width;
        static const int LineThickness;
-       static const QColor LineColour;
+       static const QColor LineColor;
 
 public:
        /**
@@ -102,7 +102,7 @@ public:
         */
        bool pt_in_label_rect(int left, int right, const QPoint &point);
 
-       QMenu* create_context_menu(QWidget *parent);
+       QMenu* create_header_context_menu(QWidget *parent);
 
        pv::widgets::Popup* create_popup(QWidget *parent);
 
@@ -111,8 +111,6 @@ public:
         */
        int owner_visual_v_offset() const;
 
-       void restack_items();
-
        /**
         * Returns the number of nested parents that this row item owner has.
         */