summaryrefslogtreecommitdiff
path: root/vcl/inc/unx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/inc/unx')
-rw-r--r--vcl/inc/unx/cairotextrender.hxx4
-rw-r--r--vcl/inc/unx/genpspgraphics.h12
-rw-r--r--vcl/inc/unx/saldisp.hxx12
-rw-r--r--vcl/inc/unx/salgdi.h24
4 files changed, 26 insertions, 26 deletions
diff --git a/vcl/inc/unx/cairotextrender.hxx b/vcl/inc/unx/cairotextrender.hxx
index 2ee28bdb3837..bdbc201780b4 100644
--- a/vcl/inc/unx/cairotextrender.hxx
+++ b/vcl/inc/unx/cairotextrender.hxx
@@ -34,7 +34,7 @@ class VCL_DLLPUBLIC CairoTextRender : public TextRenderImpl
{
FreetypeFont* mpFreetypeFont[ MAX_FALLBACK ];
- SalColor mnTextColor;
+ Color mnTextColor;
protected:
virtual GlyphCache& getPlatformGlyphCache() = 0;
@@ -50,7 +50,7 @@ public:
CairoTextRender();
- virtual void SetTextColor( SalColor nSalColor ) override;
+ virtual void SetTextColor( Color nColor ) override;
virtual void SetFont( const FontSelectPattern*, int nFallbackLevel ) override;
virtual void GetFontMetric( ImplFontMetricDataRef&, int nFallbackLevel ) override;
virtual const FontCharMapRef GetFontCharMap() const override;
diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h
index 7c01d57e0786..52ef103aaf7d 100644
--- a/vcl/inc/unx/genpspgraphics.h
+++ b/vcl/inc/unx/genpspgraphics.h
@@ -75,14 +75,14 @@ public:
virtual bool setClipRegion( const vcl::Region& ) override;
virtual void SetLineColor() override;
- virtual void SetLineColor( SalColor nSalColor ) override;
+ virtual void SetLineColor( Color nColor ) override;
virtual void SetFillColor() override;
- virtual void SetFillColor( SalColor nSalColor ) override;
+ virtual void SetFillColor( Color nColor ) override;
virtual void SetXORMode( bool bSet ) override;
virtual void SetROPLineColor( SalROPColor nROPColor ) override;
virtual void SetROPFillColor( SalROPColor nROPColor ) override;
- virtual void SetTextColor( SalColor nSalColor ) override;
+ virtual void SetTextColor( Color nColor ) override;
virtual void SetFont( const FontSelectPattern*, int nFallbackLevel ) override;
virtual void GetFontMetric( ImplFontMetricDataRef&, int nFallbackLevel ) override;
virtual const FontCharMapRef GetFontCharMap() const override;
@@ -118,7 +118,7 @@ public:
virtual void DrawTextLayout( const CommonSalLayout& ) override;
virtual bool supportsOperation( OutDevSupportType ) const override;
virtual void drawPixel( long nX, long nY ) override;
- virtual void drawPixel( long nX, long nY, SalColor nSalColor ) override;
+ virtual void drawPixel( long nX, long nY, Color nColor ) override;
virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ) override;
virtual void drawRect( long nX, long nY, long nWidth, long nHeight ) override;
virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) override;
@@ -162,9 +162,9 @@ public:
const SalBitmap& rTransparentBitmap ) override;
virtual void drawMask( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
- SalColor nMaskColor ) override;
+ Color nMaskColor ) override;
virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ) override;
- virtual SalColor getPixel( long nX, long nY ) override;
+ virtual Color getPixel( long nX, long nY ) override;
virtual void invert( long nX, long nY, long nWidth, long nHeight,
SalInvert nFlags ) override;
virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry,
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 259af28e63a8..48756f3cbfe1 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -68,7 +68,7 @@ typedef enum {
extern "C" srv_vendor_t sal_GetServerVendor( Display *p_display );
-// MSB/Bigendian view (SalColor == RGB, r=0xFF0000, g=0xFF00, b=0xFF)
+// MSB/Bigendian view (Color == RGB, r=0xFF0000, g=0xFF00, b=0xFF)
enum SalRGB { RGB, RBG,
GBR, GRB,
@@ -97,15 +97,15 @@ public:
int GetClass() const { return c_class; }
int GetDepth() const { return depth; }
- Pixel GetTCPixel( SalColor nColor ) const;
- SalColor GetTCColor( Pixel nPixel ) const;
+ Pixel GetTCPixel( Color nColor ) const;
+ Color GetTCColor( Pixel nPixel ) const;
};
class SalColormap
{
const SalDisplay* m_pDisplay;
Colormap m_hColormap;
- std::vector<SalColor> m_aPalette; // Pseudocolor
+ std::vector<Color> m_aPalette; // Pseudocolor
SalVisual m_aVisual;
std::vector<sal_uInt16> m_aLookupTable; // Pseudocolor: 12bit reduction
Pixel m_nWhitePixel;
@@ -139,8 +139,8 @@ public:
int r,
int g,
int b ) const;
- Pixel GetPixel( SalColor nColor ) const;
- SalColor GetColor( Pixel nPixel ) const;
+ Pixel GetPixel( Color nColor ) const;
+ Color GetColor( Pixel nPixel ) const;
};
class SalI18N_InputMethod;
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 887039b6b1d3..dded647ab97d 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -91,7 +91,7 @@ public:
const SalColormap& GetColormap() const { return *m_pColormap; }
using SalGraphics::GetPixel;
- inline Pixel GetPixel( SalColor nSalColor ) const;
+ inline Pixel GetPixel( Color nColor ) const;
const SalX11Screen& GetScreenNumber() const { return m_nXScreen; }
@@ -104,17 +104,17 @@ public:
virtual bool setClipRegion( const vcl::Region& ) override;
virtual void SetLineColor() override;
- virtual void SetLineColor( SalColor nSalColor ) override;
+ virtual void SetLineColor( Color nColor ) override;
virtual void SetFillColor() override;
- virtual void SetFillColor( SalColor nSalColor ) override;
+ virtual void SetFillColor( Color nColor ) override;
virtual void SetXORMode( bool bSet ) override;
virtual void SetROPLineColor( SalROPColor nROPColor ) override;
virtual void SetROPFillColor( SalROPColor nROPColor ) override;
- virtual void SetTextColor( SalColor nSalColor ) override;
+ virtual void SetTextColor( Color nColor ) override;
virtual void SetFont( const FontSelectPattern*, int nFallbackLevel ) override;
virtual void GetFontMetric( ImplFontMetricDataRef&, int nFallbackLevel ) override;
virtual const FontCharMapRef GetFontCharMap() const override;
@@ -149,7 +149,7 @@ public:
virtual bool supportsOperation( OutDevSupportType ) const override;
virtual void drawPixel( long nX, long nY ) override;
- virtual void drawPixel( long nX, long nY, SalColor nSalColor ) override;
+ virtual void drawPixel( long nX, long nY, Color nColor ) override;
virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ) override;
virtual void drawRect( long nX, long nY, long nWidth, long nHeight ) override;
virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) override;
@@ -215,10 +215,10 @@ public:
virtual void drawMask(
const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
- SalColor nMaskColor ) override;
+ Color nMaskColor ) override;
virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ) override;
- virtual SalColor getPixel( long nX, long nY ) override;
+ virtual Color getPixel( long nX, long nY ) override;
virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ) override;
virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) override;
@@ -305,7 +305,7 @@ public:
protected:
using SalGraphics::SetClipRegion;
void SetClipRegion( GC pGC, Region pXReg = nullptr ) const;
- bool GetDitherPixmap ( SalColor nSalColor );
+ bool GetDitherPixmap ( Color nColor );
using SalGraphics::DrawBitmap;
@@ -327,8 +327,8 @@ protected:
Region mpClipRegion;
#if ENABLE_CAIRO_CANVAS
vcl::Region maClipRegion;
- SalColor mnPenColor;
- SalColor mnFillColor;
+ Color mnPenColor;
+ Color mnFillColor;
#endif // ENABLE_CAIRO_CANVAS
GC pFontGC_; // Font attributes
@@ -356,8 +356,8 @@ inline const SalVisual& X11SalGraphics::GetVisual() const
inline Display *X11SalGraphics::GetXDisplay() const
{ return GetColormap().GetXDisplay(); }
-inline Pixel X11SalGraphics::GetPixel( SalColor nSalColor ) const
-{ return GetColormap().GetPixel( nSalColor ); }
+inline Pixel X11SalGraphics::GetPixel( Color nColor ) const
+{ return GetColormap().GetPixel( nColor ); }
#endif // INCLUDED_VCL_INC_UNX_SALGDI_H
generated by cgit (git 2.34.1) at 2025-03-22 15:39:15 +0000