Rename create_context_menu() to create_header_context_menu()

diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
index 208185ac63a7e26ccb0da39ac11bae73b501aed6..9eeea1c29ec20beaa7139eb8ea1d9b835754b109 100644 (file)
--- a/pv/views/trace/decodetrace.cpp
+++ b/pv/views/trace/decodetrace.cpp
@@ -307,9 +307,9 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
        form->addRow(stack_button_box);
 }
 
-QMenu* DecodeTrace::create_context_menu(QWidget *parent)
+QMenu* DecodeTrace::create_header_context_menu(QWidget *parent)
 {
-       QMenu *const menu = Trace::create_context_menu(parent);
+       QMenu *const menu = Trace::create_header_context_menu(parent);
 
        menu->addSeparator();
 

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index deda663e6b73232db502da514db1ccd65330fdc3..4d9e59c162b7484d2c748dbfb2afd492f5f7be25 100644 (file)
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -118,7 +118,7 @@ public:
 
        void populate_popup_form(QWidget *parent, QFormLayout *form);
 
-       QMenu* create_context_menu(QWidget *parent);
+       QMenu* create_header_context_menu(QWidget *parent);
 
        void delete_pressed();
 

diff --git a/pv/views/trace/flag.cpp b/pv/views/trace/flag.cpp
index 1cdaea8448ffdd5ad8107ca9c961a3842e544f14..64ef1047d03e6b5057753ccca7fe0a468aefee44 100644 (file)
--- a/pv/views/trace/flag.cpp
+++ b/pv/views/trace/flag.cpp
@@ -81,7 +81,7 @@ pv::widgets::Popup* Flag::create_popup(QWidget *parent)
        return popup;
 }
 
-QMenu* Flag::create_context_menu(QWidget *parent)
+QMenu* Flag::create_header_context_menu(QWidget *parent)
 {
        QMenu *const menu = new QMenu(parent);
 

diff --git a/pv/views/trace/flag.hpp b/pv/views/trace/flag.hpp
index 150d37e81eebab9effc4de3e5e6b89375c385c4c..4bf6ebd5db7f974a9857e733ce0b49c8cbde046f 100644 (file)
--- a/pv/views/trace/flag.hpp
+++ b/pv/views/trace/flag.hpp
@@ -69,7 +69,7 @@ public:
 
        pv::widgets::Popup* create_popup(QWidget *parent);
 
-       QMenu* create_context_menu(QWidget *parent);
+       QMenu* create_header_context_menu(QWidget *parent);
 
        void delete_pressed();
 

diff --git a/pv/views/trace/header.cpp b/pv/views/trace/header.cpp
index 10fc7eb9fc3600920f50280f7d521685abe97e88..c5510fcb40c44a8c6cf3ad4631736b51fac061ea 100644 (file)
--- a/pv/views/trace/header.cpp
+++ b/pv/views/trace/header.cpp
@@ -125,7 +125,7 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
        if (!r)
                return;
 
-       QMenu *menu = r->create_context_menu(this);
+       QMenu *menu = r->create_header_context_menu(this);
        if (!menu)
                menu = new QMenu(this);
 

diff --git a/pv/views/trace/marginwidget.cpp b/pv/views/trace/marginwidget.cpp
index fa12c2b5b8d9257e8d5e24b885c4a711ee34055d..7b7503577ed53cbba888298f97af8892d4700751 100644 (file)
--- a/pv/views/trace/marginwidget.cpp
+++ b/pv/views/trace/marginwidget.cpp
@@ -57,7 +57,7 @@ void MarginWidget::contextMenuEvent(QContextMenuEvent *event)
        if (!r)
                return;
 
-       QMenu *menu = r->create_context_menu(this);
+       QMenu *menu = r->create_header_context_menu(this);
        if (menu)
                menu->exec(event->globalPos());
 }

diff --git a/pv/views/trace/signal.cpp b/pv/views/trace/signal.cpp
index d9a7a0841a78b99dc806868e55ebf3198a1cc870..0c0cde05e18aa4d9d9f5cab9b748743b7fbffc7c 100644 (file)
--- a/pv/views/trace/signal.cpp
+++ b/pv/views/trace/signal.cpp
@@ -130,9 +130,9 @@ void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
        add_color_option(parent, form);
 }
 
