diff options
| author | Marcus Müller <mmueller@gnuradio.org> | 2021-01-25 22:23:49 +0100 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-01-27 08:10:35 -0500 |
| commit | b47544890b045a8e7bb15386e08e046e9afbd193 (patch) | |
| tree | eae700277b99a174fa2248c359e2e60ef6176abd | |
| parent | 67f52885880af77d342219cd673a039ae476dfcc (diff) | |
Qt: deprecated MidButton->MiddleButton, available since Qt4.7
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
| -rw-r--r-- | gr-qtgui/lib/DisplayPlot.cc | 2 | ||||
| -rw-r--r-- | gr-qtgui/lib/TimeRasterDisplayPlot.cc | 2 | ||||
| -rw-r--r-- | gr-qtgui/lib/WaterfallDisplayPlot.cc | 2 | ||||
| -rw-r--r-- | gr-qtgui/lib/displayform.cc | 2 | ||||
| -rw-r--r-- | gr-qtgui/lib/eyedisplaysform.cc | 2 | ||||
| -rw-r--r-- | gr-qtgui/lib/numberdisplayform.cc | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/gr-qtgui/lib/DisplayPlot.cc b/gr-qtgui/lib/DisplayPlot.cc index 8c115c8b8c..5be0431d97 100644 --- a/gr-qtgui/lib/DisplayPlot.cc +++ b/gr-qtgui/lib/DisplayPlot.cc @@ -44,7 +44,7 @@ DisplayPlot::DisplayPlot(int nplots, QWidget* parent) d_panner = new QwtPlotPanner(canvas()); d_panner->setAxisEnabled(QwtPlot::yRight, false); - d_panner->setMouseButton(Qt::MidButton, Qt::ControlModifier); + d_panner->setMouseButton(Qt::MiddleButton, Qt::ControlModifier); // emit the position of clicks on widget d_picker = new QwtDblClickPlotPicker(canvas()); diff --git a/gr-qtgui/lib/TimeRasterDisplayPlot.cc b/gr-qtgui/lib/TimeRasterDisplayPlot.cc index 7ce5652079..1e6924f699 100644 --- a/gr-qtgui/lib/TimeRasterDisplayPlot.cc +++ b/gr-qtgui/lib/TimeRasterDisplayPlot.cc @@ -418,7 +418,7 @@ TimeRasterDisplayPlot::TimeRasterDisplayPlot( setAlpha(0, 255); // LeftButton for the zooming - // MidButton for the panning + // MiddleButton for the panning // RightButton: zoom out by 1 // Ctrl+RighButton: zoom out to full size d_zoomer = new TimeRasterZoomer(canvas(), diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.cc b/gr-qtgui/lib/WaterfallDisplayPlot.cc index a03a8c017d..9b21990a75 100644 --- a/gr-qtgui/lib/WaterfallDisplayPlot.cc +++ b/gr-qtgui/lib/WaterfallDisplayPlot.cc @@ -158,7 +158,7 @@ WaterfallDisplayPlot::WaterfallDisplayPlot(int nplots, QWidget* parent) setAlpha(0, 255); // LeftButton for the zooming - // MidButton for the panning + // MiddleButton for the panning // RightButton: zoom out by 1 // Ctrl+RighButton: zoom out to full size d_zoomer = new WaterfallZoomer(canvas(), 0); diff --git a/gr-qtgui/lib/displayform.cc b/gr-qtgui/lib/displayform.cc index b8a4b34efb..af998a72f3 100644 --- a/gr-qtgui/lib/displayform.cc +++ b/gr-qtgui/lib/displayform.cc @@ -147,7 +147,7 @@ DisplayForm::~DisplayForm() void DisplayForm::mousePressEvent(QMouseEvent* e) { bool ctrloff = Qt::ControlModifier != QApplication::keyboardModifiers(); - if ((e->button() == Qt::MidButton) && ctrloff && (d_menu_on)) { + if ((e->button() == Qt::MiddleButton) && ctrloff && (d_menu_on)) { if (d_stop_state == false) d_stop_act->setText(tr("Stop")); else diff --git a/gr-qtgui/lib/eyedisplaysform.cc b/gr-qtgui/lib/eyedisplaysform.cc index 5f79f4ec64..6c4a37e1ee 100644 --- a/gr-qtgui/lib/eyedisplaysform.cc +++ b/gr-qtgui/lib/eyedisplaysform.cc @@ -155,7 +155,7 @@ void EyeDisplaysForm::resizeEvent(QResizeEvent* e) void EyeDisplaysForm::mousePressEvent(QMouseEvent* e) { bool ctrloff = Qt::ControlModifier != QApplication::keyboardModifiers(); - if ((e->button() == Qt::MidButton) && ctrloff && (d_menu_on)) { + if ((e->button() == Qt::MiddleButton) && ctrloff && (d_menu_on)) { if (d_stop_state == false) d_stop_act->setText(tr("Stop")); else diff --git a/gr-qtgui/lib/numberdisplayform.cc b/gr-qtgui/lib/numberdisplayform.cc index 380576e171..75fb7055a1 100644 --- a/gr-qtgui/lib/numberdisplayform.cc +++ b/gr-qtgui/lib/numberdisplayform.cc @@ -157,7 +157,7 @@ NumberDisplayForm::~NumberDisplayForm() void NumberDisplayForm::mousePressEvent(QMouseEvent* e) { bool ctrloff = Qt::ControlModifier != QApplication::keyboardModifiers(); - if ((e->button() == Qt::MidButton) && ctrloff && (d_menu_on)) { + if ((e->button() == Qt::MiddleButton) && ctrloff && (d_menu_on)) { if (d_stop_state == false) d_stop_act->setText(tr("Stop")); else |