include/svx/deflt3d.hxx | 68 ++++++++++++++++++++-------------------- svx/source/engine3d/deflt3d.cxx | 30 ++++++++--------- 2 files changed, 49 insertions(+), 49 deletions(-)
New commits: commit b6f7ad722ec668e9c9324f82044e768af2cdf766 Author: Miklos Vajna <[email protected]> AuthorDate: Mon Jan 15 08:10:06 2024 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Mon Jan 15 09:34:25 2024 +0100 svx: prefix members of E3dDefaultAttributes See tdf#94879 for motivation. Change-Id: Icfa7f881de446095067c0f3a4a601cfd5da3228c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162073 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins diff --git a/include/svx/deflt3d.hxx b/include/svx/deflt3d.hxx index f3312afd5fd8..573378b46414 100644 --- a/include/svx/deflt3d.hxx +++ b/include/svx/deflt3d.hxx @@ -35,27 +35,27 @@ class SAL_WARN_UNUSED UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) E3dDefaultAttributes { private: // Cube object - basegfx::B3DPoint aDefaultCubePos; - basegfx::B3DVector aDefaultCubeSize; - bool bDefaultCubePosIsCenter; + basegfx::B3DPoint m_aDefaultCubePos; + basegfx::B3DVector m_aDefaultCubeSize; + bool m_bDefaultCubePosIsCenter; // Sphere object - basegfx::B3DPoint aDefaultSphereCenter; - basegfx::B3DVector aDefaultSphereSize; + basegfx::B3DPoint m_aDefaultSphereCenter; + basegfx::B3DVector m_aDefaultSphereSize; // Lathe object - bool bDefaultLatheSmoothed; - bool bDefaultLatheSmoothFrontBack; - bool bDefaultLatheCharacterMode; - bool bDefaultLatheCloseFront; - bool bDefaultLatheCloseBack; + bool m_bDefaultLatheSmoothed; + bool m_bDefaultLatheSmoothFrontBack; + bool m_bDefaultLatheCharacterMode; + bool m_bDefaultLatheCloseFront; + bool m_bDefaultLatheCloseBack; // Extrude object - bool bDefaultExtrudeSmoothed; - bool bDefaultExtrudeSmoothFrontBack; - bool bDefaultExtrudeCharacterMode; - bool bDefaultExtrudeCloseFront; - bool bDefaultExtrudeCloseBack; + bool m_bDefaultExtrudeSmoothed; + bool m_bDefaultExtrudeSmoothFrontBack; + bool m_bDefaultExtrudeCharacterMode; + bool m_bDefaultExtrudeCloseFront; + bool m_bDefaultExtrudeCloseBack; public: // Constructor @@ -65,31 +65,31 @@ public: void Reset(); // Cube object - const basegfx::B3DPoint& GetDefaultCubePos() const { return aDefaultCubePos; } - const basegfx::B3DVector& GetDefaultCubeSize() const { return aDefaultCubeSize; } - bool GetDefaultCubePosIsCenter() const { return bDefaultCubePosIsCenter; } + const basegfx::B3DPoint& GetDefaultCubePos() const { return m_aDefaultCubePos; } + const basegfx::B3DVector& GetDefaultCubeSize() const { return m_aDefaultCubeSize; } + bool GetDefaultCubePosIsCenter() const { return m_bDefaultCubePosIsCenter; } // Sphere object - const basegfx::B3DPoint& GetDefaultSphereCenter() const { return aDefaultSphereCenter; } - const basegfx::B3DVector& GetDefaultSphereSize() const { return aDefaultSphereSize; } + const basegfx::B3DPoint& GetDefaultSphereCenter() const { return m_aDefaultSphereCenter; } + const basegfx::B3DVector& GetDefaultSphereSize() const { return m_aDefaultSphereSize; } // Lathe object - bool GetDefaultLatheSmoothed() const { return bDefaultLatheSmoothed; } - bool GetDefaultLatheSmoothFrontBack() const { return bDefaultLatheSmoothFrontBack; } - bool GetDefaultLatheCharacterMode() const { return bDefaultLatheCharacterMode; } - void SetDefaultLatheCharacterMode(const bool bNew) { bDefaultLatheCharacterMode = bNew; } - bool GetDefaultLatheCloseFront() const { return bDefaultLatheCloseFront; } - bool GetDefaultLatheCloseBack() const { return bDefaultLatheCloseBack; } + bool GetDefaultLatheSmoothed() const { return m_bDefaultLatheSmoothed; } + bool GetDefaultLatheSmoothFrontBack() const { return m_bDefaultLatheSmoothFrontBack; } + bool GetDefaultLatheCharacterMode() const { return m_bDefaultLatheCharacterMode; } + void SetDefaultLatheCharacterMode(const bool bNew) { m_bDefaultLatheCharacterMode = bNew; } + bool GetDefaultLatheCloseFront() const { return m_bDefaultLatheCloseFront; } + bool GetDefaultLatheCloseBack() const { return m_bDefaultLatheCloseBack; } // Extrude object - bool GetDefaultExtrudeSmoothed() const { return bDefaultExtrudeSmoothed; } - bool GetDefaultExtrudeSmoothFrontBack() const { return bDefaultExtrudeSmoothFrontBack; } - bool GetDefaultExtrudeCharacterMode() const { return bDefaultExtrudeCharacterMode; } - void SetDefaultExtrudeCharacterMode(const bool bNew) { bDefaultExtrudeCharacterMode = bNew; } - bool GetDefaultExtrudeCloseFront() const { return bDefaultExtrudeCloseFront; } - void SetDefaultExtrudeCloseFront(const bool bNew) { bDefaultExtrudeCloseFront = bNew; } - bool GetDefaultExtrudeCloseBack() const { return bDefaultExtrudeCloseBack; } - void SetDefaultExtrudeCloseBack(const bool bNew) { bDefaultExtrudeCloseBack = bNew; } + bool GetDefaultExtrudeSmoothed() const { return m_bDefaultExtrudeSmoothed; } + bool GetDefaultExtrudeSmoothFrontBack() const { return m_bDefaultExtrudeSmoothFrontBack; } + bool GetDefaultExtrudeCharacterMode() const { return m_bDefaultExtrudeCharacterMode; } + void SetDefaultExtrudeCharacterMode(const bool bNew) { m_bDefaultExtrudeCharacterMode = bNew; } + bool GetDefaultExtrudeCloseFront() const { return m_bDefaultExtrudeCloseFront; } + void SetDefaultExtrudeCloseFront(const bool bNew) { m_bDefaultExtrudeCloseFront = bNew; } + bool GetDefaultExtrudeCloseBack() const { return m_bDefaultExtrudeCloseBack; } + void SetDefaultExtrudeCloseBack(const bool bNew) { m_bDefaultExtrudeCloseBack = bNew; } }; #endif // INCLUDED_SVX_DEFLT3D_HXX diff --git a/svx/source/engine3d/deflt3d.cxx b/svx/source/engine3d/deflt3d.cxx index 89342e67601d..fb912f62e2d7 100644 --- a/svx/source/engine3d/deflt3d.cxx +++ b/svx/source/engine3d/deflt3d.cxx @@ -26,27 +26,27 @@ E3dDefaultAttributes::E3dDefaultAttributes() { Reset(); } void E3dDefaultAttributes::Reset() { // Cube object - aDefaultCubePos = basegfx::B3DPoint(-500.0, -500.0, -500.0); - aDefaultCubeSize = basegfx::B3DVector(1000.0, 1000.0, 1000.0); - bDefaultCubePosIsCenter = false; + m_aDefaultCubePos = basegfx::B3DPoint(-500.0, -500.0, -500.0); + m_aDefaultCubeSize = basegfx::B3DVector(1000.0, 1000.0, 1000.0); + m_bDefaultCubePosIsCenter = false; // Sphere object - aDefaultSphereCenter = basegfx::B3DPoint(0.0, 0.0, 0.0); - aDefaultSphereSize = basegfx::B3DPoint(1000.0, 1000.0, 1000.0); + m_aDefaultSphereCenter = basegfx::B3DPoint(0.0, 0.0, 0.0); + m_aDefaultSphereSize = basegfx::B3DPoint(1000.0, 1000.0, 1000.0); // Lathe object - bDefaultLatheSmoothed = true; - bDefaultLatheSmoothFrontBack = false; - bDefaultLatheCharacterMode = false; - bDefaultLatheCloseFront = true; - bDefaultLatheCloseBack = true; + m_bDefaultLatheSmoothed = true; + m_bDefaultLatheSmoothFrontBack = false; + m_bDefaultLatheCharacterMode = false; + m_bDefaultLatheCloseFront = true; + m_bDefaultLatheCloseBack = true; // Extrude object - bDefaultExtrudeSmoothed = true; - bDefaultExtrudeSmoothFrontBack = false; - bDefaultExtrudeCharacterMode = false; - bDefaultExtrudeCloseFront = true; - bDefaultExtrudeCloseBack = true; + m_bDefaultExtrudeSmoothed = true; + m_bDefaultExtrudeSmoothFrontBack = false; + m_bDefaultExtrudeCharacterMode = false; + m_bDefaultExtrudeCloseFront = true; + m_bDefaultExtrudeCloseBack = true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
