diff options
| -rw-r--r-- | core/fpdfapi/page/cpdf_formobject.h | 2 | ||||
| -rw-r--r-- | core/fpdfapi/page/cpdf_pageobjectholder.h | 2 | ||||
| -rw-r--r-- | core/fxge/dib/cfx_imagerenderer.h | 4 | ||||
| -rw-r--r-- | core/fxge/dib/cfx_imagetransformer.h | 2 | ||||
| -rw-r--r-- | fxjs/cfxjse_engine.h | 2 | ||||
| -rw-r--r-- | fxjs/cfxjse_resolveprocessor.h | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/core/fpdfapi/page/cpdf_formobject.h b/core/fpdfapi/page/cpdf_formobject.h index dc53c454c4..c24bfbfd2c 100644 --- a/core/fpdfapi/page/cpdf_formobject.h +++ b/core/fpdfapi/page/cpdf_formobject.h @@ -33,7 +33,7 @@ class CPDF_FormObject final : public CPDF_PageObject { const CFX_Matrix& form_matrix() const { return m_FormMatrix; } private: - const std::unique_ptr<CPDF_Form> m_pForm; + std::unique_ptr<CPDF_Form> const m_pForm; CFX_Matrix m_FormMatrix; }; diff --git a/core/fpdfapi/page/cpdf_pageobjectholder.h b/core/fpdfapi/page/cpdf_pageobjectholder.h index b1f7fb9e7f..4f5a60f79d 100644 --- a/core/fpdfapi/page/cpdf_pageobjectholder.h +++ b/core/fpdfapi/page/cpdf_pageobjectholder.h @@ -102,7 +102,7 @@ class CPDF_PageObjectHolder { private: bool m_bBackgroundAlphaNeeded = false; ParseState m_ParseState = ParseState::kNotParsed; - const UnownedPtr<CPDF_Dictionary> m_pDict; + UnownedPtr<CPDF_Dictionary> const m_pDict; UnownedPtr<CPDF_Document> m_pDocument; std::vector<CFX_FloatRect> m_MaskBoundingBoxes; std::unique_ptr<CPDF_ContentParser> m_pParser; diff --git a/core/fxge/dib/cfx_imagerenderer.h b/core/fxge/dib/cfx_imagerenderer.h index 905ff8c25d..5232933f49 100644 --- a/core/fxge/dib/cfx_imagerenderer.h +++ b/core/fxge/dib/cfx_imagerenderer.h @@ -36,8 +36,8 @@ class CFX_ImageRenderer { bool Continue(PauseIndicatorIface* pPause); private: - const RetainPtr<CFX_DIBitmap> m_pDevice; - const UnownedPtr<const CFX_ClipRgn> m_pClipRgn; + RetainPtr<CFX_DIBitmap> const m_pDevice; + UnownedPtr<const CFX_ClipRgn> const m_pClipRgn; const CFX_Matrix m_Matrix; const int m_BitmapAlpha; const int m_BlendType; diff --git a/core/fxge/dib/cfx_imagetransformer.h b/core/fxge/dib/cfx_imagetransformer.h index 61fe1e1ba1..c19e744c1a 100644 --- a/core/fxge/dib/cfx_imagetransformer.h +++ b/core/fxge/dib/cfx_imagetransformer.h @@ -98,7 +98,7 @@ class CFX_ImageTransformer { int increment, std::function<void(const DownSampleData&, uint8_t*)> func); - const RetainPtr<CFX_DIBBase> m_pSrc; + RetainPtr<CFX_DIBBase> const m_pSrc; UnownedPtr<const CFX_Matrix> const m_pMatrix; const FX_RECT* const m_pClip; FX_RECT m_StretchClip; diff --git a/fxjs/cfxjse_engine.h b/fxjs/cfxjse_engine.h index a766e268a4..183074d70a 100644 --- a/fxjs/cfxjse_engine.h +++ b/fxjs/cfxjse_engine.h @@ -118,7 +118,7 @@ class CFXJSE_Engine final : public CFX_V8 { // CacheList holds the List items so we can clean them up when we're done. std::vector<std::unique_ptr<CXFA_List>> m_CacheList; UnownedPtr<std::vector<CXFA_Node*>> m_pScriptNodeArray; - const std::unique_ptr<CFXJSE_ResolveProcessor> m_ResolveProcessor; + std::unique_ptr<CFXJSE_ResolveProcessor> const m_ResolveProcessor; std::unique_ptr<CFXJSE_FormCalcContext> m_FM2JSContext; UnownedPtr<CXFA_Object> m_pThisObject; XFA_AttributeEnum m_eRunAtType = XFA_AttributeEnum::Client; diff --git a/fxjs/cfxjse_resolveprocessor.h b/fxjs/cfxjse_resolveprocessor.h index dea7abdc5b..2a98bc9b2a 100644 --- a/fxjs/cfxjse_resolveprocessor.h +++ b/fxjs/cfxjse_resolveprocessor.h @@ -71,7 +71,7 @@ class CFXJSE_ResolveProcessor { void FilterCondition(CFXJSE_ResolveNodeData& rnd, WideString wsCondition); int32_t m_iCurStart = 0; - const std::unique_ptr<CXFA_NodeHelper> m_pNodeHelper; + std::unique_ptr<CXFA_NodeHelper> const m_pNodeHelper; }; #endif // FXJS_CFXJSE_RESOLVEPROCESSOR_H_ |