From 929e3819a87237f6ef757b6846f471a5ba569a30 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 28 Sep 2020 16:27:54 +0200 Subject: [PATCH] Qt6: enterEvent now gets passed a QEnterEvent Add a Utils::EnterEvent for porting. Task-number: QTCREATORBUG-24098 Change-Id: I2782fe33e41a813b5562676f6dc87d6d53babdd3 Reviewed-by: hjk --- src/libs/qmleditorwidgets/contextpanewidget.cpp | 2 +- src/libs/qmleditorwidgets/contextpanewidget.h | 5 ++++- src/libs/qmleditorwidgets/customcolordialog.cpp | 2 +- src/libs/qmleditorwidgets/customcolordialog.h | 5 ++++- src/libs/utils/detailswidget.cpp | 2 +- src/libs/utils/detailswidget.h | 4 +++- src/libs/utils/fancymainwindow.cpp | 9 +++++---- src/libs/utils/porting.h | 11 +++++++++++ src/plugins/coreplugin/fancytabwidget.cpp | 2 +- src/plugins/coreplugin/fancytabwidget.h | 3 ++- src/plugins/coreplugin/iwelcomepage.cpp | 2 +- src/plugins/coreplugin/iwelcomepage.h | 3 ++- src/plugins/debugger/debuggertooltipmanager.cpp | 15 +++++---------- src/plugins/modeleditor/dragtool.cpp | 2 +- src/plugins/modeleditor/dragtool.h | 4 +++- src/plugins/scxmleditor/common/colorthemeview.cpp | 2 +- src/plugins/scxmleditor/common/colorthemeview.h | 4 +++- src/plugins/welcome/welcomeplugin.cpp | 7 ++++--- 18 files changed, 53 insertions(+), 31 deletions(-) diff --git a/src/libs/qmleditorwidgets/contextpanewidget.cpp b/src/libs/qmleditorwidgets/contextpanewidget.cpp index db8b69a47f2..04ad83de34c 100644 --- a/src/libs/qmleditorwidgets/contextpanewidget.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidget.cpp @@ -149,7 +149,7 @@ void DragWidget::leaveEvent(QEvent *) unsetCursor(); } -void DragWidget::enterEvent(QEvent *) +void DragWidget::enterEvent(EnterEvent *) { if (HostOsInfo::isMacHost()) setCursor(Qt::ArrowCursor); diff --git a/src/libs/qmleditorwidgets/contextpanewidget.h b/src/libs/qmleditorwidgets/contextpanewidget.h index deb5d457526..f73b8014de9 100644 --- a/src/libs/qmleditorwidgets/contextpanewidget.h +++ b/src/libs/qmleditorwidgets/contextpanewidget.h @@ -26,6 +26,9 @@ #pragma once #include "qmleditorwidgets_global.h" + +#include + #include #include @@ -62,7 +65,7 @@ protected: void mouseMoveEvent(QMouseEvent * event) override; void virtual protectedMoved(); void leaveEvent(QEvent *) override; - void enterEvent(QEvent *) override; + void enterEvent(Utils::EnterEvent *) override; private: QGraphicsDropShadowEffect *m_dropShadowEffect; diff --git a/src/libs/qmleditorwidgets/customcolordialog.cpp b/src/libs/qmleditorwidgets/customcolordialog.cpp index 3792785ad2d..2556b973742 100644 --- a/src/libs/qmleditorwidgets/customcolordialog.cpp +++ b/src/libs/qmleditorwidgets/customcolordialog.cpp @@ -186,7 +186,7 @@ void CustomColorDialog::leaveEvent(QEvent *) unsetCursor(); } -void CustomColorDialog::enterEvent(QEvent *) +void CustomColorDialog::enterEvent(EnterEvent *) { if (HostOsInfo::isMacHost()) setCursor(Qt::ArrowCursor); diff --git a/src/libs/qmleditorwidgets/customcolordialog.h b/src/libs/qmleditorwidgets/customcolordialog.h index 88564c81424..cf3de364bc3 100644 --- a/src/libs/qmleditorwidgets/customcolordialog.h +++ b/src/libs/qmleditorwidgets/customcolordialog.h @@ -26,6 +26,9 @@ #pragma once #include "qmleditorwidgets_global.h" + +#include + #include QT_BEGIN_NAMESPACE @@ -83,7 +86,7 @@ signals: protected: void setupWidgets(); void leaveEvent(QEvent *) override; - void enterEvent(QEvent *) override; + void enterEvent(Utils::EnterEvent *) override; private: QFrame *m_beforeColorWidget; diff --git a/src/libs/utils/detailswidget.cpp b/src/libs/utils/detailswidget.cpp index 062320846d7..1b58919c201 100644 --- a/src/libs/utils/detailswidget.cpp +++ b/src/libs/utils/detailswidget.cpp @@ -292,7 +292,7 @@ void DetailsWidget::paintEvent(QPaintEvent *paintEvent) } } -void DetailsWidget::enterEvent(QEvent * event) +void DetailsWidget::enterEvent(EnterEvent *event) { QWidget::enterEvent(event); d->changeHoverState(true); diff --git a/src/libs/utils/detailswidget.h b/src/libs/utils/detailswidget.h index e9c55c9eaf0..a7b7f4d7917 100644 --- a/src/libs/utils/detailswidget.h +++ b/src/libs/utils/detailswidget.h @@ -27,6 +27,8 @@ #include "utils_global.h" +#include "porting.h" + #include namespace Utils { @@ -94,7 +96,7 @@ private: protected: void paintEvent(QPaintEvent *paintEvent) override; - void enterEvent(QEvent *event) override; + void enterEvent(EnterEvent *event) override; void leaveEvent(QEvent *event) override; private: diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp index b271095effb..a18fa48520f 100644 --- a/src/libs/utils/fancymainwindow.cpp +++ b/src/libs/utils/fancymainwindow.cpp @@ -26,6 +26,7 @@ #include "fancymainwindow.h" #include "algorithm.h" +#include "porting.h" #include "qtcassert.h" #include "stringutils.h" @@ -74,7 +75,7 @@ public: DockWidget(QWidget *inner, FancyMainWindow *parent, bool immutable = false); bool eventFilter(QObject *, QEvent *event) override; - void enterEvent(QEvent *event) override; + void enterEvent(EnterEvent *event) override; void leaveEvent(QEvent *event) override; void handleMouseTimeout(); void handleToplevelChanged(bool floating); @@ -114,7 +115,7 @@ public: QSize minimumSizeHint() const override { return sizeHint(); } - void enterEvent(QEvent *event) override + void enterEvent(EnterEvent *event) override { if (isEnabled()) update(); @@ -193,7 +194,7 @@ public: setProperty("managed_titlebar", 1); } - void enterEvent(QEvent *event) override + void enterEvent(EnterEvent *event) override { setActive(true); QWidget::enterEvent(event); @@ -303,7 +304,7 @@ bool DockWidget::eventFilter(QObject *, QEvent *event) return false; } -void DockWidget::enterEvent(QEvent *event) +void DockWidget::enterEvent(EnterEvent *event) { if (!m_immutable) QApplication::instance()->installEventFilter(this); diff --git a/src/libs/utils/porting.h b/src/libs/utils/porting.h index 5b74464ac80..91dbeaa7279 100644 --- a/src/libs/utils/porting.h +++ b/src/libs/utils/porting.h @@ -27,6 +27,9 @@ #include "utils_global.h" +#ifdef QT_GUI_LIB +#include +#endif #include namespace Utils { @@ -84,4 +87,12 @@ inline QStringView midView(const QString &s, int offset, int length) } #endif +#ifdef QT_GUI_LIB +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +using EnterEvent = QEvent; +#else +using EnterEvent = QEnterEvent; +#endif +#endif + } // namespace Utils diff --git a/src/plugins/coreplugin/fancytabwidget.cpp b/src/plugins/coreplugin/fancytabwidget.cpp index a233b8c58c0..ea2cc88e4a2 100644 --- a/src/plugins/coreplugin/fancytabwidget.cpp +++ b/src/plugins/coreplugin/fancytabwidget.cpp @@ -164,7 +164,7 @@ bool FancyTabBar::event(QEvent *event) } // Resets hover animation on mouse enter -void FancyTabBar::enterEvent(QEvent *event) +void FancyTabBar::enterEvent(EnterEvent *event) { Q_UNUSED(event) m_hoverRect = QRect(); diff --git a/src/plugins/coreplugin/fancytabwidget.h b/src/plugins/coreplugin/fancytabwidget.h index 92f2b49e69f..11f3f3bcd39 100644 --- a/src/plugins/coreplugin/fancytabwidget.h +++ b/src/plugins/coreplugin/fancytabwidget.h @@ -26,6 +26,7 @@ #pragma once #include +#include #include #include @@ -87,7 +88,7 @@ public: void paintTab(QPainter *painter, int tabIndex) const; void mousePressEvent(QMouseEvent *event) override; void mouseMoveEvent(QMouseEvent *event) override; - void enterEvent(QEvent *event) override; + void enterEvent(Utils::EnterEvent *event) override; void leaveEvent(QEvent *event) override; bool validIndex(int index) const { return index >= 0 && index < m_tabs.count(); } diff --git a/src/plugins/coreplugin/iwelcomepage.cpp b/src/plugins/coreplugin/iwelcomepage.cpp index 38582941331..e305bbe7d5f 100644 --- a/src/plugins/coreplugin/iwelcomepage.cpp +++ b/src/plugins/coreplugin/iwelcomepage.cpp @@ -157,7 +157,7 @@ void WelcomePageButton::mousePressEvent(QMouseEvent *) d->onClicked(); } -void WelcomePageButton::enterEvent(QEvent *) +void WelcomePageButton::enterEvent(EnterEvent *) { d->doUpdate(true); } diff --git a/src/plugins/coreplugin/iwelcomepage.h b/src/plugins/coreplugin/iwelcomepage.h index 63a1d632a18..bc4ea7878d0 100644 --- a/src/plugins/coreplugin/iwelcomepage.h +++ b/src/plugins/coreplugin/iwelcomepage.h @@ -28,6 +28,7 @@ #include "core_global.h" #include +#include #include #include @@ -76,7 +77,7 @@ public: ~WelcomePageButton() override; void mousePressEvent(QMouseEvent *) override; - void enterEvent(QEvent *) override; + void enterEvent(Utils::EnterEvent *) override; void leaveEvent(QEvent *) override; void setText(const QString &text); diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp index d439b4d0d4d..546a68fac65 100644 --- a/src/plugins/debugger/debuggertooltipmanager.cpp +++ b/src/plugins/debugger/debuggertooltipmanager.cpp @@ -50,9 +50,10 @@ #include #include +#include +#include #include #include -#include #include #include @@ -456,15 +457,9 @@ public: ~DebuggerToolTipWidget() override { DEBUG("DESTROY DEBUGGERTOOLTIP WIDGET"); } - void closeEvent(QCloseEvent *) override - { - DEBUG("CLOSE DEBUGGERTOOLTIP WIDGET"); - } + void closeEvent(QCloseEvent *) override { DEBUG("CLOSE DEBUGGERTOOLTIP WIDGET"); } - void enterEvent(QEvent *) override - { - DEBUG("ENTER DEBUGGERTOOLTIP WIDGET"); - } + void enterEvent(EnterEvent *) override { DEBUG("ENTER DEBUGGERTOOLTIP WIDGET"); } void leaveEvent(QEvent *) override { @@ -1085,7 +1080,7 @@ void DebuggerToolTipManagerPrivate::loadSessionData() closeAllToolTips(); const QString data = SessionManager::value(sessionSettingsKeyC).toString(); QXmlStreamReader r(data); - if (r.readNextStartElement() && r.name() == sessionDocumentC) { + if (r.readNextStartElement() && r.name() == QLatin1String(sessionDocumentC)) { while (!r.atEnd()) { if (readStartElement(r, toolTipElementC)) { const QXmlStreamAttributes attributes = r.attributes(); diff --git a/src/plugins/modeleditor/dragtool.cpp b/src/plugins/modeleditor/dragtool.cpp index fd4d75fca00..b86a86412f7 100644 --- a/src/plugins/modeleditor/dragtool.cpp +++ b/src/plugins/modeleditor/dragtool.cpp @@ -120,7 +120,7 @@ void DragTool::paintEvent(QPaintEvent *event) } } -void DragTool::enterEvent(QEvent *event) +void DragTool::enterEvent(Utils::EnterEvent *event) { Q_UNUSED(event) update(); diff --git a/src/plugins/modeleditor/dragtool.h b/src/plugins/modeleditor/dragtool.h index 4de18b195bd..38c66fe296e 100644 --- a/src/plugins/modeleditor/dragtool.h +++ b/src/plugins/modeleditor/dragtool.h @@ -25,6 +25,8 @@ #pragma once +#include + #include #include @@ -46,7 +48,7 @@ public: protected: void paintEvent(QPaintEvent *event) override; - void enterEvent(QEvent *event) override; + void enterEvent(Utils::EnterEvent *event) override; void leaveEvent(QEvent *event) override; void mousePressEvent(QMouseEvent *event) override; void mouseMoveEvent(QMouseEvent *event) override; diff --git a/src/plugins/scxmleditor/common/colorthemeview.cpp b/src/plugins/scxmleditor/common/colorthemeview.cpp index 54fb006d33c..1c7640bbec7 100644 --- a/src/plugins/scxmleditor/common/colorthemeview.cpp +++ b/src/plugins/scxmleditor/common/colorthemeview.cpp @@ -73,7 +73,7 @@ void ColorThemeItem::openColorDialog() } } -void ColorThemeItem::enterEvent(QEvent *e) +void ColorThemeItem::enterEvent(Utils::EnterEvent *e) { m_pen.setWidth(isEnabled() ? 3 : 1); diff --git a/src/plugins/scxmleditor/common/colorthemeview.h b/src/plugins/scxmleditor/common/colorthemeview.h index 56e7002fa2f..7ad74b9d610 100644 --- a/src/plugins/scxmleditor/common/colorthemeview.h +++ b/src/plugins/scxmleditor/common/colorthemeview.h @@ -25,6 +25,8 @@ #pragma once +#include + #include #include @@ -53,7 +55,7 @@ signals: protected: void paintEvent(QPaintEvent *e) override; - void enterEvent(QEvent *e) override; + void enterEvent(Utils::EnterEvent *e) override; void leaveEvent(QEvent *e) override; void mousePressEvent(QMouseEvent *e) override; diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index 1a1b840f00f..f814c9f4702 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -41,13 +41,14 @@ #include #include -#include #include #include +#include +#include #include #include -#include #include +#include #include #include @@ -194,7 +195,7 @@ public: setLayout(layout); } - void enterEvent(QEvent *) override + void enterEvent(EnterEvent *) override { QPalette pal; pal.setColor(QPalette::Window, themeColor(Theme::Welcome_HoverColor));