Remove typdefs for pointer types in fx_system.h

fpdfsdk/src/javascript/PublicMethods.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/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_Object.h"
@@ skipping 46 matching lines @@
         JS_STATIC_GLOBAL_FUN_ENTRY(AFRange_Validate)
         JS_STATIC_GLOBAL_FUN_ENTRY(AFMergeChange)
         JS_STATIC_GLOBAL_FUN_ENTRY(AFParseDateEx)
         JS_STATIC_GLOBAL_FUN_ENTRY(AFExtractNums)
 END_JS_STATIC_GLOBAL_FUN()
 
 IMPLEMENT_JS_STATIC_GLOBAL_FUN(CJS_PublicMethods)
 
 struct stru_TbConvert
 {
-        FX_LPCSTR lpszJSMark;
-        FX_LPCSTR lpszCppMark;
+        const FX_CHAR* lpszJSMark;
+        const FX_CHAR* lpszCppMark;
 };
 
 static const stru_TbConvert fcTable[] = {
         { "mmmm","%B" },
         { "mmm", "%b" },
         { "mm",  "%m" },
         //"m"
         { "dddd","%A" },
         { "ddd", "%a" },
         { "dd",  "%d" },
         //"d",   "%w",
         { "yyyy","%Y" },
         { "yy",  "%y" },
         { "HH",  "%H" },
         //"H"
         { "hh",  "%I" },
         //"h"
         { "MM",  "%M" },
         //"M"
         { "ss",  "%S" },
         //"s
         { "tt",  "%p" },
         //"t"
 };
 
-static FX_LPCWSTR months[] =
+static const FX_WCHAR* months[] =
 {
         L"Jan", L"Feb", L"Mar", L"Apr", L"May", L"Jun", L"Jul", L"Aug", L"Sep", L"Oct", L"Nov", L"Dec"
 };
 
-static FX_LPCWSTR fullmonths[] =
+static const FX_WCHAR* fullmonths[] =
 {
         L"January", L"February", L"March", L"April", L"May", L"June", L"July", L"August", L"September", L"October", L"November", L"December"
 };
 
