Rename EMotionFX class members to follow the m_ naming convention
Signed-off-by: Chris Burel <burelc@amazon.com>
This commit is contained in:
@@ -15,7 +15,7 @@ namespace MCore
|
||||
// constructor
|
||||
DiskFile::DiskFile()
|
||||
: File()
|
||||
, mFile(nullptr)
|
||||
, m_file(nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -38,7 +38,7 @@ namespace MCore
|
||||
bool DiskFile::Open(const char* fileName, EMode mode)
|
||||
{
|
||||
// if the file already is open, close it first
|
||||
if (mFile)
|
||||
if (m_file)
|
||||
{
|
||||
Close();
|
||||
}
|
||||
@@ -65,27 +65,27 @@ namespace MCore
|
||||
}();
|
||||
|
||||
// set the file mode we used
|
||||
mFileMode = mode;
|
||||
m_fileMode = mode;
|
||||
|
||||
// set the filename
|
||||
mFileName = fileName;
|
||||
m_fileName = fileName;
|
||||
|
||||
// try to open the file
|
||||
mFile = nullptr;
|
||||
azfopen(&mFile, fileName, fileMode);
|
||||
m_file = nullptr;
|
||||
azfopen(&m_file, fileName, fileMode);
|
||||
|
||||
// check on success
|
||||
return (mFile != nullptr);
|
||||
return (m_file != nullptr);
|
||||
}
|
||||
|
||||
|
||||
// close the file
|
||||
void DiskFile::Close()
|
||||
{
|
||||
if (mFile)
|
||||
if (m_file)
|
||||
{
|
||||
fclose(mFile);
|
||||
mFile = nullptr;
|
||||
fclose(m_file);
|
||||
m_file = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -93,41 +93,41 @@ namespace MCore
|
||||
// flush the file
|
||||
void DiskFile::Flush()
|
||||
{
|
||||
MCORE_ASSERT(mFile);
|
||||
fflush(mFile);
|
||||
MCORE_ASSERT(m_file);
|
||||
fflush(m_file);
|
||||
}
|
||||
|
||||
|
||||
bool DiskFile::GetIsOpen() const
|
||||
{
|
||||
return (mFile != nullptr);
|
||||
return (m_file != nullptr);
|
||||
}
|
||||
|
||||
|
||||
// return true when we have reached the end of the file
|
||||
bool DiskFile::GetIsEOF() const
|
||||
{
|
||||
MCORE_ASSERT(mFile);
|
||||
return (feof(mFile) != 0);
|
||||
MCORE_ASSERT(m_file);
|
||||
return (feof(m_file) != 0);
|
||||
}
|
||||
|
||||
|
||||
// returns the next byte in the file
|
||||
uint8 DiskFile::GetNextByte()
|
||||
{
|
||||
MCORE_ASSERT(mFile);
|
||||
MCORE_ASSERT((mFileMode == READ) || (mFileMode == READWRITE) || (mFileMode == READWRITEAPPEND) || (mFileMode == APPEND) || (mFileMode == READWRITECREATE)); // make sure we opened the file in read mode
|
||||
return static_cast<uint8>(fgetc(mFile));
|
||||
MCORE_ASSERT(m_file);
|
||||
MCORE_ASSERT((m_fileMode == READ) || (m_fileMode == READWRITE) || (m_fileMode == READWRITEAPPEND) || (m_fileMode == APPEND) || (m_fileMode == READWRITECREATE)); // make sure we opened the file in read mode
|
||||
return static_cast<uint8>(fgetc(m_file));
|
||||
}
|
||||
|
||||
|
||||
// write a given byte to the file
|
||||
bool DiskFile::WriteByte(uint8 value)
|
||||
{
|
||||
MCORE_ASSERT(mFile);
|
||||
MCORE_ASSERT((mFileMode == WRITE) || (mFileMode == READWRITE) || (mFileMode == READWRITEAPPEND) || (mFileMode == READWRITECREATE)); // make sure we opened the file in write mode
|
||||
MCORE_ASSERT(m_file);
|
||||
MCORE_ASSERT((m_fileMode == WRITE) || (m_fileMode == READWRITE) || (m_fileMode == READWRITEAPPEND) || (m_fileMode == READWRITECREATE)); // make sure we opened the file in write mode
|
||||
|
||||
if (fputc(value, mFile) == EOF)
|
||||
if (fputc(value, m_file) == EOF)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@@ -139,10 +139,10 @@ namespace MCore
|
||||
// write data to the file
|
||||
size_t DiskFile::Write(const void* data, size_t length)
|
||||
{
|
||||
MCORE_ASSERT(mFile);
|
||||
MCORE_ASSERT((mFileMode == WRITE) || (mFileMode == READWRITE) || (mFileMode == READWRITEAPPEND) || (mFileMode == READWRITECREATE)); // make sure we opened the file in write mode
|
||||
MCORE_ASSERT(m_file);
|
||||
MCORE_ASSERT((m_fileMode == WRITE) || (m_fileMode == READWRITE) || (m_fileMode == READWRITEAPPEND) || (m_fileMode == READWRITECREATE)); // make sure we opened the file in write mode
|
||||
|
||||
if (fwrite(data, length, 1, mFile) == 0)
|
||||
if (fwrite(data, length, 1, m_file) == 0)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@@ -154,10 +154,10 @@ namespace MCore
|
||||
// read data from the file
|
||||
size_t DiskFile::Read(void* data, size_t length)
|
||||
{
|
||||
MCORE_ASSERT(mFile);
|
||||
MCORE_ASSERT((mFileMode == READ) || (mFileMode == READWRITE) || (mFileMode == READWRITEAPPEND) || (mFileMode == APPEND) || (mFileMode == READWRITECREATE)); // make sure we opened the file in read mode
|
||||
MCORE_ASSERT(m_file);
|
||||
MCORE_ASSERT((m_fileMode == READ) || (m_fileMode == READWRITE) || (m_fileMode == READWRITEAPPEND) || (m_fileMode == APPEND) || (m_fileMode == READWRITECREATE)); // make sure we opened the file in read mode
|
||||
|
||||
if (fread(data, length, 1, mFile) == 0)
|
||||
if (fread(data, length, 1, m_file) == 0)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@@ -169,13 +169,13 @@ namespace MCore
|
||||
// get the file mode
|
||||
DiskFile::EMode DiskFile::GetFileMode() const
|
||||
{
|
||||
return mFileMode;
|
||||
return m_fileMode;
|
||||
}
|
||||
|
||||
|
||||
// get the file name
|
||||
const AZStd::string& DiskFile::GetFileName() const
|
||||
{
|
||||
return mFileName;
|
||||
return m_fileName;
|
||||
}
|
||||
} // namespace MCore
|
||||
|
||||
Reference in New Issue
Block a user