vcl/inc/qt5/QtWidget.hxx | 11 +++-----
vcl/qt5/QtWidget.cxx | 63 +++++++++++++++++++++++------------------------
2 files changed, 36 insertions(+), 38 deletions(-)
New commits:
commit 525b3aaa13990185937e773c5afd921476dfeb23
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Sat Apr 12 14:59:41 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sun Apr 13 19:16:57 2025 +0200
qt: Make more QtWidget methods non-static
As done for other methods in previous commits,
make more methods non-static and use class
members directly instead of passing them
as method params.
Change-Id: I9180f7ff94d56b8291878fc5c7ac9e4bcc5d280f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184101
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/inc/qt5/QtWidget.hxx b/vcl/inc/qt5/QtWidget.hxx
index 3ad064f9151d..27d8c98fea93 100644
--- a/vcl/inc/qt5/QtWidget.hxx
+++ b/vcl/inc/qt5/QtWidget.hxx
@@ -43,14 +43,13 @@ class QtWidget : public QWidget
int m_nDeltaX;
int m_nDeltaY;
- static void commitText(QtFrame&, const QString& aText);
- static void deleteReplacementText(const QtFrame& rFrame, int
nReplacementStart,
- int nReplacementLength);
+ void commitText(const QString& aText) const;
+ void deleteReplacementText(int nReplacementStart, int nReplacementLength)
const;
bool handleEvent(QEvent* pEvent);
// mouse events are always accepted
void handleMouseButtonEvent(const QMouseEvent*) const;
- static bool handleGestureEvent(const QtFrame& rFrame, QGestureEvent*
pGestureEvent);
- static bool handleKeyEvent(QtFrame&, const QWidget&, QKeyEvent*);
+ bool handleGestureEvent(QGestureEvent* pGestureEvent) const;
+ bool handleKeyEvent(QKeyEvent*) const;
void handleMouseEnterLeaveEvent(QEvent*) const;
void fillSalAbstractMouseEvent(const QInputEvent* pQEvent, const QPoint&
rPos,
Qt::MouseButtons eButtons, int nWidth,
diff --git a/vcl/qt5/QtWidget.cxx b/vcl/qt5/QtWidget.cxx
index 886ee1b0bd99..074d18917330 100644
--- a/vcl/qt5/QtWidget.cxx
+++ b/vcl/qt5/QtWidget.cxx
@@ -414,7 +414,7 @@ static sal_uInt16 GetKeyCode(int keyval,
Qt::KeyboardModifiers modifiers)
return nCode;
}
-void QtWidget::commitText(QtFrame& rFrame, const QString& aText)
+void QtWidget::commitText(const QString& aText) const
{
SalExtTextInputEvent aInputEvent;
aInputEvent.mpTextAttr = nullptr;
@@ -423,21 +423,20 @@ void QtWidget::commitText(QtFrame& rFrame, const QString&
aText)
aInputEvent.mnCursorPos = aInputEvent.maText.getLength();
SolarMutexGuard aGuard;
- vcl::DeletionListener aDel(&rFrame);
- rFrame.CallCallback(SalEvent::ExtTextInput, &aInputEvent);
+ vcl::DeletionListener aDel(&m_rFrame);
+ m_rFrame.CallCallback(SalEvent::ExtTextInput, &aInputEvent);
if (!aDel.isDeleted())
- rFrame.CallCallback(SalEvent::EndExtTextInput, nullptr);
+ m_rFrame.CallCallback(SalEvent::EndExtTextInput, nullptr);
}
-void QtWidget::deleteReplacementText(const QtFrame& rFrame, int
nReplacementStart,
- int nReplacementLength)
+void QtWidget::deleteReplacementText(int nReplacementStart, int
nReplacementLength) const
{
// get the surrounding text
SolarMutexGuard aGuard;
SalSurroundingTextRequestEvent aSurroundingTextEvt;
aSurroundingTextEvt.maText.clear();
aSurroundingTextEvt.mnStart = aSurroundingTextEvt.mnEnd = 0;
- rFrame.CallCallback(SalEvent::SurroundingTextRequest,
&aSurroundingTextEvt);
+ m_rFrame.CallCallback(SalEvent::SurroundingTextRequest,
&aSurroundingTextEvt);
// Turn nReplacementStart, nReplacementLength into a UTF-16 selection
const Selection aSelection = SalFrame::CalcDeleteSurroundingSelection(
@@ -454,10 +453,10 @@ void QtWidget::deleteReplacementText(const QtFrame&
rFrame, int nReplacementStar
SalSurroundingTextSelectionChangeEvent aEvt;
aEvt.mnStart = aSelection.Min();
aEvt.mnEnd = aSelection.Max();
- rFrame.CallCallback(SalEvent::DeleteSurroundingTextRequest, &aEvt);
+ m_rFrame.CallCallback(SalEvent::DeleteSurroundingTextRequest, &aEvt);
}
-bool QtWidget::handleGestureEvent(const QtFrame& rFrame, QGestureEvent*
pGestureEvent)
+bool QtWidget::handleGestureEvent(QGestureEvent* pGestureEvent) const
{
if (QGesture* pGesture = pGestureEvent->gesture(Qt::PinchGesture))
{
@@ -494,7 +493,7 @@ bool QtWidget::handleGestureEvent(const QtFrame& rFrame,
QGestureEvent* pGesture
aEvent.mnX = aHotspot.x();
aEvent.mnY = aHotspot.y();
aEvent.mfScaleDelta = 1 + pPinchGesture->totalScaleFactor();
- rFrame.CallCallback(SalEvent::GestureZoom, &aEvent);
+ m_rFrame.CallCallback(SalEvent::GestureZoom, &aEvent);
pGestureEvent->accept();
return true;
}
@@ -503,15 +502,15 @@ bool QtWidget::handleGestureEvent(const QtFrame& rFrame,
QGestureEvent* pGesture
return false;
}
-bool QtWidget::handleKeyEvent(QtFrame& rFrame, const QWidget& rWidget,
QKeyEvent* pEvent)
+bool QtWidget::handleKeyEvent(QKeyEvent* pEvent) const
{
const bool bIsKeyPressed
= pEvent->type() == QEvent::KeyPress || pEvent->type() ==
QEvent::ShortcutOverride;
sal_uInt16 nCode = GetKeyCode(pEvent->key(), pEvent->modifiers());
if (bIsKeyPressed && nCode == 0 && pEvent->text().length() > 1
- && rWidget.testAttribute(Qt::WA_InputMethodEnabled))
+ && testAttribute(Qt::WA_InputMethodEnabled))
{
- commitText(rFrame, pEvent->text());
+ commitText(pEvent->text());
pEvent->accept();
return true;
}
@@ -578,27 +577,27 @@ bool QtWidget::handleKeyEvent(QtFrame& rFrame, const
QWidget& rWidget, QKeyEvent
{
// sending the old mnModKeyCode mask on release is needed to
// implement the writing direction switch with Ctrl + L/R-Shift
- aModEvt.mnModKeyCode = rFrame.m_nKeyModifiers;
+ aModEvt.mnModKeyCode = m_rFrame.m_nKeyModifiers;
nModCode &= ~nModMask;
- rFrame.m_nKeyModifiers &= ~nExtModMask;
+ m_rFrame.m_nKeyModifiers &= ~nExtModMask;
}
else
{
nModCode |= nModMask;
- rFrame.m_nKeyModifiers |= nExtModMask;
- aModEvt.mnModKeyCode = rFrame.m_nKeyModifiers;
+ m_rFrame.m_nKeyModifiers |= nExtModMask;
+ aModEvt.mnModKeyCode = m_rFrame.m_nKeyModifiers;
}
}
#endif
aModEvt.mnCode = nModCode;
- rFrame.CallCallback(SalEvent::KeyModChange, &aModEvt);
+ m_rFrame.CallCallback(SalEvent::KeyModChange, &aModEvt);
return false;
}
#if CHECK_ANY_QT_USING_X11
// prevent interference of writing direction switch (Ctrl + L/R-Shift)
with "normal" shortcuts
- rFrame.m_nKeyModifiers = ModKeyFlags::NONE;
+ m_rFrame.m_nKeyModifiers = ModKeyFlags::NONE;
#endif
SalKeyEvent aEvent;
@@ -609,9 +608,9 @@ bool QtWidget::handleKeyEvent(QtFrame& rFrame, const
QWidget& rWidget, QKeyEvent
bool bStopProcessingKey;
if (bIsKeyPressed)
- bStopProcessingKey = rFrame.CallCallback(SalEvent::KeyInput, &aEvent);
+ bStopProcessingKey = m_rFrame.CallCallback(SalEvent::KeyInput,
&aEvent);
else
- bStopProcessingKey = rFrame.CallCallback(SalEvent::KeyUp, &aEvent);
+ bStopProcessingKey = m_rFrame.CallCallback(SalEvent::KeyUp, &aEvent);
if (bStopProcessingKey)
pEvent->accept();
return bStopProcessingKey;
@@ -622,7 +621,7 @@ bool QtWidget::handleEvent(QEvent* pEvent)
if (pEvent->type() == QEvent::Gesture)
{
QGestureEvent* pGestureEvent = static_cast<QGestureEvent*>(pEvent);
- return handleGestureEvent(m_rFrame, pGestureEvent);
+ return handleGestureEvent(pGestureEvent);
}
else if (pEvent->type() == QEvent::ShortcutOverride)
{
@@ -648,7 +647,7 @@ bool QtWidget::handleEvent(QEvent* pEvent)
// and if it's handled - disable the shortcut, it should have been
activated.
// Don't process keyPressEvent generated after disabling shortcut
since it was handled here.
// If event is not handled, don't accept it and let Qt activate
related shortcut.
- if (handleKeyEvent(m_rFrame, *this, static_cast<QKeyEvent*>(pEvent)))
+ if (handleKeyEvent(static_cast<QKeyEvent*>(pEvent)))
return true;
}
else if (pEvent->type() == QEvent::ToolTip)
@@ -678,7 +677,7 @@ bool QtWidget::event(QEvent* pEvent) { return
handleEvent(pEvent) || QWidget::ev
void QtWidget::keyReleaseEvent(QKeyEvent* pEvent)
{
- if (!handleKeyEvent(m_rFrame, *this, pEvent))
+ if (!handleKeyEvent(pEvent))
QWidget::keyReleaseEvent(pEvent);
}
@@ -758,9 +757,9 @@ void QtWidget::inputMethodEvent(QInputMethodEvent* pEvent)
if (nReplacementLength > 0 || bHasCommitText)
{
if (nReplacementLength > 0)
- deleteReplacementText(m_rFrame, pEvent->replacementStart(),
nReplacementLength);
+ deleteReplacementText(pEvent->replacementStart(),
nReplacementLength);
if (bHasCommitText)
- commitText(m_rFrame, pEvent->commitString());
+ commitText(pEvent->commitString());
}
else
{
commit f0b83c111c21112637536377d0e759d64f6362e6
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Sat Apr 12 14:47:21 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sun Apr 13 19:16:49 2025 +0200
qt: Make QtWidget::handleMouseEnterLeaveEvents non-static
Make non-static and use `m_rFrame` directly instead of
passing it as a param.
Also rename to QtWidget::handleMouseEnterLeaveEvent
(i.e. drop "s" at the end, as it only processes
a single event, like the other methods.
Change-Id: If7312982f1fc9ea16b06fe05bfbccaa6737dac30
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184100
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/inc/qt5/QtWidget.hxx b/vcl/inc/qt5/QtWidget.hxx
index eb176255ce71..3ad064f9151d 100644
--- a/vcl/inc/qt5/QtWidget.hxx
+++ b/vcl/inc/qt5/QtWidget.hxx
@@ -51,7 +51,7 @@ class QtWidget : public QWidget
void handleMouseButtonEvent(const QMouseEvent*) const;
static bool handleGestureEvent(const QtFrame& rFrame, QGestureEvent*
pGestureEvent);
static bool handleKeyEvent(QtFrame&, const QWidget&, QKeyEvent*);
- static void handleMouseEnterLeaveEvents(const QtFrame&, QEvent*);
+ void handleMouseEnterLeaveEvent(QEvent*) const;
void fillSalAbstractMouseEvent(const QInputEvent* pQEvent, const QPoint&
rPos,
Qt::MouseButtons eButtons, int nWidth,
SalAbstractMouseEvent& aSalEvent) const;
diff --git a/vcl/qt5/QtWidget.cxx b/vcl/qt5/QtWidget.cxx
index 47138c2ef302..886ee1b0bd99 100644
--- a/vcl/qt5/QtWidget.cxx
+++ b/vcl/qt5/QtWidget.cxx
@@ -138,10 +138,10 @@ void QtWidget::mouseMoveEvent(QMouseEvent* pEvent)
pEvent->accept();
}
-void QtWidget::handleMouseEnterLeaveEvents(const QtFrame& rFrame, QEvent*
pQEvent)
+void QtWidget::handleMouseEnterLeaveEvent(QEvent* pQEvent) const
{
- const qreal fRatio = rFrame.devicePixelRatioF();
- const QWidget* pWidget = rFrame.GetQWidget();
+ const qreal fRatio = m_rFrame.devicePixelRatioF();
+ const QWidget* pWidget = m_rFrame.GetQWidget();
const Point aPos = toPoint(pWidget->mapFromGlobal(QCursor::pos()) *
fRatio);
SalMouseEvent aEvent;
@@ -158,11 +158,11 @@ void QtWidget::handleMouseEnterLeaveEvents(const QtFrame&
rFrame, QEvent* pQEven
nEventType = SalEvent::MouseMove;
else
nEventType = SalEvent::MouseLeave;
- rFrame.CallCallback(nEventType, &aEvent);
+ m_rFrame.CallCallback(nEventType, &aEvent);
pQEvent->accept();
}
-void QtWidget::leaveEvent(QEvent* pEvent) {
handleMouseEnterLeaveEvents(m_rFrame, pEvent); }
+void QtWidget::leaveEvent(QEvent* pEvent) {
handleMouseEnterLeaveEvent(pEvent); }
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
void QtWidget::enterEvent(QEnterEvent* pEvent)
@@ -170,7 +170,7 @@ void QtWidget::enterEvent(QEnterEvent* pEvent)
void QtWidget::enterEvent(QEvent* pEvent)
#endif
{
- handleMouseEnterLeaveEvents(m_rFrame, pEvent);
+ handleMouseEnterLeaveEvent(pEvent);
}
void QtWidget::wheelEvent(QWheelEvent* pEvent)
