From ccd76f902dd0999e47cc05913d4e97c7743a49c2 Mon Sep 17 00:00:00 2001 From: Simon De Backer Date: Fri, 4 Dec 2020 18:13:48 +0100 Subject: [PATCH] fix QT DEPRECATED VERSION 5.15.2 -Qt::MidButton --- sources/diagramview.cpp | 10 +++++----- sources/editor/elementview.cpp | 15 +++++++++------ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/sources/diagramview.cpp b/sources/diagramview.cpp index 87fe9dedd..92adfef12 100644 --- a/sources/diagramview.cpp +++ b/sources/diagramview.cpp @@ -449,7 +449,7 @@ void DiagramView::mousePressEvent(QMouseEvent *e) if (m_event_interface && m_event_interface->mousePressEvent(e)) return; //Start drag view when hold the middle button -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove if (e->button() == Qt::MidButton) #else #if TODO_LIST @@ -505,8 +505,8 @@ void DiagramView::mouseMoveEvent(QMouseEvent *e) setToolTip(tr("(Dev) X: %1 Y: %2").arg(e->pos().x()).arg(e->pos().y())); if (m_event_interface && m_event_interface->mouseMoveEvent(e)) return; - //Drag the view -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove + // Drag the view +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove if (e->buttons() == Qt::MidButton) #else #if TODO_LIST @@ -573,8 +573,8 @@ void DiagramView::mouseReleaseEvent(QMouseEvent *e) { if (m_event_interface && m_event_interface->mouseReleaseEvent(e)) return; - //Stop drag view -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove + // Stop drag view +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove if (e->button() == Qt::MidButton) #else #if TODO_LIST diff --git a/sources/editor/elementview.cpp b/sources/editor/elementview.cpp index 877532cc6..9117da8d4 100644 --- a/sources/editor/elementview.cpp +++ b/sources/editor/elementview.cpp @@ -372,8 +372,9 @@ ElementContent ElementView::pasteWithOffset(const QDomDocument &xml_document) { du milieu de la souris. @param e QMouseEvent decrivant l'evenement souris */ -void ElementView::mousePressEvent(QMouseEvent *e) { -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove +void ElementView::mousePressEvent(QMouseEvent* e) +{ +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove if (e->button() == Qt::MidButton) #else #if TODO_LIST @@ -393,8 +394,9 @@ void ElementView::mousePressEvent(QMouseEvent *e) { @brief ElementView::mouseMoveEvent Manage the event move mouse */ -void ElementView::mouseMoveEvent(QMouseEvent *e) { -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove +void ElementView::mouseMoveEvent(QMouseEvent* e) +{ +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove if (e->buttons() == Qt::MidButton) #else #if TODO_LIST @@ -418,8 +420,9 @@ void ElementView::mouseMoveEvent(QMouseEvent *e) { @brief ElementView::mouseReleaseEvent Manage event release click mouse */ -void ElementView::mouseReleaseEvent(QMouseEvent *e) { -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove +void ElementView::mouseReleaseEvent(QMouseEvent* e) +{ +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) // ### Qt 6: remove if (e->button() == Qt::MidButton) #else #if TODO_LIST