Header: Renamed get_mouse_over_row_item to get_mouse_over_item

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 82c7dd0559a4662fe4123c2c4ed213c7649c8fe7..c19d10883af7fed3c77e3ee60d0f497faadb2958 100644 (file)
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -80,7 +80,7 @@ QSize Header::extended_size_hint() const
        return sizeHint() + QSize(ViewItem::HighlightRadius, 0);
 }
 
        return sizeHint() + QSize(ViewItem::HighlightRadius, 0);
 }
 

-shared_ptr<RowItem> Header::get_mouse_over_row_item(const QPoint &pt)
+shared_ptr<RowItem> Header::get_mouse_over_item(const QPoint &pt)

 {
        const QRect r(0, 0, width() - BaselineOffset, height());
        for (auto &i : view_)
 {
        const QRect r(0, 0, width() - BaselineOffset, height());
        for (auto &i : view_)


@@ -173,7 +173,7 @@ void Header::mousePressEvent(QMouseEvent *event)
        assert(event);
 
        mouse_down_point_ = event->pos();
        assert(event);
 
        mouse_down_point_ = event->pos();

-       mouse_down_item_ = get_mouse_over_row_item(event->pos());
+       mouse_down_item_ = get_mouse_over_item(event->pos());

 
        if (event->button() & Qt::LeftButton)
                mouseLeftPressEvent(event);
 
        if (event->button() & Qt::LeftButton)
                mouseLeftPressEvent(event);


@@ -188,7 +188,7 @@ void Header::mouseLeftReleaseEvent(QMouseEvent *event)
 
        // Unselect everything if control is not pressed
        const shared_ptr<RowItem> mouse_over =
 
        // Unselect everything if control is not pressed
        const shared_ptr<RowItem> mouse_over =

-               get_mouse_over_row_item(event->pos());
+               get_mouse_over_item(event->pos());

 
        for (auto &r : view_)
                r->drag_release();
 
        for (auto &r : view_)
                r->drag_release();


@@ -273,7 +273,7 @@ void Header::leaveEvent(QEvent*)
 
 void Header::contextMenuEvent(QContextMenuEvent *event)
 {
 
 void Header::contextMenuEvent(QContextMenuEvent *event)
 {

-       const shared_ptr<RowItem> r = get_mouse_over_row_item(mouse_point_);
+       const shared_ptr<RowItem> r = get_mouse_over_item(mouse_point_);

        if (!r)
                return;
 
        if (!r)
                return;
 

diff --git a/pv/view/header.hpp b/pv/view/header.hpp
index c5c8ae7a323ced381a0d18048ef31cca2327d7f7..10335cf5b6faf0cafbfe96f09fcd5ef8bddf4425 100644 (file)
--- a/pv/view/header.hpp
+++ b/pv/view/header.hpp
@@ -59,7 +59,7 @@ public:
        static const int BaselineOffset;
 
 private:
        static const int BaselineOffset;
 
 private:

-       std::shared_ptr<pv::view::RowItem> get_mouse_over_row_item(
+       std::shared_ptr<pv::view::RowItem> get_mouse_over_item(

                const QPoint &pt);
 
        void clear_selection();
                const QPoint &pt);
 
        void clear_selection();