-QMenu* Signal::create_context_menu(QWidget *parent)
+QMenu* Signal::create_header_context_menu(QWidget *parent)
 {
-       QMenu *const menu = Trace::create_context_menu(parent);
+       QMenu *const menu = Trace::create_header_context_menu(parent);
 
        menu->addSeparator();
 

diff --git a/pv/views/trace/signal.hpp b/pv/views/trace/signal.hpp
index 7f88720f7943904142008b82d88f8103caefa464..1c53d8b2260a960669261c056f069a9e35883bfb 100644 (file)
--- a/pv/views/trace/signal.hpp
+++ b/pv/views/trace/signal.hpp
@@ -83,7 +83,7 @@ public:
 
        virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
-       QMenu* create_context_menu(QWidget *parent);
+       QMenu* create_header_context_menu(QWidget *parent);
 
        void delete_pressed();
 

diff --git a/pv/views/trace/trace.cpp b/pv/views/trace/trace.cpp
index 3b79dcd98aea33db43ca32fbe9f37415048dc2c6..8c450a088604e543a2b1f41e421011e0e3d719db 100644 (file)
--- a/pv/views/trace/trace.cpp
+++ b/pv/views/trace/trace.cpp
@@ -149,9 +149,9 @@ void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
                Qt::AlignCenter | Qt::AlignVCenter, base_->name());
 }
 
-QMenu* Trace::create_context_menu(QWidget *parent)
+QMenu* Trace::create_header_context_menu(QWidget *parent)
 {
-       QMenu *const menu = ViewItem::create_context_menu(parent);
+       QMenu *const menu = ViewItem::create_header_context_menu(parent);
 
        return menu;
 }

diff --git a/pv/views/trace/trace.hpp b/pv/views/trace/trace.hpp
index bc97736c03de58f1ccc4d9d2e09571c110c6d909..0c493d7206b56577c8915c8d5cf90962895376ef 100644 (file)
--- a/pv/views/trace/trace.hpp
+++ b/pv/views/trace/trace.hpp
@@ -117,7 +117,7 @@ public:
         */
        virtual void paint_label(QPainter &p, const QRect &rect, bool hover);
 
-       virtual QMenu* create_context_menu(QWidget *parent);
+       virtual QMenu* create_header_context_menu(QWidget *parent);
 
        pv::widgets::Popup* create_popup(QWidget *parent);
 

diff --git a/pv/views/trace/tracegroup.cpp b/pv/views/trace/tracegroup.cpp
index 6df8f6506b9ea3a552d40e4dc5dcdd86f6d71ba2..a639ce9cea426f0224e91e15f585c2df520d9cb0 100644 (file)
--- a/pv/views/trace/tracegroup.cpp
+++ b/pv/views/trace/tracegroup.cpp
@@ -133,7 +133,7 @@ bool TraceGroup::pt_in_label_rect(int left, int right, const QPoint &point)
        return false;
 }
 
-QMenu* TraceGroup::create_context_menu(QWidget *parent)
+QMenu* TraceGroup::create_header_context_menu(QWidget *parent)
 {
        QMenu *const menu = new QMenu(parent);
 

diff --git a/pv/views/trace/tracegroup.hpp b/pv/views/trace/tracegroup.hpp
index a1cc6fdc4558151911b56e40531d0fc5a23ea31a..4a793665886856971b52e56d8647a96ab6fc92af 100644 (file)
--- a/pv/views/trace/tracegroup.hpp
+++ b/pv/views/trace/tracegroup.hpp
@@ -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);
 

diff --git a/pv/views/trace/viewitem.cpp b/pv/views/trace/viewitem.cpp
index 7c1fae736699e2215aefb71e7aaec1f0a714fe00..ee0720ea6064dd12538bd0bbec10e9c68daaf72b 100644 (file)
--- a/pv/views/trace/viewitem.cpp
+++ b/pv/views/trace/viewitem.cpp
@@ -82,7 +82,7 @@ QRectF ViewItem::hit_box_rect(const ViewItemPaintParams &pp) const
        return QRectF();
 }
 
-QMenu* ViewItem::create_context_menu(QWidget *parent)
+QMenu* ViewItem::create_header_context_menu(QWidget *parent)
 {
        context_parent_ = parent;
        return new QMenu(parent);

diff --git a/pv/views/trace/viewitem.hpp b/pv/views/trace/viewitem.hpp
index 91242f57478e3bb9223bb8f01abf14118853c21a..e07b26b87912cc1f072c1f4fd12e2eff2cdbe9df 100644 (file)
--- a/pv/views/trace/viewitem.hpp
+++ b/pv/views/trace/viewitem.hpp
@@ -155,7 +155,7 @@ public:
        static QColor select_text_color(QColor background);
 
 public:
-       virtual QMenu* create_context_menu(QWidget *parent);
+       virtual QMenu* create_header_context_menu(QWidget *parent);
 
        virtual QMenu* create_view_context_menu(QWidget *parent);