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.

10 files changed, 17 insertions, 17 deletions

diff --git a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h
index 7abdeeffce..b82330c6b9 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h
@@ -77,9 +77,9 @@ public:
 	void						SetFillerNotify(IPWL_Filler_Notify* pNotify);
 
 	CFX_WideString				GetText() const;
-	void						SetText(FX_LPCWSTR text);
+	void						SetText(const FX_WCHAR* text);
 
-	void						AddString(FX_LPCWSTR string);
+	void						AddString(const FX_WCHAR* string);
 	int32_t					GetSelect() const;
 	void						SetSelect(int32_t nItemIndex);
 
diff --git a/fpdfsdk/include/pdfwindow/PWL_Edit.h b/fpdfsdk/include/pdfwindow/PWL_Edit.h
index 93db6f09bd..81500e90ad 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Edit.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Edit.h
@@ -81,8 +81,8 @@ public:
 	virtual void					PasteText();
 	virtual void 					CutText();
 
-	virtual void					SetText(FX_LPCWSTR csText);
-	void							ReplaceSel(FX_LPCWSTR csText);
+	virtual void					SetText(const FX_WCHAR* csText);
+	void							ReplaceSel(const FX_WCHAR* csText);
 
 	CFX_ByteString					GetTextAppearanceStream(const CPDF_Point & ptOffset) const;
 	CFX_ByteString					GetCaretAppearanceStream(const CPDF_Point & ptOffset) const;	
diff --git a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
index 2eb779ddc8..bfa1868b9e 100644
--- a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
+++ b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
@@ -81,7 +81,7 @@ public:
 	virtual FX_FLOAT				GetFontSize() const;
 	
 public:
-	virtual void					SetText(FX_LPCWSTR csText);
+	virtual void					SetText(const FX_WCHAR* csText);
 
 	virtual void					CopyText();
 	virtual void					PasteText();
@@ -131,7 +131,7 @@ protected:
 
 	virtual void					InsertWord(FX_WORD word, int32_t nCharset);
 	virtual void					InsertReturn();
-	virtual void					InsertText(FX_LPCWSTR csText);
+	virtual void					InsertText(const FX_WCHAR* csText);
 
 	virtual void					SetCursor();
 	FX_BOOL							IsWndHorV();
diff --git a/fpdfsdk/include/pdfwindow/PWL_FontMap.h b/fpdfsdk/include/pdfwindow/PWL_FontMap.h
index 4f44660cb2..f83575b66f 100644
--- a/fpdfsdk/include/pdfwindow/PWL_FontMap.h
+++ b/fpdfsdk/include/pdfwindow/PWL_FontMap.h
@@ -72,7 +72,7 @@ public:
 	virtual int32_t							CharSetFromUnicode(FX_WORD word, int32_t nOldCharset);
 
 public:
-	virtual void								Initial(FX_LPCSTR fontname = NULL);
+	virtual void								Initial(const FX_CHAR* fontname = NULL);
 	void										SetSystemHandler(IFX_SystemHandler* pSystemHandler);
 
 	int32_t									GetFontMapCount() const;
diff --git a/fpdfsdk/include/pdfwindow/PWL_Icon.h b/fpdfsdk/include/pdfwindow/PWL_Icon.h
index c09f7a9fe8..1a2adf6469 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Icon.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Icon.h
@@ -27,7 +27,7 @@ public:
 	void							GetImageSize(FX_FLOAT & fWidth,FX_FLOAT & fHeight);
 	CPDF_Matrix						GetImageMatrix();
 	CFX_ByteString					GetImageAlias();
-	void							SetImageAlias(FX_LPCSTR sImageAlias);
+	void							SetImageAlias(const FX_CHAR* sImageAlias);
 
 protected:
 	CPDF_Stream*					m_pPDFStream;
diff --git a/fpdfsdk/include/pdfwindow/PWL_Label.h b/fpdfsdk/include/pdfwindow/PWL_Label.h
index be083db486..6d9754dd80 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Label.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Label.h
@@ -21,7 +21,7 @@ public:
 	virtual void					SetFontSize(FX_FLOAT fFontSize);
 	virtual FX_FLOAT				GetFontSize() const;
 
-	void							SetText(FX_LPCWSTR csText);
+	void							SetText(const FX_WCHAR* csText);
 	CFX_WideString					GetText() const;
 	void							SetLimitChar(int32_t nLimitChar);
 	void							SetHorzScale(int32_t nHorzScale);
diff --git a/fpdfsdk/include/pdfwindow/PWL_ListBox.h b/fpdfsdk/include/pdfwindow/PWL_ListBox.h
index c5a6df76dd..bbb9f35125 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ListBox.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ListBox.h
@@ -59,7 +59,7 @@ public:
 
 	virtual void					OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam = 0, intptr_t lParam = 0);
 	virtual void					RePosChildWnd();
-	virtual void					SetText(FX_LPCWSTR csText,FX_BOOL bRefresh = TRUE);
+	virtual void					SetText(const FX_WCHAR* csText,FX_BOOL bRefresh = TRUE);
 	virtual CFX_WideString			GetText() const;	
 	virtual CPDF_Rect				GetFocusRect() const;
 	virtual void					SetFontSize(FX_FLOAT fFontSize);
@@ -67,7 +67,7 @@ public:
 
 	void							OnNotifySelChanged(FX_BOOL bKeyDown, FX_BOOL & bExit , FX_DWORD nFlag);
 
-	void							AddString(FX_LPCWSTR string);	
+	void							AddString(const FX_WCHAR* string);	
 	void							SetTopVisibleIndex(int32_t nItemIndex);
 	void							ScrollToListItem(int32_t nItemIndex);
 	void							ResetContent();
diff --git a/fpdfsdk/include/pdfwindow/PWL_Note.h b/fpdfsdk/include/pdfwindow/PWL_Note.h
index a9e6dda05b..ee6ec6ff02 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Note.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Note.h
@@ -145,7 +145,7 @@ public:
 	FX_FLOAT							GetItemLeftMargin();
 	FX_FLOAT							GetItemRightMargin();
 
-	virtual void						SetText(FX_LPCWSTR csText);
+	virtual void						SetText(const FX_WCHAR* csText);
 
 protected:
 	virtual void						OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam = 0, intptr_t lParam = 0);
diff --git a/fpdfsdk/include/pdfwindow/PWL_Signature.h b/fpdfsdk/include/pdfwindow/PWL_Signature.h
index bdc1406a3d..be5ec58d1f 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Signature.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Signature.h
@@ -38,10 +38,10 @@ public:
 	CPWL_Signature();
 	virtual ~CPWL_Signature();
 
-	void								SetText(FX_LPCWSTR sText);
-	void								SetDescription(FX_LPCWSTR string);
+	void								SetText(const FX_WCHAR* sText);
+	void								SetDescription(const FX_WCHAR* string);
 	void								SetImage(CFX_DIBSource* pImage);
-	void								SetImageStream(CPDF_Stream * pStream, FX_LPCSTR sImageAlias);
+	void								SetImageStream(CPDF_Stream * pStream, const FX_CHAR* sImageAlias);
 
 	void								SetTextFlag(FX_BOOL bTextExist);
 	void								SetImageFlag(FX_BOOL bImageExist);
diff --git a/fpdfsdk/include/pdfwindow/PWL_Wnd.h b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
index 970480f14a..9f089e6fa4 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Wnd.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
@@ -173,8 +173,8 @@ class IPWL_SpellCheck
 {
 public:
         virtual ~IPWL_SpellCheck() { }
-	virtual FX_BOOL							CheckWord(FX_LPCSTR sWord) = 0;
-	virtual void							SuggestWords(FX_LPCSTR sWord, CFX_ByteStringArray & sSuggest) = 0;	
+	virtual FX_BOOL							CheckWord(const FX_CHAR* sWord) = 0;
+	virtual void							SuggestWords(const FX_CHAR* sWord, CFX_ByteStringArray & sSuggest) = 0;	
 };
 
 class IPWL_Provider