From b116136da234afcad018bb44a3ccb64b9ad2a554 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Tue, 9 Jun 2015 11:29:12 -0700
Subject: Merge to XFA: Remove more cruft from fx_system.h

New manual edits in the following to fix compilation:
  fx_bmp.h, fx_gif.h, fx_graphics.h

Original Review URL: https://codereview.chromium.org/1169963003

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1170103004
---
 fpdfsdk/src/fpdf_sysfontinfo.cpp | 18 +++++++++---------
 fpdfsdk/src/fpdfsave.cpp         |  6 +++---
 fpdfsdk/src/fpdfview.cpp         |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'fpdfsdk/src')

diff --git a/fpdfsdk/src/fpdf_sysfontinfo.cpp b/fpdfsdk/src/fpdf_sysfontinfo.cpp
index f73a7701dc..4d77794768 100644
--- a/fpdfsdk/src/fpdf_sysfontinfo.cpp
+++ b/fpdfsdk/src/fpdf_sysfontinfo.cpp
@@ -8,19 +8,19 @@
 #include "../include/fsdk_define.h"
 #include "../include/pdfwindow/PWL_FontMap.h"
 
-class CSysFontInfo_Ext FX_FINAL : public IFX_SystemFontInfo
+class CSysFontInfo_Ext final : public IFX_SystemFontInfo
 {
 public:
 	FPDF_SYSFONTINFO*	m_pInfo;
 
-	virtual void		Release() FX_OVERRIDE
+	virtual void		Release() override
 	{
 		if (m_pInfo->Release)
 			m_pInfo->Release(m_pInfo);
 		delete this;
 	}
 
-	virtual	FX_BOOL		EnumFontList(CFX_FontMapper* pMapper) FX_OVERRIDE
+	virtual	FX_BOOL		EnumFontList(CFX_FontMapper* pMapper) override
 	{
 		if (m_pInfo->EnumFonts) {
 			m_pInfo->EnumFonts(m_pInfo, pMapper);
@@ -29,28 +29,28 @@ public:
 		return FALSE;
 	}
 
-	virtual void*		MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, FX_LPCSTR family, FX_BOOL& bExact)  FX_OVERRIDE
+	virtual void*		MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, FX_LPCSTR family, FX_BOOL& bExact)  override
 	{
 		if (m_pInfo->MapFont)
 			return m_pInfo->MapFont(m_pInfo, weight, bItalic, charset, pitch_family, family, &bExact);
 		return NULL;
 	}
 
-	virtual void*		GetFont(FX_LPCSTR family)  FX_OVERRIDE
+	virtual void*		GetFont(FX_LPCSTR family)  override
 	{
 		if (m_pInfo->GetFont)
 			return m_pInfo->GetFont(m_pInfo, family);
 		return NULL;
 	}
 
-	virtual FX_DWORD	GetFontData(void* hFont, FX_DWORD table, FX_LPBYTE buffer, FX_DWORD size)  FX_OVERRIDE
+	virtual FX_DWORD	GetFontData(void* hFont, FX_DWORD table, FX_LPBYTE buffer, FX_DWORD size)  override
 	{
 		if (m_pInfo->GetFontData)
 			return m_pInfo->GetFontData(m_pInfo, hFont, table, buffer, size);
 		return 0;
 	}
 
-	virtual FX_BOOL		GetFaceName(void* hFont, CFX_ByteString& name)  FX_OVERRIDE
+	virtual FX_BOOL		GetFaceName(void* hFont, CFX_ByteString& name)  override
 	{
 		if (m_pInfo->GetFaceName == NULL) return FALSE;
 		FX_DWORD size = m_pInfo->GetFaceName(m_pInfo, hFont, NULL, 0);
@@ -62,7 +62,7 @@ public:
 		return TRUE;
 	}
 
-	virtual FX_BOOL		GetFontCharset(void* hFont, int& charset)  FX_OVERRIDE
+	virtual FX_BOOL		GetFontCharset(void* hFont, int& charset)  override
 	{
 		if (m_pInfo->GetFontCharset) {
 			charset = m_pInfo->GetFontCharset(m_pInfo, hFont);
@@ -71,7 +71,7 @@ public:
 		return FALSE;
 	}
 
-	virtual void		DeleteFont(void* hFont)  FX_OVERRIDE
+	virtual void		DeleteFont(void* hFont)  override
 	{
 		if (m_pInfo->DeleteFont)
 			m_pInfo->DeleteFont(m_pInfo, hFont);
diff --git a/fpdfsdk/src/fpdfsave.cpp b/fpdfsdk/src/fpdfsave.cpp
index b3ab2f0df9..db9e289d9e 100644
--- a/fpdfsdk/src/fpdfsave.cpp
+++ b/fpdfsdk/src/fpdfsave.cpp
@@ -18,14 +18,14 @@
 #include <ctime>
 #endif
 
-class CFX_IFileWrite FX_FINAL : public IFX_StreamWrite
+class CFX_IFileWrite final : public IFX_StreamWrite
 {
 	
 public:
 	CFX_IFileWrite();
 	FX_BOOL				Init( FPDF_FILEWRITE * pFileWriteStruct );
-	virtual	FX_BOOL		WriteBlock(const void* pData, size_t size) FX_OVERRIDE;
-	virtual void		Release() FX_OVERRIDE {}
+	virtual	FX_BOOL		WriteBlock(const void* pData, size_t size) override;
+	virtual void		Release() override {}
 	
 protected:
 	FPDF_FILEWRITE*		m_pFileWriteStruct;
diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp
index 3d26efa11c..7e68740e59 100644
--- a/fpdfsdk/src/fpdfview.cpp
+++ b/fpdfsdk/src/fpdfview.cpp
@@ -299,7 +299,7 @@ DLLEXPORT  FPDF_BOOL STDCALL FPDF_LoadXFA(FPDF_DOCUMENT document)
 
 extern void CheckUnSupportError(CPDF_Document * pDoc, FX_DWORD err_code);
 
-class CMemFile FX_FINAL: public IFX_FileRead
+class CMemFile final : public IFX_FileRead
 {
 public:
 	CMemFile(FX_BYTE* pBuf, FX_FILESIZE size):m_pBuf(pBuf),m_size(size) {}
-- 
cgit v1.2.3