From f8af565a78ee1910b8c98a5bdfb9ab6b88442317 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 6 Mar 2018 18:56:33 +0000 Subject: Rename IFX classes in core/fxge to Iface This CL renames IFX classes in core/fxge to Iface. Change-Id: I137167ddd4ff1563d8002d9501222c27183408cc Reviewed-on: https://pdfium-review.googlesource.com/27990 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- core/fxge/win32/fx_win32_device.cpp | 16 ++++++++-------- core/fxge/win32/win32_int.h | 14 +++++++------- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'core/fxge/win32') diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp index 41dc22060b..e20c765535 100644 --- a/core/fxge/win32/fx_win32_device.cpp +++ b/core/fxge/win32/fx_win32_device.cpp @@ -23,7 +23,7 @@ #include "core/fxge/dib/cstretchengine.h" #include "core/fxge/fx_font.h" #include "core/fxge/fx_freetype.h" -#include "core/fxge/ifx_systemfontinfo.h" +#include "core/fxge/systemfontinfo_iface.h" #include "core/fxge/win32/cfx_windowsdib.h" #include "core/fxge/win32/dwrite_int.h" #include "core/fxge/win32/win32_int.h" @@ -326,12 +326,12 @@ class CFX_Win32FallbackFontInfo final : public CFX_FolderFontInfo { const char* family) override; }; -class CFX_Win32FontInfo final : public IFX_SystemFontInfo { +class CFX_Win32FontInfo final : public SystemFontInfoIface { public: CFX_Win32FontInfo(); ~CFX_Win32FontInfo() override; - // IFX_SystemFontInfo + // SystemFontInfoIface bool EnumFontList(CFX_FontMapper* pMapper) override; void* MapFont(int weight, bool bItalic, @@ -679,10 +679,10 @@ bool CFX_Win32FontInfo::GetFontCharset(void* hFont, int* charset) { int g_pdfium_print_mode = WindowsPrintMode::kModeEmf; -std::unique_ptr IFX_SystemFontInfo::CreateDefault( +std::unique_ptr SystemFontInfoIface::CreateDefault( const char** pUnused) { if (IsGDIEnabled()) - return std::unique_ptr(new CFX_Win32FontInfo); + return std::unique_ptr(new CFX_Win32FontInfo); // Select the fallback font information class if GDI is disabled. CFX_Win32FallbackFontInfo* pInfoFallback = new CFX_Win32FallbackFontInfo; @@ -695,7 +695,7 @@ std::unique_ptr IFX_SystemFontInfo::CreateDefault( fonts_path += "\\Fonts"; pInfoFallback->AddPath(fonts_path); } - return std::unique_ptr(pInfoFallback); + return std::unique_ptr(pInfoFallback); } void CFX_GEModule::InitPlatform() { @@ -707,7 +707,7 @@ void CFX_GEModule::InitPlatform() { if (IsGDIEnabled()) pPlatformData->m_GdiplusExt.Load(); m_pPlatformData = pPlatformData; - m_pFontMgr->SetSystemFontInfo(IFX_SystemFontInfo::CreateDefault(nullptr)); + m_pFontMgr->SetSystemFontInfo(SystemFontInfoIface::CreateDefault(nullptr)); } void CFX_GEModule::DestroyPlatform() { @@ -1350,7 +1350,7 @@ CFX_WindowsRenderDevice::CFX_WindowsRenderDevice(HDC hDC) { CFX_WindowsRenderDevice::~CFX_WindowsRenderDevice() {} // static -IFX_RenderDeviceDriver* CFX_WindowsRenderDevice::CreateDriver(HDC hDC) { +RenderDeviceDriverIface* CFX_WindowsRenderDevice::CreateDriver(HDC hDC) { int device_type = ::GetDeviceCaps(hDC, TECHNOLOGY); int obj_type = ::GetObjectType(hDC); bool use_printer = device_type == DT_RASPRINTER || diff --git a/core/fxge/win32/win32_int.h b/core/fxge/win32/win32_int.h index f27a420734..34d307c2cd 100644 --- a/core/fxge/win32/win32_int.h +++ b/core/fxge/win32/win32_int.h @@ -14,7 +14,7 @@ #include "core/fxcrt/retain_ptr.h" #include "core/fxge/cfx_pathdata.h" -#include "core/fxge/ifx_renderdevicedriver.h" +#include "core/fxge/renderdevicedriver_iface.h" #include "core/fxge/win32/cfx_psrenderer.h" #include "core/fxge/win32/cpsoutput.h" #include "core/fxge/win32/dwrite_int.h" @@ -129,12 +129,12 @@ class CWin32Platform { CDWriteExt m_DWriteExt; }; -class CGdiDeviceDriver : public IFX_RenderDeviceDriver { +class CGdiDeviceDriver : public RenderDeviceDriverIface { protected: CGdiDeviceDriver(HDC hDC, int device_class); ~CGdiDeviceDriver() override; - // IFX_RenderDeviceDriver + // RenderDeviceDriverIface int GetDeviceCaps(int caps_id) const override; void SaveState() override; void RestoreState(bool bKeepSaved) override; @@ -270,13 +270,13 @@ class CGdiPrinterDriver : public CGdiDeviceDriver { const int m_VertSize; }; -class CPSPrinterDriver : public IFX_RenderDeviceDriver { +class CPSPrinterDriver : public RenderDeviceDriverIface { public: CPSPrinterDriver(HDC hDC, int ps_level, bool bCmykOutput); ~CPSPrinterDriver() override; protected: - // IFX_RenderDeviceDriver + // RenderDeviceDriverIface int GetDeviceCaps(int caps_id) const override; bool StartRendering() override; void EndRendering() override; @@ -335,13 +335,13 @@ class CPSPrinterDriver : public IFX_RenderDeviceDriver { CFX_PSRenderer m_PSRenderer; }; -class CTextOnlyPrinterDriver : public IFX_RenderDeviceDriver { +class CTextOnlyPrinterDriver : public RenderDeviceDriverIface { public: explicit CTextOnlyPrinterDriver(HDC hDC); ~CTextOnlyPrinterDriver() override; protected: - // IFX_RenderDeviceDriver + // RenderDeviceDriverIface int GetDeviceCaps(int caps_id) const override; void SaveState() override{}; void RestoreState(bool bKeepSaved) override{}; -- cgit v1.2.3