mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-12 07:04:36 +00:00
virtuals removed
virtuals removed and replaced with override where necessary, clang-tidy to the rescue.
This commit is contained in:
parent
88a43f3137
commit
efbe5e90f5
255 changed files with 2164 additions and 2164 deletions
|
|
@ -249,16 +249,16 @@ public:
|
|||
bool isFull() { return bitNum > (bufSize << 3); }
|
||||
bool isValid() { return !error; }
|
||||
|
||||
bool _read (const U32 size,void* d);
|
||||
bool _write(const U32 size,const void* d);
|
||||
bool _read (const U32 size,void* d) override;
|
||||
bool _write(const U32 size,const void* d) override;
|
||||
|
||||
void readString(char stringBuf[256]);
|
||||
void writeString(const char *stringBuf, S32 maxLen=255);
|
||||
void readString(char stringBuf[256]) override;
|
||||
void writeString(const char *stringBuf, S32 maxLen=255) override;
|
||||
|
||||
bool hasCapability(const Capability) const { return true; }
|
||||
U32 getPosition() const;
|
||||
bool setPosition(const U32 in_newPosition);
|
||||
U32 getStreamSize();
|
||||
bool hasCapability(const Capability) const override { return true; }
|
||||
U32 getPosition() const override;
|
||||
bool setPosition(const U32 in_newPosition) override;
|
||||
U32 getStreamSize() override;
|
||||
S32 getMaxWriteBitNum() const { return maxWriteBitNum; }
|
||||
};
|
||||
|
||||
|
|
@ -295,13 +295,13 @@ public:
|
|||
/// Write us out to a stream... Results in last byte getting padded!
|
||||
void writeToStream(Stream &s);
|
||||
|
||||
virtual void writeBits(S32 bitCount, const void *bitPtr)
|
||||
void writeBits(S32 bitCount, const void *bitPtr) override
|
||||
{
|
||||
validate((bitCount >> 3) + 1); // Add a little safety.
|
||||
BitStream::writeBits(bitCount, bitPtr);
|
||||
}
|
||||
|
||||
virtual bool writeFlag(bool val)
|
||||
bool writeFlag(bool val) override
|
||||
{
|
||||
validate(1); // One bit will at most grow our buffer by a byte.
|
||||
return BitStream::writeFlag(val);
|
||||
|
|
|
|||
|
|
@ -50,11 +50,11 @@ public:
|
|||
static FileStream *createAndOpen(const String &inFileName, Torque::FS::File::AccessMode inMode);
|
||||
|
||||
// mandatory methods from Stream base class...
|
||||
virtual bool hasCapability(const Capability i_cap) const;
|
||||
bool hasCapability(const Capability i_cap) const override;
|
||||
|
||||
virtual U32 getPosition() const;
|
||||
virtual bool setPosition(const U32 i_newPosition);
|
||||
virtual U32 getStreamSize();
|
||||
U32 getPosition() const override;
|
||||
bool setPosition(const U32 i_newPosition) override;
|
||||
U32 getStreamSize() override;
|
||||
|
||||
// additional methods needed for a file stream...
|
||||
virtual bool open(const String &inFileName, Torque::FS::File::AccessMode inMode);
|
||||
|
|
@ -63,12 +63,12 @@ public:
|
|||
bool flush();
|
||||
//rjson compatibility
|
||||
bool Flush() { return flush(); }
|
||||
FileStream* clone() const;
|
||||
FileStream* clone() const override;
|
||||
|
||||
protected:
|
||||
// more mandatory methods from Stream base class...
|
||||
virtual bool _read(const U32 i_numBytes, void *o_pBuffer);
|
||||
virtual bool _write(const U32 i_numBytes, const void* i_pBuffer);
|
||||
bool _read(const U32 i_numBytes, void *o_pBuffer) override;
|
||||
bool _write(const U32 i_numBytes, const void* i_pBuffer) override;
|
||||
|
||||
void init();
|
||||
bool fillBuffer(const U32 i_startPosition);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue