diff options
| author | tsepez <tsepez@chromium.org> | 2017-01-10 06:03:26 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2017-01-10 06:03:26 -0800 |
| commit | 3128d1c45d8bc313abb8aae151f86bbe62c52e56 (patch) | |
| tree | dffc158fa0e9a4c17801b82063e9ba203daf979e /xfa | |
| parent | 5e9066cbfa252b84d49f8b4adba445ba7761e81f (diff) | |
| download | pdfium-3128d1c45d8bc313abb8aae151f86bbe62c52e56.tar.xz | |
Remove more _LP* typedefs.
Code is much clearer when we use the actual types
rather than this convention.
Review-Url: https://codereview.chromium.org/2618993002
Diffstat (limited to 'xfa')
| -rw-r--r-- | xfa/fgas/font/cfgas_fontmgr.cpp | 2 | ||||
| -rw-r--r-- | xfa/fgas/font/cfgas_fontmgr.h | 2 | ||||
| -rw-r--r-- | xfa/fxfa/app/xfa_ffbarcode.cpp | 6 | ||||
| -rw-r--r-- | xfa/fxfa/app/xfa_ffbarcode.h | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/xfa/fgas/font/cfgas_fontmgr.cpp b/xfa/fgas/font/cfgas_fontmgr.cpp index 72f7b88f95..add66899a7 100644 --- a/xfa/fgas/font/cfgas_fontmgr.cpp +++ b/xfa/fgas/font/cfgas_fontmgr.cpp @@ -47,7 +47,7 @@ int32_t GetSimilarityScore(FX_FONTDESCRIPTOR const* pFont, return iValue; } -FX_FONTDESCRIPTOR const* MatchDefaultFont(FX_LPFONTMATCHPARAMS pParams, +FX_FONTDESCRIPTOR const* MatchDefaultFont(FX_FONTMATCHPARAMS* pParams, const CFX_FontDescriptors& fonts) { FX_FONTDESCRIPTOR const* pBestFont = nullptr; int32_t iBestSimilar = 0; diff --git a/xfa/fgas/font/cfgas_fontmgr.h b/xfa/fgas/font/cfgas_fontmgr.h index 303d73404b..5e03af031f 100644 --- a/xfa/fgas/font/cfgas_fontmgr.h +++ b/xfa/fgas/font/cfgas_fontmgr.h @@ -52,8 +52,6 @@ struct FX_FONTMATCHPARAMS { uint16_t wCodePage; }; -typedef FX_FONTMATCHPARAMS* FX_LPFONTMATCHPARAMS; - struct FX_FONTSIGNATURE { uint32_t fsUsb[4]; uint32_t fsCsb[2]; diff --git a/xfa/fxfa/app/xfa_ffbarcode.cpp b/xfa/fxfa/app/xfa_ffbarcode.cpp index de0638fb13..822029df3e 100644 --- a/xfa/fxfa/app/xfa_ffbarcode.cpp +++ b/xfa/fxfa/app/xfa_ffbarcode.cpp @@ -92,7 +92,7 @@ const XFA_BARCODETYPEENUMINFO g_XFABarCodeTypeEnumData[] = { const int32_t g_iXFABarcodeTypeCount = sizeof(g_XFABarCodeTypeEnumData) / sizeof(XFA_BARCODETYPEENUMINFO); -XFA_LPCBARCODETYPEENUMINFO XFA_GetBarcodeTypeByName( +const XFA_BARCODETYPEENUMINFO* XFA_GetBarcodeTypeByName( const CFX_WideStringC& wsName) { if (wsName.IsEmpty()) return nullptr; @@ -102,7 +102,7 @@ XFA_LPCBARCODETYPEENUMINFO XFA_GetBarcodeTypeByName( int32_t iEnd = g_iXFABarcodeTypeCount - 1; do { int32_t iMid = (iStart + iEnd) / 2; - XFA_LPCBARCODETYPEENUMINFO pInfo = g_XFABarCodeTypeEnumData + iMid; + const XFA_BARCODETYPEENUMINFO* pInfo = g_XFABarCodeTypeEnumData + iMid; if (uHash == pInfo->uHash) { return pInfo; } else if (uHash < pInfo->uHash) { @@ -168,7 +168,7 @@ void CXFA_FFBarcode::UpdateWidgetProperty() { CXFA_FFTextEdit::UpdateWidgetProperty(); CFWL_Barcode* pBarCodeWidget = (CFWL_Barcode*)m_pNormalWidget; CFX_WideString wsType = GetDataAcc()->GetBarcodeType(); - XFA_LPCBARCODETYPEENUMINFO pBarcodeTypeInfo = + const XFA_BARCODETYPEENUMINFO* pBarcodeTypeInfo = XFA_GetBarcodeTypeByName(wsType.AsStringC()); if (!pBarcodeTypeInfo) return; diff --git a/xfa/fxfa/app/xfa_ffbarcode.h b/xfa/fxfa/app/xfa_ffbarcode.h index d2b5df3517..4690b3d612 100644 --- a/xfa/fxfa/app/xfa_ffbarcode.h +++ b/xfa/fxfa/app/xfa_ffbarcode.h @@ -90,12 +90,12 @@ enum XFA_BARCODETYPEENUM { XFA_BARCODETYPE_upcean5, XFA_BARCODETYPE_upsMaxicode }; + struct XFA_BARCODETYPEENUMINFO { uint32_t uHash; const FX_WCHAR* pName; XFA_BARCODETYPEENUM eName; BC_TYPE eBCType; }; -typedef XFA_BARCODETYPEENUMINFO const* XFA_LPCBARCODETYPEENUMINFO; #endif // XFA_FXFA_APP_XFA_FFBARCODE_H_ |