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.

8 files changed, 14 insertions, 14 deletions

diff --git a/xfa/include/fwl/core/fwl_grid.h b/xfa/include/fwl/core/fwl_grid.h
index 0d4e2d61f8..677bd918f5 100644
--- a/xfa/include/fwl/core/fwl_grid.h
+++ b/xfa/include/fwl/core/fwl_grid.h
@@ -37,7 +37,7 @@ enum FWL_GRIDSIZE {
     FWL_GRIDSIZE_MaxHeight,

 };

 typedef struct _FWL_HGRIDCOLROW {

-    FX_LPVOID pData;

+    void* pData;

 } * FWL_HGRIDCOLROW;

 class IFWL_Grid : public IFWL_Content

 {

diff --git a/xfa/include/fwl/core/fwl_note.h b/xfa/include/fwl/core/fwl_note.h
index 7e553a9eb2..c3dcead1e4 100644
--- a/xfa/include/fwl/core/fwl_note.h
+++ b/xfa/include/fwl/core/fwl_note.h
@@ -322,7 +322,7 @@ IFWL_Widget *m_pOwner;
 END_FWL_EVENT_DEF

 BEGIN_FWL_EVENT_DEF(CFWL_EvtMenuCommand, FWL_EVTHASH_MenuCommand)

 int32_t m_iCommand;

-FX_LPVOID m_pData;

+void* m_pData;

 END_FWL_EVENT_DEF

 BEGIN_FWL_EVENT_DEF(CFWL_EvtSizeChanged, FWL_EVTHASH_SizeChanged)

 IFWL_Widget *m_pWidget;

@@ -384,6 +384,6 @@ FWL_ERR FWL_AddToolTipTarget(IFWL_ToolTipTarget *pTarget);
 FWL_ERR FWL_RemoveToolTipTarget(IFWL_ToolTipTarget *pTarget);

 FWL_ERR	FWL_SetToolTipInitialDelay(int32_t iDelayTime);

 FWL_ERR	FWL_SetToolTipAutoPopDelay(int32_t iDelayTime);

-typedef FX_BOOL (*FWLMessageHookCallback)(CFWL_Message *msg, FX_LPVOID info);

-FWL_ERR FWL_SetHook(IFWL_NoteDriver *driver, FWLMessageHookCallback callback, FX_LPVOID info);

+typedef FX_BOOL (*FWLMessageHookCallback)(CFWL_Message *msg, void* info);

+FWL_ERR FWL_SetHook(IFWL_NoteDriver *driver, FWLMessageHookCallback callback, void* info);

 #endif

diff --git a/xfa/include/fwl/core/fwl_target.h b/xfa/include/fwl/core/fwl_target.h
index 3c8b531f24..d04a1f9c75 100644
--- a/xfa/include/fwl/core/fwl_target.h
+++ b/xfa/include/fwl/core/fwl_target.h
@@ -20,6 +20,6 @@ public:
     FWL_ERR			Finalize();

 protected:

     virtual ~IFWL_Target();

-    FX_LPVOID	m_pData;

+    void*	m_pData;

 };

 #endif

diff --git a/xfa/include/fwl/core/fwl_theme.h b/xfa/include/fwl/core/fwl_theme.h
index cc29e351d1..9ab970b47c 100644
--- a/xfa/include/fwl/core/fwl_theme.h
+++ b/xfa/include/fwl/core/fwl_theme.h
@@ -45,7 +45,7 @@ public:
     int32_t				 m_iPart;

     FX_DWORD				 m_dwStates;

     FX_DWORD				 m_dwData;

-    FX_LPVOID				 m_pData;

