diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2011-01-17 18:42:24 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2011-01-17 18:42:24 +0100 |
commit | 4fff39f59ca0d78aa2ec98e41b679404d953a058 (patch) | |
tree | faf5f1b5294717201c8f861e197a086dd4f0616c | |
parent | b23ca3c2d830dc18840a42f5881733fbf0951119 (diff) |
add const to GetBitCount()
-rw-r--r-- | vcl/aqua/inc/salgdi.h | 2 | ||||
-rw-r--r-- | vcl/aqua/source/gdi/salgdi.cxx | 2 | ||||
-rw-r--r-- | vcl/inc/vcl/salgdi.hxx | 2 | ||||
-rw-r--r-- | vcl/os2/inc/salgdi.h | 2 | ||||
-rw-r--r-- | vcl/os2/source/gdi/salgdi.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/headless/svpgdi.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/headless/svpgdi.hxx | 2 | ||||
-rw-r--r-- | vcl/unx/headless/svppspgraphics.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/headless/svppspgraphics.hxx | 2 | ||||
-rw-r--r-- | vcl/unx/inc/pspgraphics.h | 2 | ||||
-rw-r--r-- | vcl/unx/inc/salgdi.h | 2 | ||||
-rw-r--r-- | vcl/unx/source/gdi/pspgraphics.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/source/gdi/salgdi.cxx | 2 | ||||
-rw-r--r-- | vcl/win/inc/salgdi.h | 2 | ||||
-rw-r--r-- | vcl/win/source/gdi/salgdi.cxx | 2 |
15 files changed, 15 insertions, 15 deletions
diff --git a/vcl/aqua/inc/salgdi.h b/vcl/aqua/inc/salgdi.h index eb203863ed..2c5f37c2a2 100644 --- a/vcl/aqua/inc/salgdi.h +++ b/vcl/aqua/inc/salgdi.h @@ -245,7 +245,7 @@ public: // get device resolution virtual void GetResolution( long& rDPIX, long& rDPIY ); // get the depth of the device - virtual USHORT GetBitCount(); + virtual USHORT GetBitCount() const; // get the width of the device virtual long GetGraphicsWidth() const; diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx index 4585699d12..a892aaa130 100644 --- a/vcl/aqua/source/gdi/salgdi.cxx +++ b/vcl/aqua/source/gdi/salgdi.cxx @@ -452,7 +452,7 @@ void AquaSalGraphics::copyResolution( AquaSalGraphics& rGraphics ) // ----------------------------------------------------------------------- -USHORT AquaSalGraphics::GetBitCount() +USHORT AquaSalGraphics::GetBitCount() const { USHORT nBits = mnBitmapDepth ? mnBitmapDepth : 32;//24; return nBits; diff --git a/vcl/inc/vcl/salgdi.hxx b/vcl/inc/vcl/salgdi.hxx index a92a7d91cd..15b2c70867 100644 --- a/vcl/inc/vcl/salgdi.hxx +++ b/vcl/inc/vcl/salgdi.hxx @@ -200,7 +200,7 @@ public: // get device resolution virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) = 0; // get the depth of the device - virtual USHORT GetBitCount() = 0; + virtual USHORT GetBitCount() const = 0; // get the width of the device virtual long GetGraphicsWidth() const = 0; diff --git a/vcl/os2/inc/salgdi.h b/vcl/os2/inc/salgdi.h index 621451d181..d7be9a6376 100644 --- a/vcl/os2/inc/salgdi.h +++ b/vcl/os2/inc/salgdi.h @@ -206,7 +206,7 @@ public: // get device resolution virtual void GetResolution( long& rDPIX, long& rDPIY ); // get the depth of the device - virtual USHORT GetBitCount(); + virtual USHORT GetBitCount() const; // get the width of the device virtual long GetGraphicsWidth() const; diff --git a/vcl/os2/source/gdi/salgdi.cxx b/vcl/os2/source/gdi/salgdi.cxx index c5fc42c6ef..6db8bb4b55 100644 --- a/vcl/os2/source/gdi/salgdi.cxx +++ b/vcl/os2/source/gdi/salgdi.cxx @@ -165,7 +165,7 @@ void Os2SalGraphics::GetResolution( long& rDPIX, long& rDPIY ) // ----------------------------------------------------------------------- -USHORT Os2SalGraphics::GetBitCount() +USHORT Os2SalGraphics::GetBitCount() const { LONG nBitCount; DevQueryCaps( mhDC, CAPS_COLOR_BITCOUNT, 1, &nBitCount ); diff --git a/vcl/unx/headless/svpgdi.cxx b/vcl/unx/headless/svpgdi.cxx index f1cf483770..582c870ead 100644 --- a/vcl/unx/headless/svpgdi.cxx +++ b/vcl/unx/headless/svpgdi.cxx @@ -132,7 +132,7 @@ void SvpSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) rDPIX = rDPIY = 96; } -USHORT SvpSalGraphics::GetBitCount() +USHORT SvpSalGraphics::GetBitCount() const { return SvpElement::getBitCountFromScanlineFormat( m_aDevice->getScanlineFormat() ); } diff --git a/vcl/unx/headless/svpgdi.hxx b/vcl/unx/headless/svpgdi.hxx index 2a05b104d7..ed3396e3c1 100644 --- a/vcl/unx/headless/svpgdi.hxx +++ b/vcl/unx/headless/svpgdi.hxx @@ -65,7 +65,7 @@ public: // overload all pure virtual methods virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ); - virtual USHORT GetBitCount(); + virtual USHORT GetBitCount() const; virtual long GetGraphicsWidth() const; virtual void ResetClipRegion(); diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx index a7b3c11a0b..7c3df8b239 100644 --- a/vcl/unx/headless/svppspgraphics.cxx +++ b/vcl/unx/headless/svppspgraphics.cxx @@ -205,7 +205,7 @@ void PspGraphics::GetResolution( sal_Int32 &rDPIX, sal_Int32 &rDPIY ) } } -USHORT PspGraphics::GetBitCount() +USHORT PspGraphics::GetBitCount() const { return m_pPrinterGfx->GetBitCount(); } diff --git a/vcl/unx/headless/svppspgraphics.hxx b/vcl/unx/headless/svppspgraphics.hxx index 6e865f3409..a438ef3a99 100644 --- a/vcl/unx/headless/svppspgraphics.hxx +++ b/vcl/unx/headless/svppspgraphics.hxx @@ -87,7 +87,7 @@ public: // overload all pure virtual methods virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ); - virtual USHORT GetBitCount(); + virtual USHORT GetBitCount() const; virtual long GetGraphicsWidth() const; virtual void ResetClipRegion(); diff --git a/vcl/unx/inc/pspgraphics.h b/vcl/unx/inc/pspgraphics.h index 9616202e74..275c3a999f 100644 --- a/vcl/unx/inc/pspgraphics.h +++ b/vcl/unx/inc/pspgraphics.h @@ -84,7 +84,7 @@ public: // overload all pure virtual methods virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ); - virtual USHORT GetBitCount(); + virtual USHORT GetBitCount() const; virtual long GetGraphicsWidth() const; virtual void ResetClipRegion(); diff --git a/vcl/unx/inc/salgdi.h b/vcl/unx/inc/salgdi.h index 038e12911a..938e220757 100644 --- a/vcl/unx/inc/salgdi.h +++ b/vcl/unx/inc/salgdi.h @@ -231,7 +231,7 @@ public: // overload all pure virtual methods virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ); - virtual USHORT GetBitCount(); + virtual USHORT GetBitCount() const; virtual long GetGraphicsWidth() const; virtual long GetGraphicsHeight() const; diff --git a/vcl/unx/source/gdi/pspgraphics.cxx b/vcl/unx/source/gdi/pspgraphics.cxx index c25e065a14..5c30d53a9f 100644 --- a/vcl/unx/source/gdi/pspgraphics.cxx +++ b/vcl/unx/source/gdi/pspgraphics.cxx @@ -279,7 +279,7 @@ void PspGraphics::GetResolution( sal_Int32 &rDPIX, sal_Int32 &rDPIY ) } } -USHORT PspGraphics::GetBitCount() +USHORT PspGraphics::GetBitCount() const { return m_pPrinterGfx->GetBitCount(); } diff --git a/vcl/unx/source/gdi/salgdi.cxx b/vcl/unx/source/gdi/salgdi.cxx index 9a4912e845..14f5b90573 100644 --- a/vcl/unx/source/gdi/salgdi.cxx +++ b/vcl/unx/source/gdi/salgdi.cxx @@ -531,7 +531,7 @@ void X11SalGraphics::GetResolution( sal_Int32 &rDPIX, sal_Int32 &rDPIY ) // cons } // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -USHORT X11SalGraphics::GetBitCount() // const +USHORT X11SalGraphics::GetBitCount() const { return GetVisual().GetDepth(); } diff --git a/vcl/win/inc/salgdi.h b/vcl/win/inc/salgdi.h index 0ba816c23b..6b80293203 100644 --- a/vcl/win/inc/salgdi.h +++ b/vcl/win/inc/salgdi.h @@ -251,7 +251,7 @@ public: // get device resolution virtual void GetResolution( long& rDPIX, long& rDPIY ); // get the depth of the device - virtual USHORT GetBitCount(); + virtual USHORT GetBitCount() const; // get the width of the device virtual long GetGraphicsWidth() const; diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index 89d54b9580..1ca00688c0 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -804,7 +804,7 @@ void WinSalGraphics::GetResolution( long& rDPIX, long& rDPIY ) // ----------------------------------------------------------------------- -USHORT WinSalGraphics::GetBitCount() +USHORT WinSalGraphics::GetBitCount() const { return (USHORT)GetDeviceCaps( mhDC, BITSPIXEL ); } |