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.

5 files changed, 18 insertions, 18 deletions

diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp
index bdcbc4c418..5a4a2066fc 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp
@@ -46,7 +46,7 @@ CBC_DataMatrixDetector::~CBC_DataMatrixDetector()
     }

     m_rectangleDetector = NULL;

 }

-inline FX_BOOL ResultPointsAndTransitionsComparator(FX_LPVOID a, FX_LPVOID b)

+inline FX_BOOL ResultPointsAndTransitionsComparator(void* a, void* b)

 {

     return ((CBC_ResultPointsAndTransitions *)b)->GetTransitions() > ((CBC_ResultPointsAndTransitions *)a)->GetTransitions();

 }

diff --git a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
index 8a0271f1a0..cc46b8156d 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
@@ -131,7 +131,7 @@ CFX_WideString CBC_EdifactEncoder::encodeToCodewords(CFX_WideString sb, int32_t
     int32_t len = sb.GetLength() - startPos;

     if (len == 0) {

         e = BCExceptionNoContents;

-        return (FX_LPWSTR)"";

+        return (FX_WCHAR*)"";

     }

     FX_WCHAR c1 = sb.GetAt(startPos);

     FX_WCHAR c2 = len >= 2 ? sb.GetAt(startPos + 1) : 0;

diff --git a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp
index e574742b54..89b920825f 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp
@@ -106,14 +106,14 @@ CFX_WideString CBC_ErrorCorrection::encodeECC200(CFX_WideString codewords, CBC_S
 {

     if (codewords.GetLength() != symbolInfo->m_dataCapacity) {

         e = BCExceptionIllegalArgument;

-        return (FX_LPWSTR)"";

+        return (FX_WCHAR*)"";

     }

     CFX_WideString sb;

     sb += codewords;

     int32_t blockCount = symbolInfo->getInterleavedBlockCount();

     if (blockCount == 1) {

         CFX_WideString ecc = createECCBlock(codewords, symbolInfo->m_errorCodewords, e);

-        BC_EXCEPTION_CHECK_ReturnValue(e, (FX_LPWSTR)"");

+        BC_EXCEPTION_CHECK_ReturnValue(e, (FX_WCHAR*)"");

         sb += ecc;

     } else {

         CFX_Int32Array dataSizes;

@@ -136,7 +136,7 @@ CFX_WideString CBC_ErrorCorrection::encodeECC200(CFX_WideString codewords, CBC_S
                 temp += (FX_WCHAR)codewords.GetAt(d);

             }

             CFX_WideString ecc = createECCBlock(temp, errorSizes[block], e);

-            BC_EXCEPTION_CHECK_ReturnValue(e, (FX_LPWSTR)"");

+            BC_EXCEPTION_CHECK_ReturnValue(e, (FX_WCHAR*)"");

             int32_t pos = 0;

             for (int32_t l = block; l < errorSizes[block] * blockCount; l += blockCount) {

                 sb.SetAt(symbolInfo->m_dataCapacity + l, ecc.GetAt(pos++));

@@ -160,7 +160,7 @@ CFX_WideString CBC_ErrorCorrection::createECCBlock(CFX_WideString codewords, int
     }

     if (table < 0) {

         e = BCExceptionIllegalArgument;

-        return (FX_LPWSTR)"";

+        return (FX_WCHAR*)"";

     }

     FX_WORD* ecc = FX_Alloc(FX_WORD, numECWords);

     FXSYS_memset32(ecc, 0, numECWords * sizeof(FX_WORD));

diff --git a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp
index 3866f45a5e..3aded2d349 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp
@@ -72,7 +72,7 @@ CFX_WideString CBC_HighLevelEncoder::encodeHighLevel(CFX_WideString msg, CFX_Wid
 CFX_WideString CBC_HighLevelEncoder::encodeHighLevel(CFX_WideString msg,  CFX_WideString ecLevel, SymbolShapeHint shape, CBC_Dimension* minSize, CBC_Dimension* maxSize, int32_t &e)

 {

     CBC_EncoderContext context(msg, ecLevel, e);

-    BC_EXCEPTION_CHECK_ReturnValue(e, (FX_LPWSTR)"");

+    BC_EXCEPTION_CHECK_ReturnValue(e, (FX_WCHAR*)"");

     context.setSymbolShape(shape);

     context.setSizeConstraints(minSize, maxSize);

     if ((msg.Mid(0, 6) == MACRO_05_HEADER) && (msg.Mid(msg.GetLength() - 1, 1) == MACRO_TRAILER)) {

@@ -99,7 +99,7 @@ CFX_WideString CBC_HighLevelEncoder::encodeHighLevel(CFX_WideString msg,  CFX_Wi
                 delete (CBC_Encoder*)encoders.GetAt(i);

             }

             encoders.RemoveAll();

-            return (FX_LPWSTR)"";

+            return (FX_WCHAR*)"";

         }

         if (context.m_newEncoding >= 0) {

             encodingMode = context.m_newEncoding;

@@ -113,7 +113,7 @@ CFX_WideString CBC_HighLevelEncoder::encodeHighLevel(CFX_WideString msg,  CFX_Wi
             delete (CBC_Encoder*)encoders.GetAt(i);

         }

         encoders.RemoveAll();

-        return (FX_LPWSTR)"";

+        return (FX_WCHAR*)"";

     }

     int32_t capacity = context.m_symbolInfo->m_dataCapacity;

     if (len < capacity) {

diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp
index 0044683a5c..587bdd3128 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp
@@ -217,24 +217,24 @@ int32_t CBC_SymbolInfo::getErrorLengthForInterleavedBlock(int32_t index)
 CFX_WideString CBC_SymbolInfo::toString(int32_t &e)

 {

     CFX_WideString sb;

-    sb += (FX_LPWSTR)(m_rectangular ? "Rectangular Symbol:" : "Square Symbol:");

-    sb += (FX_LPWSTR)" data region ";

+    sb += (FX_WCHAR*)(m_rectangular ? "Rectangular Symbol:" : "Square Symbol:");

+    sb += (FX_WCHAR*)" data region ";

     sb += m_matrixWidth;

     sb += (FX_WCHAR)'x';

     sb += m_matrixHeight;

-    sb += (FX_LPWSTR)", symbol size ";

+    sb += (FX_WCHAR*)", symbol size ";

     sb += getSymbolWidth(e);

-    BC_EXCEPTION_CHECK_ReturnValue(e, (FX_LPWSTR)"");

+    BC_EXCEPTION_CHECK_ReturnValue(e, (FX_WCHAR*)"");

     sb += (FX_WCHAR)'x';

     sb += getSymbolHeight(e);

-    BC_EXCEPTION_CHECK_ReturnValue(e, (FX_LPWSTR)"");

-    sb += (FX_LPWSTR)", symbol data size ";

+    BC_EXCEPTION_CHECK_ReturnValue(e, (FX_WCHAR*)"");

+    sb += (FX_WCHAR*)", symbol data size ";

     sb += getSymbolDataWidth(e);

-    BC_EXCEPTION_CHECK_ReturnValue(e, (FX_LPWSTR)"");

+    BC_EXCEPTION_CHECK_ReturnValue(e, (FX_WCHAR*)"");

     sb += (FX_WCHAR)'x';

     sb += getSymbolDataHeight(e);

-    BC_EXCEPTION_CHECK_ReturnValue(e, (FX_LPWSTR)"");

-    sb += (FX_LPWSTR)", codewords ";

+    BC_EXCEPTION_CHECK_ReturnValue(e, (FX_WCHAR*)"");

+    sb += (FX_WCHAR*)", codewords ";

     sb += m_dataCapacity;

     sb += (FX_WCHAR)'+';

     sb += m_errorCodewords;