summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/widgets/dialogs/qwizard_win.cpp2
-rw-r--r--src/widgets/dialogs/qwizard_win_p.h2
-rw-r--r--src/widgets/kernel/qwidget.cpp8
-rw-r--r--src/widgets/kernel/qwidget.h3
-rw-r--r--src/widgets/widgets/qcombobox_p.h2
-rw-r--r--src/widgets/widgets/qdockwidget.cpp4
-rw-r--r--src/widgets/widgets/qmenu.cpp2
-rw-r--r--src/widgets/widgets/qmenu.h2
-rw-r--r--src/widgets/widgets/qtabbar.cpp4
-rw-r--r--src/widgets/widgets/qtoolbutton.cpp2
-rw-r--r--src/widgets/widgets/qtoolbutton.h2
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp2
-rw-r--r--tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp6
-rw-r--r--tests/manual/cocoa/nativewidgets/main.cpp2
14 files changed, 21 insertions, 22 deletions
diff --git a/src/widgets/dialogs/qwizard_win.cpp b/src/widgets/dialogs/qwizard_win.cpp
index c80db1fd94..9575dc7fba 100644
--- a/src/widgets/dialogs/qwizard_win.cpp
+++ b/src/widgets/dialogs/qwizard_win.cpp
@@ -94,7 +94,7 @@ QSize QVistaBackButton::sizeHint() const
return QSize(width, height);
}
-void QVistaBackButton::enterEvent(QEvent *event)
+void QVistaBackButton::enterEvent(QEnterEvent *event)
{
if (isEnabled())
update();
diff --git a/src/widgets/dialogs/qwizard_win_p.h b/src/widgets/dialogs/qwizard_win_p.h
index 520046ca02..a8799e4b86 100644
--- a/src/widgets/dialogs/qwizard_win_p.h
+++ b/src/widgets/dialogs/qwizard_win_p.h
@@ -75,7 +75,7 @@ public:
inline QSize minimumSizeHint() const override
{ return sizeHint(); }
- void enterEvent(QEvent *event) override;
+ void enterEvent(QEnterEvent *event) override;
void leaveEvent(QEvent *event) override;
void paintEvent(QPaintEvent *event) override;
};
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index dc7f8f7dc4..5a76be82a5 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -8756,7 +8756,7 @@ bool QWidget::event(QEvent *event)
QCoreApplication::sendEvent(const_cast<QWidget *>(this), &tip);
}
#endif
- enterEvent(event);
+ enterEvent(static_cast<QEnterEvent*>(event));
break;
case QEvent::Leave:
@@ -9402,7 +9402,7 @@ void QWidget::focusOutEvent(QFocusEvent *)
}
/*!
- \fn void QWidget::enterEvent(QEvent *event)
+ \fn void QWidget::enterEvent(QEnterEvent *event)
This event handler can be reimplemented in a subclass to receive
widget enter events which are passed in the \a event parameter.
@@ -9413,12 +9413,10 @@ void QWidget::focusOutEvent(QFocusEvent *)
\sa leaveEvent(), mouseMoveEvent(), event()
*/
-void QWidget::enterEvent(QEvent *)
+void QWidget::enterEvent(QEnterEvent *)
{
}
-// ### Qt 6: void QWidget::enterEvent(QEnterEvent *).
-
/*!
\fn void QWidget::leaveEvent(QEvent *event)
diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h
index 6f4c709c10..b423b0ebad 100644
--- a/src/widgets/kernel/qwidget.h
+++ b/src/widgets/kernel/qwidget.h
@@ -75,6 +75,7 @@ class QMouseEvent;
class QWheelEvent;
class QHoverEvent;
class QKeyEvent;
+class QEnterEvent;
class QFocusEvent;
class QPaintEvent;
class QMoveEvent;
@@ -622,7 +623,7 @@ protected:
virtual void keyReleaseEvent(QKeyEvent *event);
virtual void focusInEvent(QFocusEvent *event);
virtual void focusOutEvent(QFocusEvent *event);
- virtual void enterEvent(QEvent *event);
+ virtual void enterEvent(QEnterEvent *event);
virtual void leaveEvent(QEvent *event);
virtual void paintEvent(QPaintEvent *event);
virtual void moveEvent(QMoveEvent *event);
diff --git a/src/widgets/widgets/qcombobox_p.h b/src/widgets/widgets/qcombobox_p.h
index b3adb4be69..a7e7af64a1 100644
--- a/src/widgets/widgets/qcombobox_p.h
+++ b/src/widgets/widgets/qcombobox_p.h
@@ -154,7 +154,7 @@ protected:
fast = false;
}
- void enterEvent(QEvent *) override {
+ void enterEvent(QEnterEvent *) override {
startTimer();
}
diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp
index fd9e98c795..6f5f345a40 100644
--- a/src/widgets/widgets/qdockwidget.cpp
+++ b/src/widgets/widgets/qdockwidget.cpp
@@ -129,7 +129,7 @@ public:
QSize minimumSizeHint() const override
{ return sizeHint(); }
- void enterEvent(QEvent *event) override;
+ void enterEvent(QEnterEvent *event) override;
void leaveEvent(QEvent *event) override;
void paintEvent(QPaintEvent *event) override;
@@ -205,7 +205,7 @@ QSize QDockWidgetTitleButton::sizeHint() const
return QSize(size, size);
}
-void QDockWidgetTitleButton::enterEvent(QEvent *event)
+void QDockWidgetTitleButton::enterEvent(QEnterEvent *event)
{
if (isEnabled()) update();
QAbstractButton::enterEvent(event);
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
index 9007d2af78..aa04873f63 100644
--- a/src/widgets/widgets/qmenu.cpp
+++ b/src/widgets/widgets/qmenu.cpp
@@ -3502,7 +3502,7 @@ void QMenu::mouseMoveEvent(QMouseEvent *e)
/*!
\reimp
*/
-void QMenu::enterEvent(QEvent *)
+void QMenu::enterEvent(QEnterEvent *)
{
Q_D(QMenu);
d->hasReceievedEnter = true;
diff --git a/src/widgets/widgets/qmenu.h b/src/widgets/widgets/qmenu.h
index e8b27c3278..f7348529e2 100644
--- a/src/widgets/widgets/qmenu.h
+++ b/src/widgets/widgets/qmenu.h
@@ -249,7 +249,7 @@ protected:
#if QT_CONFIG(wheelevent)
void wheelEvent(QWheelEvent *) override;
#endif
- void enterEvent(QEvent *) override;
+ void enterEvent(QEnterEvent *) override;
void leaveEvent(QEvent *) override;
void hideEvent(QHideEvent *) override;
void paintEvent(QPaintEvent *) override;
diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp
index 7761bcea30..5e686aa396 100644
--- a/src/widgets/widgets/qtabbar.cpp
+++ b/src/widgets/widgets/qtabbar.cpp
@@ -83,7 +83,7 @@ public:
QSize sizeHint() const override;
QSize minimumSizeHint() const override
{ return sizeHint(); }
- void enterEvent(QEvent *event) override;
+ void enterEvent(QEnterEvent *event) override;
void leaveEvent(QEvent *event) override;
void paintEvent(QPaintEvent *event) override;
};
@@ -2814,7 +2814,7 @@ QSize CloseButton::sizeHint() const
return QSize(width, height);
}
-void CloseButton::enterEvent(QEvent *event)
+void CloseButton::enterEvent(QEnterEvent *event)
{
if (isEnabled())
update();
diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp
index 5a394cfda8..30ac2f219c 100644
--- a/src/widgets/widgets/qtoolbutton.cpp
+++ b/src/widgets/widgets/qtoolbutton.cpp
@@ -527,7 +527,7 @@ void QToolButtonPrivate::_q_actionTriggered()
/*!
\reimp
*/
-void QToolButton::enterEvent(QEvent * e)
+void QToolButton::enterEvent(QEnterEvent * e)
{
Q_D(QToolButton);
if (d->autoRaise)
diff --git a/src/widgets/widgets/qtoolbutton.h b/src/widgets/widgets/qtoolbutton.h
index 5d522c62bb..96702c145f 100644
--- a/src/widgets/widgets/qtoolbutton.h
+++ b/src/widgets/widgets/qtoolbutton.h
@@ -112,7 +112,7 @@ protected:
void paintEvent(QPaintEvent *) override;
void actionEvent(QActionEvent *) override;
- void enterEvent(QEvent *) override;
+ void enterEvent(QEnterEvent *) override;
void leaveEvent(QEvent *) override;
void timerEvent(QTimerEvent *) override;
void changeEvent(QEvent *) override;
diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
index ebf340db2a..34f27dbfcf 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
@@ -943,7 +943,7 @@ public:
installEventFilter(this);
}
- void enterEvent(QEvent *event)
+ void enterEvent(QEnterEvent *event)
{
enterCount++;
QWidget::enterEvent(event);
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index ae91685697..d670f19d0e 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -5596,7 +5596,7 @@ public:
r = QRegion();
}
- void enterEvent(QEvent *) override { ++enters; }
+ void enterEvent(QEnterEvent *) override { ++enters; }
void leaveEvent(QEvent *) override { ++leaves; }
void resetCounts()
@@ -9627,7 +9627,7 @@ void tst_QWidget::syntheticEnterLeave()
{
public:
using QWidget::QWidget;
- void enterEvent(QEvent *) override { ++numEnterEvents; }
+ void enterEvent(QEnterEvent *) override { ++numEnterEvents; }
void leaveEvent(QEvent *) override { ++numLeaveEvents; }
int numEnterEvents = 0;
int numLeaveEvents = 0;
@@ -9742,7 +9742,7 @@ void tst_QWidget::taskQTBUG_4055_sendSyntheticEnterLeave()
{
public:
using QWidget::QWidget;
- void enterEvent(QEvent *) override { ++numEnterEvents; }
+ void enterEvent(QEnterEvent *) override { ++numEnterEvents; }
void mouseMoveEvent(QMouseEvent *event) override
{
QCOMPARE(event->button(), Qt::NoButton);
diff --git a/tests/manual/cocoa/nativewidgets/main.cpp b/tests/manual/cocoa/nativewidgets/main.cpp
index 3923e30de7..769bf8664a 100644
--- a/tests/manual/cocoa/nativewidgets/main.cpp
+++ b/tests/manual/cocoa/nativewidgets/main.cpp
@@ -61,7 +61,7 @@ public:
update();
}
- void enterEvent(QEvent *)
+ void enterEvent(QEnterEvent *)
{
s = 200;
v = 200;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-13 22:35:32 +0000