From bff506d3b5e03891c137d9fe18f65cae112ebf2a Mon Sep 17 00:00:00 2001 From: weili Date: Mon, 20 Jun 2016 11:37:05 -0700 Subject: Change func(void) to func() Since PDFium is compiled as C++ code, the void keyword is not needed. BUG=pdfium:519 Review-Url: https://codereview.chromium.org/2084603003 --- core/fpdfapi/fpdf_font/ttgsubtable.cpp | 4 ++-- core/fpdfapi/fpdf_font/ttgsubtable.h | 2 +- core/fxcrt/include/fx_system.h | 2 +- core/fxge/win32/fx_win32_gdipext.cpp | 6 +++--- fpdfsdk/javascript/Field.h | 2 +- fxjse/context.h | 2 +- xfa/fxfa/parser/xfa_script_nodehelper.cpp | 16 ++++++++++++++-- xfa/fxfa/parser/xfa_script_nodehelper.h | 5 +++-- xfa/fxfa/parser/xfa_script_resolveprocessor.cpp | 4 ++-- xfa/fxfa/parser/xfa_script_resolveprocessor.h | 6 ++++-- 10 files changed, 32 insertions(+), 17 deletions(-) diff --git a/core/fpdfapi/fpdf_font/ttgsubtable.cpp b/core/fpdfapi/fpdf_font/ttgsubtable.cpp index 8900e274fe..56a388203f 100644 --- a/core/fpdfapi/fpdf_font/ttgsubtable.cpp +++ b/core/fpdfapi/fpdf_font/ttgsubtable.cpp @@ -61,7 +61,7 @@ FX_BOOL CFX_GlyphMap::Lookup(int key, int& value) { return TRUE; } -CFX_CTTGSUBTable::CFX_CTTGSUBTable(void) +CFX_CTTGSUBTable::CFX_CTTGSUBTable() : m_bFeautureMapLoad(FALSE), loaded(false) {} CFX_CTTGSUBTable::CFX_CTTGSUBTable(FT_Bytes gsub) @@ -71,7 +71,7 @@ CFX_CTTGSUBTable::CFX_CTTGSUBTable(FT_Bytes gsub) CFX_CTTGSUBTable::~CFX_CTTGSUBTable() {} -bool CFX_CTTGSUBTable::IsOk(void) const { +bool CFX_CTTGSUBTable::IsOk() const { return loaded; } diff --git a/core/fpdfapi/fpdf_font/ttgsubtable.h b/core/fpdfapi/fpdf_font/ttgsubtable.h index de7a4f03ec..fc040b6e53 100644 --- a/core/fpdfapi/fpdf_font/ttgsubtable.h +++ b/core/fpdfapi/fpdf_font/ttgsubtable.h @@ -33,7 +33,7 @@ class CFX_CTTGSUBTable { explicit CFX_CTTGSUBTable(FT_Bytes gsub); virtual ~CFX_CTTGSUBTable(); - bool IsOk(void) const; + bool IsOk() const; bool LoadGSUBTable(FT_Bytes gsub); bool GetVerticalGlyph(uint32_t glyphnum, uint32_t* vglyphnum); diff --git a/core/fxcrt/include/fx_system.h b/core/fxcrt/include/fx_system.h index ca5d49aad6..f4fc2e819c 100644 --- a/core/fxcrt/include/fx_system.h +++ b/core/fxcrt/include/fx_system.h @@ -228,7 +228,7 @@ extern "C" { #define FXSYS_GetFullPathName GetFullPathName #define FXSYS_GetModuleFileName GetModuleFileName #else -int FXSYS_GetACP(void); +int FXSYS_GetACP(); char* FXSYS_itoa(int value, char* str, int radix); int FXSYS_WideCharToMultiByte(uint32_t codepage, uint32_t dwFlags, diff --git a/core/fxge/win32/fx_win32_gdipext.cpp b/core/fxge/win32/fx_win32_gdipext.cpp index 3de1b5a8d5..8acf23b22a 100644 --- a/core/fxge/win32/fx_win32_gdipext.cpp +++ b/core/fxge/win32/fx_win32_gdipext.cpp @@ -1274,10 +1274,10 @@ class GpStream final : public IStream { } return E_NOINTERFACE; } - ULONG STDMETHODCALLTYPE AddRef(void) override { + ULONG STDMETHODCALLTYPE AddRef() override { return (ULONG)InterlockedIncrement(&m_RefCount); } - ULONG STDMETHODCALLTYPE Release(void) override { + ULONG STDMETHODCALLTYPE Release() override { ULONG res = (ULONG)InterlockedDecrement(&m_RefCount); if (res == 0) { delete this; @@ -1333,7 +1333,7 @@ class GpStream final : public IStream { return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE Commit(DWORD) override { return E_NOTIMPL; } - HRESULT STDMETHODCALLTYPE Revert(void) override { return E_NOTIMPL; } + HRESULT STDMETHODCALLTYPE Revert() override { return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE LockRegion(ULARGE_INTEGER, ULARGE_INTEGER, DWORD) override { diff --git a/fpdfsdk/javascript/Field.h b/fpdfsdk/javascript/Field.h index 84bba6862d..2972909149 100644 --- a/fpdfsdk/javascript/Field.h +++ b/fpdfsdk/javascript/Field.h @@ -478,7 +478,7 @@ class Field : public CJS_EmbedObj { class CJS_Field : public CJS_Object { public: explicit CJS_Field(v8::Local pObject) : CJS_Object(pObject) {} - ~CJS_Field(void) override {} + ~CJS_Field() override {} void InitInstance(IJS_Runtime* pIRuntime) override; diff --git a/fxjse/context.h b/fxjse/context.h index 869fbfb1fb..3cc7123f55 100644 --- a/fxjse/context.h +++ b/fxjse/context.h @@ -26,7 +26,7 @@ class CFXJSE_Context { CFXJSE_HostObject* lpGlobalObject = nullptr); ~CFXJSE_Context(); - v8::Isolate* GetRuntime(void) { return m_pIsolate; } + v8::Isolate* GetRuntime() { return m_pIsolate; } std::unique_ptr GetGlobalObject(); void EnableCompatibleMode(); FX_BOOL ExecuteScript(const FX_CHAR* szScript, diff --git a/xfa/fxfa/parser/xfa_script_nodehelper.cpp b/xfa/fxfa/parser/xfa_script_nodehelper.cpp index 9d699757f9..80c9020d73 100644 --- a/xfa/fxfa/parser/xfa_script_nodehelper.cpp +++ b/xfa/fxfa/parser/xfa_script_nodehelper.cpp @@ -16,14 +16,16 @@ #include "xfa/fxfa/parser/xfa_script_imp.h" #include "xfa/fxfa/parser/xfa_utils.h" -CXFA_NodeHelper::CXFA_NodeHelper(void) +CXFA_NodeHelper::CXFA_NodeHelper() : m_eLastCreateType(XFA_ELEMENT_DataValue), m_pCreateParent(NULL), m_iCreateCount(0), m_iCreateFlag(XFA_RESOLVENODE_RSTYPE_CreateNodeOne), m_iCurAllStart(-1), m_pAllStartParent(NULL) {} -CXFA_NodeHelper::~CXFA_NodeHelper(void) {} + +CXFA_NodeHelper::~CXFA_NodeHelper() {} + CXFA_Node* CXFA_NodeHelper::XFA_ResolveNodes_GetOneChild( CXFA_Node* parent, const FX_WCHAR* pwsName, @@ -39,6 +41,7 @@ CXFA_Node* CXFA_NodeHelper::XFA_ResolveNodes_GetOneChild( } return siblings[0]; } + int32_t CXFA_NodeHelper::XFA_CountSiblings(CXFA_Node* pNode, XFA_LOGIC_TYPE eLogicType, CXFA_NodeArray* pSiblings, @@ -65,6 +68,7 @@ int32_t CXFA_NodeHelper::XFA_CountSiblings(CXFA_Node* pNode, eLogicType, bIsClassName); } } + int32_t CXFA_NodeHelper::XFA_NodeAcc_TraverseAnySiblings( CXFA_Node* parent, uint32_t dNameHash, @@ -125,6 +129,7 @@ int32_t CXFA_NodeHelper::XFA_NodeAcc_TraverseAnySiblings( } return nCount; } + int32_t CXFA_NodeHelper::XFA_NodeAcc_TraverseSiblings(CXFA_Node* parent, uint32_t dNameHash, CXFA_NodeArray* pSiblings, @@ -200,6 +205,7 @@ int32_t CXFA_NodeHelper::XFA_NodeAcc_TraverseSiblings(CXFA_Node* parent, } return nCount; } + CXFA_Node* CXFA_NodeHelper::XFA_ResolveNodes_GetParent( CXFA_Node* pNode, XFA_LOGIC_TYPE eLogicType) { @@ -225,6 +231,7 @@ CXFA_Node* CXFA_NodeHelper::XFA_ResolveNodes_GetParent( } return parent; } + int32_t CXFA_NodeHelper::XFA_GetIndex(CXFA_Node* pNode, XFA_LOGIC_TYPE eLogicType, FX_BOOL bIsProperty, @@ -255,6 +262,7 @@ int32_t CXFA_NodeHelper::XFA_GetIndex(CXFA_Node* pNode, } return 0; } + void CXFA_NodeHelper::XFA_GetNameExpression(CXFA_Node* refNode, CFX_WideString& wsName, FX_BOOL bIsAllPath, @@ -304,6 +312,7 @@ FX_BOOL CXFA_NodeHelper::XFA_NodeIsTransparent(CXFA_Node* refNode) { } return FALSE; } + FX_BOOL CXFA_NodeHelper::XFA_CreateNode_ForCondition( CFX_WideString& wsCondition) { int32_t iLen = wsCondition.GetLength(); @@ -342,6 +351,7 @@ FX_BOOL CXFA_NodeHelper::XFA_CreateNode_ForCondition( } return FALSE; } + FX_BOOL CXFA_NodeHelper::XFA_ResolveNodes_CreateNode( CFX_WideString wsName, CFX_WideString wsCondition, @@ -403,6 +413,7 @@ FX_BOOL CXFA_NodeHelper::XFA_ResolveNodes_CreateNode( } return bResult; } + void CXFA_NodeHelper::XFA_SetCreateNodeType(CXFA_Node* refNode) { if (refNode == NULL) { return; @@ -417,6 +428,7 @@ void CXFA_NodeHelper::XFA_SetCreateNodeType(CXFA_Node* refNode) { m_eLastCreateType = XFA_ELEMENT_DataValue; } } + FX_BOOL CXFA_NodeHelper::XFA_NodeIsProperty(CXFA_Node* refNode) { CXFA_Node* parent = XFA_ResolveNodes_GetParent(refNode, XFA_LOGIC_NoTransparent); diff --git a/xfa/fxfa/parser/xfa_script_nodehelper.h b/xfa/fxfa/parser/xfa_script_nodehelper.h index e90db585fc..76d1302818 100644 --- a/xfa/fxfa/parser/xfa_script_nodehelper.h +++ b/xfa/fxfa/parser/xfa_script_nodehelper.h @@ -19,8 +19,9 @@ enum XFA_LOGIC_TYPE { class CXFA_NodeHelper { public: - CXFA_NodeHelper(void); - ~CXFA_NodeHelper(void); + CXFA_NodeHelper(); + ~CXFA_NodeHelper(); + CXFA_Node* XFA_ResolveNodes_GetOneChild(CXFA_Node* parent, const FX_WCHAR* pwsName, FX_BOOL bIsClassName = FALSE); diff --git a/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp b/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp index 2e61a06885..dd6fb686c9 100644 --- a/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp +++ b/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp @@ -17,10 +17,10 @@ #include "xfa/fxfa/parser/xfa_script_nodehelper.h" #include "xfa/fxfa/parser/xfa_utils.h" -CXFA_ResolveProcessor::CXFA_ResolveProcessor(void) +CXFA_ResolveProcessor::CXFA_ResolveProcessor() : m_pNodeHelper(new CXFA_NodeHelper), m_iCurStart(0) {} -CXFA_ResolveProcessor::~CXFA_ResolveProcessor(void) { +CXFA_ResolveProcessor::~CXFA_ResolveProcessor() { delete m_pNodeHelper; } diff --git a/xfa/fxfa/parser/xfa_script_resolveprocessor.h b/xfa/fxfa/parser/xfa_script_resolveprocessor.h index 0d932ef815..ae9add69cb 100644 --- a/xfa/fxfa/parser/xfa_script_resolveprocessor.h +++ b/xfa/fxfa/parser/xfa_script_resolveprocessor.h @@ -29,10 +29,12 @@ class CXFA_ResolveNodesData { const XFA_SCRIPTATTRIBUTEINFO* m_pScriptAttribute; XFA_RESOVENODE_RSTYPE m_dwFlag; }; + class CXFA_ResolveProcessor { public: - CXFA_ResolveProcessor(void); - ~CXFA_ResolveProcessor(void); + CXFA_ResolveProcessor(); + ~CXFA_ResolveProcessor(); + int32_t XFA_ResolveNodes(CXFA_ResolveNodesData& rnd); int32_t XFA_ResolveNodes_AnyChild(CXFA_ResolveNodesData& rnd); int32_t XFA_ResolveNodes_Dollar(CXFA_ResolveNodesData& rnd); -- cgit v1.2.3