diff options
author | Philipp Hofer <philipp.hofer@protonmail.com> | 2020-11-12 13:03:16 +0100 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2020-11-21 13:19:17 +0100 |
commit | 01baeab99890e5650b3dabc15f8d900490a5a133 (patch) | |
tree | 64a1b30b20a53262605312fff4d035876fc7c811 /include/vcl | |
parent | 0108cd51faf942b3fc3a292522d4b2f421f1cf45 (diff) |
tdf#123936 Formatting files in module include with clang-format
Change-Id: I0507dd797cd5a35e0ae14f4b69ee4e172d08a71a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105681
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
Diffstat (limited to 'include/vcl')
-rw-r--r-- | include/vcl/IContext.hxx | 8 | ||||
-rw-r--r-- | include/vcl/IconThemeInfo.hxx | 16 | ||||
-rw-r--r-- | include/vcl/NotebookbarContextControl.hxx | 2 | ||||
-rw-r--r-- | include/vcl/dllapi.h | 2 | ||||
-rw-r--r-- | include/vcl/exceptiontypes.hxx | 7 | ||||
-rw-r--r-- | include/vcl/extoutdevdata.hxx | 3 | ||||
-rw-r--r-- | include/vcl/gdimetafiletools.hxx | 3 | ||||
-rw-r--r-- | include/vcl/introwin.hxx | 5 | ||||
-rw-r--r-- | include/vcl/keycodes.hxx | 47 | ||||
-rw-r--r-- | include/vcl/mtfxmldump.hxx | 5 | ||||
-rw-r--r-- | include/vcl/opengl/OpenGLWrapper.hxx | 5 | ||||
-rw-r--r-- | include/vcl/pngread.hxx | 2 | ||||
-rw-r--r-- | include/vcl/sound.hxx | 3 | ||||
-rw-r--r-- | include/vcl/uitest/factory.hxx | 5 | ||||
-rw-r--r-- | include/vcl/vclmain.hxx | 4 | ||||
-rw-r--r-- | include/vcl/wmfexternal.hxx | 9 |
16 files changed, 61 insertions, 65 deletions
diff --git a/include/vcl/IContext.hxx b/include/vcl/IContext.hxx index 6af9b20c4453..05823d190ed7 100644 --- a/include/vcl/IContext.hxx +++ b/include/vcl/IContext.hxx @@ -16,14 +16,10 @@ namespace vcl { - class VCL_DLLPUBLIC IContext { protected: - IContext() - { - maContext.push_back( vcl::EnumContext::Context::Any ); - } + IContext() { maContext.push_back(vcl::EnumContext::Context::Any); } public: void SetContext(const std::vector<vcl::EnumContext::Context>& aContext) @@ -31,7 +27,7 @@ public: maContext = aContext; } - bool HasContext( const vcl::EnumContext::Context eContext ) const + bool HasContext(const vcl::EnumContext::Context eContext) const { auto aFind = std::find(maContext.begin(), maContext.end(), eContext); if (aFind == maContext.end()) diff --git a/include/vcl/IconThemeInfo.hxx b/include/vcl/IconThemeInfo.hxx index 92892283c8fc..c398754c88a1 100644 --- a/include/vcl/IconThemeInfo.hxx +++ b/include/vcl/IconThemeInfo.hxx @@ -21,14 +21,13 @@ class IconThemeInfoTest; class IconThemeSelectorTest; class IconThemeScannerTest; -namespace vcl { - +namespace vcl +{ /** This class provides information about an icon theme. */ -class VCL_DLLPUBLIC IconThemeInfo { - +class VCL_DLLPUBLIC IconThemeInfo +{ public: - /** The name of the icon theme to use for high contrast mode */ static constexpr OUStringLiteral HIGH_CONTRAST_ID = u"sifr"; @@ -38,7 +37,7 @@ public: */ IconThemeInfo(const OUString& urlToFile); - const OUString& GetDisplayName() const {return mDisplayName;} + const OUString& GetDisplayName() const { return mDisplayName; } const OUString& GetThemeId() const { return mThemeId; } @@ -61,8 +60,8 @@ public: FindIconThemeById(const std::vector<vcl::IconThemeInfo>& themes, const OUString& themeId); /** Check whether a theme with a specified id is in a vector of IconThemeInfo */ - static bool - IconThemeIsInVector(const std::vector<vcl::IconThemeInfo>& themes, const OUString& themeId); + static bool IconThemeIsInVector(const std::vector<vcl::IconThemeInfo>& themes, + const OUString& themeId); private: /** private constructor for testing purposes only */ @@ -95,5 +94,4 @@ private: } // namespace vcl - #endif // INCLUDED_VCL_ICONTHEMEINFO_HXX diff --git a/include/vcl/NotebookbarContextControl.hxx b/include/vcl/NotebookbarContextControl.hxx index ce557c54904f..adb6178e510d 100644 --- a/include/vcl/NotebookbarContextControl.hxx +++ b/include/vcl/NotebookbarContextControl.hxx @@ -16,7 +16,7 @@ class NotebookbarContextControl { public: virtual ~NotebookbarContextControl() {} - virtual void SetContext( vcl::EnumContext::Context eContext ) = 0; + virtual void SetContext(vcl::EnumContext::Context eContext) = 0; }; #endif diff --git a/include/vcl/dllapi.h b/include/vcl/dllapi.h index 805d1cb00908..ccfd5e3b80c5 100644 --- a/include/vcl/dllapi.h +++ b/include/vcl/dllapi.h @@ -36,7 +36,7 @@ #define UITEST_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif -#if (defined UNX && ! defined MACOS) || defined _WIN32 +#if (defined UNX && !defined MACOS) || defined _WIN32 #define VCL_PLUGIN_PUBLIC VCL_DLLPUBLIC #else #define VCL_PLUGIN_PUBLIC SAL_DLLPRIVATE diff --git a/include/vcl/exceptiontypes.hxx b/include/vcl/exceptiontypes.hxx index 83654d3705bb..b0e63a982f88 100644 --- a/include/vcl/exceptiontypes.hxx +++ b/include/vcl/exceptiontypes.hxx @@ -20,8 +20,11 @@ #ifndef INCLUDED_VCL_EXCEPTIONTYPES_HXX #define INCLUDED_VCL_EXCEPTIONTYPES_HXX -enum class ExceptionCategory { - NONE, System, UserInterface +enum class ExceptionCategory +{ + NONE, + System, + UserInterface }; #endif // INCLUDED_VCL_EXCEPTIONTYPES_HXX diff --git a/include/vcl/extoutdevdata.hxx b/include/vcl/extoutdevdata.hxx index 5db49cddb08d..537414435215 100644 --- a/include/vcl/extoutdevdata.hxx +++ b/include/vcl/extoutdevdata.hxx @@ -24,14 +24,11 @@ namespace vcl { - class VCL_DLLPUBLIC ExtOutDevData { public: - virtual ~ExtOutDevData(); }; - } #endif // INCLUDED_VCL_EXTOUTDEVDATA_HXX diff --git a/include/vcl/gdimetafiletools.hxx b/include/vcl/gdimetafiletools.hxx index d956658676a0..665683dd279f 100644 --- a/include/vcl/gdimetafiletools.hxx +++ b/include/vcl/gdimetafiletools.hxx @@ -24,7 +24,6 @@ class GDIMetaFile; - // #i121267# Added tooling to be able to support old exporters which are based on // metafiles as graphic content, but do not implement using the contained clip // regions. @@ -37,7 +36,6 @@ class GDIMetaFile; void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource); - // Allow to check if a Metafile contains clipping or not bool usesClipActions(const GDIMetaFile& rSource); @@ -52,7 +50,6 @@ public: virtual ~MetafileAccessor(); }; - #endif // INCLUDED_VCL_GDIMETAFILETOOLS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/introwin.hxx b/include/vcl/introwin.hxx index fbe35c710a06..8d7d709e457b 100644 --- a/include/vcl/introwin.hxx +++ b/include/vcl/introwin.hxx @@ -30,10 +30,9 @@ private: SAL_DLLPRIVATE void ImplInitIntroWindowData(); public: - IntroWindow(); - virtual ~IntroWindow() override; + IntroWindow(); + virtual ~IntroWindow() override; virtual void dispose() override; - }; #endif // INCLUDED_VCL_INTROWIN_HXX diff --git a/include/vcl/keycodes.hxx b/include/vcl/keycodes.hxx index c262610fd35b..e68f176ffe32 100644 --- a/include/vcl/keycodes.hxx +++ b/include/vcl/keycodes.hxx @@ -160,32 +160,39 @@ constexpr sal_uInt16 KEY_NUMLOCK = css::awt::Key::NUMLOCK; constexpr sal_uInt16 KEY_SCROLLLOCK = css::awt::Key::SCROLLLOCK; // extended Modifier-Keys (only used for modkey events) -enum class ModKeyFlags { - NONE = 0x0000, - LeftShift = 0x0001, - RightShift = 0x0002, - LeftMod1 = 0x0004, - RightMod1 = 0x0008, - LeftMod2 = 0x0010, - RightMod2 = 0x0020, - LeftMod3 = 0x0040, - RightMod3 = 0x0080, - Mod1Msk = LeftMod1 | RightMod1, // should be Mod1Mask, but that conflicts with a X.h macro grrrr - Mod2Msk = LeftMod2 | RightMod2, +enum class ModKeyFlags +{ + NONE = 0x0000, + LeftShift = 0x0001, + RightShift = 0x0002, + LeftMod1 = 0x0004, + RightMod1 = 0x0008, + LeftMod2 = 0x0010, + RightMod2 = 0x0020, + LeftMod3 = 0x0040, + RightMod3 = 0x0080, + Mod1Msk = LeftMod1 | RightMod1, // should be Mod1Mask, but that conflicts with a X.h macro grrrr + Mod2Msk = LeftMod2 | RightMod2, +}; +namespace o3tl +{ +template <> struct typed_flags<ModKeyFlags> : is_typed_flags<ModKeyFlags, 0x00ff> +{ }; -namespace o3tl { - template<> struct typed_flags<ModKeyFlags> : is_typed_flags<ModKeyFlags, 0x00ff> {}; } -enum class KeyIndicatorState { - NONE = 0x0000, - CAPSLOCK = 0x0001, - NUMLOCK = 0x0002, - SCROLLLOCK = 0x0004 +enum class KeyIndicatorState +{ + NONE = 0x0000, + CAPSLOCK = 0x0001, + NUMLOCK = 0x0002, + SCROLLLOCK = 0x0004 }; namespace o3tl { - template<> struct typed_flags<KeyIndicatorState> : is_typed_flags<KeyIndicatorState, 0x0007> {}; +template <> struct typed_flags<KeyIndicatorState> : is_typed_flags<KeyIndicatorState, 0x0007> +{ +}; } #endif // INCLUDED_VCL_KEYCODES_HXX diff --git a/include/vcl/mtfxmldump.hxx b/include/vcl/mtfxmldump.hxx index 3bdf4d663eb9..edfcaff55e4d 100644 --- a/include/vcl/mtfxmldump.hxx +++ b/include/vcl/mtfxmldump.hxx @@ -15,7 +15,10 @@ #include <vcl/metaactiontypes.hxx> #include <o3tl/enumarray.hxx> -namespace tools { class XmlWriter; } +namespace tools +{ +class XmlWriter; +} class GDIMetaFile; class SvStream; diff --git a/include/vcl/opengl/OpenGLWrapper.hxx b/include/vcl/opengl/OpenGLWrapper.hxx index c84286ea5244..23237804e79b 100644 --- a/include/vcl/opengl/OpenGLWrapper.hxx +++ b/include/vcl/opengl/OpenGLWrapper.hxx @@ -31,10 +31,7 @@ struct VCL_DLLPUBLIC OpenGLWrapper */ static sal_Int64 getBufferSwapCounter(); #else - static bool isVCLOpenGLEnabled() - { - return false; - } + static bool isVCLOpenGLEnabled() { return false; } #endif }; diff --git a/include/vcl/pngread.hxx b/include/vcl/pngread.hxx index fe59bfa1b4a6..d3fa1942ee57 100644 --- a/include/vcl/pngread.hxx +++ b/include/vcl/pngread.hxx @@ -27,7 +27,6 @@ namespace vcl { - class PNGReaderImpl; class VCL_DLLPUBLIC PNGReader @@ -35,7 +34,6 @@ class VCL_DLLPUBLIC PNGReader std::unique_ptr<PNGReaderImpl> mpImpl; public: - /* the PNG chunks are read within the c'tor, so the stream will be positioned at the end of the PNG */ explicit PNGReader(SvStream& rStream); diff --git a/include/vcl/sound.hxx b/include/vcl/sound.hxx index 2df3c800442e..77398a3efe9f 100644 --- a/include/vcl/sound.hxx +++ b/include/vcl/sound.hxx @@ -21,11 +21,10 @@ #include <vcl/dllapi.h> - class VCL_DLLPUBLIC Sound { public: - static void Beep(); + static void Beep(); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/uitest/factory.hxx b/include/vcl/uitest/factory.hxx index 3319c5e18583..e51427876668 100644 --- a/include/vcl/uitest/factory.hxx +++ b/include/vcl/uitest/factory.hxx @@ -13,10 +13,9 @@ #include <memory> #include <functional> -namespace vcl { - +namespace vcl +{ class Window; - } class UIObject; diff --git a/include/vcl/vclmain.hxx b/include/vcl/vclmain.hxx index 54a630c43223..6572d6d30e8b 100644 --- a/include/vcl/vclmain.hxx +++ b/include/vcl/vclmain.hxx @@ -16,8 +16,8 @@ #include <vcl/dllapi.h> #endif -namespace vclmain { - +namespace vclmain +{ // Function called from vclmain's implementation of main, needs to be // implemented by the application and needs to instantiate a (static, derived) // instance of Application (where the Application constructor takes care to link diff --git a/include/vcl/wmfexternal.hxx b/include/vcl/wmfexternal.hxx index d20fdf84d034..fcff240a5ff4 100644 --- a/include/vcl/wmfexternal.hxx +++ b/include/vcl/wmfexternal.hxx @@ -23,7 +23,10 @@ #include <vcl/dllapi.h> #include <com/sun/star/uno/Sequence.hxx> -namespace com::sun::star::beans { struct PropertyValue; } +namespace com::sun::star::beans +{ +struct PropertyValue; +} struct VCL_DLLPUBLIC WmfExternal { @@ -47,8 +50,8 @@ struct VCL_DLLPUBLIC WmfExternal sal_uInt16 mapMode; WmfExternal(); - css::uno::Sequence< css::beans::PropertyValue > getSequence() const; - bool setSequence(const css::uno::Sequence< css::beans::PropertyValue >& rSequence); + css::uno::Sequence<css::beans::PropertyValue> getSequence() const; + bool setSequence(const css::uno::Sequence<css::beans::PropertyValue>& rSequence); }; #endif |