vcl/inc/qt5/QtClipboard.hxx | 10 +++++----- vcl/qt5/QtClipboard.cxx | 34 +++++++++++++++++----------------- 2 files changed, 22 insertions(+), 22 deletions(-)
New commits: commit 1635021d25203031c5f79c9ebb7b694e1197b0d9 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Feb 27 12:10:00 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Feb 28 09:14:06 2026 +0100 qt: Use "e" prefix for QClipboard::Mode vars Use the usual "e" naming prefix, since this is an enum. Change-Id: I0b65996be17ea50c2d65272a5c6ed2f636ce5397 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200614 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/vcl/inc/qt5/QtClipboard.hxx b/vcl/inc/qt5/QtClipboard.hxx index 2dc6db46500e..2acd26f4354a 100644 --- a/vcl/inc/qt5/QtClipboard.hxx +++ b/vcl/inc/qt5/QtClipboard.hxx @@ -37,7 +37,7 @@ class QtClipboard final osl::Mutex m_aMutex; const OUString m_aClipboardName; - const QClipboard::Mode m_aClipboardMode; + const QClipboard::Mode m_eClipboardMode; // has to be set, if LO changes the QClipboard itself, so it won't instantly lose // ownership by it's self-triggered QClipboard::changed handler bool m_bOwnClipboardChange; @@ -50,13 +50,13 @@ class QtClipboard final css::uno::Reference<css::datatransfer::clipboard::XClipboardOwner> m_aOwner; std::vector<css::uno::Reference<css::datatransfer::clipboard::XClipboardListener>> m_aListeners; - bool isOwner(const QClipboard::Mode aMode); - static bool isSupported(const QClipboard::Mode aMode); + bool isOwner(const QClipboard::Mode eMode); + static bool isSupported(const QClipboard::Mode eMode); - explicit QtClipboard(OUString aModeString, const QClipboard::Mode aMode); + explicit QtClipboard(OUString aModeString, const QClipboard::Mode eMode); private Q_SLOTS: - void handleChanged(QClipboard::Mode mode); + void handleChanged(QClipboard::Mode eMode); void handleClearClipboard(); signals: diff --git a/vcl/qt5/QtClipboard.cxx b/vcl/qt5/QtClipboard.cxx index 71190a2a7ee0..329d06eb0e42 100644 --- a/vcl/qt5/QtClipboard.cxx +++ b/vcl/qt5/QtClipboard.cxx @@ -29,16 +29,16 @@ #include <emscripten.h> #endif -QtClipboard::QtClipboard(OUString aModeString, const QClipboard::Mode aMode) +QtClipboard::QtClipboard(OUString aModeString, const QClipboard::Mode eMode) : cppu::WeakComponentImplHelper<css::datatransfer::clipboard::XSystemClipboard, css::datatransfer::clipboard::XFlushableClipboard, XServiceInfo>(m_aMutex) , m_aClipboardName(std::move(aModeString)) - , m_aClipboardMode(aMode) + , m_eClipboardMode(eMode) , m_bOwnClipboardChange(false) , m_bDoClear(false) { - assert(isSupported(m_aClipboardMode)); + assert(isSupported(m_eClipboardMode)); // DirectConnection guarantees the changed slot runs in the same thread as the QClipboard connect(QApplication::clipboard(), &QClipboard::changed, this, &QtClipboard::handleChanged, Qt::DirectConnection); @@ -68,19 +68,19 @@ void QtClipboard::flushClipboard() SolarMutexGuard g; QtInstance& rQtInstance = GetQtInstance(); rQtInstance.RunInMainThread([this]() { - if (!isOwner(m_aClipboardMode)) + if (!isOwner(m_eClipboardMode)) return; QClipboard* pClipboard = QApplication::clipboard(); const QtMimeData* pQtMimeData - = qobject_cast<const QtMimeData*>(pClipboard->mimeData(m_aClipboardMode)); + = qobject_cast<const QtMimeData*>(pClipboard->mimeData(m_eClipboardMode)); assert(pQtMimeData); QMimeData* pMimeCopy = nullptr; if (pQtMimeData && pQtMimeData->deepCopy(&pMimeCopy)) { m_bOwnClipboardChange = true; - pClipboard->setMimeData(pMimeCopy, m_aClipboardMode); + pClipboard->setMimeData(pMimeCopy, m_eClipboardMode); m_bOwnClipboardChange = false; } }); @@ -96,11 +96,11 @@ css::uno::Reference<css::datatransfer::XTransferable> QtClipboard::getContents() // if we're the owner, we might have the XTransferable from setContents. but // maybe a non-LO clipboard change from within LO, like some C'n'P in the // QFileDialog, might have invalidated m_aContents, so we need to check it too. - if (isOwner(m_aClipboardMode) && m_aContents.is()) + if (isOwner(m_eClipboardMode) && m_aContents.is()) return m_aContents; // check if we can still use the shared QtClipboardTransferable - const QMimeData* pMimeData = QApplication::clipboard()->mimeData(m_aClipboardMode); + const QMimeData* pMimeData = QApplication::clipboard()->mimeData(m_eClipboardMode); #if defined(EMSCRIPTEN) if (!pMimeData) pMimeData = &aMimeData; @@ -113,7 +113,7 @@ css::uno::Reference<css::datatransfer::XTransferable> QtClipboard::getContents() return m_aContents; } - m_aContents = new QtClipboardTransferable(m_aClipboardMode, pMimeData); + m_aContents = new QtClipboardTransferable(m_eClipboardMode, pMimeData); return m_aContents; } @@ -121,7 +121,7 @@ void QtClipboard::handleClearClipboard() { if (!m_bDoClear) return; - QApplication::clipboard()->clear(m_aClipboardMode); + QApplication::clipboard()->clear(m_eClipboardMode); } void QtClipboard::setContents( @@ -140,7 +140,7 @@ void QtClipboard::setContents( if (!m_bDoClear) { m_bOwnClipboardChange = true; - QApplication::clipboard()->setMimeData(new QtMimeData(m_aContents), m_aClipboardMode); + QApplication::clipboard()->setMimeData(new QtMimeData(m_aContents), m_eClipboardMode); m_bOwnClipboardChange = false; } else @@ -192,16 +192,16 @@ void QtClipboard::setContents( xOldOwner->lostOwnership(this, xOldContents); } -void QtClipboard::handleChanged(QClipboard::Mode aMode) +void QtClipboard::handleChanged(QClipboard::Mode eMode) { - if (aMode != m_aClipboardMode) + if (eMode != m_eClipboardMode) return; osl::ClearableMutexGuard aGuard(m_aMutex); - if (!m_bOwnClipboardChange && isOwner(aMode)) + if (!m_bOwnClipboardChange && isOwner(eMode)) { - auto const mimeData = QApplication::clipboard()->mimeData(aMode); + auto const mimeData = QApplication::clipboard()->mimeData(eMode); // QtWayland will send a second change notification (seemingly without any // trigger). And any C'n'P operation in the Qt file picker emits a signal, @@ -280,10 +280,10 @@ void QtClipboard::removeClipboardListener( std::erase(m_aListeners, listener); } -bool QtClipboard::isSupported(const QClipboard::Mode aMode) +bool QtClipboard::isSupported(const QClipboard::Mode eMode) { const QClipboard* pClipboard = QApplication::clipboard(); - switch (aMode) + switch (eMode) { case QClipboard::Selection: return pClipboard->supportsSelection();
