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/Qt5VirtualDevice.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/Qt5VirtualDevice.hxx')
-rw-r--r-- | vcl/qt5/Qt5VirtualDevice.hxx | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/vcl/qt5/Qt5VirtualDevice.hxx b/vcl/qt5/Qt5VirtualDevice.hxx index 23d464d43751..56f3107e4cc7 100644 --- a/vcl/qt5/Qt5VirtualDevice.hxx +++ b/vcl/qt5/Qt5VirtualDevice.hxx @@ -31,24 +31,22 @@ enum class DeviceFormat; class Qt5VirtualDevice : public SalVirtualDevice { - std::list< Qt5Graphics* > m_aGraphics; - std::unique_ptr< QImage > m_pImage; - DeviceFormat m_eFormat; - basegfx::B2IVector m_aFrameSize; - double m_fScale; + std::list<Qt5Graphics*> m_aGraphics; + std::unique_ptr<QImage> m_pImage; + DeviceFormat m_eFormat; + basegfx::B2IVector m_aFrameSize; + double m_fScale; public: - Qt5VirtualDevice( DeviceFormat eFormat, double fScale ); + Qt5VirtualDevice(DeviceFormat eFormat, double fScale); virtual ~Qt5VirtualDevice() override; // SalVirtualDevice - virtual SalGraphics* AcquireGraphics() override; - virtual void ReleaseGraphics( SalGraphics* pGraphics ) override; + virtual SalGraphics* AcquireGraphics() override; + virtual void ReleaseGraphics(SalGraphics* pGraphics) override; - virtual bool SetSize( long nNewDX, long nNewDY ) override; - virtual bool SetSizeUsingBuffer( long nNewDX, long nNewDY, - sal_uInt8 * pBuffer - ) override; + virtual bool SetSize(long nNewDX, long nNewDY) override; + virtual bool SetSizeUsingBuffer(long nNewDX, long nNewDY, sal_uInt8* pBuffer) override; // SalGeometryProvider virtual long GetWidth() const override; |