TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-14 01:40:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #600 from BeamNG/rename_Status

Browse source 
Rename Status enum for avoid conficts on Linux.
This commit is contained in:
Daniel Buckmaster 2014-05-10 11:01:28 +10:00
commit f69eccfdb4
10 changed files with 43 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Engine/source/platformWin32/winFileio.cpp
View file

@ -248,7 +248,7 @@ File::~File()
// Sets capability appropriate to the openMode.
// Returns the currentStatus of the file.
//-----------------------------------------------------------------------------
File::Status File::open(const char *filename, const AccessMode openMode)
File::FileStatus File::open(const char *filename, const AccessMode openMode)
{
AssertFatal(NULL != filename, "File::open: NULL fname");
AssertWarn(INVALID_HANDLE_VALUE == (HANDLE)handle, "File::open: handle already valid");
@ -363,7 +363,7 @@ U32 File::getPosition() const
//
// Returns the currentStatus of the file.
//-----------------------------------------------------------------------------
File::Status File::setPosition(S32 position, bool absolutePos)
File::FileStatus File::setPosition(S32 position, bool absolutePos)
{
AssertFatal(Closed != currentStatus, "File::setPosition: file closed");
AssertFatal(INVALID_HANDLE_VALUE != (HANDLE)handle, "File::setPosition: invalid file handle");
@ -425,7 +425,7 @@ U32 File::getSize() const
// It is an error to flush a read-only file.
// Returns the currentStatus of the file.
//-----------------------------------------------------------------------------
File::Status File::flush()
File::FileStatus File::flush()
{
AssertFatal(Closed != currentStatus, "File::flush: file closed");
AssertFatal(INVALID_HANDLE_VALUE != (HANDLE)handle, "File::flush: invalid file handle");
@ -442,7 +442,7 @@ File::Status File::flush()
//
// Returns the currentStatus
//-----------------------------------------------------------------------------
File::Status File::close()
File::FileStatus File::close()
{
// check if it's already closed...
if (Closed == currentStatus)
@ -461,7 +461,7 @@ File::Status File::close()
//-----------------------------------------------------------------------------
// Self-explanatory.
//-----------------------------------------------------------------------------
File::Status File::getStatus() const
File::FileStatus File::getStatus() const
{
return currentStatus;
}
@ -469,7 +469,7 @@ File::Status File::getStatus() const
//-----------------------------------------------------------------------------
// Sets and returns the currentStatus when an error has been encountered.
//-----------------------------------------------------------------------------
File::Status File::setStatus()
File::FileStatus File::setStatus()
{
switch (GetLastError())
{
@ -489,7 +489,7 @@ File::Status File::setStatus()
//-----------------------------------------------------------------------------
// Sets and returns the currentStatus to status.
//-----------------------------------------------------------------------------
File::Status File::setStatus(File::Status status)
File::FileStatus File::setStatus(File::FileStatus status)
{
return currentStatus = status;
}
@ -500,7 +500,7 @@ File::Status File::setStatus(File::Status status)
// The number of bytes read is available in bytesRead if a non-Null pointer is
// provided.
//-----------------------------------------------------------------------------
File::Status File::read(U32 size, char *dst, U32 *bytesRead)
File::FileStatus File::read(U32 size, char *dst, U32 *bytesRead)
{
AssertFatal(Closed != currentStatus, "File::read: file closed");
AssertFatal(INVALID_HANDLE_VALUE != (HANDLE)handle, "File::read: invalid file handle");
@ -531,7 +531,7 @@ File::Status File::read(U32 size, char *dst, U32 *bytesRead)
// The number of bytes written is available in bytesWritten if a non-Null
// pointer is provided.
//-----------------------------------------------------------------------------
File::Status File::write(U32 size, const char *src, U32 *bytesWritten)
File::FileStatus File::write(U32 size, const char *src, U32 *bytesWritten)
{
AssertFatal(Closed != currentStatus, "File::write: file closed");
AssertFatal(INVALID_HANDLE_VALUE != (HANDLE)handle, "File::write: invalid file handle");

4
Engine/source/platformWin32/winVolume.cpp
View file

@ -333,7 +333,7 @@ Path Win32File::getName() const
return mPath;
}
FileNode::Status Win32File::getStatus() const
FileNode::NodeStatus Win32File::getStatus() const
{
return mStatus;
}
@ -620,7 +620,7 @@ bool Win32Directory::getAttributes(Attributes* attr)
return true;
}
FileNode::Status Win32Directory::getStatus() const
FileNode::NodeStatus Win32Directory::getStatus() const
{
return mStatus;
}

8
Engine/source/platformWin32/winVolume.h
View file

@ -65,7 +65,7 @@ public:
~Win32File();
Path getName() const;
Status getStatus() const;
NodeStatus getStatus() const;
bool getAttributes(Attributes*);
U64 getSize();
@ -86,7 +86,7 @@ private:
Path mPath;
String mName;
void *mHandle;
Status mStatus;
NodeStatus mStatus;
Win32File(const Path &path, String name);
@ -103,7 +103,7 @@ public:
~Win32Directory();
Path getName() const;
Status getStatus() const;
NodeStatus getStatus() const;
bool getAttributes(Attributes*);
bool open();
@ -118,7 +118,7 @@ private:
Path mPath;
String mName;
void *mHandle;
Status mStatus;
NodeStatus mStatus;
Win32Directory(const Path &path,String name);