summaryrefslogtreecommitdiff
path: root/core/fpdfdoc
diff options
context:
space:
mode:
Diffstat (limited to 'core/fpdfdoc')
-rw-r--r--core/fpdfdoc/cpdf_aaction.h2
-rw-r--r--core/fpdfdoc/cpdf_action.h2
-rw-r--r--core/fpdfdoc/cpdf_actionfields.h4
-rw-r--r--core/fpdfdoc/cpdf_annot.h2
-rw-r--r--core/fpdfdoc/cpdf_apsettings.h4
-rw-r--r--core/fpdfdoc/cpdf_bookmark.h4
-rw-r--r--core/fpdfdoc/cpdf_bookmarktree.h4
-rw-r--r--core/fpdfdoc/cpdf_dest.h4
-rw-r--r--core/fpdfdoc/cpdf_docjsactions.h4
-rw-r--r--core/fpdfdoc/cpdf_filespec.h4
-rw-r--r--core/fpdfdoc/cpdf_formcontrol.h4
-rw-r--r--core/fpdfdoc/cpdf_formfield.h10
-rw-r--r--core/fpdfdoc/cpdf_iconfit.h4
-rw-r--r--core/fpdfdoc/cpdf_interform.h8
-rw-r--r--core/fpdfdoc/cpdf_link.h4
-rw-r--r--core/fpdfdoc/cpdf_nametree.h4
-rw-r--r--core/fpdfdoc/cpdf_numbertree.h4
-rw-r--r--core/fpdfdoc/cpdf_occontext.h2
-rw-r--r--core/fpdfdoc/cpdf_pagelabel.h2
-rw-r--r--core/fpdfdoc/cpdf_structelement.h10
-rw-r--r--core/fpdfdoc/cpdf_structtree.h8
-rw-r--r--core/fpdfdoc/cpdf_variabletext.h2
-rw-r--r--core/fpdfdoc/cpdf_viewerpreferences.h4
-rw-r--r--core/fpdfdoc/cpvt_fontmap.h10
-rw-r--r--core/fpdfdoc/csection.h2
-rw-r--r--core/fpdfdoc/ctypeset.h4
26 files changed, 58 insertions, 58 deletions
diff --git a/core/fpdfdoc/cpdf_aaction.h b/core/fpdfdoc/cpdf_aaction.h
index bacf1790f8..bfc67e5124 100644
--- a/core/fpdfdoc/cpdf_aaction.h
+++ b/core/fpdfdoc/cpdf_aaction.h
@@ -48,7 +48,7 @@ class CPDF_AAction {
CPDF_Dictionary* GetDict() const { return m_pDict.Get(); }
private:
- CFX_UnownedPtr<CPDF_Dictionary> const m_pDict;
+ UnownedPtr<CPDF_Dictionary> const m_pDict;
};
#endif // CORE_FPDFDOC_CPDF_AACTION_H_
diff --git a/core/fpdfdoc/cpdf_action.h b/core/fpdfdoc/cpdf_action.h
index b405f226a5..9b7f90d56b 100644
--- a/core/fpdfdoc/cpdf_action.h
+++ b/core/fpdfdoc/cpdf_action.h
@@ -55,7 +55,7 @@ class CPDF_Action {
CPDF_Action GetSubAction(size_t iIndex) const;
private:
- CFX_UnownedPtr<CPDF_Dictionary> const m_pDict;
+ UnownedPtr<CPDF_Dictionary> const m_pDict;
};
#endif // CORE_FPDFDOC_CPDF_ACTION_H_
diff --git a/core/fpdfdoc/cpdf_actionfields.h b/core/fpdfdoc/cpdf_actionfields.h
index 71b42475a7..83c70f6375 100644
--- a/core/fpdfdoc/cpdf_actionfields.h
+++ b/core/fpdfdoc/cpdf_actionfields.h
@@ -11,7 +11,7 @@
#include <vector>
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
class CPDF_Action;
class CPDF_Object;
@@ -26,7 +26,7 @@ class CPDF_ActionFields {
CPDF_Object* GetField(size_t iIndex) const;
private:
- CFX_UnownedPtr<const CPDF_Action> const m_pAction;
+ UnownedPtr<const CPDF_Action> const m_pAction;
};
#endif // CORE_FPDFDOC_CPDF_ACTIONFIELDS_H_
diff --git a/core/fpdfdoc/cpdf_annot.h b/core/fpdfdoc/cpdf_annot.h
index cb579bbd3d..ab38eff1d8 100644
--- a/core/fpdfdoc/cpdf_annot.h
+++ b/core/fpdfdoc/cpdf_annot.h
@@ -111,7 +111,7 @@ class CPDF_Annot {
CFX_FloatRect RectForDrawing() const;
MaybeOwned<CPDF_Dictionary> m_pAnnotDict;
- CFX_UnownedPtr<CPDF_Document> const m_pDocument;
+ UnownedPtr<CPDF_Document> const m_pDocument;
CPDF_Annot::Subtype m_nSubtype;
std::map<CPDF_Stream*, std::unique_ptr<CPDF_Form>> m_APMap;
// |m_bOpenState| is only set for popup annotations.
diff --git a/core/fpdfdoc/cpdf_apsettings.h b/core/fpdfdoc/cpdf_apsettings.h
index a2a1f91a33..b4b72bc167 100644
--- a/core/fpdfdoc/cpdf_apsettings.h
+++ b/core/fpdfdoc/cpdf_apsettings.h
@@ -8,9 +8,9 @@
#define CORE_FPDFDOC_CPDF_APSETTINGS_H_
#include "core/fpdfdoc/cpdf_iconfit.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_string.h"
#include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "core/fxge/fx_dib.h"
class CPDF_Dictionary;
@@ -71,7 +71,7 @@ class CPDF_ApSettings {
WideString GetCaption(const ByteString& csEntry) const;
CPDF_Stream* GetIcon(const ByteString& csEntry) const;
- CFX_UnownedPtr<CPDF_Dictionary> const m_pDict;
+ UnownedPtr<CPDF_Dictionary> const m_pDict;
};
#endif // CORE_FPDFDOC_CPDF_APSETTINGS_H_
diff --git a/core/fpdfdoc/cpdf_bookmark.h b/core/fpdfdoc/cpdf_bookmark.h
index 88f47a9450..60c86dd7b0 100644
--- a/core/fpdfdoc/cpdf_bookmark.h
+++ b/core/fpdfdoc/cpdf_bookmark.h
@@ -9,8 +9,8 @@
#include "core/fpdfdoc/cpdf_action.h"
#include "core/fpdfdoc/cpdf_dest.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/unowned_ptr.h"
class CPDF_Dictionary;
class CPDF_Document;
@@ -30,7 +30,7 @@ class CPDF_Bookmark {
CPDF_Action GetAction() const;
private:
- CFX_UnownedPtr<CPDF_Dictionary> m_pDict;
+ UnownedPtr<CPDF_Dictionary> m_pDict;
};
#endif // CORE_FPDFDOC_CPDF_BOOKMARK_H_
diff --git a/core/fpdfdoc/cpdf_bookmarktree.h b/core/fpdfdoc/cpdf_bookmarktree.h
index a854d6f4b1..3729dfc737 100644
--- a/core/fpdfdoc/cpdf_bookmarktree.h
+++ b/core/fpdfdoc/cpdf_bookmarktree.h
@@ -8,7 +8,7 @@
#define CORE_FPDFDOC_CPDF_BOOKMARKTREE_H_
#include "core/fpdfdoc/cpdf_bookmark.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
class CPDF_Document;
@@ -22,7 +22,7 @@ class CPDF_BookmarkTree {
CPDF_Document* GetDocument() const { return m_pDocument.Get(); }
private:
- CFX_UnownedPtr<CPDF_Document> const m_pDocument;
+ UnownedPtr<CPDF_Document> const m_pDocument;
};
#endif // CORE_FPDFDOC_CPDF_BOOKMARKTREE_H_
diff --git a/core/fpdfdoc/cpdf_dest.h b/core/fpdfdoc/cpdf_dest.h
index 23964d7400..2836ebb471 100644
--- a/core/fpdfdoc/cpdf_dest.h
+++ b/core/fpdfdoc/cpdf_dest.h
@@ -7,9 +7,9 @@
#ifndef CORE_FPDFDOC_CPDF_DEST_H_
#define CORE_FPDFDOC_CPDF_DEST_H_
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_string.h"
#include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/unowned_ptr.h"
class CPDF_Document;
class CPDF_Object;
@@ -36,7 +36,7 @@ class CPDF_Dest {
float* pZoom) const;
private:
- CFX_UnownedPtr<CPDF_Object> m_pObj;
+ UnownedPtr<CPDF_Object> m_pObj;
};
#endif // CORE_FPDFDOC_CPDF_DEST_H_
diff --git a/core/fpdfdoc/cpdf_docjsactions.h b/core/fpdfdoc/cpdf_docjsactions.h
index c2652d7f6d..39aafb8d50 100644
--- a/core/fpdfdoc/cpdf_docjsactions.h
+++ b/core/fpdfdoc/cpdf_docjsactions.h
@@ -8,8 +8,8 @@
#define CORE_FPDFDOC_CPDF_DOCJSACTIONS_H_
#include "core/fpdfdoc/cpdf_action.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/unowned_ptr.h"
class CPDF_Document;
@@ -25,7 +25,7 @@ class CPDF_DocJSActions {
CPDF_Document* GetDocument() const { return m_pDocument.Get(); }
private:
- CFX_UnownedPtr<CPDF_Document> const m_pDocument;
+ UnownedPtr<CPDF_Document> const m_pDocument;
};
#endif // CORE_FPDFDOC_CPDF_DOCJSACTIONS_H_
diff --git a/core/fpdfdoc/cpdf_filespec.h b/core/fpdfdoc/cpdf_filespec.h
index 131dfbe7ca..b32207d273 100644
--- a/core/fpdfdoc/cpdf_filespec.h
+++ b/core/fpdfdoc/cpdf_filespec.h
@@ -7,10 +7,10 @@
#ifndef CORE_FPDFDOC_CPDF_FILESPEC_H_
#define CORE_FPDFDOC_CPDF_FILESPEC_H_
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/cfx_weak_ptr.h"
#include "core/fxcrt/fx_string.h"
#include "core/fxcrt/string_pool_template.h"
+#include "core/fxcrt/unowned_ptr.h"
class CPDF_Dictionary;
class CPDF_Object;
@@ -36,7 +36,7 @@ class CPDF_FileSpec {
void SetFileName(const WideString& wsFileName);
private:
- CFX_UnownedPtr<CPDF_Object> const m_pObj;
+ UnownedPtr<CPDF_Object> const m_pObj;
};
#endif // CORE_FPDFDOC_CPDF_FILESPEC_H_
diff --git a/core/fpdfdoc/cpdf_formcontrol.h b/core/fpdfdoc/cpdf_formcontrol.h
index 4f686f44ab..37b3d255e2 100644
--- a/core/fpdfdoc/cpdf_formcontrol.h
+++ b/core/fpdfdoc/cpdf_formcontrol.h
@@ -128,8 +128,8 @@ class CPDF_FormControl {
CPDF_ApSettings GetMK() const;
CPDF_FormField* const m_pField;
- CFX_UnownedPtr<CPDF_Dictionary> const m_pWidgetDict;
- CFX_UnownedPtr<const CPDF_InterForm> const m_pForm;
+ UnownedPtr<CPDF_Dictionary> const m_pWidgetDict;
+ UnownedPtr<const CPDF_InterForm> const m_pForm;
};
#endif // CORE_FPDFDOC_CPDF_FORMCONTROL_H_
diff --git a/core/fpdfdoc/cpdf_formfield.h b/core/fpdfdoc/cpdf_formfield.h
index 6b4b7253e0..db1c514969 100644
--- a/core/fpdfdoc/cpdf_formfield.h
+++ b/core/fpdfdoc/cpdf_formfield.h
@@ -13,9 +13,9 @@
#include "core/fpdfdoc/cpdf_aaction.h"
#include "core/fpdfdoc/cpdf_formfield.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_string.h"
#include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "third_party/base/stl_util.h"
#define FIELDTYPE_UNKNOWN 0
@@ -168,12 +168,12 @@ class CPDF_FormField {
CPDF_FormField::Type m_Type;
uint32_t m_Flags;
- CFX_UnownedPtr<CPDF_InterForm> const m_pForm;
- CFX_UnownedPtr<CPDF_Dictionary> m_pDict;
+ UnownedPtr<CPDF_InterForm> const m_pForm;
+ UnownedPtr<CPDF_Dictionary> m_pDict;
// Owned by InterForm parent.
- std::vector<CFX_UnownedPtr<CPDF_FormControl>> m_ControlList;
+ std::vector<UnownedPtr<CPDF_FormControl>> m_ControlList;
float m_FontSize;
- CFX_UnownedPtr<CPDF_Font> m_pFont;
+ UnownedPtr<CPDF_Font> m_pFont;
};
#endif // CORE_FPDFDOC_CPDF_FORMFIELD_H_
diff --git a/core/fpdfdoc/cpdf_iconfit.h b/core/fpdfdoc/cpdf_iconfit.h
index 0fa8d37e24..e6aafb62e1 100644
--- a/core/fpdfdoc/cpdf_iconfit.h
+++ b/core/fpdfdoc/cpdf_iconfit.h
@@ -7,8 +7,8 @@
#ifndef CORE_FPDFDOC_CPDF_ICONFIT_H_
#define CORE_FPDFDOC_CPDF_ICONFIT_H_
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/unowned_ptr.h"
class CPDF_Dictionary;
@@ -27,7 +27,7 @@ class CPDF_IconFit {
const CPDF_Dictionary* GetDict() const { return m_pDict.Get(); }
private:
- CFX_UnownedPtr<const CPDF_Dictionary> const m_pDict;
+ UnownedPtr<const CPDF_Dictionary> const m_pDict;
};
#endif // CORE_FPDFDOC_CPDF_ICONFIT_H_
diff --git a/core/fpdfdoc/cpdf_interform.h b/core/fpdfdoc/cpdf_interform.h
index d3796e5752..576c2ccc39 100644
--- a/core/fpdfdoc/cpdf_interform.h
+++ b/core/fpdfdoc/cpdf_interform.h
@@ -13,9 +13,9 @@
#include "core/fpdfapi/parser/fpdf_parser_decode.h"
#include "core/fpdfdoc/cpdf_defaultappearance.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_string.h"
#include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/unowned_ptr.h"
class CFieldTree;
class CFDF_Document;
@@ -108,13 +108,13 @@ class CPDF_InterForm {
static bool s_bUpdateAP;
- CFX_UnownedPtr<CPDF_Document> const m_pDocument;
- CFX_UnownedPtr<CPDF_Dictionary> m_pFormDict;
+ UnownedPtr<CPDF_Document> const m_pDocument;
+ UnownedPtr<CPDF_Dictionary> m_pFormDict;
std::map<const CPDF_Dictionary*, std::unique_ptr<CPDF_FormControl>>
m_ControlMap;
std::unique_ptr<CFieldTree> m_pFieldTree;
ByteString m_bsEncoding;
- CFX_UnownedPtr<IPDF_FormNotify> m_pFormNotify;
+ UnownedPtr<IPDF_FormNotify> m_pFormNotify;
};
#endif // CORE_FPDFDOC_CPDF_INTERFORM_H_
diff --git a/core/fpdfdoc/cpdf_link.h b/core/fpdfdoc/cpdf_link.h
index 82f50fe004..18200cc637 100644
--- a/core/fpdfdoc/cpdf_link.h
+++ b/core/fpdfdoc/cpdf_link.h
@@ -9,8 +9,8 @@
#include "core/fpdfdoc/cpdf_action.h"
#include "core/fpdfdoc/cpdf_dest.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/unowned_ptr.h"
class CPDF_Dictionary;
@@ -27,7 +27,7 @@ class CPDF_Link {
CPDF_Action GetAction();
private:
- CFX_UnownedPtr<CPDF_Dictionary> m_pDict;
+ UnownedPtr<CPDF_Dictionary> m_pDict;
};
#endif // CORE_FPDFDOC_CPDF_LINK_H_
diff --git a/core/fpdfdoc/cpdf_nametree.h b/core/fpdfdoc/cpdf_nametree.h
index add62f1767..72d0d669e9 100644
--- a/core/fpdfdoc/cpdf_nametree.h
+++ b/core/fpdfdoc/cpdf_nametree.h
@@ -9,8 +9,8 @@
#include <memory>
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/unowned_ptr.h"
class CPDF_Array;
class CPDF_Dictionary;
@@ -36,7 +36,7 @@ class CPDF_NameTree {
CPDF_Dictionary* GetRoot() const { return m_pRoot.Get(); }
private:
- CFX_UnownedPtr<CPDF_Dictionary> m_pRoot;
+ UnownedPtr<CPDF_Dictionary> m_pRoot;
};
#endif // CORE_FPDFDOC_CPDF_NAMETREE_H_
diff --git a/core/fpdfdoc/cpdf_numbertree.h b/core/fpdfdoc/cpdf_numbertree.h
index 843e186208..47c40b93d3 100644
--- a/core/fpdfdoc/cpdf_numbertree.h
+++ b/core/fpdfdoc/cpdf_numbertree.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFDOC_CPDF_NUMBERTREE_H_
#define CORE_FPDFDOC_CPDF_NUMBERTREE_H_
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
class CPDF_Dictionary;
class CPDF_Object;
@@ -20,7 +20,7 @@ class CPDF_NumberTree {
CPDF_Object* LookupValue(int num) const;
protected:
- CFX_UnownedPtr<CPDF_Dictionary> const m_pRoot;
+ UnownedPtr<CPDF_Dictionary> const m_pRoot;
};
#endif // CORE_FPDFDOC_CPDF_NUMBERTREE_H_
diff --git a/core/fpdfdoc/cpdf_occontext.h b/core/fpdfdoc/cpdf_occontext.h
index c4fbb25724..07b41cc552 100644
--- a/core/fpdfdoc/cpdf_occontext.h
+++ b/core/fpdfdoc/cpdf_occontext.h
@@ -38,7 +38,7 @@ class CPDF_OCContext : public Retainable {
bool GetOCGVE(CPDF_Array* pExpression, int nLevel);
bool LoadOCMDState(const CPDF_Dictionary* pOCMDDict);
- CFX_UnownedPtr<CPDF_Document> const m_pDocument;
+ UnownedPtr<CPDF_Document> const m_pDocument;
const UsageType m_eUsageType;
std::map<const CPDF_Dictionary*, bool> m_OCGStates;
};
diff --git a/core/fpdfdoc/cpdf_pagelabel.h b/core/fpdfdoc/cpdf_pagelabel.h
index 1b21ca8bdb..8a7a33d16a 100644
--- a/core/fpdfdoc/cpdf_pagelabel.h
+++ b/core/fpdfdoc/cpdf_pagelabel.h
@@ -21,7 +21,7 @@ class CPDF_PageLabel {
int32_t GetPageByLabel(const WideStringView& wsLabel) const;
private:
- CFX_UnownedPtr<CPDF_Document> const m_pDocument;
+ UnownedPtr<CPDF_Document> const m_pDocument;
};
#endif // CORE_FPDFDOC_CPDF_PAGELABEL_H_
diff --git a/core/fpdfdoc/cpdf_structelement.h b/core/fpdfdoc/cpdf_structelement.h
index c1e5f5001d..57f8aee2e8 100644
--- a/core/fpdfdoc/cpdf_structelement.h
+++ b/core/fpdfdoc/cpdf_structelement.h
@@ -9,9 +9,9 @@
#include <vector>
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_string.h"
#include "core/fxcrt/retain_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "core/fxge/fx_dib.h"
class CPDF_Dictionary;
@@ -28,7 +28,7 @@ class CPDF_StructKid {
enum { Invalid, Element, PageContent, StreamContent, Object } m_Type;
RetainPtr<CPDF_StructElement> m_pElement; // For Element.
- CFX_UnownedPtr<CPDF_Dictionary> m_pDict; // For Element.
+ UnownedPtr<CPDF_Dictionary> m_pDict; // For Element.
uint32_t m_PageObjNum; // For PageContent, StreamContent, Object.
uint32_t m_RefObjNum; // For StreamContent, Object.
uint32_t m_ContentId; // For PageContent, StreamContent.
@@ -56,9 +56,9 @@ class CPDF_StructElement : public Retainable {
void LoadKids(CPDF_Dictionary* pDict);
void LoadKid(uint32_t PageObjNum, CPDF_Object* pObj, CPDF_StructKid* pKid);
- CFX_UnownedPtr<CPDF_StructTree> const m_pTree;
- CFX_UnownedPtr<CPDF_StructElement> const m_pParent;
- CFX_UnownedPtr<CPDF_Dictionary> const m_pDict;
+ UnownedPtr<CPDF_StructTree> const m_pTree;
+ UnownedPtr<CPDF_StructElement> const m_pParent;
+ UnownedPtr<CPDF_Dictionary> const m_pDict;
ByteString m_Type;
ByteString m_Title;
std::vector<CPDF_StructKid> m_Kids;
diff --git a/core/fpdfdoc/cpdf_structtree.h b/core/fpdfdoc/cpdf_structtree.h
index 9603620fc1..9f1d50e066 100644
--- a/core/fpdfdoc/cpdf_structtree.h
+++ b/core/fpdfdoc/cpdf_structtree.h
@@ -11,8 +11,8 @@
#include <memory>
#include <vector>
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/retain_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
class CPDF_Dictionary;
class CPDF_Document;
@@ -42,9 +42,9 @@ class CPDF_StructTree {
bool AddTopLevelNode(CPDF_Dictionary* pDict,
const RetainPtr<CPDF_StructElement>& pElement);
- CFX_UnownedPtr<const CPDF_Dictionary> const m_pTreeRoot;
- CFX_UnownedPtr<const CPDF_Dictionary> const m_pRoleMap;
- CFX_UnownedPtr<const CPDF_Dictionary> m_pPage;
+ UnownedPtr<const CPDF_Dictionary> const m_pTreeRoot;
+ UnownedPtr<const CPDF_Dictionary> const m_pRoleMap;
+ UnownedPtr<const CPDF_Dictionary> m_pPage;
std::vector<RetainPtr<CPDF_StructElement>> m_Kids;
};
diff --git a/core/fpdfdoc/cpdf_variabletext.h b/core/fpdfdoc/cpdf_variabletext.h
index 704408c5be..5b0c259952 100644
--- a/core/fpdfdoc/cpdf_variabletext.h
+++ b/core/fpdfdoc/cpdf_variabletext.h
@@ -58,7 +58,7 @@ class CPDF_VariableText {
private:
CPVT_WordPlace m_CurPos;
- CFX_UnownedPtr<CPDF_VariableText> const m_pVT;
+ UnownedPtr<CPDF_VariableText> const m_pVT;
};
class Provider {
diff --git a/core/fpdfdoc/cpdf_viewerpreferences.h b/core/fpdfdoc/cpdf_viewerpreferences.h
index bbe5d1a512..a1884748e4 100644
--- a/core/fpdfdoc/cpdf_viewerpreferences.h
+++ b/core/fpdfdoc/cpdf_viewerpreferences.h
@@ -7,9 +7,9 @@
#ifndef CORE_FPDFDOC_CPDF_VIEWERPREFERENCES_H_
#define CORE_FPDFDOC_CPDF_VIEWERPREFERENCES_H_
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_string.h"
#include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/unowned_ptr.h"
class CPDF_Array;
class CPDF_Dictionary;
@@ -34,7 +34,7 @@ class CPDF_ViewerPreferences {
private:
CPDF_Dictionary* GetViewerPreferences() const;
- CFX_UnownedPtr<CPDF_Document> const m_pDoc;
+ UnownedPtr<CPDF_Document> const m_pDoc;
};
#endif // CORE_FPDFDOC_CPDF_VIEWERPREFERENCES_H_
diff --git a/core/fpdfdoc/cpvt_fontmap.h b/core/fpdfdoc/cpvt_fontmap.h
index feca454774..a0b94cf25a 100644
--- a/core/fpdfdoc/cpvt_fontmap.h
+++ b/core/fpdfdoc/cpvt_fontmap.h
@@ -10,8 +10,8 @@
#include <stdint.h>
#include "core/fpdfdoc/ipvt_fontmap.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/unowned_ptr.h"
class CPDF_Document;
class CPDF_Dictionary;
@@ -39,10 +39,10 @@ class CPVT_FontMap : public IPVT_FontMap {
ByteString* sSysFontAlias);
private:
- CFX_UnownedPtr<CPDF_Document> const m_pDocument;
- CFX_UnownedPtr<CPDF_Dictionary> const m_pResDict;
- CFX_UnownedPtr<CPDF_Font> const m_pDefFont;
- CFX_UnownedPtr<CPDF_Font> m_pSysFont;
+ UnownedPtr<CPDF_Document> const m_pDocument;
+ UnownedPtr<CPDF_Dictionary> const m_pResDict;
+ UnownedPtr<CPDF_Font> const m_pDefFont;
+ UnownedPtr<CPDF_Font> m_pSysFont;
const ByteString m_sDefFontAlias;
ByteString m_sSysFontAlias;
};
diff --git a/core/fpdfdoc/csection.h b/core/fpdfdoc/csection.h
index aefdcaf7b2..7c2b70b7dc 100644
--- a/core/fpdfdoc/csection.h
+++ b/core/fpdfdoc/csection.h
@@ -57,7 +57,7 @@ class CSection final {
void ClearRightWords(int32_t nWordIndex);
void ClearMidWords(int32_t nBeginIndex, int32_t nEndIndex);
- CFX_UnownedPtr<CPDF_VariableText> const m_pVT;
+ UnownedPtr<CPDF_VariableText> const m_pVT;
};
#endif // CORE_FPDFDOC_CSECTION_H_
diff --git a/core/fpdfdoc/ctypeset.h b/core/fpdfdoc/ctypeset.h
index 6131467e56..3d56a3b092 100644
--- a/core/fpdfdoc/ctypeset.h
+++ b/core/fpdfdoc/ctypeset.h
@@ -8,8 +8,8 @@
#define CORE_FPDFDOC_CTYPESET_H_
#include "core/fpdfdoc/cpvt_floatrect.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/unowned_ptr.h"
class CPDF_VariableText;
class CSection;
@@ -28,7 +28,7 @@ class CTypeset final {
void OutputLines();
CPVT_FloatRect m_rcRet;
- CFX_UnownedPtr<CPDF_VariableText> const m_pVT;
+ UnownedPtr<CPDF_VariableText> const m_pVT;
CSection* const m_pSection;
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 20:10:52 +0000