-FX_BOOL CJS_PublicMethods::IsNumber(FX_LPCWSTR string)
+FX_BOOL CJS_PublicMethods::IsNumber(const FX_WCHAR* string)
 {
         CFX_WideString sTrim = StrTrim(string);
-        FX_LPCWSTR pTrim = sTrim.c_str();
-        FX_LPCWSTR p = pTrim;
+        const FX_WCHAR* pTrim = sTrim.c_str();
+        const FX_WCHAR* p = pTrim;
 
 
         FX_BOOL bDot = FALSE;
         FX_BOOL bKXJS = FALSE;
 
         wchar_t c;
         while ((c = *p))
         {
                 if (c == '.' || c == ',')
                 {
@@ skipping 65 matching lines @@
         default:
         return (c_Change == c_Mask);
         }
 }
 
 FX_BOOL CJS_PublicMethods::isReservedMaskChar(wchar_t ch)
 {
         return ch == L'9' || ch == L'A' || ch == L'O' || ch == L'X';
 }
 
-double CJS_PublicMethods::AF_Simple(FX_LPCWSTR sFuction, double dValue1, double dValue2)
+double CJS_PublicMethods::AF_Simple(const FX_WCHAR* sFuction, double dValue1, double dValue2)
 {
         if (FXSYS_wcsicmp(sFuction,L"AVG") == 0 || FXSYS_wcsicmp(sFuction,L"SUM") == 0)
         {
                 return dValue1 + dValue2;
         }
         else if (FXSYS_wcsicmp(sFuction, L"PRD") == 0)
         {
                 return dValue1 * dValue2;
         }
         else if (FXSYS_wcsicmp(sFuction,L"MIN") == 0)
         {
                 return FX_MIN(dValue1, dValue2);
         }
         else if (FXSYS_wcsicmp(sFuction,L"MAX") == 0)
         {
                 return FX_MAX(dValue1, dValue2);
         }
 
         return dValue1;
 }
 
-CFX_WideString CJS_PublicMethods::StrLTrim(FX_LPCWSTR pStr)
+CFX_WideString CJS_PublicMethods::StrLTrim(const FX_WCHAR* pStr)
 {
         while (*pStr && *pStr == L' ') pStr++;
 
         return pStr;
 }
 
-CFX_WideString CJS_PublicMethods::StrRTrim(FX_LPCWSTR pStr)
+CFX_WideString CJS_PublicMethods::StrRTrim(const FX_WCHAR* pStr)
 {
-        FX_LPCWSTR p = pStr;
+        const FX_WCHAR* p = pStr;
         while (*p) p++;
         while (p > pStr && *(p - 1) == L' ') p--;
 
         return CFX_WideString(pStr, p - pStr);
 }
 
-CFX_WideString CJS_PublicMethods::StrTrim(FX_LPCWSTR pStr)
+CFX_WideString CJS_PublicMethods::StrTrim(const FX_WCHAR* pStr)
 {
         return StrRTrim(StrLTrim(pStr).c_str());
 }
 
-CFX_ByteString CJS_PublicMethods::StrLTrim(FX_LPCSTR pStr)
+CFX_ByteString CJS_PublicMethods::StrLTrim(const FX_CHAR* pStr)
 {
         while (*pStr && *pStr == ' ') pStr++;
 
         return pStr;
 }
 
-CFX_ByteString CJS_PublicMethods::StrRTrim(FX_LPCSTR pStr)
+CFX_ByteString CJS_PublicMethods::StrRTrim(const FX_CHAR* pStr)
 {
-        FX_LPCSTR p = pStr;
+        const FX_CHAR* p = pStr;
         while (*p) p++;
         while (p > pStr && *(p - 1) == L' ') p--;
 
         return CFX_ByteString(pStr,p-pStr);
 }
 
-CFX_ByteString CJS_PublicMethods::StrTrim(FX_LPCSTR pStr)
+CFX_ByteString CJS_PublicMethods::StrTrim(const FX_CHAR* pStr)
 {
         return StrRTrim(StrLTrim(pStr));
 }
 
-double CJS_PublicMethods::ParseNumber(FX_LPCWSTR swSource, FX_BOOL& bAllDigits, FX_BOOL& bDot, FX_BOOL& bSign, FX_BOOL& bKXJS)
+double CJS_PublicMethods::ParseNumber(const FX_WCHAR* swSource, FX_BOOL& bAllDigits, FX_BOOL& bDot, FX_BOOL& bSign, FX_BOOL& bKXJS)
 {
         bDot = FALSE;
         bSign = FALSE;
         bKXJS = FALSE;
 
         FX_BOOL bDigitExist = FALSE;
 
-        FX_LPCWSTR p = swSource;
+        const FX_WCHAR* p = swSource;
         wchar_t c;
 
-        FX_LPCWSTR pStart = NULL;
-        FX_LPCWSTR pEnd = NULL;
+        const FX_WCHAR* pStart = NULL;
+        const FX_WCHAR* pEnd = NULL;
 
         while ((c = *p))
         {
                 if (!pStart && c != L' ')
                 {
                         pStart = p;
                 }
 
                 pEnd = p;
                 p++;
@@ skipping 113 matching lines @@
                         {
                                 dRet = atol(sDigits);
                         }
                 }
 
         }
 
         return dRet;
 }
 
-double CJS_PublicMethods::ParseStringToNumber(FX_LPCWSTR swSource)
+double CJS_PublicMethods::ParseStringToNumber(const FX_WCHAR* swSource)
 {
         FX_BOOL bAllDigits = FALSE;
         FX_BOOL bDot = FALSE;
         FX_BOOL bSign = FALSE;
         FX_BOOL bKXJS = FALSE;
 
         return ParseNumber(swSource, bAllDigits, bDot, bSign, bKXJS);
 }
 
-FX_BOOL CJS_PublicMethods::ConvertStringToNumber(FX_LPCWSTR swSource, double & dRet, FX_BOOL & bDot)
+FX_BOOL CJS_PublicMethods::ConvertStringToNumber(const FX_WCHAR* swSource, double & dRet, FX_BOOL & bDot)
 {
         FX_BOOL bAllDigits = FALSE;
         FX_BOOL bSign = FALSE;
         FX_BOOL bKXJS = FALSE;
 
         dRet = ParseNumber(swSource, bAllDigits, bDot, bSign, bKXJS);
 
         return bAllDigits;
 }
 
@@ skipping 1228 matching lines @@
         if (params.size() != 1)
         {
                 CJS_Context* pContext = (CJS_Context*)cc;
                 ASSERT(pContext != NULL);
 
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
                 return FALSE;
         }
 
         int iIndex = params[0].ToInt();
