Rename IFX_Stream to IFGAS_Stream.

xfa/fgas/crt/fgas_stream.cpp

Index: xfa/fgas/crt/fgas_stream.cpp
diff --git a/xfa/fgas/crt/fgas_stream.cpp b/xfa/fgas/crt/fgas_stream.cpp
index 485d22928216389379d1f1e02ba684b6ad0b7e3b..11711850ce78389704aa28c1427ceeb1acb91c03 100644
--- a/xfa/fgas/crt/fgas_stream.cpp
+++ b/xfa/fgas/crt/fgas_stream.cpp
@@ -191,10 +191,10 @@ enum FX_STREAMTYPE {
   FX_STREAMTYPE_BufferRead,
 };
 
-class CFX_Stream : public IFX_Stream {
+class CFGAS_Stream : public IFGAS_Stream {
  public:
-  CFX_Stream();
-  ~CFX_Stream() override;
+  CFGAS_Stream();
+  ~CFGAS_Stream() override;
 
   bool LoadFile(const FX_WCHAR* pszSrcFileName, uint32_t dwAccess);
   bool LoadBuffer(uint8_t* pData, int32_t iTotalSize, uint32_t dwAccess);
@@ -205,9 +205,9 @@ class CFX_Stream : public IFX_Stream {
                       uint32_t dwAccess,
                       bool bReleaseBufferRead);
 
-  // IFX_Stream
+  // IFGAS_Stream
   void Release() override;
-  IFX_Stream* Retain() override;
+  IFGAS_Stream* Retain() override;
   uint32_t GetAccessModes() const override;
   int32_t GetLength() const override;
   int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset) override;
@@ -222,9 +222,9 @@ class CFX_Stream : public IFX_Stream {
   int32_t GetBOM(uint8_t bom[4]) const override;
   uint16_t GetCodePage() const override;
   uint16_t SetCodePage(uint16_t wCodePage) override;
-  IFX_Stream* CreateSharedStream(uint32_t dwAccess,
-                                 int32_t iOffset,
-                                 int32_t iLength) override;
+  IFGAS_Stream* CreateSharedStream(uint32_t dwAccess,
+                                   int32_t iOffset,
+                                   int32_t iLength) override;
 
  protected:
   FX_STREAMTYPE m_eStreamType;
@@ -237,14 +237,14 @@ class CFX_Stream : public IFX_Stream {
   int32_t m_iRefCount;
 };
 
-class CFX_TextStream : public IFX_Stream {
+class CFGAS_TextStream : public IFGAS_Stream {
  public:
-  CFX_TextStream(IFX_Stream* pStream, bool bDelStream);
-  ~CFX_TextStream() override;
+  CFGAS_TextStream(IFGAS_Stream* pStream, bool bDelStream);
+  ~CFGAS_TextStream() override;
 
-  // IFX_Stream
+  // IFGAS_Stream
   void Release() override;
-  IFX_Stream* Retain() override;
+  IFGAS_Stream* Retain() override;
   uint32_t GetAccessModes() const override;
   int32_t GetLength() const override;
   int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset) override;
@@ -259,9 +259,9 @@ class CFX_TextStream : public IFX_Stream {
   int32_t GetBOM(uint8_t bom[4]) const override;
   uint16_t GetCodePage() const override;
   uint16_t SetCodePage(uint16_t wCodePage) override;
-  IFX_Stream* CreateSharedStream(uint32_t dwAccess,
-                                 int32_t iOffset,
-                                 int32_t iLength) override;
+  IFGAS_Stream* CreateSharedStream(uint32_t dwAccess,
+                                   int32_t iOffset,
+                                   int32_t iLength) override;
 
  protected:
   uint16_t m_wCodePage;
@@ -270,14 +270,14 @@ class CFX_TextStream : public IFX_Stream {
   uint8_t* m_pBuf;
   int32_t m_iBufSize;
   bool m_bDelStream;
-  IFX_Stream* m_pStreamImp;
+  IFGAS_Stream* m_pStreamImp;
   int32_t m_iRefCount;
   void InitStream();
 };
 
 class CFGAS_FileRead : public IFX_SeekableReadStream {
  public:
-  CFGAS_FileRead(IFX_Stream* pStream, bool bReleaseStream);
+  CFGAS_FileRead(IFGAS_Stream* pStream, bool bReleaseStream);
   ~CFGAS_FileRead() override;
 
   // IFX_SeekableReadStream
@@ -287,7 +287,7 @@ class CFGAS_FileRead : public IFX_SeekableReadStream {
 
  protected:
   bool m_bReleaseStream;
-  IFX_Stream* m_pStream;
+  IFGAS_Stream* m_pStream;
 };
 
 int32_t FileLength(FXSYS_FILE* file) {
@@ -322,44 +322,44 @@ bool FileSetSize(FXSYS_FILE* file, int32_t size) {
 }  // namespace
 
 // static
-IFX_Stream* IFX_Stream::CreateStream(IFX_SeekableReadStream* pFileRead,
-                                     uint32_t dwAccess) {
-  CFX_Stream* pSR = new CFX_Stream;
+IFGAS_Stream* IFGAS_Stream::CreateStream(IFX_SeekableReadStream* pFileRead,
+                                         uint32_t dwAccess) {
+  CFGAS_Stream* pSR = new CFGAS_Stream;
   if (!pSR->LoadFileRead(pFileRead, dwAccess)) {
     pSR->Release();
     return nullptr;
   }
   if (dwAccess & FX_STREAMACCESS_Text) {

[npm, 2016/12/02 16:23:22]

Nit: {}

[Tom Sepez, 2016/12/02 18:02:08]

Done.

-    return new CFX_TextStream(pSR, true);
+    return new CFGAS_TextStream(pSR, true);
   }
   return pSR;
 }
 
 // static
-IFX_Stream* IFX_Stream::CreateStream(IFX_SeekableWriteStream* pFileWrite,
-                                     uint32_t dwAccess) {
-  CFX_Stream* pSR = new CFX_Stream;
+IFGAS_Stream* IFGAS_Stream::CreateStream(IFX_SeekableWriteStream* pFileWrite,
+                                         uint32_t dwAccess) {
+  CFGAS_Stream* pSR = new CFGAS_Stream;
   if (!pSR->LoadFileWrite(pFileWrite, dwAccess)) {
     pSR->Release();
     return nullptr;
   }
   if (dwAccess & FX_STREAMACCESS_Text) {

[npm, 2016/12/02 16:23:22]

Nitto

[Tom Sepez, 2016/12/02 18:02:07]

Done.

-    return new CFX_TextStream(pSR, true);
+    return new CFGAS_TextStream(pSR, true);
   }
   return pSR;
 }
 
 // static
-IFX_Stream* IFX_Stream::CreateStream(uint8_t* pData,
-                                     int32_t length,
-                                     uint32_t dwAccess) {
-  CFX_Stream* pSR = new CFX_Stream;
+IFGAS_Stream* IFGAS_Stream::CreateStream(uint8_t* pData,
+                                         int32_t length,
+                                         uint32_t dwAccess) {
+  CFGAS_Stream* pSR = new CFGAS_Stream;
   if (!pSR->LoadBuffer(pData, length, dwAccess)) {
     pSR->Release();
     return nullptr;
   }
   if (dwAccess & FX_STREAMACCESS_Text) {

[npm, 2016/12/02 16:23:22]

Nitto

[Tom Sepez, 2016/12/02 18:02:08]

Done.

-    return new CFX_TextStream(pSR, true);
+    return new CFGAS_TextStream(pSR, true);
   }
   return pSR;
 }
@@ -896,13 +896,13 @@ int32_t CFX_BufferStreamImp::WriteString(const FX_WCHAR* pStr,
 }
 
 // static
-IFX_Stream* IFX_Stream::CreateTextStream(IFX_Stream* pBaseStream,
-                                         bool bDeleteOnRelease) {
+IFGAS_Stream* IFGAS_Stream::CreateTextStream(IFGAS_Stream* pBaseStream,
+                                             bool bDeleteOnRelease) {
   ASSERT(pBaseStream);
-  return new CFX_TextStream(pBaseStream, bDeleteOnRelease);
+  return new CFGAS_TextStream(pBaseStream, bDeleteOnRelease);
 }
 
-CFX_TextStream::CFX_TextStream(IFX_Stream* pStream, bool bDelStream)
+CFGAS_TextStream::CFGAS_TextStream(IFGAS_Stream* pStream, bool bDelStream)
     : m_wCodePage(FX_CODEPAGE_DefANSI),
       m_wBOMLength(0),
       m_dwBOM(0),
@@ -915,7 +915,7 @@ CFX_TextStream::CFX_TextStream(IFX_Stream* pStream, bool bDelStream)
   m_pStreamImp->Retain();
   InitStream();
 }

[npm, 2016/12/02 16:23:22]

Nits: space needed between methods

[Tom Sepez, 2016/12/02 18:02:08]

Done.

-CFX_TextStream::~CFX_TextStream() {
+CFGAS_TextStream::~CFGAS_TextStream() {
   m_pStreamImp->Release();
   if (m_bDelStream) {
     m_pStreamImp->Release();
@@ -924,7 +924,7 @@ CFX_TextStream::~CFX_TextStream() {
     FX_Free(m_pBuf);
   }
 }
-void CFX_TextStream::InitStream() {
+void CFGAS_TextStream::InitStream() {
   int32_t iPosition = m_pStreamImp->GetPosition();
   m_pStreamImp->Seek(FX_STREAMSEEK_Begin, 0);
   m_pStreamImp->ReadData((uint8_t*)&m_dwBOM, 3);
@@ -969,66 +969,67 @@ void CFX_TextStream::InitStream() {
 #endif
   m_pStreamImp->Seek(FX_STREAMSEEK_Begin, std::max(m_wBOMLength, iPosition));
 }
-void CFX_TextStream::Release() {
+void CFGAS_TextStream::Release() {
   if (--m_iRefCount < 1) {
     delete this;
   }
 }
-IFX_Stream* CFX_TextStream::Retain() {
+IFGAS_Stream* CFGAS_TextStream::Retain() {
   m_iRefCount++;
   return this;
 }
-uint32_t CFX_TextStream::GetAccessModes() const {
+uint32_t CFGAS_TextStream::GetAccessModes() const {
   return m_pStreamImp->GetAccessModes() | FX_STREAMACCESS_Text;
 }
-int32_t CFX_TextStream::GetLength() const {
+int32_t CFGAS_TextStream::GetLength() const {
   return m_pStreamImp->GetLength();
 }
-int32_t CFX_TextStream::Seek(FX_STREAMSEEK eSeek, int32_t iOffset) {
+int32_t CFGAS_TextStream::Seek(FX_STREAMSEEK eSeek, int32_t iOffset) {
   return m_pStreamImp->Seek(eSeek, iOffset);
 }
-int32_t CFX_TextStream::GetPosition() {
+int32_t CFGAS_TextStream::GetPosition() {
   return m_pStreamImp->GetPosition();
 }
-bool CFX_TextStream::IsEOF() const {
+bool CFGAS_TextStream::IsEOF() const {
   return m_pStreamImp->IsEOF();
 }
-int32_t CFX_TextStream::ReadData(uint8_t* pBuffer, int32_t iBufferSize) {
+int32_t CFGAS_TextStream::ReadData(uint8_t* pBuffer, int32_t iBufferSize) {
   return m_pStreamImp->ReadData(pBuffer, iBufferSize);
 }
-int32_t CFX_TextStream::WriteData(const uint8_t* pBuffer, int32_t iBufferSize) {
+int32_t CFGAS_TextStream::WriteData(const uint8_t* pBuffer,
+                                    int32_t iBufferSize) {
   return m_pStreamImp->WriteData(pBuffer, iBufferSize);
 }
-void CFX_TextStream::Flush() {
+void CFGAS_TextStream::Flush() {
   m_pStreamImp->Flush();
 }
-bool CFX_TextStream::SetLength(int32_t iLength) {
+bool CFGAS_TextStream::SetLength(int32_t iLength) {
   return m_pStreamImp->SetLength(iLength);
 }
-uint16_t CFX_TextStream::GetCodePage() const {
+uint16_t CFGAS_TextStream::GetCodePage() const {
   return m_wCodePage;
 }
-IFX_Stream* CFX_TextStream::CreateSharedStream(uint32_t dwAccess,
-                                               int32_t iOffset,
-                                               int32_t iLength) {
-  IFX_Stream* pSR =
+IFGAS_Stream* CFGAS_TextStream::CreateSharedStream(uint32_t dwAccess,
+                                                   int32_t iOffset,
+                                                   int32_t iLength) {
+  IFGAS_Stream* pSR =
       m_pStreamImp->CreateSharedStream(dwAccess, iOffset, iLength);
   if (!pSR) {
     return nullptr;
   }
   if (dwAccess & FX_STREAMACCESS_Text) {

[npm, 2016/12/02 16:23:22]

{}

[Tom Sepez, 2016/12/02 18:02:08]

Done.

-    return new CFX_TextStream(pSR, true);
+    return new CFGAS_TextStream(pSR, true);
   }
   return pSR;
 }
-int32_t CFX_TextStream::GetBOM(uint8_t bom[4]) const {
+int32_t CFGAS_TextStream::GetBOM(uint8_t bom[4]) const {
   if (m_wBOMLength < 1) {
     return 0;
   }
   *(uint32_t*)bom = m_dwBOM;
   return m_wBOMLength;
 }
-uint16_t CFX_TextStream::SetCodePage(uint16_t wCodePage) {
+uint16_t CFGAS_TextStream::SetCodePage(uint16_t wCodePage) {
   if (m_wBOMLength > 0) {
     return m_wCodePage;
   }
@@ -1036,9 +1037,9 @@ uint16_t CFX_TextStream::SetCodePage(uint16_t wCodePage) {
   m_wCodePage = wCodePage;
   return v;
 }
-int32_t CFX_TextStream::ReadString(FX_WCHAR* pStr,
-                                   int32_t iMaxLength,
-                                   bool& bEOS) {
+int32_t CFGAS_TextStream::ReadString(FX_WCHAR* pStr,
+                                     int32_t iMaxLength,
+                                     bool& bEOS) {
   ASSERT(pStr && iMaxLength > 0);
   if (!m_pStreamImp) {
     return -1;
@@ -1088,7 +1089,7 @@ int32_t CFX_TextStream::ReadString(FX_WCHAR* pStr,
   bEOS = m_pStreamImp->IsEOF();
   return iMaxLength;
 }
-int32_t CFX_TextStream::WriteString(const FX_WCHAR* pStr, int32_t iLength) {
+int32_t CFGAS_TextStream::WriteString(const FX_WCHAR* pStr, int32_t iLength) {
   ASSERT(pStr && iLength > 0);
   if ((m_pStreamImp->GetAccessModes() & FX_STREAMACCESS_Write) == 0) {
     return -1;
@@ -1105,7 +1106,7 @@ int32_t CFX_TextStream::WriteString(const FX_WCHAR* pStr, int32_t iLength) {
   }
   return iLength;
 }
-CFX_Stream::CFX_Stream()
+CFGAS_Stream::CFGAS_Stream()
     : m_eStreamType(FX_SREAMTYPE_Unknown),
       m_pStreamImp(nullptr),
       m_dwAccess(0),
@@ -1115,12 +1116,12 @@ CFX_Stream::CFX_Stream()
       m_iLength(0),
       m_iRefCount(1) {}
 
-CFX_Stream::~CFX_Stream() {
+CFGAS_Stream::~CFGAS_Stream() {
   if (m_eStreamType != FX_STREAMTYPE_Stream)
     delete m_pStreamImp;
 }
 
-bool CFX_Stream::LoadFile(const FX_WCHAR* pszSrcFileName, uint32_t dwAccess) {
+bool CFGAS_Stream::LoadFile(const FX_WCHAR* pszSrcFileName, uint32_t dwAccess) {
   if (m_eStreamType != FX_SREAMTYPE_Unknown || m_pStreamImp)
     return false;
 
@@ -1138,8 +1139,8 @@ bool CFX_Stream::LoadFile(const FX_WCHAR* pszSrcFileName, uint32_t dwAccess) {
   return true;
 }
 
-bool CFX_Stream::LoadFileRead(IFX_SeekableReadStream* pFileRead,
-                              uint32_t dwAccess) {
+bool CFGAS_Stream::LoadFileRead(IFX_SeekableReadStream* pFileRead,
+                                uint32_t dwAccess) {
   if (m_eStreamType != FX_SREAMTYPE_Unknown || m_pStreamImp)
     return false;
 
@@ -1157,8 +1158,8 @@ bool CFX_Stream::LoadFileRead(IFX_SeekableReadStream* pFileRead,
   return true;
 }
 
-bool CFX_Stream::LoadFileWrite(IFX_SeekableWriteStream* pFileWrite,
-                               uint32_t dwAccess) {
+bool CFGAS_Stream::LoadFileWrite(IFX_SeekableWriteStream* pFileWrite,
+                                 uint32_t dwAccess) {
   if (m_eStreamType != FX_SREAMTYPE_Unknown || m_pStreamImp)
     return false;
 
@@ -1176,9 +1177,9 @@ bool CFX_Stream::LoadFileWrite(IFX_SeekableWriteStream* pFileWrite,
   return true;
 }
 
-bool CFX_Stream::LoadBuffer(uint8_t* pData,
-                            int32_t iTotalSize,
-                            uint32_t dwAccess) {
+bool CFGAS_Stream::LoadBuffer(uint8_t* pData,
+                              int32_t iTotalSize,
+                              uint32_t dwAccess) {
   if (m_eStreamType != FX_SREAMTYPE_Unknown || m_pStreamImp)
     return false;
 
@@ -1196,10 +1197,10 @@ bool CFX_Stream::LoadBuffer(uint8_t* pData,
   return true;
 }
 
-bool CFX_Stream::LoadBufferRead(IFX_BufferedReadStream* pBufferRead,
-                                int32_t iFileSize,
-                                uint32_t dwAccess,
-                                bool bReleaseBufferRead) {
+bool CFGAS_Stream::LoadBufferRead(IFX_BufferedReadStream* pBufferRead,
+                                  int32_t iFileSize,
+                                  uint32_t dwAccess,
+                                  bool bReleaseBufferRead) {
   if (m_eStreamType != FX_SREAMTYPE_Unknown || m_pStreamImp)
     return false;
 
@@ -1218,21 +1219,21 @@ bool CFX_Stream::LoadBufferRead(IFX_BufferedReadStream* pBufferRead,
   return true;
 }
 
-void CFX_Stream::Release() {
+void CFGAS_Stream::Release() {
   if (--m_iRefCount < 1) {
     delete this;
   }
 }
-IFX_Stream* CFX_Stream::Retain() {
+IFGAS_Stream* CFGAS_Stream::Retain() {
   m_iRefCount++;
   return this;
 }
 
-uint32_t CFX_Stream::GetAccessModes() const {
+uint32_t CFGAS_Stream::GetAccessModes() const {
   return m_dwAccess;
 }
 
-int32_t CFX_Stream::GetLength() const {
+int32_t CFGAS_Stream::GetLength() const {
   if (!m_pStreamImp) {
     return -1;
   }
@@ -1242,7 +1243,7 @@ int32_t CFX_Stream::GetLength() const {
   }
   return m_iLength;
 }
-int32_t CFX_Stream::Seek(FX_STREAMSEEK eSeek, int32_t iOffset) {
+int32_t CFGAS_Stream::Seek(FX_STREAMSEEK eSeek, int32_t iOffset) {
   if (!m_pStreamImp) {
     return -1;
   }
@@ -1267,7 +1268,7 @@ int32_t CFX_Stream::Seek(FX_STREAMSEEK eSeek, int32_t iOffset) {
   }
   return m_iPosition - m_iStart;
 }
-int32_t CFX_Stream::GetPosition() {
+int32_t CFGAS_Stream::GetPosition() {
   if (!m_pStreamImp) {
     return -1;
   }
@@ -1277,7 +1278,7 @@ int32_t CFX_Stream::GetPosition() {
   }
   return m_iPosition - m_iStart;
 }
-bool CFX_Stream::IsEOF() const {
+bool CFGAS_Stream::IsEOF() const {
   if (!m_pStreamImp) {
     return true;
   }
@@ -1287,7 +1288,7 @@ bool CFX_Stream::IsEOF() const {
   }
   return m_iPosition >= m_iStart + m_iLength;
 }
-int32_t CFX_Stream::ReadData(uint8_t* pBuffer, int32_t iBufferSize) {
+int32_t CFGAS_Stream::ReadData(uint8_t* pBuffer, int32_t iBufferSize) {
   ASSERT(pBuffer && iBufferSize > 0);
   if (!m_pStreamImp) {
     return -1;
@@ -1303,7 +1304,9 @@ int32_t CFX_Stream::ReadData(uint8_t* pBuffer, int32_t iBufferSize) {
   m_iPosition = m_pStreamImp->GetPosition();
   return iLen;
 }
-int32_t CFX_Stream::ReadString(FX_WCHAR* pStr, int32_t iMaxLength, bool& bEOS) {
+int32_t CFGAS_Stream::ReadString(FX_WCHAR* pStr,
+                                 int32_t iMaxLength,
+                                 bool& bEOS) {
   ASSERT(pStr && iMaxLength > 0);
   if (!m_pStreamImp) {
     return -1;
@@ -1325,7 +1328,7 @@ int32_t CFX_Stream::ReadString(FX_WCHAR* pStr, int32_t iMaxLength, bool& bEOS) {
   return iLen;
 }
 
-int32_t CFX_Stream::WriteData(const uint8_t* pBuffer, int32_t iBufferSize) {
+int32_t CFGAS_Stream::WriteData(const uint8_t* pBuffer, int32_t iBufferSize) {
   ASSERT(pBuffer && iBufferSize > 0);
   if (!m_pStreamImp) {
     return -1;
@@ -1351,7 +1354,7 @@ int32_t CFX_Stream::WriteData(const uint8_t* pBuffer, int32_t iBufferSize) {
   }
   return iLen;
 }
-int32_t CFX_Stream::WriteString(const FX_WCHAR* pStr, int32_t iLength) {
+int32_t CFGAS_Stream::WriteString(const FX_WCHAR* pStr, int32_t iLength) {
   ASSERT(pStr && iLength > 0);
   if (!m_pStreamImp) {
     return -1;
@@ -1377,7 +1380,7 @@ int32_t CFX_Stream::WriteString(const FX_WCHAR* pStr, int32_t iLength) {
   }
   return iLen;
 }
-void CFX_Stream::Flush() {
+void CFGAS_Stream::Flush() {
   if (!m_pStreamImp) {
     return;
   }
@@ -1386,7 +1389,7 @@ void CFX_Stream::Flush() {
   }
   m_pStreamImp->Flush();
 }
-bool CFX_Stream::SetLength(int32_t iLength) {
+bool CFGAS_Stream::SetLength(int32_t iLength) {
   if (!m_pStreamImp) {
     return false;
   }
@@ -1395,29 +1398,29 @@ bool CFX_Stream::SetLength(int32_t iLength) {
   }
   return m_pStreamImp->SetLength(iLength);
 }
-int32_t CFX_Stream::GetBOM(uint8_t bom[4]) const {
+int32_t CFGAS_Stream::GetBOM(uint8_t bom[4]) const {
   if (!m_pStreamImp) {
     return -1;
   }
   return 0;
 }
-uint16_t CFX_Stream::GetCodePage() const {
+uint16_t CFGAS_Stream::GetCodePage() const {
 #if _FX_ENDIAN_ == _FX_LITTLE_ENDIAN_
   return FX_CODEPAGE_UTF16LE;
 #else
   return FX_CODEPAGE_UTF16BE;
 #endif
 }
-uint16_t CFX_Stream::SetCodePage(uint16_t wCodePage) {
+uint16_t CFGAS_Stream::SetCodePage(uint16_t wCodePage) {
 #if _FX_ENDIAN_ == _FX_LITTLE_ENDIAN_
   return FX_CODEPAGE_UTF16LE;
 #else
   return FX_CODEPAGE_UTF16BE;
 #endif
 }
-IFX_Stream* CFX_Stream::CreateSharedStream(uint32_t dwAccess,
-                                           int32_t iOffset,
-                                           int32_t iLength) {
+IFGAS_Stream* CFGAS_Stream::CreateSharedStream(uint32_t dwAccess,
+                                               int32_t iOffset,
+                                               int32_t iLength) {
   ASSERT(iLength > 0);
   if (!m_pStreamImp) {
     return nullptr;
@@ -1439,7 +1442,7 @@ IFX_Stream* CFX_Stream::CreateSharedStream(uint32_t dwAccess,
   if (iEnd < iStart || iEnd > iTotal) {
     return nullptr;
   }
-  CFX_Stream* pShared = new CFX_Stream;
+  CFGAS_Stream* pShared = new CFGAS_Stream;
   pShared->m_eStreamType = FX_STREAMTYPE_Stream;
   pShared->m_pStreamImp = m_pStreamImp;
   pShared->m_dwAccess = dwAccess;
@@ -1448,16 +1451,16 @@ IFX_Stream* CFX_Stream::CreateSharedStream(uint32_t dwAccess,
   pShared->m_iStart = iStart;
   pShared->m_iLength = (dwAccess & FX_STREAMACCESS_Write) != 0 ? 0 : iLength;
   if (dwAccess & FX_STREAMACCESS_Text) {
-    return IFX_Stream::CreateTextStream(pShared, true);
+    return IFGAS_Stream::CreateTextStream(pShared, true);

[npm, 2016/12/02 16:23:22]

{}

[Tom Sepez, 2016/12/02 18:02:08]

Done.

   }
   return pShared;
 }
 
-IFX_SeekableReadStream* IFX_Stream::MakeSeekableReadStream() {
+IFX_SeekableReadStream* IFGAS_Stream::MakeSeekableReadStream() {
   return new CFGAS_FileRead(this, false);
 }
 
-CFGAS_FileRead::CFGAS_FileRead(IFX_Stream* pStream, bool bReleaseStream)
+CFGAS_FileRead::CFGAS_FileRead(IFGAS_Stream* pStream, bool bReleaseStream)
     : m_bReleaseStream(bReleaseStream), m_pStream(pStream) {
   ASSERT(m_pStream);
 }