Merge to XFA: Remove typdefs for pointer types in fx_system.h.

Original Review URL: https://codereview.chromium.org/1171733003

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1178613002.

5 files changed, 15 insertions, 15 deletions

diff --git a/xfa/include/fwl/lightwidget/combobox.h b/xfa/include/fwl/lightwidget/combobox.h
index 594c056e83..fe1b5c4f25 100644
--- a/xfa/include/fwl/lightwidget/combobox.h
+++ b/xfa/include/fwl/lightwidget/combobox.h
@@ -36,8 +36,8 @@ public:
     FX_BOOL		EditRedo(FX_BSTR bsRecord);

     FX_BOOL		EditUndo(FX_BSTR bsRecord);

     FWL_ERR		SetMaxListHeight(FX_FLOAT fMaxHeight);

-    FWL_ERR		SetItemData(int32_t iIndex, FX_LPVOID pData);

-    FX_LPVOID	GetItemData(int32_t iIndex);

+    FWL_ERR		SetItemData(int32_t iIndex, void* pData);

+    void*	GetItemData(int32_t iIndex);

     FWL_ERR		SetListTheme(IFWL_ThemeProvider *pTheme);

     FX_BOOL		AfterFocusShowDropList();

     FWL_ERR		OpenDropDownList(FX_BOOL bActivate);

@@ -78,9 +78,9 @@ protected:
         virtual	FX_DWORD		GetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);

         virtual	FWL_ERR			GetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_WideString &wsText);

         virtual FWL_ERR			GetItemRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_RectF& rtItem);

-        virtual FX_LPVOID		GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);

+        virtual void*		GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);

         virtual	FWL_ERR			SetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_DWORD dwStyle);

-        virtual FWL_ERR			SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_LPCWSTR pszText);

+        virtual FWL_ERR			SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const FX_WCHAR* pszText);

         virtual FWL_ERR			SetItemRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const CFX_RectF& rtItem);

         virtual FX_FLOAT		GetItemHeight(IFWL_Widget *pWidget);

         virtual CFX_DIBitmap*	GetItemIcon(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);

@@ -110,6 +110,6 @@ public:
     CFX_DIBitmap	*m_pDIB;

     FX_DWORD		m_dwCheckState;

     CFX_RectF		m_rtCheckBox;

-    FX_LPVOID		m_pData;

+    void*		m_pData;

 };

 #endif

diff --git a/xfa/include/fwl/lightwidget/edit.h b/xfa/include/fwl/lightwidget/edit.h
index d95baa20e1..94a4ac48e4 100644
--- a/xfa/include/fwl/lightwidget/edit.h
+++ b/xfa/include/fwl/lightwidget/edit.h
@@ -28,7 +28,7 @@ public:
     FWL_ERR		SetLimit(int32_t nLimit);

     FWL_ERR		SetAliasChar(FX_WCHAR wAlias);

     FWL_ERR		SetFormatString(const CFX_WideString &wsFormat);

-    FWL_ERR		Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLen);

+    FWL_ERR		Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLen);

     FWL_ERR		DeleteSelections();

     FWL_ERR		DeleteRange(int32_t nStart, int32_t nCount = -1);

     FWL_ERR		ReplaceSelections(const CFX_WideStringC &wsReplace);

diff --git a/xfa/include/fwl/lightwidget/listbox.h b/xfa/include/fwl/lightwidget/listbox.h
index a8d024abaa..839bc18a9a 100644
--- a/xfa/include/fwl/lightwidget/listbox.h
+++ b/xfa/include/fwl/lightwidget/listbox.h
@@ -34,8 +34,8 @@ public:
     FWL_HLISTITEM	GetItem(int32_t nIndex);

     FWL_ERR		SetItemString(FWL_HLISTITEM hItem, FX_WSTR wsText);

     FWL_ERR		GetItemString(FWL_HLISTITEM hItem, CFX_WideString &wsText);

-    FWL_ERR		SetItemData(FWL_HLISTITEM hItem, FX_LPVOID pData);

-    FX_LPVOID	GetItemData(FWL_HLISTITEM hItem);

+    FWL_ERR		SetItemData(FWL_HLISTITEM hItem, void* pData);

