diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2016-03-01 14:45:20 -0500 |
---|---|---|
committer | Dan Sinclair <dsinclair@chromium.org> | 2016-03-01 14:45:20 -0500 |
commit | 738b08ce6b9f80d93b815411b47c2b11c2f090f6 (patch) | |
tree | ec648b9bdf6d9597043bfe657d56f98dc3cdef30 /xfa/src/fxfa | |
parent | 50dfc4a7068e8e08105f7b9a3945136e7246e677 (diff) | |
download | pdfium-738b08ce6b9f80d93b815411b47c2b11c2f090f6.tar.xz |
Fix and enable lint checks.
This CL fixes and enables:
* readability/namespace
* readability/multiline_string
* readability/multiline_comment
* readability/inheritance
* readability/function
* readability/braces
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1747123002 .
Diffstat (limited to 'xfa/src/fxfa')
-rw-r--r-- | xfa/src/fxfa/src/app/xfa_textlayout.h | 2 | ||||
-rw-r--r-- | xfa/src/fxfa/src/common/xfa_script.h | 2 | ||||
-rw-r--r-- | xfa/src/fxfa/src/fm2js/xfa_error.h | 4 | ||||
-rw-r--r-- | xfa/src/fxfa/src/fm2js/xfa_expression.h | 2 | ||||
-rw-r--r-- | xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp | 4 | ||||
-rw-r--r-- | xfa/src/fxfa/src/parser/xfa_object_imp.cpp | 9 |
6 files changed, 13 insertions, 10 deletions
diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.h b/xfa/src/fxfa/src/app/xfa_textlayout.h index 9b4bb7c979..03067ced5a 100644 --- a/xfa/src/fxfa/src/app/xfa_textlayout.h +++ b/xfa/src/fxfa/src/app/xfa_textlayout.h @@ -190,7 +190,7 @@ class CXFA_LinkUserData : public IFX_Unknown, public CFX_Target { virtual FX_DWORD AddRef() { return ++m_dwRefCount; } public: - const FX_WCHAR* GetLinkURL() { return m_pszURLContent; }; + const FX_WCHAR* GetLinkURL() { return m_pszURLContent; } protected: IFX_MEMAllocator* m_pAllocator; diff --git a/xfa/src/fxfa/src/common/xfa_script.h b/xfa/src/fxfa/src/common/xfa_script.h index ebd3a0f00e..47be3165fe 100644 --- a/xfa/src/fxfa/src/common/xfa_script.h +++ b/xfa/src/fxfa/src/common/xfa_script.h @@ -38,7 +38,7 @@ enum XFA_RESOVENODE_RSTYPE { class CXFA_HVALUEArray : public CFX_ArrayTemplate<FXJSE_HVALUE> { public: - CXFA_HVALUEArray(FXJSE_HRUNTIME hRunTime) : m_hRunTime(hRunTime){}; + CXFA_HVALUEArray(FXJSE_HRUNTIME hRunTime) : m_hRunTime(hRunTime) {} ~CXFA_HVALUEArray() { for (int32_t i = 0; i < GetSize(); i++) { FXJSE_Value_Release(GetAt(i)); diff --git a/xfa/src/fxfa/src/fm2js/xfa_error.h b/xfa/src/fxfa/src/fm2js/xfa_error.h index 41b1942215..474b28b7c9 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_error.h +++ b/xfa/src/fxfa/src/fm2js/xfa_error.h @@ -24,8 +24,8 @@ enum XFA_FM_ERRMSG { class CXFA_FMErrorInfo { public: - CXFA_FMErrorInfo() : linenum(0){}; - ~CXFA_FMErrorInfo(){}; + CXFA_FMErrorInfo() : linenum(0) {} + ~CXFA_FMErrorInfo() {} FX_DWORD linenum; CFX_WideString message; }; diff --git a/xfa/src/fxfa/src/fm2js/xfa_expression.h b/xfa/src/fxfa/src/fm2js/xfa_expression.h index f70ee60e5f..2d2da0cb89 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_expression.h +++ b/xfa/src/fxfa/src/fm2js/xfa_expression.h @@ -23,7 +23,7 @@ class CXFA_FMExpression { public: CXFA_FMExpression(FX_DWORD line); CXFA_FMExpression(FX_DWORD line, XFA_FM_EXPTYPE type); - virtual ~CXFA_FMExpression(){}; + virtual ~CXFA_FMExpression() {} virtual void ToJavaScript(CFX_WideTextBuf& javascript); virtual void ToImpliedReturnJS(CFX_WideTextBuf&); FX_DWORD GetLine() { return m_line; } diff --git a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp index 381dc92ff8..3d46f85c8c 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp @@ -1676,7 +1676,7 @@ static void XFA_ItemLayoutProcessor_AddTrailerBeforeSplit( } pProcessor->m_pLayoutItem->m_sSize.y += fHeight; pProcessor->m_pLayoutItem->AddChild(pTrailerLayoutItem); -}; +} static void XFA_ItemLayoutProcessor_AddLeaderAfterSplit( CXFA_ItemLayoutProcessor* pProcessor, CXFA_ContentLayoutItem* pLeaderLayoutItem) { @@ -1717,7 +1717,7 @@ static void XFA_ItemLayoutProcessor_AddLeaderAfterSplit( } pProcessor->m_pLayoutItem->m_sSize.y += fHeight; pProcessor->m_pLayoutItem->AddChild(pLeaderLayoutItem); -}; +} static void XFA_ItemLayoutProcessor_AddPendingNode( CXFA_ItemLayoutProcessor* pProcessor, CXFA_Node* pPendingNode, diff --git a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp index 1c5bd758a8..c7a288bb27 100644 --- a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp @@ -178,24 +178,27 @@ CXFA_Node* CXFA_Node::GetNodeItem(XFA_NODEITEM eItem, switch (eItem) { case XFA_NODEITEM_NextSibling: pNode = m_pNext; - if (eType != XFA_OBJECTTYPEMASK) + if (eType != XFA_OBJECTTYPEMASK) { while (pNode && pNode->GetObjectType() != eType) { pNode = pNode->m_pNext; } + } break; case XFA_NODEITEM_FirstChild: pNode = m_pChild; - if (eType != XFA_OBJECTTYPEMASK) + if (eType != XFA_OBJECTTYPEMASK) { while (pNode && pNode->GetObjectType() != eType) { pNode = pNode->m_pNext; } + } break; case XFA_NODEITEM_Parent: pNode = m_pParent; - if (eType != XFA_OBJECTTYPEMASK) + if (eType != XFA_OBJECTTYPEMASK) { while (pNode && pNode->GetObjectType() != eType) { pNode = pNode->m_pParent; } + } break; case XFA_NODEITEM_PrevSibling: if (m_pParent) { |