diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-11-13 09:08:30 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-11-13 10:43:39 +0100 |
| commit | 53e13b256fa5082eb29ea2addd1bfa184827e53b (patch) | |
| tree | 820c9e5ec61ce4cb1c6713a71aedfd8a0383fa01 /vcl/qt5 | |
| parent | 70fa61918415f642228127847491224078532218 (diff) | |
clang-format: standardize on 5.0.0
Restrict the git hook further to only enforce style in case the found
clang-format binary's version matches to avoid output differences with
different clang-format version.
While at it, move the blacklist reading after the version check to speed
up committing a bit when no local enforcement happens.
Also add a simple script to list formatted files, since the blacklist is
large enough that doing it naively from the shell is too slow.
Change-Id: I0bc05961d262cc6bc91c6efdd1b91994ecfc6940
Reviewed-on: https://gerrit.libreoffice.org/44662
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'vcl/qt5')
| -rw-r--r-- | vcl/qt5/Qt5Frame.cxx | 14 | ||||
| -rw-r--r-- | vcl/qt5/tst_exclude_posted_events.hxx | 3 |
2 files changed, 10 insertions, 7 deletions
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx index 3f2ea2da7ba3..e853b7d43d9e 100644 --- a/vcl/qt5/Qt5Frame.cxx +++ b/vcl/qt5/Qt5Frame.cxx @@ -184,9 +184,10 @@ void Qt5Frame::SetTitle(const OUString& rTitle) void Qt5Frame::SetIcon(sal_uInt16 nIcon) { - if (m_nStyle & (SalFrameStyleFlags::PLUG | SalFrameStyleFlags::SYSTEMCHILD - | SalFrameStyleFlags::FLOAT | SalFrameStyleFlags::INTRO - | SalFrameStyleFlags::OWNERDRAWDECORATION) + if (m_nStyle + & (SalFrameStyleFlags::PLUG | SalFrameStyleFlags::SYSTEMCHILD + | SalFrameStyleFlags::FLOAT | SalFrameStyleFlags::INTRO + | SalFrameStyleFlags::OWNERDRAWDECORATION) || !m_pQWidget->isWindow()) return; @@ -268,7 +269,7 @@ void Qt5Frame::SetPosSize(long nX, long nY, long nWidth, long nHeight, sal_uInt1 if ((nFlags & (SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT)) && (nWidth > 0 && nHeight > 0) // sometimes stupid things happen - ) + ) { m_bDefaultSize = false; if (isChild(false) || !m_pQWidget->isMaximized()) @@ -332,8 +333,9 @@ void Qt5Frame::SetWindowState(const SalFrameState* pState) if ((pState->mnMask & WindowStateMask::State) && (pState->mnState & WindowStateState::Maximized) && (pState->mnMask & nMaxGeometryMask) == nMaxGeometryMask) m_pQWidget->showMaximized(); - else if (pState->mnMask & (WindowStateMask::X | WindowStateMask::Y | WindowStateMask::Width - | WindowStateMask::Height)) + else if (pState->mnMask + & (WindowStateMask::X | WindowStateMask::Y | WindowStateMask::Width + | WindowStateMask::Height)) { sal_uInt16 nPosSizeFlags = 0; QPoint aPos = m_pQWidget->pos(); diff --git a/vcl/qt5/tst_exclude_posted_events.hxx b/vcl/qt5/tst_exclude_posted_events.hxx index d12c012e4547..79c9887f843e 100644 --- a/vcl/qt5/tst_exclude_posted_events.hxx +++ b/vcl/qt5/tst_exclude_posted_events.hxx @@ -56,7 +56,8 @@ static int tst_excludePostedEvents() TestExcludePostedEvents test; QCoreApplication::postEvent(&test, new QEvent(eventType)); QEventLoop loop; - loop.processEvents(QEventLoop::ExcludeUserInputEvents | QEventLoop::ExcludeSocketNotifiers + loop.processEvents(QEventLoop::ExcludeUserInputEvents + | QEventLoop::ExcludeSocketNotifiers // | QEventLoop::WaitForMoreEvents | QEventLoop::X11ExcludeTimers); QVERIFY(!test.processed); |