diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-11-08 11:28:04 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-11-08 15:35:18 +0100 |
commit | b536e10390c171e96b6477c04d66023a1da543c4 (patch) | |
tree | 4c04275831cea51f0a343d00e382f519a08bcd90 /vcl/qt5/Qt5Object.cxx | |
parent | 958c09acc1058a4a0eba28ac94f2883fff64d600 (diff) |
Retrofit "KeepEmptyLinesAtTheStartOfBlocks: false" into .clang-format
...even if that can cause reformatting of already formatted code. The problem I
came across is that without this something like
> namespace {
>
> void f1();
>
> void f2();
>
> }
(which is quite a common style in the current code base) would be changed to
> namespace
> {
>
> void f1();
>
> void f2();
> }
instead of
> namespace
> {
> void f1();
>
> void f2();
> }
and I found no other clang-format style option that would result in the
presence or absence of an empty line be identical at the start and end of the
namespace block.
vmiklos asked to reformat the existing new (i.e., non-blacklisted) files at the
same time, so this commit includes that. Some of those new files had not been
formatted at all, so this commit includes their full reformatting changes.
Change-Id: I54daf0c11098d07d02c802104cf7f56372e61f7c
Reviewed-on: https://gerrit.libreoffice.org/44450
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/qt5/Qt5Object.cxx')
-rw-r--r-- | vcl/qt5/Qt5Object.cxx | 52 |
1 files changed, 19 insertions, 33 deletions
diff --git a/vcl/qt5/Qt5Object.cxx b/vcl/qt5/Qt5Object.cxx index ad7dfea8817e..887b949e4c42 100644 --- a/vcl/qt5/Qt5Object.cxx +++ b/vcl/qt5/Qt5Object.cxx @@ -23,63 +23,49 @@ #include <QtWidgets/QWidget> -Qt5Object::Qt5Object( Qt5Frame* pParent, bool bShow ) - : m_pParent( pParent ) +Qt5Object::Qt5Object(Qt5Frame* pParent, bool bShow) + : m_pParent(pParent) { - if ( !m_pParent || !pParent->GetQWidget() ) + if (!m_pParent || !pParent->GetQWidget()) return; - m_pQWidget.reset( new QWidget( pParent->GetQWidget() ) ); - if ( bShow ) + m_pQWidget.reset(new QWidget(pParent->GetQWidget())); + if (bShow) m_pQWidget->show(); } -Qt5Object::~Qt5Object() -{ -} +Qt5Object::~Qt5Object() {} void Qt5Object::ResetClipRegion() { - if ( m_pQWidget.get() ) - m_pRegion = QRegion( m_pQWidget->geometry() ); + if (m_pQWidget.get()) + m_pRegion = QRegion(m_pQWidget->geometry()); else m_pRegion = QRegion(); } -void Qt5Object::BeginSetClipRegion( sal_uLong ) -{ - m_pRegion = QRegion(); -} +void Qt5Object::BeginSetClipRegion(sal_uLong) { m_pRegion = QRegion(); } -void Qt5Object::UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) +void Qt5Object::UnionClipRegion(long nX, long nY, long nWidth, long nHeight) { - m_pRegion += QRect( nX, nY, nWidth, nHeight ); + m_pRegion += QRect(nX, nY, nWidth, nHeight); } void Qt5Object::EndSetClipRegion() { - if ( m_pQWidget.get() ) - m_pRegion = m_pRegion.intersected( m_pQWidget->geometry() ); -} - -void Qt5Object::SetPosSize( long nX, long nY, long nWidth, long nHeight ) -{ - + if (m_pQWidget.get()) + m_pRegion = m_pRegion.intersected(m_pQWidget->geometry()); } -void Qt5Object::Show( bool bVisible ) -{ - if( m_pQWidget ) - m_pQWidget->setVisible( bVisible ); -} +void Qt5Object::SetPosSize(long nX, long nY, long nWidth, long nHeight) {} -void Qt5Object::SetForwardKey( bool bEnable ) +void Qt5Object::Show(bool bVisible) { + if (m_pQWidget) + m_pQWidget->setVisible(bVisible); } -const SystemEnvData* Qt5Object::GetSystemData() const -{ - return nullptr; -} +void Qt5Object::SetForwardKey(bool bEnable) {} +const SystemEnvData* Qt5Object::GetSystemData() const { return nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |