summaryrefslogtreecommitdiff
path: root/fpdfsdk/pwl
diff options
context:
space:
mode:
Diffstat (limited to 'fpdfsdk/pwl')
-rw-r--r--fpdfsdk/pwl/cpwl_appstream.h6
-rw-r--r--fpdfsdk/pwl/cpwl_combo_box.h12
-rw-r--r--fpdfsdk/pwl/cpwl_edit.h6
-rw-r--r--fpdfsdk/pwl/cpwl_edit_impl.h20
-rw-r--r--fpdfsdk/pwl/cpwl_font_map.h2
-rw-r--r--fpdfsdk/pwl/cpwl_icon.h6
-rw-r--r--fpdfsdk/pwl/cpwl_list_box.h8
-rw-r--r--fpdfsdk/pwl/cpwl_list_impl.h6
-rw-r--r--fpdfsdk/pwl/cpwl_scroll_bar.h8
-rw-r--r--fpdfsdk/pwl/cpwl_timer.h6
-rw-r--r--fpdfsdk/pwl/cpwl_wnd.cpp6
-rw-r--r--fpdfsdk/pwl/cpwl_wnd.h8
12 files changed, 47 insertions, 47 deletions
diff --git a/fpdfsdk/pwl/cpwl_appstream.h b/fpdfsdk/pwl/cpwl_appstream.h
index d73e3aa0a7..810e79c9e7 100644
--- a/fpdfsdk/pwl/cpwl_appstream.h
+++ b/fpdfsdk/pwl/cpwl_appstream.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_PWL_CPWL_APPSTREAM_H_
#define FPDFSDK_PWL_CPWL_APPSTREAM_H_
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/unowned_ptr.h"
class CPDFSDK_Widget;
class CPDF_Dictionary;
@@ -36,8 +36,8 @@ class CPWL_AppStream {
ByteString GetBackgroundAppStream() const;
ByteString GetBorderAppStream() const;
- CFX_UnownedPtr<CPDFSDK_Widget> widget_;
- CFX_UnownedPtr<CPDF_Dictionary> dict_;
+ UnownedPtr<CPDFSDK_Widget> widget_;
+ UnownedPtr<CPDF_Dictionary> dict_;
};
#endif // FPDFSDK_PWL_CPWL_APPSTREAM_H_
diff --git a/fpdfsdk/pwl/cpwl_combo_box.h b/fpdfsdk/pwl/cpwl_combo_box.h
index c9fa2cda4b..d8e384e501 100644
--- a/fpdfsdk/pwl/cpwl_combo_box.h
+++ b/fpdfsdk/pwl/cpwl_combo_box.h
@@ -9,7 +9,7 @@
#include <memory>
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/pwl/cpwl_edit.h"
#include "fpdfsdk/pwl/cpwl_list_box.h"
#include "fpdfsdk/pwl/cpwl_wnd.h"
@@ -89,15 +89,15 @@ class CPWL_ComboBox : public CPWL_Wnd {
void CreateListBox(const CreateParams& cp);
void SetPopup(bool bPopup);
- CFX_UnownedPtr<CPWL_Edit> m_pEdit;
- CFX_UnownedPtr<CPWL_CBButton> m_pButton;
- CFX_UnownedPtr<CPWL_CBListBox> m_pList;
+ UnownedPtr<CPWL_Edit> m_pEdit;
+ UnownedPtr<CPWL_CBButton> m_pButton;
+ UnownedPtr<CPWL_CBListBox> m_pList;
CFX_FloatRect m_rcOldWindow;
bool m_bPopup = false;
bool m_bBottom = true;
int32_t m_nSelectItem = -1;
- CFX_UnownedPtr<IPWL_Filler_Notify> m_pFillerNotify;
- CFX_UnownedPtr<CFFL_FormFiller> m_pFormFiller;
+ UnownedPtr<IPWL_Filler_Notify> m_pFillerNotify;
+ UnownedPtr<CFFL_FormFiller> m_pFormFiller;
};
#endif // FPDFSDK_PWL_CPWL_COMBO_BOX_H_
diff --git a/fpdfsdk/pwl/cpwl_edit.h b/fpdfsdk/pwl/cpwl_edit.h
index d61b94730e..d093f44d84 100644
--- a/fpdfsdk/pwl/cpwl_edit.h
+++ b/fpdfsdk/pwl/cpwl_edit.h
@@ -10,7 +10,7 @@
#include <utility>
#include "core/fpdfdoc/cpvt_wordrange.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/pwl/cpwl_edit_ctrl.h"
#define PWL_CLASSNAME_EDIT "CPWL_Edit"
@@ -129,8 +129,8 @@ class CPWL_Edit : public CPWL_EditCtrl {
bool m_bFocus;
CFX_FloatRect m_rcOldWindow;
- CFX_UnownedPtr<IPWL_Filler_Notify> m_pFillerNotify;
- CFX_UnownedPtr<CFFL_FormFiller> m_pFormFiller;
+ UnownedPtr<IPWL_Filler_Notify> m_pFillerNotify;
+ UnownedPtr<CFFL_FormFiller> m_pFormFiller;
};
#endif // FPDFSDK_PWL_CPWL_EDIT_H_
diff --git a/fpdfsdk/pwl/cpwl_edit_impl.h b/fpdfsdk/pwl/cpwl_edit_impl.h
index a63b22cd10..76f756eb1c 100644
--- a/fpdfsdk/pwl/cpwl_edit_impl.h
+++ b/fpdfsdk/pwl/cpwl_edit_impl.h
@@ -13,7 +13,7 @@
#include "core/fpdfdoc/cpvt_secprops.h"
#include "core/fpdfdoc/cpvt_wordprops.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#define FX_EDIT_ISLATINWORD(u) \
(u == 0x2D || (u <= 0x005A && u >= 0x0041) || \
@@ -144,7 +144,7 @@ class CFXEU_InsertWord : public IFX_Edit_UndoItem {
void Undo() override;
private:
- CFX_UnownedPtr<CPWL_EditImpl> m_pEdit;
+ UnownedPtr<CPWL_EditImpl> m_pEdit;
CPVT_WordPlace m_wpOld;
CPVT_WordPlace m_wpNew;
@@ -167,7 +167,7 @@ class CFXEU_InsertReturn : public IFX_Edit_UndoItem {
void Undo() override;
private:
- CFX_UnownedPtr<CPWL_EditImpl> m_pEdit;
+ UnownedPtr<CPWL_EditImpl> m_pEdit;
CPVT_WordPlace m_wpOld;
CPVT_WordPlace m_wpNew;
@@ -191,7 +191,7 @@ class CFXEU_Backspace : public IFX_Edit_UndoItem {
void Undo() override;
private:
- CFX_UnownedPtr<CPWL_EditImpl> m_pEdit;
+ UnownedPtr<CPWL_EditImpl> m_pEdit;
CPVT_WordPlace m_wpOld;
CPVT_WordPlace m_wpNew;
@@ -218,7 +218,7 @@ class CFXEU_Delete : public IFX_Edit_UndoItem {
void Undo() override;
private:
- CFX_UnownedPtr<CPWL_EditImpl> m_pEdit;
+ UnownedPtr<CPWL_EditImpl> m_pEdit;
CPVT_WordPlace m_wpOld;
CPVT_WordPlace m_wpNew;
@@ -241,7 +241,7 @@ class CFXEU_Clear : public IFX_Edit_UndoItem {
void Undo() override;
private:
- CFX_UnownedPtr<CPWL_EditImpl> m_pEdit;
+ UnownedPtr<CPWL_EditImpl> m_pEdit;
CPVT_WordRange m_wrSel;
WideString m_swText;
@@ -261,7 +261,7 @@ class CFXEU_InsertText : public IFX_Edit_UndoItem {
void Undo() override;
private:
- CFX_UnownedPtr<CPWL_EditImpl> m_pEdit;
+ UnownedPtr<CPWL_EditImpl> m_pEdit;
CPVT_WordPlace m_wpOld;
CPVT_WordPlace m_wpNew;
@@ -430,8 +430,8 @@ class CPWL_EditImpl {
private:
std::unique_ptr<CPDF_VariableText> m_pVT;
- CFX_UnownedPtr<CPWL_EditCtrl> m_pNotify;
- CFX_UnownedPtr<CPWL_Edit> m_pOperationNotify;
+ UnownedPtr<CPWL_EditCtrl> m_pNotify;
+ UnownedPtr<CPWL_Edit> m_pOperationNotify;
std::unique_ptr<CPWL_EditImpl_Provider> m_pVTProvider;
CPVT_WordPlace m_wpCaret;
CPVT_WordPlace m_wpOldCaret;
@@ -466,7 +466,7 @@ class CPWL_EditImpl_Iterator {
const CPVT_WordPlace& GetAt() const;
private:
- CFX_UnownedPtr<CPWL_EditImpl> m_pEdit;
+ UnownedPtr<CPWL_EditImpl> m_pEdit;
CPDF_VariableText::Iterator* m_pVTIterator;
};
diff --git a/fpdfsdk/pwl/cpwl_font_map.h b/fpdfsdk/pwl/cpwl_font_map.h
index 5336949399..0712bf1240 100644
--- a/fpdfsdk/pwl/cpwl_font_map.h
+++ b/fpdfsdk/pwl/cpwl_font_map.h
@@ -88,7 +88,7 @@ class CPWL_FontMap : public IPVT_FontMap {
uint8_t nCharset);
std::unique_ptr<CPDF_Document> m_pPDFDoc;
- CFX_UnownedPtr<CFX_SystemHandler> const m_pSystemHandler;
+ UnownedPtr<CFX_SystemHandler> const m_pSystemHandler;
};
#endif // FPDFSDK_PWL_CPWL_FONT_MAP_H_
diff --git a/fpdfsdk/pwl/cpwl_icon.h b/fpdfsdk/pwl/cpwl_icon.h
index e2f792b9d5..df88465a5a 100644
--- a/fpdfsdk/pwl/cpwl_icon.h
+++ b/fpdfsdk/pwl/cpwl_icon.h
@@ -9,8 +9,8 @@
#include <utility>
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/pwl/cpwl_wnd.h"
class CPWL_Icon : public CPWL_Wnd {
@@ -37,8 +37,8 @@ class CPWL_Icon : public CPWL_Wnd {
// width, height
std::pair<float, float> GetImageSize();
- CFX_UnownedPtr<CPDF_Stream> m_pPDFStream;
- CFX_UnownedPtr<CPDF_IconFit> m_pIconFit;
+ UnownedPtr<CPDF_Stream> m_pPDFStream;
+ UnownedPtr<CPDF_IconFit> m_pIconFit;
};
#endif // FPDFSDK_PWL_CPWL_ICON_H_
diff --git a/fpdfsdk/pwl/cpwl_list_box.h b/fpdfsdk/pwl/cpwl_list_box.h
index 1e028f7299..fec4d63a0c 100644
--- a/fpdfsdk/pwl/cpwl_list_box.h
+++ b/fpdfsdk/pwl/cpwl_list_box.h
@@ -9,7 +9,7 @@
#include <memory>
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/pwl/cpwl_wnd.h"
class CPWL_ListCtrl;
@@ -35,7 +35,7 @@ class CPWL_List_Notify {
void IOnInvalidateRect(CFX_FloatRect* pRect);
private:
- CFX_UnownedPtr<CPWL_ListBox> m_pList;
+ UnownedPtr<CPWL_ListBox> m_pList;
};
class CPWL_ListBox : public CPWL_Wnd {
@@ -101,10 +101,10 @@ class CPWL_ListBox : public CPWL_Wnd {
std::unique_ptr<CPWL_List_Notify> m_pListNotify;
bool m_bMouseDown;
bool m_bHoverSel;
- CFX_UnownedPtr<IPWL_Filler_Notify> m_pFillerNotify;
+ UnownedPtr<IPWL_Filler_Notify> m_pFillerNotify;
private:
- CFX_UnownedPtr<CFFL_FormFiller> m_pFormFiller;
+ UnownedPtr<CFFL_FormFiller> m_pFormFiller;
};
#endif // FPDFSDK_PWL_CPWL_LIST_BOX_H_
diff --git a/fpdfsdk/pwl/cpwl_list_impl.h b/fpdfsdk/pwl/cpwl_list_impl.h
index 18ca0a3a15..e39a9c8b20 100644
--- a/fpdfsdk/pwl/cpwl_list_impl.h
+++ b/fpdfsdk/pwl/cpwl_list_impl.h
@@ -11,9 +11,9 @@
#include <memory>
#include <vector>
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_coordinates.h"
#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/unowned_ptr.h"
class CPWL_EditImpl;
class CPWL_EditImpl_Iterator;
@@ -152,7 +152,7 @@ class CPWL_ListCtrl {
CFX_FloatRect m_rcPlate;
CFX_FloatRect m_rcContent;
- CFX_UnownedPtr<CPWL_List_Notify> m_pNotify;
+ UnownedPtr<CPWL_List_Notify> m_pNotify;
bool m_bNotifyFlag;
CFX_PointF m_ptScrollPos;
CPLST_Select m_aSelItems; // for multiple
@@ -162,7 +162,7 @@ class CPWL_ListCtrl {
int32_t m_nCaretIndex; // for multiple
std::vector<std::unique_ptr<Item>> m_ListItems;
float m_fFontSize;
- CFX_UnownedPtr<IPVT_FontMap> m_pFontMap;
+ UnownedPtr<IPVT_FontMap> m_pFontMap;
bool m_bMultiple;
};
diff --git a/fpdfsdk/pwl/cpwl_scroll_bar.h b/fpdfsdk/pwl/cpwl_scroll_bar.h
index 48aef16e38..1e71e3b90f 100644
--- a/fpdfsdk/pwl/cpwl_scroll_bar.h
+++ b/fpdfsdk/pwl/cpwl_scroll_bar.h
@@ -7,7 +7,7 @@
#ifndef FPDFSDK_PWL_CPWL_SCROLL_BAR_H_
#define FPDFSDK_PWL_CPWL_SCROLL_BAR_H_
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/pwl/cpwl_wnd.h"
class CPWL_SBButton;
@@ -170,9 +170,9 @@ class CPWL_ScrollBar : public CPWL_Wnd {
PWL_SCROLLBAR_TYPE m_sbType;
PWL_SCROLL_INFO m_OriginInfo;
- CFX_UnownedPtr<CPWL_SBButton> m_pMinButton;
- CFX_UnownedPtr<CPWL_SBButton> m_pMaxButton;
- CFX_UnownedPtr<CPWL_SBButton> m_pPosButton;
+ UnownedPtr<CPWL_SBButton> m_pMinButton;
+ UnownedPtr<CPWL_SBButton> m_pMaxButton;
+ UnownedPtr<CPWL_SBButton> m_pPosButton;
PWL_SCROLL_PRIVATEDATA m_sData;
bool m_bMouseDown;
bool m_bMinOrMax;
diff --git a/fpdfsdk/pwl/cpwl_timer.h b/fpdfsdk/pwl/cpwl_timer.h
index 4a07425993..6e082abd4b 100644
--- a/fpdfsdk/pwl/cpwl_timer.h
+++ b/fpdfsdk/pwl/cpwl_timer.h
@@ -7,7 +7,7 @@
#ifndef FPDFSDK_PWL_CPWL_TIMER_H_
#define FPDFSDK_PWL_CPWL_TIMER_H_
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
class CFX_SystemHandler;
class CPWL_TimerHandler;
@@ -24,8 +24,8 @@ class CPWL_Timer {
private:
int32_t m_nTimerID;
- CFX_UnownedPtr<CPWL_TimerHandler> m_pAttached;
- CFX_UnownedPtr<CFX_SystemHandler> m_pSystemHandler;
+ UnownedPtr<CPWL_TimerHandler> m_pAttached;
+ UnownedPtr<CFX_SystemHandler> m_pSystemHandler;
};
#endif // FPDFSDK_PWL_CPWL_TIMER_H_
diff --git a/fpdfsdk/pwl/cpwl_wnd.cpp b/fpdfsdk/pwl/cpwl_wnd.cpp
index 9abe03c3fb..d7eb853c8f 100644
--- a/fpdfsdk/pwl/cpwl_wnd.cpp
+++ b/fpdfsdk/pwl/cpwl_wnd.cpp
@@ -131,9 +131,9 @@ class CPWL_MsgControl : public Observable<CPWL_MsgControl> {
private:
std::vector<CPWL_Wnd*> m_aMousePath;
std::vector<CPWL_Wnd*> m_aKeyboardPath;
- CFX_UnownedPtr<CPWL_Wnd> m_pCreatedWnd;
- CFX_UnownedPtr<CPWL_Wnd> m_pMainMouseWnd;
- CFX_UnownedPtr<CPWL_Wnd> m_pMainKeyboardWnd;
+ UnownedPtr<CPWL_Wnd> m_pCreatedWnd;
+ UnownedPtr<CPWL_Wnd> m_pMainMouseWnd;
+ UnownedPtr<CPWL_Wnd> m_pMainKeyboardWnd;
};
CPWL_Wnd::CPWL_Wnd()
diff --git a/fpdfsdk/pwl/cpwl_wnd.h b/fpdfsdk/pwl/cpwl_wnd.h
index ecef1e2e10..11b62b337c 100644
--- a/fpdfsdk/pwl/cpwl_wnd.h
+++ b/fpdfsdk/pwl/cpwl_wnd.h
@@ -11,8 +11,8 @@
#include <vector>
#include "core/fpdfdoc/cpdf_formcontrol.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/observable.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "core/fxge/cfx_color.h"
#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
#include "fpdfsdk/cpdfsdk_widget.h"
@@ -131,7 +131,7 @@ class CPWL_Wnd : public CPWL_TimerHandler, public Observable<CPWL_Wnd> {
CFX_SystemHandler* pSystemHandler; // required
IPVT_FontMap* pFontMap; // required
ProviderIface::ObservedPtr pProvider; // required
- CFX_UnownedPtr<FocusHandlerIface> pFocusHandler; // optional
+ UnownedPtr<FocusHandlerIface> pFocusHandler; // optional
uint32_t dwFlags; // optional
CFX_Color sBackgroundColor; // optional
CPDFSDK_Widget::ObservedPtr pAttachedWidget; // required
@@ -142,7 +142,7 @@ class CPWL_Wnd : public CPWL_TimerHandler, public Observable<CPWL_Wnd> {
int32_t nTransparency; // optional
float fFontSize; // optional
CPWL_Dash sDash; // optional
- CFX_UnownedPtr<PrivateData> pAttachedData; // optional
+ UnownedPtr<PrivateData> pAttachedData; // optional
CPWL_Wnd* pParentWnd; // ignore
CPWL_MsgControl* pMsgControl; // ignore
int32_t eCursorType; // ignore
@@ -311,7 +311,7 @@ class CPWL_Wnd : public CPWL_TimerHandler, public Observable<CPWL_Wnd> {
CreateParams m_CreationParams;
std::vector<CPWL_Wnd*> m_Children;
- CFX_UnownedPtr<CPWL_ScrollBar> m_pVScrollBar;
+ UnownedPtr<CPWL_ScrollBar> m_pVScrollBar;
CFX_FloatRect m_rcWindow;
CFX_FloatRect m_rcClip;
bool m_bCreated;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 02:03:19 +0000