+    void*	GetItemData(FWL_HLISTITEM hItem);

     FWL_HLISTITEM	GetItemAtPoint(FX_FLOAT fx, FX_FLOAT fy);

     FX_DWORD		GetItemStates(FWL_HLISTITEM hItem);

     CFWL_ListBox();

@@ -56,10 +56,10 @@ protected:
         virtual	FX_DWORD		GetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);

         virtual	FWL_ERR			GetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_WideString &wsText);

         virtual FWL_ERR			GetItemRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_RectF &rtItem);

-        virtual FX_LPVOID		GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);

+        virtual void*		GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);

 

         virtual	FWL_ERR			SetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_DWORD dwStyle);

-        virtual FWL_ERR			SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_LPCWSTR pszText);

+        virtual FWL_ERR			SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const FX_WCHAR* pszText);

         virtual FWL_ERR			SetItemRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const CFX_RectF &rtItem);

         virtual FX_FLOAT		GetItemHeight(IFWL_Widget *pWidget);

         virtual CFX_DIBitmap*	GetItemIcon(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);

@@ -91,7 +91,7 @@ public:
     FX_DWORD		m_dwStates;

     CFX_WideString	m_wsText;

     CFX_DIBitmap	*m_pDIB;

-    FX_LPVOID		m_pData;

+    void*		m_pData;

     FX_DWORD		m_dwCheckState;

     CFX_RectF		m_rtCheckBox;

 };

diff --git a/xfa/include/fwl/lightwidget/theme.h b/xfa/include/fwl/lightwidget/theme.h
index 0edd9d4b3d..9c36ab5035 100644
--- a/xfa/include/fwl/lightwidget/theme.h
+++ b/xfa/include/fwl/lightwidget/theme.h
@@ -22,7 +22,7 @@ public:
     virtual FWL_ERR		SetThemeMatrix(IFWL_Widget *pWidget, const CFX_Matrix &matrix);

     virtual FX_BOOL		DrawBackground(CFWL_ThemeBackground *pParams);

     virtual FX_BOOL		DrawText(CFWL_ThemeText *pParams);

-    virtual FX_LPVOID   GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);

+    virtual void*   GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);

     virtual FX_BOOL		IsCustomizedLayout(IFWL_Widget *pWidget);

     virtual FWL_ERR		GetPartRect(CFWL_ThemePart* pThemePart, CFX_RectF &rtPart);

     virtual FX_BOOL		IsInPart(CFWL_ThemePart* pThemePart, FX_FLOAT fx, FX_FLOAT fy);

@@ -31,7 +31,7 @@ public:
     virtual FWL_ERR		Finalize();

     CFWL_Theme();

     virtual ~CFWL_Theme();

-    FWL_ERR		SetFont(IFWL_Widget *pWidget, FX_LPCWSTR strFont, FX_FLOAT fFontSize, FX_ARGB rgbFont);

+    FWL_ERR		SetFont(IFWL_Widget *pWidget, const FX_WCHAR* strFont, FX_FLOAT fFontSize, FX_ARGB rgbFont);

     CFWL_WidgetTP* GetTheme(IFWL_Widget* pWidget);

 protected:

     CFX_PtrArray	m_arrThemes;

diff --git a/xfa/include/fwl/lightwidget/widget.h b/xfa/include/fwl/lightwidget/widget.h
index d581c7fb40..b6bd62bb2a 100644
--- a/xfa/include/fwl/lightwidget/widget.h
+++ b/xfa/include/fwl/lightwidget/widget.h
@@ -62,8 +62,8 @@ public:
     FWL_ERR			ModifyStylesEx(FX_DWORD dwStylesExAdded, FX_DWORD dwStylesExRemoved);

     FX_DWORD		GetStates();

     FWL_ERR			SetStates(FX_DWORD dwStates, FX_BOOL bSet = TRUE);

-    FWL_ERR			SetPrivateData(FX_LPVOID module_id, FX_LPVOID pData, PD_CALLBACK_FREEDATA callback);

-    FX_LPVOID		GetPrivateData(FX_LPVOID module_id);

+    FWL_ERR			SetPrivateData(void* module_id, void* pData, PD_CALLBACK_FREEDATA callback);

+    void*		GetPrivateData(void* module_id);

     FWL_ERR			Update();

     FWL_ERR			LockUpdate();

     FWL_ERR			UnlockUpdate();