+    void*				 m_pData;

 };

 class CFWL_ThemeBackground : public CFWL_ThemePart

 {

@@ -82,7 +82,7 @@ public:
     virtual FWL_ERR		SetThemeMatrix(IFWL_Widget *pWidget, const CFX_Matrix &matrix) = 0;

     virtual FX_BOOL		DrawBackground(CFWL_ThemeBackground *pParams) = 0;

     virtual FX_BOOL		DrawText(CFWL_ThemeText *pParams) = 0;

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

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

     virtual FX_BOOL		IsCustomizedLayout(IFWL_Widget *pWidget) = 0;

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

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

diff --git a/xfa/include/fwl/core/fwl_thread.h b/xfa/include/fwl/core/fwl_thread.h
index 9b001f4fcb..d6bbf93f3a 100644
--- a/xfa/include/fwl/core/fwl_thread.h
+++ b/xfa/include/fwl/core/fwl_thread.h
@@ -10,7 +10,7 @@ class IFWL_NoteDriver;
 class IFWL_Thread;

 class IFWL_NoteThread;

 typedef struct _FWL_HTHREAD {

-    FX_LPVOID pData;

+    void* pData;

 } *FWL_HTHREAD;

 class IFWL_Thread

 {

@@ -36,7 +36,7 @@ public:
     virtual IFWL_NoteDriver* GetNoteDriver() = 0;

 };

 typedef struct _FWL_HMUTEX {

-    FX_LPVOID pData;

+    void* pData;

 } *FWL_HMUTEX;

 FWL_HMUTEX	FWL_CreateMutex();

 FWL_ERR		FWL_DestroyMutex(FWL_HMUTEX hMutex);

@@ -45,7 +45,7 @@ FWL_ERR		FWL_TryLockMutex(FWL_HMUTEX hMutex);
 FWL_ERR		FWL_UnlockMutex(FWL_HMUTEX hMutex);

 FWL_ERR		FWL_IsLockedMutex(FWL_HMUTEX hMutex, FX_BOOL &bLocked);

 typedef struct _FWL_HSEMAPHORE {

-    FX_LPVOID pData;

+    void* pData;

 } *FWL_HSEMAPHORE;

 FWL_HSEMAPHORE	FWL_CreateSemaphore();

 FWL_ERR		FWL_DestroySemaphore(FWL_HSEMAPHORE hSemaphore);

diff --git a/xfa/include/fwl/core/fwl_timer.h b/xfa/include/fwl/core/fwl_timer.h
index a71cff72be..a12f92a9d3 100644
--- a/xfa/include/fwl/core/fwl_timer.h
+++ b/xfa/include/fwl/core/fwl_timer.h
@@ -8,7 +8,7 @@
 #define _FWL_TIMER_H

 class IFWL_Timer;

 typedef struct _FWL_HTIMER {

-    FX_LPVOID pData;

+    void* pData;

 } *FWL_HTIMER;

 class IFWL_Timer

 {

diff --git a/xfa/include/fwl/core/fwl_widget.h b/xfa/include/fwl/core/fwl_widget.h
index c7ef2d48ca..b6377cdc9f 100644
--- a/xfa/include/fwl/core/fwl_widget.h
+++ b/xfa/include/fwl/core/fwl_widget.h
@@ -38,8 +38,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();

diff --git a/xfa/include/fwl/core/fwl_widgetmgr.h b/xfa/include/fwl/core/fwl_widgetmgr.h
index 9fcb4b682c..95ff26a84c 100644
--- a/xfa/include/fwl/core/fwl_widgetmgr.h
+++ b/xfa/include/fwl/core/fwl_widgetmgr.h
@@ -28,7 +28,7 @@ public:
     virtual IFWL_Widget*	GetWidget(IFWL_Widget *pWidget, FWL_WGTRELATION eRelation) = 0;

     virtual int32_t		GetWidgetIndex(IFWL_Widget *pWidget) = 0;

     virtual FX_BOOL			SetWidgetIndex(IFWL_Widget *pWidget, int32_t nIndex) = 0;

-    virtual FX_BOOL			IsWidget(FX_LPVOID pObj) = 0;

+    virtual FX_BOOL			IsWidget(void* pObj) = 0;

     virtual FWL_ERR			RepaintWidget(IFWL_Widget *pWidget, const CFX_RectF *pRect = NULL) = 0;

     virtual FX_DWORD		GetCapability() = 0;

 };