diff options
author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2015-08-15 15:36:14 +0200 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2015-08-15 21:54:47 +0200 |
commit | f7274c63475597c5c0e5ed16a82efb78eebacdcd (patch) | |
tree | 0baee1614e8146d59b259acc151eac8d23aaaaec /canvas | |
parent | 849f1d37d575bc752c8f987c7541dbd4bfd998c1 (diff) |
canvas: whitespace/comments cleanup
The more redundant cases of whitespace/comments had to go...
Change-Id: Id0bfab5f60f123c0a4d3d9f8468791e0d8046225
Diffstat (limited to 'canvas')
-rw-r--r-- | canvas/source/tools/canvascustomspritehelper.cxx | 4 | ||||
-rw-r--r-- | canvas/source/tools/pagemanager.cxx | 34 | ||||
-rw-r--r-- | canvas/source/tools/surface.cxx | 37 | ||||
-rw-r--r-- | canvas/source/tools/surface.hxx | 6 | ||||
-rw-r--r-- | canvas/source/tools/surfaceproxy.cxx | 20 | ||||
-rw-r--r-- | canvas/source/tools/surfaceproxy.hxx | 5 | ||||
-rw-r--r-- | canvas/source/tools/surfaceproxymanager.cxx | 9 | ||||
-rw-r--r-- | canvas/source/tools/surfacerect.hxx | 10 |
8 files changed, 3 insertions, 122 deletions
diff --git a/canvas/source/tools/canvascustomspritehelper.cxx b/canvas/source/tools/canvascustomspritehelper.cxx index 6a421361319f..c02f890da09e 100644 --- a/canvas/source/tools/canvascustomspritehelper.cxx +++ b/canvas/source/tools/canvascustomspritehelper.cxx @@ -404,7 +404,6 @@ namespace canvas } } - // Sprite interface bool CanvasCustomSpriteHelper::isAreaUpdateOpaque( const ::basegfx::B2DRange& rUpdateArea ) const { if( !mbIsCurrClipRectangle || @@ -427,8 +426,6 @@ namespace canvas } } - - ::basegfx::B2DRange CanvasCustomSpriteHelper::getUpdateArea( const ::basegfx::B2DRange& rBounds ) const { // Internal! Only call with locked object mutex! @@ -460,7 +457,6 @@ namespace canvas maPosition + maCurrClipBounds.getMaximum() ); } - ::basegfx::B2DRange CanvasCustomSpriteHelper::getFullSpriteRect() const { // Internal! Only call with locked object mutex! diff --git a/canvas/source/tools/pagemanager.cxx b/canvas/source/tools/pagemanager.cxx index aa1eaa0dc7f4..9b8466d7bb2c 100644 --- a/canvas/source/tools/pagemanager.cxx +++ b/canvas/source/tools/pagemanager.cxx @@ -23,15 +23,6 @@ namespace canvas { - - - // PageManager - - - - // PageManager::allocateSpace - - FragmentSharedPtr PageManager::allocateSpace( const ::basegfx::B2ISize& rSize ) { // we are asked to find a location for the requested size. @@ -74,10 +65,6 @@ namespace canvas return pFragment; } - - // PageManager::free - - void PageManager::free( const FragmentSharedPtr& pFragment ) { // erase the reference to the given fragment from our @@ -94,10 +81,6 @@ namespace canvas pFragment->free(pFragment); } - - // PageManager::nakedFragment - - void PageManager::nakedFragment( const FragmentSharedPtr& pFragment ) { if(maPages.empty()) @@ -151,10 +134,6 @@ namespace canvas } } - - // PageManager::relocate - - bool PageManager::relocate( const FragmentSharedPtr& pFragment ) { // the fragment passed as argument is assumed to @@ -181,29 +160,16 @@ namespace canvas return false; } - - // PageManager::validatePages - - void PageManager::validatePages() { for( const auto& rPagePtr : maPages ) rPagePtr->validate(); } - - // PageManager::getPageSize - - ::basegfx::B2ISize PageManager::getPageSize() const { return mpRenderModule->getPageSize(); } - - - // PageManager::getRenderModule - - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/tools/surface.cxx b/canvas/source/tools/surface.cxx index 27b615d8d98a..3ec52b6b5c92 100644 --- a/canvas/source/tools/surface.cxx +++ b/canvas/source/tools/surface.cxx @@ -28,11 +28,6 @@ namespace canvas { - - - // Surface::Surface - - Surface::Surface( const PageManagerSharedPtr& rPageManager, const IColorBufferSharedPtr& rColorBuffer, const ::basegfx::B2IPoint& rPos, @@ -46,29 +41,17 @@ namespace canvas { } - - // Surface::~Surface - - Surface::~Surface() { if(mpFragment) mpPageManager->free(mpFragment); } - - // Surface::getUVCoords - - void Surface::setColorBufferDirty() { mbIsDirty=true; } - - // Surface::getUVCoords - - basegfx::B2DRectangle Surface::getUVCoords() const { ::basegfx::B2ISize aPageSize(mpPageManager->getPageSize()); @@ -89,10 +72,6 @@ namespace canvas (oy+sy)/ph ); } - - // Surface::getUVCoords - - basegfx::B2DRectangle Surface::getUVCoords( const ::basegfx::B2IPoint& rPos, const ::basegfx::B2ISize& rSize ) const { @@ -111,10 +90,6 @@ namespace canvas (oy+sy)/ph ); } - - // Surface::draw - - bool Surface::draw( double fAlpha, const ::basegfx::B2DPoint& rPos, const ::basegfx::B2DHomMatrix& rTransform ) @@ -211,10 +186,6 @@ namespace canvas return !(pRenderModule->isError()); } - - // Surface::drawRectangularArea - - bool Surface::drawRectangularArea( double fAlpha, const ::basegfx::B2DPoint& rPos, @@ -337,10 +308,6 @@ namespace canvas return !(pRenderModule->isError()); } - - // Surface::drawWithClip - - bool Surface::drawWithClip( double fAlpha, const ::basegfx::B2DPoint& rPos, const ::basegfx::B2DPolygon& rClipPoly, @@ -445,10 +412,6 @@ namespace canvas return !(pRenderModule->isError()); } - - // Surface::prepareRendering - - void Surface::prepareRendering() { mpPageManager->validatePages(); diff --git a/canvas/source/tools/surface.hxx b/canvas/source/tools/surface.hxx index 2b61b5ae3742..33186c11ce17 100644 --- a/canvas/source/tools/surface.hxx +++ b/canvas/source/tools/surface.hxx @@ -35,10 +35,6 @@ namespace canvas { - - // Surface - - /** surfaces denote occupied areas within pages. pages encapsulate the hardware buffers that @@ -114,7 +110,6 @@ namespace canvas const ::basegfx::B2DPolygon& rClipPoly, const ::basegfx::B2DHomMatrix& rTransform ); - // private attributes private: IColorBufferSharedPtr mpColorBuffer; @@ -138,7 +133,6 @@ namespace canvas bool mbIsDirty; - // private methods private: bool refresh( canvas::IColorBuffer& rBuffer ) const; void prepareRendering(); diff --git a/canvas/source/tools/surfaceproxy.cxx b/canvas/source/tools/surfaceproxy.cxx index e35ad4d490dc..fd5b8e2f833e 100644 --- a/canvas/source/tools/surfaceproxy.cxx +++ b/canvas/source/tools/surfaceproxy.cxx @@ -27,10 +27,6 @@ namespace canvas { - - // SurfaceProxy::SurfaceProxy - - SurfaceProxy::SurfaceProxy( const canvas::IColorBufferSharedPtr& pBuffer, const PageManagerSharedPtr& pPageManager ) : mpPageManager( pPageManager ), @@ -83,20 +79,12 @@ namespace canvas } } - - // SurfaceProxy::setColorBufferDirty - - void SurfaceProxy::setColorBufferDirty() { for( const auto& rSurfacePtr : maSurfaceList ) rSurfacePtr->setColorBufferDirty(); } - - // SurfaceProxy::draw - - bool SurfaceProxy::draw( double fAlpha, const ::basegfx::B2DPoint& rPos, const ::basegfx::B2DHomMatrix& rTransform ) @@ -107,10 +95,6 @@ namespace canvas return true; } - - // SurfaceProxy::draw - - bool SurfaceProxy::draw( double fAlpha, const ::basegfx::B2DPoint& rPos, const ::basegfx::B2DRange& rArea, @@ -122,10 +106,6 @@ namespace canvas return true; } - - // SurfaceProxy::draw - - bool SurfaceProxy::draw( double fAlpha, const ::basegfx::B2DPoint& rPos, const ::basegfx::B2DPolyPolygon& rClipPoly, diff --git a/canvas/source/tools/surfaceproxy.hxx b/canvas/source/tools/surfaceproxy.hxx index 4b5862bf0967..3eb7019e0f27 100644 --- a/canvas/source/tools/surfaceproxy.hxx +++ b/canvas/source/tools/surfaceproxy.hxx @@ -28,11 +28,6 @@ namespace canvas { - - - // SurfaceProxy - - /** Definition of the surface proxy class. Surface proxies are the connection between *one* source image diff --git a/canvas/source/tools/surfaceproxymanager.cxx b/canvas/source/tools/surfaceproxymanager.cxx index fd5eb7712532..839a6724874d 100644 --- a/canvas/source/tools/surfaceproxymanager.cxx +++ b/canvas/source/tools/surfaceproxymanager.cxx @@ -26,11 +26,6 @@ namespace canvas { - - - // SurfaceProxyManager - - class SurfaceProxyManager : public ISurfaceProxyManager { public: @@ -65,10 +60,6 @@ namespace canvas PageManagerSharedPtr mpPageManager; }; - - // createSurfaceProxyManager - - ISurfaceProxyManagerSharedPtr createSurfaceProxyManager( const IRenderModuleSharedPtr& rRenderModule ) { return ISurfaceProxyManagerSharedPtr( diff --git a/canvas/source/tools/surfacerect.hxx b/canvas/source/tools/surfacerect.hxx index bc476bc534c2..b98cd28487f0 100644 --- a/canvas/source/tools/surfacerect.hxx +++ b/canvas/source/tools/surfacerect.hxx @@ -25,10 +25,6 @@ namespace canvas { - - // SurfaceRect - - struct SurfaceRect { ::basegfx::B2IPoint maPos; @@ -67,7 +63,7 @@ namespace canvas return true; } - // returns true if the horizontal line intersects the rect. + /// returns true if the horizontal line intersects the rect. bool hLineIntersect( sal_Int32 lx1, sal_Int32 lx2, sal_Int32 ly ) const { const sal_Int32 x1(maPos.getX()); @@ -81,7 +77,7 @@ namespace canvas return true; } - //! Returns true if the vertical line intersects the rect. + /// returns true if the vertical line intersects the rect. bool vLineIntersect( sal_Int32 lx, sal_Int32 ly1, sal_Int32 ly2 ) const { const sal_Int32 x1(maPos.getX()); @@ -95,7 +91,7 @@ namespace canvas return true; } - // returns true if the passed rect intersects this one. + /// returns true if the passed rect intersects this one. bool intersection( const SurfaceRect& r ) const { const sal_Int32 x1(maPos.getX()); |