summaryrefslogtreecommitdiff
path: root/canvas
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-08-21 20:03:57 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-08-22 09:34:35 +0200
commitd5b07dc9c0185e59077e54c91792476dcbba8d44 (patch)
treefa77258288df99fe68fdd32846f804932def0269 /canvas
parentf949d8665e83ece5648af0a73a675036067b88e2 (diff)
loplugin:constmethod in canvas,comphelper
Change-Id: I8790355369159b2325d3992712b2f65e0401db86 Reviewed-on: https://gerrit.libreoffice.org/77930 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'canvas')
-rw-r--r--canvas/source/cairo/cairo_canvashelper.cxx2
-rw-r--r--canvas/source/cairo/cairo_canvashelper.hxx2
-rw-r--r--canvas/source/cairo/cairo_devicehelper.hxx2
-rw-r--r--canvas/source/cairo/cairo_spritecanvas.cxx6
-rw-r--r--canvas/source/cairo/cairo_spritecanvas.hxx6
-rw-r--r--canvas/source/cairo/cairo_spritedevicehelper.cxx2
-rw-r--r--canvas/source/cairo/cairo_spritedevicehelper.hxx6
-rw-r--r--canvas/source/opengl/ogl_bitmapcanvashelper.cxx2
-rw-r--r--canvas/source/opengl/ogl_bitmapcanvashelper.hxx4
-rw-r--r--canvas/source/vcl/canvasbitmaphelper.cxx4
-rw-r--r--canvas/source/vcl/canvasbitmaphelper.hxx4
11 files changed, 20 insertions, 20 deletions
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index 71ca12e629ef..3aa7ad8d0a5d 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -1260,7 +1260,7 @@ namespace cairocanvas
}
- geometry::IntegerSize2D CanvasHelper::getSize()
+ geometry::IntegerSize2D CanvasHelper::getSize() const
{
if( !mpSurfaceProvider )
return geometry::IntegerSize2D(1, 1); // we're disposed
diff --git a/canvas/source/cairo/cairo_canvashelper.hxx b/canvas/source/cairo/cairo_canvashelper.hxx
index 0ee7b1011552..0e7cef1b75ba 100644
--- a/canvas/source/cairo/cairo_canvashelper.hxx
+++ b/canvas/source/cairo/cairo_canvashelper.hxx
@@ -195,7 +195,7 @@ namespace cairocanvas
// BitmapCanvasHelper functionality
// ================================
- css::geometry::IntegerSize2D getSize();
+ css::geometry::IntegerSize2D getSize() const;
css::uno::Reference< css::rendering::XBitmap >
getScaledBitmap( const css::geometry::RealSize2D& newSize,
diff --git a/canvas/source/cairo/cairo_devicehelper.hxx b/canvas/source/cairo/cairo_devicehelper.hxx
index a010e5b67a6d..6e59615c32b8 100644
--- a/canvas/source/cairo/cairo_devicehelper.hxx
+++ b/canvas/source/cairo/cairo_devicehelper.hxx
@@ -90,7 +90,7 @@ namespace cairocanvas
void dumpScreenContent() const;
OutputDevice* getOutputDevice() const { return mpRefDevice; }
- const ::cairo::SurfaceSharedPtr& getSurface() { return mpSurface; }
+ const ::cairo::SurfaceSharedPtr& getSurface() const { return mpSurface; }
::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent );
::cairo::SurfaceSharedPtr createSurface( BitmapSystemData const & rData, const Size& rSize );
diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx
index 3b4e5aa1bb69..00ddd6c66cb7 100644
--- a/canvas/source/cairo/cairo_spritecanvas.cxx
+++ b/canvas/source/cairo/cairo_spritecanvas.cxx
@@ -176,17 +176,17 @@ namespace cairocanvas
return maDeviceHelper.getOutputDevice();
}
- SurfaceSharedPtr const & SpriteCanvas::getBufferSurface()
+ SurfaceSharedPtr const & SpriteCanvas::getBufferSurface() const
{
return maDeviceHelper.getBufferSurface();
}
- SurfaceSharedPtr const & SpriteCanvas::getWindowSurface()
+ SurfaceSharedPtr const & SpriteCanvas::getWindowSurface() const
{
return maDeviceHelper.getWindowSurface();
}
- const ::basegfx::B2ISize& SpriteCanvas::getSizePixel()
+ const ::basegfx::B2ISize& SpriteCanvas::getSizePixel() const
{
return maDeviceHelper.getSizePixel();
}
diff --git a/canvas/source/cairo/cairo_spritecanvas.hxx b/canvas/source/cairo/cairo_spritecanvas.hxx
index 4ec6e8b10522..cf5a5f4e57ab 100644
--- a/canvas/source/cairo/cairo_spritecanvas.hxx
+++ b/canvas/source/cairo/cairo_spritecanvas.hxx
@@ -143,10 +143,10 @@ namespace cairocanvas
const css::rendering::ViewState& viewState,
const css::rendering::RenderState& renderState ) override;
- ::cairo::SurfaceSharedPtr const & getWindowSurface();
- ::cairo::SurfaceSharedPtr const & getBufferSurface();
+ ::cairo::SurfaceSharedPtr const & getWindowSurface() const;
+ ::cairo::SurfaceSharedPtr const & getBufferSurface() const;
- const ::basegfx::B2ISize& getSizePixel();
+ const ::basegfx::B2ISize& getSizePixel() const;
void setSizePixel( const ::basegfx::B2ISize& rSize );
void flush();
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx
index a636a22f2e39..bbff8d026263 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.cxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx
@@ -124,7 +124,7 @@ namespace cairocanvas
setSize( ::basegfx::B2ISize(rBounds.Width, rBounds.Height) );
}
- SurfaceSharedPtr const & SpriteDeviceHelper::getWindowSurface()
+ SurfaceSharedPtr const & SpriteDeviceHelper::getWindowSurface() const
{
return DeviceHelper::getSurface();
}
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.hxx b/canvas/source/cairo/cairo_spritedevicehelper.hxx
index c541d9cf2a47..f7ad11205a67 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.hxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.hxx
@@ -59,11 +59,11 @@ namespace cairocanvas
void notifySizeUpdate( const css::awt::Rectangle& rBounds );
void setSize( const ::basegfx::B2ISize& rSize );
- const ::cairo::SurfaceSharedPtr& getBufferSurface() { return mpBufferSurface; }
- ::cairo::SurfaceSharedPtr const & getWindowSurface();
+ const ::cairo::SurfaceSharedPtr& getBufferSurface() const { return mpBufferSurface; }
+ ::cairo::SurfaceSharedPtr const & getWindowSurface() const;
::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent );
::cairo::SurfaceSharedPtr createSurface( BitmapSystemData const & rData, const Size& rSize );
- const ::basegfx::B2ISize& getSizePixel() { return maSize; }
+ const ::basegfx::B2ISize& getSizePixel() const { return maSize; }
void flush();
private:
diff --git a/canvas/source/opengl/ogl_bitmapcanvashelper.cxx b/canvas/source/opengl/ogl_bitmapcanvashelper.cxx
index ddf39a6bfa0f..1ed881fda5ab 100644
--- a/canvas/source/opengl/ogl_bitmapcanvashelper.cxx
+++ b/canvas/source/opengl/ogl_bitmapcanvashelper.cxx
@@ -57,7 +57,7 @@ namespace oglcanvas
return uno::Sequence< sal_Int8 >();
}
- rendering::IntegerBitmapLayout BitmapCanvasHelper::getMemoryLayout()
+ rendering::IntegerBitmapLayout BitmapCanvasHelper::getMemoryLayout() const
{
return ::canvas::tools::getStdMemoryLayout(getSize());
}
diff --git a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
index b55eb4576ee9..d6e3e9695065 100644
--- a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
+++ b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
@@ -49,7 +49,7 @@ namespace oglcanvas
// BitmapCanvasHelper functionality
// ================================
- const css::geometry::IntegerSize2D& getSize() { return maSize; }
+ const css::geometry::IntegerSize2D& getSize() const { return maSize; }
css::uno::Reference< css::rendering::XBitmap >
getScaledBitmap( const css::geometry::RealSize2D& newSize,
@@ -63,7 +63,7 @@ namespace oglcanvas
getPixel( css::rendering::IntegerBitmapLayout& bitmapLayout,
const css::geometry::IntegerPoint2D& pos );
- css::rendering::IntegerBitmapLayout getMemoryLayout();
+ css::rendering::IntegerBitmapLayout getMemoryLayout() const;
private:
css::geometry::IntegerSize2D maSize;
diff --git a/canvas/source/vcl/canvasbitmaphelper.cxx b/canvas/source/vcl/canvasbitmaphelper.cxx
index 5e5e6183f911..03a0ea5274fc 100644
--- a/canvas/source/vcl/canvasbitmaphelper.cxx
+++ b/canvas/source/vcl/canvasbitmaphelper.cxx
@@ -74,7 +74,7 @@ namespace vclcanvas
CanvasHelper::disposing();
}
- geometry::IntegerSize2D CanvasBitmapHelper::getSize()
+ geometry::IntegerSize2D CanvasBitmapHelper::getSize() const
{
if( !mpBackBuffer )
return geometry::IntegerSize2D();
@@ -162,7 +162,7 @@ namespace vclcanvas
return aRes;
}
- rendering::IntegerBitmapLayout CanvasBitmapHelper::getMemoryLayout()
+ rendering::IntegerBitmapLayout CanvasBitmapHelper::getMemoryLayout() const
{
if( !mpOutDevProvider.get() )
return rendering::IntegerBitmapLayout(); // we're disposed
diff --git a/canvas/source/vcl/canvasbitmaphelper.hxx b/canvas/source/vcl/canvasbitmaphelper.hxx
index fe438a00f011..31a20d8db795 100644
--- a/canvas/source/vcl/canvasbitmaphelper.hxx
+++ b/canvas/source/vcl/canvasbitmaphelper.hxx
@@ -80,7 +80,7 @@ namespace vclcanvas
void clear();
- css::geometry::IntegerSize2D getSize();
+ css::geometry::IntegerSize2D getSize() const;
css::uno::Reference< css::rendering::XBitmap >
getScaledBitmap( const css::geometry::RealSize2D& newSize,
@@ -94,7 +94,7 @@ namespace vclcanvas
getPixel( css::rendering::IntegerBitmapLayout& bitmapLayout,
const css::geometry::IntegerPoint2D& pos );
- css::rendering::IntegerBitmapLayout getMemoryLayout();
+ css::rendering::IntegerBitmapLayout getMemoryLayout() const;
/// @internal
BitmapEx getBitmap() const;