fix: remove useless void in function parameter list

- according to c++ standard, single void in function parameter is equal to empty parameter list. for removing this syntax which may cause misunderstanding (becuase in C, they are different I guess), I replace all `(void)` to `()`.
This commit is contained in:
yyc12345 2024-12-28 22:09:26 +08:00
parent aeb2e86b14
commit ead22d13ff
20 changed files with 31 additions and 31 deletions

View File

@ -44,9 +44,9 @@ namespace LibCmo::CK2 {
const void* GetPtr(CKINT extraoff = 0) { return (this->m_MemBegin + m_MemPos + extraoff); } const void* GetPtr(CKINT extraoff = 0) { return (this->m_MemBegin + m_MemPos + extraoff); }
void* GetMutablePtr(CKINT extraoff = 0) { return (this->m_MemBegin + m_MemPos + extraoff); } void* GetMutablePtr(CKINT extraoff = 0) { return (this->m_MemBegin + m_MemPos + extraoff); }
void* GetBase(void) { return this->m_MemBegin; } void* GetBase() { return this->m_MemBegin; }
CKDWORD GetSize(void) { return this->m_MemSize; } CKDWORD GetSize() { return this->m_MemSize; }
CKDWORD GetCursor(void) { return this->m_MemPos; } CKDWORD GetCursor() { return this->m_MemPos; }
void MoveCursor(CKINT off) { this->m_MemPos += off; } void MoveCursor(CKINT off) { this->m_MemPos += off; }
void SetCursor(CKDWORD off) { this->m_MemPos = off; } void SetCursor(CKDWORD off) { this->m_MemPos = off; }
void Read(void* data, CKDWORD data_size) { void Read(void* data, CKDWORD data_size) {

View File

@ -265,8 +265,8 @@ namespace LibCmo::CK2 {
#pragma region Read Function #pragma region Read Function
public: public:
void StartRead(void); void StartRead();
void StopRead(void); void StopRead();
/* ========== Identifier Functions ==========*/ /* ========== Identifier Functions ==========*/
@ -556,7 +556,7 @@ namespace LibCmo::CK2 {
/* /*
* Actually this function mix various functions, including CloseChunk(), UpdateSize() and etc. * Actually this function mix various functions, including CloseChunk(), UpdateSize() and etc.
*/ */
void StopWrite(void); void StopWrite();
/* ========== Identifier Functions ==========*/ /* ========== Identifier Functions ==========*/

View File

@ -4,7 +4,7 @@
namespace LibCmo::CK2 { namespace LibCmo::CK2 {
void CKStateChunk::StartRead(void) { void CKStateChunk::StartRead() {
if (this->m_Parser.m_Status != CKStateChunkStatus::IDLE) return; if (this->m_Parser.m_Status != CKStateChunkStatus::IDLE) return;
this->m_Parser.m_CurrentPos = 0u; this->m_Parser.m_CurrentPos = 0u;
@ -13,7 +13,7 @@ namespace LibCmo::CK2 {
this->m_Parser.m_Status = CKStateChunkStatus::READ; this->m_Parser.m_Status = CKStateChunkStatus::READ;
} }
void CKStateChunk::StopRead(void) { void CKStateChunk::StopRead() {
if (this->m_Parser.m_Status != CKStateChunkStatus::READ) return; if (this->m_Parser.m_Status != CKStateChunkStatus::READ) return;
this->m_Parser.m_CurrentPos = 0u; this->m_Parser.m_CurrentPos = 0u;
@ -220,7 +220,7 @@ namespace LibCmo::CK2 {
return true; return true;
} }
//CKStateChunk* CKStateChunk::ReadSubChunk(void) { //CKStateChunk* CKStateChunk::ReadSubChunk() {
// CKStateChunk* subchunk = nullptr; // CKStateChunk* subchunk = nullptr;
// // get size and do a enough space check // // get size and do a enough space check

View File

@ -32,7 +32,7 @@ namespace LibCmo::CK2 {
this->m_Parser.m_Status = CKStateChunkStatus::WRITE; this->m_Parser.m_Status = CKStateChunkStatus::WRITE;
} }
void CKStateChunk::StopWrite(void) { void CKStateChunk::StopWrite() {
if (this->m_Parser.m_Status != CKStateChunkStatus::WRITE) return; if (this->m_Parser.m_Status != CKStateChunkStatus::WRITE) return;
// update buffer size // update buffer size

View File

@ -11,7 +11,7 @@ namespace LibCmo::CK2::ObjImpls {
virtual ~CK3dEntity(); virtual ~CK3dEntity();
YYCC_DEL_CLS_COPY_MOVE(CK3dEntity); YYCC_DEL_CLS_COPY_MOVE(CK3dEntity);
virtual CK_CLASSID GetClassID(void) override { virtual CK_CLASSID GetClassID() override {
return CK_CLASSID::CKCID_3DENTITY; return CK_CLASSID::CKCID_3DENTITY;
} }

View File

@ -13,7 +13,7 @@ namespace LibCmo::CK2::ObjImpls {
virtual ~CK3dObject() {} virtual ~CK3dObject() {}
YYCC_DEL_CLS_COPY_MOVE(CK3dObject); YYCC_DEL_CLS_COPY_MOVE(CK3dObject);
virtual CK_CLASSID GetClassID(void) override { virtual CK_CLASSID GetClassID() override {
return CK_CLASSID::CKCID_3DOBJECT; return CK_CLASSID::CKCID_3DOBJECT;
} }
// CK3dObject do not implement any load/save functions // CK3dObject do not implement any load/save functions

View File

@ -11,7 +11,7 @@ namespace LibCmo::CK2::ObjImpls {
virtual ~CKBeObject(); virtual ~CKBeObject();
YYCC_DEL_CLS_COPY_MOVE(CKBeObject); YYCC_DEL_CLS_COPY_MOVE(CKBeObject);
virtual CK_CLASSID GetClassID(void) override { virtual CK_CLASSID GetClassID() override {
return CK_CLASSID::CKCID_BEOBJECT; return CK_CLASSID::CKCID_BEOBJECT;
} }

View File

@ -11,7 +11,7 @@ namespace LibCmo::CK2::ObjImpls {
virtual ~CKCamera(); virtual ~CKCamera();
YYCC_DEL_CLS_COPY_MOVE(CKCamera); YYCC_DEL_CLS_COPY_MOVE(CKCamera);
virtual CK_CLASSID GetClassID(void) override { virtual CK_CLASSID GetClassID() override {
return CK_CLASSID::CKCID_CAMERA; return CK_CLASSID::CKCID_CAMERA;
} }

View File

@ -11,7 +11,7 @@ namespace LibCmo::CK2::ObjImpls {
virtual ~CKGroup(); virtual ~CKGroup();
YYCC_DEL_CLS_COPY_MOVE(CKGroup); YYCC_DEL_CLS_COPY_MOVE(CKGroup);
virtual CK_CLASSID GetClassID(void) override { virtual CK_CLASSID GetClassID() override {
return CK_CLASSID::CKCID_GROUP; return CK_CLASSID::CKCID_GROUP;
} }

View File

@ -11,7 +11,7 @@ namespace LibCmo::CK2::ObjImpls {
virtual ~CKLight(); virtual ~CKLight();
YYCC_DEL_CLS_COPY_MOVE(CKLight); YYCC_DEL_CLS_COPY_MOVE(CKLight);
virtual CK_CLASSID GetClassID(void) override { virtual CK_CLASSID GetClassID() override {
return CK_CLASSID::CKCID_LIGHT; return CK_CLASSID::CKCID_LIGHT;
} }

View File

@ -12,7 +12,7 @@ namespace LibCmo::CK2::ObjImpls {
virtual ~CKMaterial(); virtual ~CKMaterial();
YYCC_DEL_CLS_COPY_MOVE(CKMaterial); YYCC_DEL_CLS_COPY_MOVE(CKMaterial);
virtual CK_CLASSID GetClassID(void) override { virtual CK_CLASSID GetClassID() override {
return CK_CLASSID::CKCID_MATERIAL; return CK_CLASSID::CKCID_MATERIAL;
} }

View File

@ -21,7 +21,7 @@ namespace LibCmo::CK2::ObjImpls {
virtual ~CKMesh(); virtual ~CKMesh();
YYCC_DEL_CLS_COPY_MOVE(CKMesh); YYCC_DEL_CLS_COPY_MOVE(CKMesh);
virtual CK_CLASSID GetClassID(void) override { virtual CK_CLASSID GetClassID() override {
return CK_CLASSID::CKCID_MESH; return CK_CLASSID::CKCID_MESH;
} }

View File

@ -16,16 +16,16 @@ namespace LibCmo::CK2::ObjImpls {
#pragma region Non-virtual Functions #pragma region Non-virtual Functions
CK_ID CKObject::GetID(void) const { CK_ID CKObject::GetID() const {
return m_ID; return m_ID;
} }
CKSTRING CKObject::GetName(void) const { CKSTRING CKObject::GetName() const {
return XContainer::NSXString::ToCKSTRING(m_Name); return XContainer::NSXString::ToCKSTRING(m_Name);
} }
void CKObject::SetName(CKSTRING u8_name) { void CKObject::SetName(CKSTRING u8_name) {
XContainer::NSXString::FromCKSTRING(m_Name, u8_name); XContainer::NSXString::FromCKSTRING(m_Name, u8_name);
} }
CK_OBJECT_FLAGS CKObject::GetObjectFlags(void) const { CK_OBJECT_FLAGS CKObject::GetObjectFlags() const {
return m_ObjectFlags; return m_ObjectFlags;
} }
void CKObject::SetObjectFlags(CK_OBJECT_FLAGS flags) { void CKObject::SetObjectFlags(CK_OBJECT_FLAGS flags) {

View File

@ -42,15 +42,15 @@ namespace LibCmo::CK2::ObjImpls {
virtual ~CKObject(); virtual ~CKObject();
YYCC_DEL_CLS_COPY_MOVE(CKObject); YYCC_DEL_CLS_COPY_MOVE(CKObject);
CK_ID GetID(void) const; CK_ID GetID() const;
CKSTRING GetName(void) const; CKSTRING GetName() const;
void SetName(CKSTRING u8_name); void SetName(CKSTRING u8_name);
CK_OBJECT_FLAGS GetObjectFlags(void) const; CK_OBJECT_FLAGS GetObjectFlags() const;
void SetObjectFlags(CK_OBJECT_FLAGS flags); void SetObjectFlags(CK_OBJECT_FLAGS flags);
bool IsToBeDeleted() const; bool IsToBeDeleted() const;
CKContext* GetCKContext() const; CKContext* GetCKContext() const;
virtual CK_CLASSID GetClassID(void) { virtual CK_CLASSID GetClassID() {
return CK_CLASSID::CKCID_OBJECT; return CK_CLASSID::CKCID_OBJECT;
} }

View File

@ -13,7 +13,7 @@ namespace LibCmo::CK2::ObjImpls {
virtual ~CKRenderObject() {} virtual ~CKRenderObject() {}
YYCC_DEL_CLS_COPY_MOVE(CKRenderObject); YYCC_DEL_CLS_COPY_MOVE(CKRenderObject);
virtual CK_CLASSID GetClassID(void) override { virtual CK_CLASSID GetClassID() override {
return CK_CLASSID::CKCID_RENDEROBJECT; return CK_CLASSID::CKCID_RENDEROBJECT;
} }

View File

@ -13,7 +13,7 @@ namespace LibCmo::CK2::ObjImpls {
virtual ~CKSceneObject() {} virtual ~CKSceneObject() {}
YYCC_DEL_CLS_COPY_MOVE(CKSceneObject); YYCC_DEL_CLS_COPY_MOVE(CKSceneObject);
virtual CK_CLASSID GetClassID(void) override { virtual CK_CLASSID GetClassID() override {
return CK_CLASSID::CKCID_SCENEOBJECT; return CK_CLASSID::CKCID_SCENEOBJECT;
} }
// CKSceneObject do not override any RW functions. // CKSceneObject do not override any RW functions.

View File

@ -11,7 +11,7 @@ namespace LibCmo::CK2::ObjImpls {
virtual ~CKTargetCamera(); virtual ~CKTargetCamera();
YYCC_DEL_CLS_COPY_MOVE(CKTargetCamera); YYCC_DEL_CLS_COPY_MOVE(CKTargetCamera);
virtual CK_CLASSID GetClassID(void) override { virtual CK_CLASSID GetClassID() override {
return CK_CLASSID::CKCID_TARGETCAMERA; return CK_CLASSID::CKCID_TARGETCAMERA;
} }

View File

@ -11,7 +11,7 @@ namespace LibCmo::CK2::ObjImpls {
virtual ~CKTargetLight(); virtual ~CKTargetLight();
YYCC_DEL_CLS_COPY_MOVE(CKTargetLight); YYCC_DEL_CLS_COPY_MOVE(CKTargetLight);
virtual CK_CLASSID GetClassID(void) override { virtual CK_CLASSID GetClassID() override {
return CK_CLASSID::CKCID_TARGETLIGHT; return CK_CLASSID::CKCID_TARGETLIGHT;
} }

View File

@ -12,7 +12,7 @@ namespace LibCmo::CK2::ObjImpls {
virtual ~CKTexture(); virtual ~CKTexture();
YYCC_DEL_CLS_COPY_MOVE(CKTexture); YYCC_DEL_CLS_COPY_MOVE(CKTexture);
virtual CK_CLASSID GetClassID(void) override { virtual CK_CLASSID GetClassID() override {
return CK_CLASSID::CKCID_TEXTURE; return CK_CLASSID::CKCID_TEXTURE;
} }

View File

@ -128,7 +128,7 @@ namespace LibCmo::VxMath {
this->m_bIsValid = true; this->m_bIsValid = true;
} }
VxMemoryMappedFile::~VxMemoryMappedFile(void) { VxMemoryMappedFile::~VxMemoryMappedFile() {
if (this->m_bIsValid) { if (this->m_bIsValid) {
// only success mapping need free // only success mapping need free
this->m_bIsValid = false; this->m_bIsValid = false;