FX_BOOL considered harmful.

core/src/fxge/skia/fx_skia_device.h

Index: core/src/fxge/skia/fx_skia_device.h
diff --git a/core/src/fxge/skia/fx_skia_device.h b/core/src/fxge/skia/fx_skia_device.h
index ab51e51a33704abef07d91b0dfd1e284b2197688..7278671dc7a6ad76d18aa0b5b861bc0754508ece 100644
--- a/core/src/fxge/skia/fx_skia_device.h
+++ b/core/src/fxge/skia/fx_skia_device.h
@@ -9,7 +9,7 @@
 class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver
 {
 public:
-	CFX_SkiaDeviceDriver(CFX_DIBitmap* pBitmap, int dither_bits, FX_BOOL bRgbByteOrder, CFX_DIBitmap* pOriDevice, FX_BOOL bGroupKnockout);
+	CFX_SkiaDeviceDriver(CFX_DIBitmap* pBitmap, int dither_bits, bool bRgbByteOrder, CFX_DIBitmap* pOriDevice, bool bGroupKnockout);
 	virtual ~CFX_SkiaDeviceDriver();
 
 	/** Options */
@@ -17,22 +17,22 @@ public:
 
 	/** Save and restore all graphic states */
 	virtual void		SaveState();
-	virtual void		RestoreState(FX_BOOL bKeepSaved);
+	virtual void		RestoreState(bool bKeepSaved);
 
 	/** Set clipping path using filled region */
-	virtual FX_BOOL		SetClip_PathFill(const CFX_PathData* pPathData,	// path info
+	virtual bool		SetClip_PathFill(const CFX_PathData* pPathData,	// path info
 							const CFX_AffineMatrix* pObject2Device,	// optional transformation
 							int fill_mode	// fill mode, WINDING or ALTERNATE
 							);
 
 	/** Set clipping path using stroked region */
-	virtual FX_BOOL		SetClip_PathStroke(const CFX_PathData* pPathData,	// path info
+	virtual bool		SetClip_PathStroke(const CFX_PathData* pPathData,	// path info
 							const CFX_AffineMatrix* pObject2Device,	// optional transformation
 							const CFX_GraphStateData* pGraphState	// graphic state, for pen attributes
 							);
 
 	/** Draw a path */
-	virtual FX_BOOL		DrawPath(const CFX_PathData* pPathData,
+	virtual bool		DrawPath(const CFX_PathData* pPathData,
 						const CFX_AffineMatrix* pObject2Device,
 						const CFX_GraphStateData* pGraphState,
 						FX_DWORD fill_color,
@@ -42,44 +42,44 @@ public:
 						void* pIccTransform = NULL
 							);
 
-	virtual FX_BOOL		SetPixel(int x, int y, FX_DWORD color,
+	virtual bool		SetPixel(int x, int y, FX_DWORD color,
 						int alpha_flag = 0, void* pIccTransform = NULL);
 
-	virtual FX_BOOL		FillRect(const FX_RECT* pRect, FX_DWORD fill_color,
+	virtual bool		FillRect(const FX_RECT* pRect, FX_DWORD fill_color,
 						int alpha_flag = 0, void* pIccTransform = NULL);
 
 	/** Draw a single pixel (device dependant) line */
-	virtual FX_BOOL		DrawCosmeticLine(FX_FIXFLOAT x1, FX_FIXFLOAT y1, FX_FIXFLOAT x2, FX_FIXFLOAT y2, FX_DWORD color,
-							int alpha_flag, void* pIccTransform, int blend_type) { return FALSE; }
+	virtual bool		DrawCosmeticLine(FX_FIXFLOAT x1, FX_FIXFLOAT y1, FX_FIXFLOAT x2, FX_FIXFLOAT y2, FX_DWORD color,
+							int alpha_flag, void* pIccTransform, int blend_type) { return false; }
 
-	virtual FX_BOOL		GetClipBox(FX_RECT* pRect);
+	virtual bool		GetClipBox(FX_RECT* pRect);
 
 	/** Load device buffer into a DIB */
-	virtual FX_BOOL		GetDIBits(CFX_DIBitmap* pBitmap, int left, int top, void* pIccTransform = NULL, FX_BOOL bDEdge = FALSE);
+	virtual bool		GetDIBits(CFX_DIBitmap* pBitmap, int left, int top, void* pIccTransform = NULL, bool bDEdge = false);
 
 	virtual CFX_DIBitmap*   GetBackDrop() { return m_pAggDriver->GetBackDrop(); }
 
-	virtual FX_BOOL		SetDIBits(const CFX_DIBSource* pBitmap, FX_DWORD color, const FX_RECT* pSrcRect,
+	virtual bool		SetDIBits(const CFX_DIBSource* pBitmap, FX_DWORD color, const FX_RECT* pSrcRect,
 						int dest_left, int dest_top, int blend_type,
 						int alpha_flag = 0, void* pIccTransform = NULL);
-	virtual FX_BOOL		StretchDIBits(const CFX_DIBSource* pBitmap, FX_DWORD color, int dest_left, int dest_top,
+	virtual bool		StretchDIBits(const CFX_DIBSource* pBitmap, FX_DWORD color, int dest_left, int dest_top,
 				int dest_width, int dest_height, const FX_RECT* pClipRect, FX_DWORD flags,
 				int alpha_flag = 0, void* pIccTransform = NULL);
 
-	virtual FX_BOOL		StartDIBits(const CFX_DIBSource* pBitmap, int bitmap_alpha, FX_DWORD color,
+	virtual bool		StartDIBits(const CFX_DIBSource* pBitmap, int bitmap_alpha, FX_DWORD color,
 				const CFX_AffineMatrix* pMatrix, FX_DWORD flags, void*& handle,
 				int alpha_flag = 0, void* pIccTransform = NULL);
-	virtual FX_BOOL		ContinueDIBits(void* handle, IFX_Pause* pPause);
+	virtual bool		ContinueDIBits(void* handle, IFX_Pause* pPause);
 	virtual void		CancelDIBits(void* handle);
 
-	virtual FX_BOOL     DrawDeviceText(int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont,
+	virtual bool     DrawDeviceText(int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont,
 						CFX_FontCache* pCache, const CFX_AffineMatrix* pObject2Device, FX_FIXFLOAT font_size, FX_DWORD color,
 						int alpha_flag = 0, void* pIccTransform = NULL);
 
-	virtual FX_BOOL		RenderRasterizer(rasterizer_scanline_aa& rasterizer, FX_DWORD color, FX_BOOL bFullCover, FX_BOOL bGroupKnockout,
+	virtual bool		RenderRasterizer(rasterizer_scanline_aa& rasterizer, FX_DWORD color, bool bFullCover, bool bGroupKnockout,
 							int alpha_flag, void* pIccTransform);
-	virtual FX_BOOL		RenderRasterizerSkia(SkPath& skPath, const SkPaint& origPaint, SkIRect& rect, FX_DWORD color, FX_BOOL bFullCover, FX_BOOL bGroupKnockout,
-							int alpha_flag, void* pIccTransform, FX_BOOL bFill = TRUE);
+	virtual bool		RenderRasterizerSkia(SkPath& skPath, const SkPaint& origPaint, SkIRect& rect, FX_DWORD color, bool bFullCover, bool bGroupKnockout,
+							int alpha_flag, void* pIccTransform, bool bFill = true);
 	void				SetClipMask(rasterizer_scanline_aa& rasterizer);
 	void				SetClipMask(SkPath& skPath, SkPaint* spaint);
 	virtual	uint8_t*	GetBuffer() const {return m_pAggDriver->GetBuffer();}