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.hxx | |
parent | add dif support to fftester (diff) | |
download | core-b536e10390c171e96b6477c04d66023a1da543c4.tar.gz core-b536e10390c171e96b6477c04d66023a1da543c4.zip |
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.hxx')
-rw-r--r-- | vcl/qt5/Qt5Object.hxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/vcl/qt5/Qt5Object.hxx b/vcl/qt5/Qt5Object.hxx index b66f55063d2c..df62016aded1 100644 --- a/vcl/qt5/Qt5Object.hxx +++ b/vcl/qt5/Qt5Object.hxx @@ -31,26 +31,26 @@ class Qt5Frame; class Qt5Object : public SalObject { - SystemEnvData m_aSystemData; - std::unique_ptr< QWidget > m_pQWidget; - Qt5Frame* m_pParent; - QRegion m_pRegion; + SystemEnvData m_aSystemData; + std::unique_ptr<QWidget> m_pQWidget; + Qt5Frame* m_pParent; + QRegion m_pRegion; public: - Qt5Object( Qt5Frame* pParent, bool bShow ); + Qt5Object(Qt5Frame* pParent, bool bShow); virtual ~Qt5Object() override; - virtual void ResetClipRegion() override; - virtual void BeginSetClipRegion( sal_uLong nRects ) override; - virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override; - virtual void EndSetClipRegion() override; + virtual void ResetClipRegion() override; + virtual void BeginSetClipRegion(sal_uLong nRects) override; + virtual void UnionClipRegion(long nX, long nY, long nWidth, long nHeight) override; + virtual void EndSetClipRegion() override; - virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) override; - virtual void Show( bool bVisible ) override; + virtual void SetPosSize(long nX, long nY, long nWidth, long nHeight) override; + virtual void Show(bool bVisible) override; - virtual void SetForwardKey( bool bEnable ) override; + virtual void SetForwardKey(bool bEnable) override; - virtual const SystemEnvData* GetSystemData() const override; + virtual const SystemEnvData* GetSystemData() const override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |