Remove typdefs for pointer types in fx_system.h

core/include/fpdfapi/fpdf_objects.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_
 
 #include "../fxcrt/fx_ext.h"
@@ skipping 18 matching lines @@
 #define PDFOBJ_BOOLEAN          1
 #define PDFOBJ_NUMBER           2
 #define PDFOBJ_STRING           3
 #define PDFOBJ_NAME                     4
 #define PDFOBJ_ARRAY            5
 #define PDFOBJ_DICTIONARY       6
 #define PDFOBJ_STREAM           7
 #define PDFOBJ_NULL                     8
 #define PDFOBJ_REFERENCE        9
 
-typedef IFX_FileStream* (*FPDF_LPFCloneStreamCallback)(CPDF_Stream *pStream, FX_LPVOID pUserData);
+typedef IFX_FileStream* (*FPDF_LPFCloneStreamCallback)(CPDF_Stream *pStream, void* pUserData);
 class CPDF_Object 
 {
 public:
 
     int                                 GetType() const
     {
         return m_Type;
     }
 
     FX_DWORD                            GetObjNum() const
@@ skipping 26 matching lines @@
     FX_FLOAT                            GetNumber16() const;
 
     int                                 GetInteger() const;
 
     CPDF_Dictionary*                    GetDict() const;
 
     CPDF_Array*                         GetArray() const;
 
     void                                SetString(const CFX_ByteString& str);
 
-    void                                SetUnicodeText(FX_LPCWSTR pUnicodes, int len = -1);
+    void                                SetUnicodeText(const FX_WCHAR* pUnicodes, int len = -1);
 
     int                                 GetDirectType() const;
 
     FX_BOOL                             IsModified() const
     {
         return FALSE;
     }
 protected:
     CPDF_Object(FX_DWORD type) : m_Type(type), m_ObjNum(0), m_GenNum(0) { }
     ~CPDF_Object() { }
@@ skipping 161 matching lines @@
     static CPDF_Name*           Create(const CFX_ByteString& str)
     {
         return new CPDF_Name(str);
     }
 
     static CPDF_Name*           Create(FX_BSTR str)
     {
         return new CPDF_Name(str);
     }
 
-    static CPDF_Name*           Create(FX_LPCSTR str)
+    static CPDF_Name*           Create(const FX_CHAR* str)
     {
         return new CPDF_Name(str);
     }
 
     CPDF_Name(const CFX_ByteString& str) : CPDF_Object(PDFOBJ_NAME), m_Name(str) { }
     CPDF_Name(FX_BSTR str) : CPDF_Object(PDFOBJ_NAME), m_Name(str) { }
-    CPDF_Name(FX_LPCSTR str) : CPDF_Object(PDFOBJ_NAME), m_Name(str) { }
+    CPDF_Name(const FX_CHAR* str) : CPDF_Object(PDFOBJ_NAME), m_Name(str) { }
 
     CFX_ByteString&                     GetString()
     {
         return m_Name;
     }
 
     FX_BOOL                                     Identical(CPDF_Name* pOther) const
     {
         return m_Name == pOther->m_Name;
     }
@@ skipping 213 matching lines @@
     ~CPDF_Dictionary();
 
     CFX_CMapByteStringToPtr     m_Map;
 
     friend class                        CPDF_Object;
 };
 class CPDF_Stream : public CPDF_Object
 {
 public:
 
-    static CPDF_Stream*         Create(FX_LPBYTE pData, FX_DWORD size, CPDF_Dictionary* pDict)
+    static CPDF_Stream*         Create(uint8_t* pData, FX_DWORD size, CPDF_Dictionary* pDict)
     {
         return new CPDF_Stream(pData, size, pDict);
     }
 
-    CPDF_Stream(FX_LPBYTE pData, FX_DWORD size, CPDF_Dictionary* pDict);
+    CPDF_Stream(uint8_t* pData, FX_DWORD size, CPDF_Dictionary* pDict);
 
     CPDF_Dictionary*            GetDict() const
     {
         return m_pDict;
     }
 
-    void                                        SetData(FX_LPCBYTE pData, FX_DWORD size, FX_BOOL bCompressed, FX_BOOL bKeepBuf);
+    void                                        SetData(const uint8_t* pData, FX_DWORD size, FX_BOOL bCompressed, FX_BOOL bKeepBuf);
 
     void                                        InitStream(uint8_t* pData, FX_DWORD size, CPDF_Dictionary* pDict);
 
     void                                        InitStream(IFX_FileRead *pFile, CPDF_Dictionary* pDict);
 
     FX_BOOL                                     Identical(CPDF_Stream* pOther) const;
 
     CPDF_StreamFilter*          GetStreamFilter(FX_BOOL bRaw = FALSE) const;
 
 
 
     FX_DWORD                            GetRawSize() const
     {
         return m_dwSize;
     }
 
-    FX_BOOL                                     ReadRawData(FX_FILESIZE start_pos, FX_LPBYTE pBuf, FX_DWORD buf_size) const;
+    FX_BOOL                                     ReadRawData(FX_FILESIZE start_pos, uint8_t* pBuf, FX_DWORD buf_size) const;
 
 
     FX_BOOL                                     IsMemoryBased() const
     {
         return m_GenNum == (FX_DWORD) - 1;
     }
 
-    CPDF_Stream*                        Clone(FX_BOOL bDirect, FPDF_LPFCloneStreamCallback lpfCallback, FX_LPVOID pUserData) const;
+    CPDF_Stream*                        Clone(FX_BOOL bDirect, FPDF_LPFCloneStreamCallback lpfCallback, void* pUserData) const;
 protected:
 
     ~CPDF_Stream();
 
     CPDF_Dictionary*            m_pDict;
 
     FX_DWORD                            m_dwSize;
 
     FX_DWORD                            m_GenNum;
 
     union {
 
-        FX_LPBYTE                       m_pDataBuf;
+        uint8_t*                        m_pDataBuf;
 
         IFX_FileRead*           m_pFile;
     };
 
     FX_FILESIZE                         m_FileOffset;
 
     CPDF_CryptoHandler*         m_pCryptoHandler;
 
     void                                        InitStream(CPDF_Dictionary* pDict);
     friend class                        CPDF_Object;
@@ skipping 14 matching lines @@
     const CPDF_Stream*          GetStream() const
     {
         return m_pStream;
     }
 
     CPDF_Dictionary*            GetDict() const
     {
         return m_pStream? m_pStream->GetDict() : NULL;
     }
 
-    FX_LPCBYTE                          GetData() const;
+    const uint8_t*                              GetData() const;
 
     FX_DWORD                            GetSize() const;
 
-    FX_LPBYTE                           DetachData();
+    uint8_t*                            DetachData();
 
     const CFX_ByteString&       GetImageDecoder()
     {
         return m_ImageDecoder;
     }
 
     const CPDF_Dictionary*      GetImageParam()
     {
         return m_pImageParam;
     }
 protected:
 
-    FX_LPBYTE                           m_pData;
+    uint8_t*                            m_pData;
 
     FX_DWORD                            m_dwSize;
 
     FX_BOOL                                     m_bNewBuf;
 
     CFX_ByteString                      m_ImageDecoder;
 
     CPDF_Dictionary*            m_pImageParam;
 
     const CPDF_Stream*          m_pStream;
 
-    FX_LPBYTE                           m_pSrcData;
+    uint8_t*                            m_pSrcData;
 };
 CFX_DataFilter* FPDF_CreateFilter(FX_BSTR name, const CPDF_Dictionary* pParam, int width = 0, int height = 0);
 #define FPDF_FILTER_BUFFER_SIZE         20480
 class CPDF_StreamFilter 
 {
 public:
 
     ~CPDF_StreamFilter();
 
-    FX_DWORD                    ReadBlock(FX_LPBYTE buffer, FX_DWORD size);
+    FX_DWORD                    ReadBlock(uint8_t* buffer, FX_DWORD size);
 
     FX_DWORD                    GetSrcPos()
     {
         return m_SrcOffset;
     }
 
     const CPDF_Stream*  GetStream()
     {
         return m_pStream;
     }
 protected:
 
     CPDF_StreamFilter() {}
 
-    FX_DWORD                    ReadLeftOver(FX_LPBYTE buffer, FX_DWORD buf_size);
+    FX_DWORD                    ReadLeftOver(uint8_t* buffer, FX_DWORD buf_size);
 
     const CPDF_Stream*  m_pStream;
 
     CFX_DataFilter*             m_pFilter;
 
     CFX_BinaryBuf*              m_pBuffer;
 
     FX_DWORD                    m_BufOffset;
 
     FX_DWORD                    m_SrcOffset;
@@ skipping 80 matching lines @@
 protected:
 
     CFX_MapPtrToPtr                     m_IndirectObjs;
 
     CPDF_Parser*                        m_pParser;
 
     FX_DWORD                            m_LastObjNum;
 };
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_