-        FX_LPCWSTR cFormats[] =  {L"m/d", L"m/d/yy", L"mm/dd/yy", L"mm/yy", L"d-mmm", L"d-mmm-yy", L"dd-mmm-yy",
+        const FX_WCHAR* cFormats[] =  {L"m/d", L"m/d/yy", L"mm/dd/yy", L"mm/yy", L"d-mmm", L"d-mmm-yy", L"dd-mmm-yy",
                 L"yy-mm-dd", L"mmm-yy", L"mmmm-yy", L"mmm d, yyyy", L"mmmm d, yyyy",
                 L"m/d/yy h:MM tt", L"m/d/yy HH:MM" };
 
         ASSERT(iIndex < FX_ArraySize(cFormats));
 
         if (iIndex < 0)
                 iIndex = 0;
         if (iIndex >= FX_ArraySize(cFormats))
                 iIndex = 0;
         CJS_Parameters newParams;
@@ skipping 10 matching lines @@
         if (params.size() != 1)
         {
                 CJS_Context* pContext = (CJS_Context*)cc;
                 ASSERT(pContext != NULL);
 
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
                 return FALSE;
         }
 
         int iIndex = params[0].ToInt();
-        FX_LPCWSTR cFormats[] =  {L"m/d", L"m/d/yy", L"mm/dd/yy", L"mm/yy", L"d-mmm", L"d-mmm-yy", L"dd-mmm-yy",
+        const FX_WCHAR* cFormats[] =  {L"m/d", L"m/d/yy", L"mm/dd/yy", L"mm/yy", L"d-mmm", L"d-mmm-yy", L"dd-mmm-yy",
                 L"yy-mm-dd", L"mmm-yy", L"mmmm-yy", L"mmm d, yyyy", L"mmmm d, yyyy",
                 L"m/d/yy h:MM tt", L"m/d/yy HH:MM" };
 
         ASSERT(iIndex<FX_ArraySize(cFormats));
 
         if (iIndex < 0)
                 iIndex = 0;
         if (iIndex >= FX_ArraySize(cFormats))
                 iIndex = 0;
         CJS_Parameters newParams;
         CJS_Value val(isolate,cFormats[iIndex]);
         newParams.push_back(val);
         return AFDate_KeystrokeEx(cc,newParams,vRet,sError);
 }
 
 //function AFTime_Format(ptf)
 FX_BOOL CJS_PublicMethods::AFTime_Format(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         v8::Isolate* isolate = ::GetIsolate(cc);
 
         if (params.size() != 1)
         {
                 CJS_Context* pContext = (CJS_Context*)cc;
                 ASSERT(pContext != NULL);
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
                 return FALSE;
         }
 
         int iIndex = params[0].ToInt();
-        FX_LPCWSTR cFormats[] = {L"HH:MM", L"h:MM tt", L"HH:MM:ss", L"h:MM:ss tt"};
+        const FX_WCHAR* cFormats[] = {L"HH:MM", L"h:MM tt", L"HH:MM:ss", L"h:MM:ss tt"};
 
         ASSERT(iIndex<FX_ArraySize(cFormats));
 
         if (iIndex < 0)
                 iIndex = 0;
         if (iIndex >= FX_ArraySize(cFormats))
                 iIndex = 0;
         CJS_Parameters newParams;
         CJS_Value val(isolate,cFormats[iIndex]);
         newParams.push_back(val);
         return AFDate_FormatEx(cc,newParams,vRet,sError);
 }
 
 FX_BOOL CJS_PublicMethods::AFTime_Keystroke(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         v8::Isolate* isolate = ::GetIsolate(cc);
         if (params.size() != 1)
         {
                 CJS_Context* pContext = (CJS_Context*)cc;
                 ASSERT(pContext != NULL);
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
                 return FALSE;
         }
 
         int iIndex = params[0].ToInt();
-        FX_LPCWSTR cFormats[] = {L"HH:MM", L"h:MM tt", L"HH:MM:ss", L"h:MM:ss tt"};
+        const FX_WCHAR* cFormats[] = {L"HH:MM", L"h:MM tt", L"HH:MM:ss", L"h:MM:ss tt"};
 
         ASSERT(iIndex<FX_ArraySize(cFormats));
 
         if (iIndex < 0)
                 iIndex = 0;
         if (iIndex >= FX_ArraySize(cFormats))
                 iIndex = 0;
         CJS_Parameters newParams;
         CJS_Value val(isolate,cFormats[iIndex]);
         newParams.push_back(val);
@@ skipping 535 matching lines @@
                 nums.SetElement(nIndex,CJS_Value(isolate,sPart.c_str()));
         }
 
         if (nums.GetLength() > 0)
                 vRet = nums;
         else
                 vRet.SetNull();
 
         return TRUE;
 }