Remove typdefs for pointer types in fx_system.h

fpdfsdk/src/javascript/global.cpp

 // 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
 
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_Context.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_EventHandler.h"
@@ skipping 120 matching lines @@
 void global_alternate::Initial(CPDFDoc_Environment* pApp)
 {
         m_pApp = pApp;
 
         CJS_RuntimeFactory* pFactory = pApp->m_pJSRuntimeFactory;
         ASSERT(pFactory);
         m_pGlobalData = pFactory->NewGlobalData(pApp);
         UpdateGlobalPersistentVariables();
 }
 
-FX_BOOL global_alternate::QueryProperty(FX_LPCWSTR propname)
+FX_BOOL global_alternate::QueryProperty(const FX_WCHAR* propname)
 {
         return CFX_WideString(propname) != L"setPersistent";
 }
 
-FX_BOOL global_alternate::DelProperty(IFXJS_Context* cc, FX_LPCWSTR propname, CFX_WideString& sError)
+FX_BOOL global_alternate::DelProperty(IFXJS_Context* cc, const FX_WCHAR* propname, CFX_WideString& sError)
 {
         js_global_data* pData = NULL;
         CFX_ByteString sPropName = CFX_ByteString::FromUnicode(propname);
 
-        if (m_mapGlobal.Lookup(sPropName, (FX_LPVOID&)pData))
+        if (m_mapGlobal.Lookup(sPropName, (void*&)pData))
         {
                 pData->bDeleted = TRUE;
                 return TRUE;
         }
 
         return FALSE;
 }
 
-FX_BOOL global_alternate::DoProperty(IFXJS_Context* cc, FX_LPCWSTR propname, CJS_PropValue& vp, CFX_WideString& sError)
+FX_BOOL global_alternate::DoProperty(IFXJS_Context* cc, const FX_WCHAR* propname, CJS_PropValue& vp, CFX_WideString& sError)
 {
         if (vp.IsSetting())
         {
                 CFX_ByteString sPropName = CFX_ByteString::FromUnicode(propname);
                 switch (vp.GetType())
                 {
                 case VT_number:
                         {
                                 double dData;
                                 vp >> dData;
@@ skipping 28 matching lines @@
                         }
                 default:
                         return FALSE;
                 }
         }
         else
         {
                 js_global_data* pData = NULL;
                 CFX_ByteString sPropName = CFX_ByteString::FromUnicode(propname);
 
-                if (m_mapGlobal.Lookup(sPropName, (FX_LPVOID&)pData))
+                if (m_mapGlobal.Lookup(sPropName, (void*&)pData))
                 {
                         if (pData)
                         {
                                 if (!pData->bDeleted)
                                 {
                                         switch (pData->nType)
                                         {
                                         case JS_GLOBALDATA_TYPE_NUMBER:
                                                 vp << pData->dData;
                                                 break;
@@ skipping 43 matching lines @@
         CJS_Context* pContext = static_cast<CJS_Context*>(cc);
         if (params.size() != 2)
         {
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
                 return FALSE;
         }
 
         CFX_ByteString sName = params[0].ToCFXByteString();
 
         js_global_data* pData = NULL;
-        if (m_mapGlobal.Lookup(sName, (FX_LPVOID&)pData))
+        if (m_mapGlobal.Lookup(sName, (void*&)pData))
         {
                 if (pData && !pData->bDeleted)
                 {
                         pData->bPersistent = params[1].ToBool();
                         return TRUE;
                 }
         }
 
         sError = JSGetStringFromID(pContext, IDS_STRING_JSNOGLOBAL);
         return FALSE;
@@ skipping 50 matching lines @@
 
 void global_alternate::CommitGlobalPersisitentVariables()
 {
         ASSERT(m_pGlobalData != NULL);
 
         FX_POSITION      pos = m_mapGlobal.GetStartPosition();
         while (pos)
         {
                 CFX_ByteString name; 
                 js_global_data* pData = NULL;
-                m_mapGlobal.GetNextAssoc(pos, name, (FX_LPVOID&)pData);
+                m_mapGlobal.GetNextAssoc(pos, name, (void*&)pData);
                 
                 if (pData)
                 {
                         if (pData->bDeleted)
                         {
                                 m_pGlobalData->DeleteGlobalVariable(name);
                         }
                         else
                         {
                                 switch (pData->nType)
@@ skipping 133 matching lines @@
         }
 }
 
 void global_alternate::DestroyGlobalPersisitentVariables()
 {
         FX_POSITION      pos = m_mapGlobal.GetStartPosition();
         while (pos)
         {
                 CFX_ByteString name; 
                 js_global_data* pData = NULL;
-                m_mapGlobal.GetNextAssoc(pos, name, (FX_LPVOID&)pData);
+                m_mapGlobal.GetNextAssoc(pos, name, (void*&)pData);
                 delete pData;
         }
 
         m_mapGlobal.RemoveAll();
 }
 
 
-FX_BOOL global_alternate::SetGlobalVariables(FX_LPCSTR propname, int nType, 
+FX_BOOL global_alternate::SetGlobalVariables(const FX_CHAR* propname, int nType, 
                                 double dData, bool bData, const CFX_ByteString& sData, JSObject pData, bool bDefaultPersistent)
 {
         if (propname == NULL) return FALSE;
 
         js_global_data* pTemp = NULL;
-        m_mapGlobal.Lookup(propname, (FX_LPVOID&)pTemp);
+        m_mapGlobal.Lookup(propname, (void*&)pTemp);
 
         if (pTemp)
         {
                 if (pTemp->bDeleted || pTemp->nType != nType)
                 {
                         pTemp->dData = 0;
                         pTemp->bData = 0;
                         pTemp->sData = "";
                         pTemp->nType = nType;
                 }
@@ skipping 71 matching lines @@
                 {
                         pNewData = new js_global_data;
                         pNewData->nType = JS_GLOBALDATA_TYPE_NULL;
                         pNewData->bPersistent = bDefaultPersistent;
                 }
                 break;
         default:
                 return FALSE;
         }       
 
-        m_mapGlobal.SetAt(propname, (FX_LPVOID)pNewData);
+        m_mapGlobal.SetAt(propname, (void*)pNewData);
 
         return TRUE;
 }
 
 FXJSVALUETYPE GET_VALUE_TYPE(v8::Local<v8::Value> p)
 {
   const unsigned int nHash = JS_CalcHash(JS_GetTypeof(p));
 
   if (nHash == JSCONST_nUndefHash)
     return VT_undefined;
   if (nHash == JSCONST_nNullHash)
     return VT_null;
   if (nHash == JSCONST_nStringHash)
     return VT_string;
   if (nHash == JSCONST_nNumberHash)
     return VT_number;
   if (nHash == JSCONST_nBoolHash)
     return VT_boolean;
   if (nHash == JSCONST_nDateHash)
     return VT_date;
   if (nHash == JSCONST_nObjectHash)
     return VT_object;
   if (nHash == JSCONST_nFXobjHash)
     return VT_fxobject;
 
   return VT_unknown;
 }