From 67e3108c259c09f4c82bb06a954093949acb9c41 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 19 Dec 2016 17:46:07 +0100 Subject: [PATCH] Fixed: Virtual methods with different parameters --- code/nel/include/nel/3d/particle_system.h | 2 +- code/nel/include/nel/3d/particle_system_process.h | 4 ++-- code/nel/include/nel/3d/ps_emitter.h | 12 ++++++------ code/nel/include/nel/3d/ps_located.h | 14 +++++++------- code/nel/include/nel/gui/group_table.h | 2 +- code/nel/include/nel/net/module_gateway.h | 2 +- code/nel/src/3d/particle_system.cpp | 2 +- code/nel/src/3d/ps_located.cpp | 4 ++-- code/nel/src/gui/group_table.cpp | 4 ++-- code/nel/src/net/module.cpp | 2 +- code/nel/src/net/module_gateway.cpp | 10 +++++----- code/nel/src/net/module_local_gateway.cpp | 2 +- .../client/src/interface_v3/interface_observer.h | 2 +- 13 files changed, 31 insertions(+), 31 deletions(-) diff --git a/code/nel/include/nel/3d/particle_system.h b/code/nel/include/nel/3d/particle_system.h index 7255cfec9..50a8d8269 100644 --- a/code/nel/include/nel/3d/particle_system.h +++ b/code/nel/include/nel/3d/particle_system.h @@ -841,7 +841,7 @@ public: /// return true when there are still emitters in the system - bool hasEmitters(void) const; + bool hasEmitters() const; /// return true when there are still particles bool hasParticles() const; diff --git a/code/nel/include/nel/3d/particle_system_process.h b/code/nel/include/nel/3d/particle_system_process.h index 1ff031a5a..75aa6e0f1 100644 --- a/code/nel/include/nel/3d/particle_system_process.h +++ b/code/nel/include/nel/3d/particle_system_process.h @@ -163,10 +163,10 @@ class CParticleSystemProcess : public NLMISC::IStreamable virtual void setMatrixMode(TPSMatrixMode matrixMode); /// tells whether there are alive entities / particles in the system - virtual bool hasParticles(void) const { return false ; } + virtual bool hasParticles() const { return false ; } /// tells whether there are alive emitters / particles in the system - virtual bool hasEmitters(void) const { return false ; } + virtual bool hasEmitters() const { return false ; } /// max number of faces wanted by this process (for load balancing) diff --git a/code/nel/include/nel/3d/ps_emitter.h b/code/nel/include/nel/3d/ps_emitter.h index 3d62dd7f0..7170be75a 100644 --- a/code/nel/include/nel/3d/ps_emitter.h +++ b/code/nel/include/nel/3d/ps_emitter.h @@ -51,14 +51,14 @@ public: //@} /// Return this bindable type - uint32 getType(void) const { return PSEmitter; } + uint32 getType() const { return PSEmitter; } /// Return priority for emitters - virtual uint32 getPriority(void) const { return 500; } + virtual uint32 getPriority() const { return 500; } /// Return true if this located bindable derived class holds alive emitters - virtual bool hasEmitters(void) { nlassert(_Owner); return _Owner->getSize() != 0; } + virtual bool hasEmitters() const { nlassert(_Owner); return _Owner->getSize() != 0; } virtual void step(TPSProcessPass pass); @@ -76,7 +76,7 @@ public: /// Display the emitter in edition mode - virtual void showTool(void); + virtual void showTool(); /** Set the type of located to be emitted. The default is NULL which mean that no emission will occur * \return true if the operation could be performed. It can fail when this cause the system the system to last forever, @@ -90,9 +90,9 @@ public: virtual void notifyTargetRemoved(CPSLocated *ptr); /// Get emitted type. - CPSLocated *getEmittedType(void) { return _EmittedType; } + CPSLocated *getEmittedType() { return _EmittedType; } /// Get const ptr on emitted type - const CPSLocated *getEmittedType(void) const { return _EmittedType; } + const CPSLocated *getEmittedType() const { return _EmittedType; } /** The type of emission. diff --git a/code/nel/include/nel/3d/ps_located.h b/code/nel/include/nel/3d/ps_located.h index 08d1c72d8..4245c5c81 100644 --- a/code/nel/include/nel/3d/ps_located.h +++ b/code/nel/include/nel/3d/ps_located.h @@ -449,14 +449,14 @@ public: void setName(const std::string &name) { _Name = name; } /// get the located bindable name (edition purpose) - std::string getName(void) const { return _Name; } + std::string getName() const { return _Name; } /// tells whether there are alive entities / particles in the system - virtual bool hasParticles(void) const; + virtual bool hasParticles() const; /// tells whether there are alive emitters / particles in the system - virtual bool hasEmitters(void) const; + virtual bool hasEmitters() const; /** Enable the to force LOD degradation. This will suppress instances immediately, (during the motion pass) so that * there won't be more than maxNbInstance * dist / maxDist instances. This may not be desirable @@ -468,7 +468,7 @@ public: /** Test whether LOD degradation was activated * \see forceLODDegradation() */ - bool hasLODDegradation(void) const { return _LODDegradation; } + bool hasLODDegradation() const { return _LODDegradation; } /// for the CPSLocated to reevaluate the max number of faces it may need @@ -853,11 +853,11 @@ public: */ void setLOD(TPSLod lod) { _LOD = lod; } /// get the valid lods for that object - TPSLod getLOD(void) const { return _LOD; } + TPSLod getLOD() const { return _LOD; } /// tells whether there are alive entities / particles - virtual bool hasParticles(void) const { return false; } + virtual bool hasParticles() const { return false; } /// tells whether there are alive emitters - virtual bool hasEmitters(void) const { return false; } + virtual bool hasEmitters() const { return false; } /** set the extern ID of this located bindable. 0 means no extern access. The map of ID-locatedBindable. Is in th * particle system, so this located bindable must have been attached to a particle system, otherwise an assertion is raised */ diff --git a/code/nel/include/nel/gui/group_table.h b/code/nel/include/nel/gui/group_table.h index 746078908..2be9ef98c 100644 --- a/code/nel/include/nel/gui/group_table.h +++ b/code/nel/include/nel/gui/group_table.h @@ -64,7 +64,7 @@ namespace NLGUI xmlNodePtr serialize( xmlNodePtr parentNode, const char *type ) const; // to be called by CGroupTable - bool parse (xmlNodePtr cur, CInterfaceGroup * parentGroup, uint columnIndex, uint rowIndex); + bool parseCell (xmlNodePtr cur, CInterfaceGroup * parentGroup, uint columnIndex, uint rowIndex); // If the cell is a new line. This is the first after a bool NewLine; diff --git a/code/nel/include/nel/net/module_gateway.h b/code/nel/include/nel/net/module_gateway.h index 27fb2784d..a097f8de0 100644 --- a/code/nel/include/nel/net/module_gateway.h +++ b/code/nel/include/nel/net/module_gateway.h @@ -264,7 +264,7 @@ namespace NLNET /** Send a message to a module. */ - virtual void sendModuleMessage(IModuleProxy *senderProxy, IModuleProxy *addresseeProxy, const NLNET::CMessage &message) =0; + virtual void sendModuleProxyMessage(IModuleProxy *senderProxy, IModuleProxy *addresseeProxy, const NLNET::CMessage &message) =0; /** Send a message to the module plugged in this gateway. * You can override this method to change the dispatching, add filtering, diff --git a/code/nel/src/3d/particle_system.cpp b/code/nel/src/3d/particle_system.cpp index b50ffa8a2..477739e98 100644 --- a/code/nel/src/3d/particle_system.cpp +++ b/code/nel/src/3d/particle_system.cpp @@ -320,7 +320,7 @@ void CParticleSystem::setViewMat(const NLMISC::CMatrix &m) } ///======================================================================================= -bool CParticleSystem::hasEmitters(void) const +bool CParticleSystem::hasEmitters() const { NL_PS_FUNC_MAIN(CParticleSystem_hasEmitters) for (TProcessVect::const_iterator it = _ProcessVect.begin(); it != _ProcessVect.end(); ++it) diff --git a/code/nel/src/3d/ps_located.cpp b/code/nel/src/3d/ps_located.cpp index 82c385241..8dbe2d823 100644 --- a/code/nel/src/3d/ps_located.cpp +++ b/code/nel/src/3d/ps_located.cpp @@ -480,7 +480,7 @@ uint CPSLocated::querryMaxWantedNumFaces(void) /// *************************************************************************************** /// tells whether there are alive entities / particles in the system -bool CPSLocated::hasParticles(void) const +bool CPSLocated::hasParticles() const { NL_PS_FUNC(CPSLocated_hasParticles) CHECK_PS_INTEGRITY @@ -494,7 +494,7 @@ bool CPSLocated::hasParticles(void) const /// *************************************************************************************** /// tells whether there are alive emitters -bool CPSLocated::hasEmitters(void) const +bool CPSLocated::hasEmitters() const { NL_PS_FUNC(CPSLocated_hasEmitters) CHECK_PS_INTEGRITY diff --git a/code/nel/src/gui/group_table.cpp b/code/nel/src/gui/group_table.cpp index e194a70a4..f3f009dfc 100644 --- a/code/nel/src/gui/group_table.cpp +++ b/code/nel/src/gui/group_table.cpp @@ -340,7 +340,7 @@ namespace NLGUI } // ---------------------------------------------------------------------------- - bool CGroupCell::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup, uint columnIndex, uint rowIndex) + bool CGroupCell::parseCell(xmlNodePtr cur, CInterfaceGroup * parentGroup, uint columnIndex, uint rowIndex) { CXMLAutoPtr ptr; ptr = (char*) xmlGetProp( cur, (xmlChar*)"id"); @@ -1562,7 +1562,7 @@ namespace NLGUI if (strcmp((char*)currCol->name,"TD") == 0) { CGroupCell *cell = new CGroupCell(CViewBase::TCtorParam()); - if (cell->parse(currCol, this, column, row)) + if (cell->parseCell(currCol, this, column, row)) { cell->NewLine = newLine; newLine = false; diff --git a/code/nel/src/net/module.cpp b/code/nel/src/net/module.cpp index b0e21308f..73a1c7867 100644 --- a/code/nel/src/net/module.cpp +++ b/code/nel/src/net/module.cpp @@ -879,7 +879,7 @@ namespace NLNET throw EModuleNotReachable(); } - _Gateway->sendModuleMessage(senderProx, this, message); + _Gateway->sendModuleProxyMessage(senderProx, this, message); } const TSecurityData *CModuleProxy::findSecurityData(uint8 dataTag) const diff --git a/code/nel/src/net/module_gateway.cpp b/code/nel/src/net/module_gateway.cpp index 074dd78cd..81ba76859 100644 --- a/code/nel/src/net/module_gateway.cpp +++ b/code/nel/src/net/module_gateway.cpp @@ -627,7 +627,7 @@ namespace NLNET if (from->NextMessageType != CModuleMessageHeaderCodec::mt_invalid) { // this message must be dispatched to a module - onReceiveModuleMessage(from, msgin); + onReceiveModuleMessageFromGateway(from, msgin); } // Not a module message, dispatch the gateway message else if (msgin.getName() == "MOD_OP") @@ -813,7 +813,7 @@ namespace NLNET /***********************************/ /** A gateway receive module operation */ - void onReceiveModuleMessage(CGatewayRoute *from, const CMessage &msgin) + void onReceiveModuleMessageFromGateway(CGatewayRoute *from, const CMessage &msgin) { H_AUTO(CModuleGetaway_onReceiveModuleMessage); // clean the message type now, any return path will be safe @@ -843,7 +843,7 @@ namespace NLNET addresseeProxy = it->second; // give the message to the gateway (either for local dispatch or for forwarding) - sendModuleMessage(senderProxy, addresseeProxy, msgin); + sendModuleProxyMessage(senderProxy, addresseeProxy, msgin); } // A gateway receive a module message header @@ -1293,7 +1293,7 @@ namespace NLNET } - virtual void sendModuleMessage(IModuleProxy *senderProxy, IModuleProxy *addresseeProxy, const NLNET::CMessage &message) + virtual void sendModuleProxyMessage(IModuleProxy *senderProxy, IModuleProxy *addresseeProxy, const NLNET::CMessage &message) { H_AUTO(CModuleGetaway_sendModuleMessage); // manage firewall @@ -1581,7 +1581,7 @@ namespace NLNET IModuleProxy *destProx = it2->second; - sendModuleMessage(senderProx, destProx, message); + sendModuleProxyMessage(senderProx, destProx, message); } virtual void _broadcastModuleMessage(IModule *senderModule, const NLNET::CMessage &message) diff --git a/code/nel/src/net/module_local_gateway.cpp b/code/nel/src/net/module_local_gateway.cpp index 3c66c5dcc..3446c0663 100644 --- a/code/nel/src/net/module_local_gateway.cpp +++ b/code/nel/src/net/module_local_gateway.cpp @@ -287,7 +287,7 @@ namespace NLNET // virtual void onReceiveModuleMessage(TModuleGatewayProxyPtr &senderGateway, TModuleMessagePtr &message) // { // } - virtual void sendModuleMessage(IModuleProxy * /* senderProxy */, IModuleProxy * /* addresseeProxy */, const CMessage &/* message */) + virtual void sendModuleProxyMessage(IModuleProxy * /* senderProxy */, IModuleProxy * /* addresseeProxy */, const CMessage &/* message */) { } virtual void dispatchModuleMessage(IModuleProxy * /* senderProxy */, IModuleProxy * /* addresseeProxy */, const CMessage &/* message */) diff --git a/code/ryzom/client/src/interface_v3/interface_observer.h b/code/ryzom/client/src/interface_v3/interface_observer.h index 6da93637e..c44357616 100644 --- a/code/ryzom/client/src/interface_v3/interface_observer.h +++ b/code/ryzom/client/src/interface_v3/interface_observer.h @@ -45,7 +45,7 @@ public: /** * observer update */ - virtual void update (NLMISC::CCDBNodeLeaf* leaf)=0; + virtual void update (NLMISC::ICDBNode* leaf)=0; };