Merge with develop

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;

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)

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.

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
 	  */

code/nel/include/nel/gui/group_html.h

@@ -321,7 +321,7 @@ namespace NLGUI
 		// \name internal methods
 
 		// Add a group in the current parent group
-		void addGroup (CInterfaceGroup *group, uint beginSpace);
+		void addHtmlGroup (CInterfaceGroup *group, uint beginSpace);
 
 		// Get the current parent group
 		CInterfaceGroup *getCurrentGroup();

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 <td> after a <tr>
 		bool	NewLine;

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,

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)

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

code/nel/src/3d/render_target_manager.cpp

@@ -150,6 +150,7 @@ void CRenderTargetManager::cleanup()
 				desc->TextureUser = NULL;
 				desc->TextureInterface = NULL; // CSmartPtr
 				m_RenderTargets.erase(m_RenderTargets.begin() + i);
+				delete desc;
 				--i;
 			}
 			else

code/nel/src/3d/water_height_map.cpp

@@ -76,7 +76,7 @@ void CWaterHeightMap::updateUserPos()
 
 	nlassert(_Size != 0);
 	if ((uint) x == _X && (uint) y == _Y) return;
-	if ((uint) abs((long int)(x - _X)) < _Size && (uint) abs((long int)(y - _Y)) < _Size) // are there common pixels with the previous location?
+	if ((uint) std::abs((sint)(x - _X)) < _Size && (uint) std::abs((sint)(y - _Y)) < _Size) // are there common pixels with the previous location?
 	{
 		// compute zone
 

code/nel/src/gui/group_html.cpp

@@ -1965,7 +1965,7 @@ namespace NLGUI
 
 					// Table must fit the container size
 
-					addGroup (table, 0);
+					addHtmlGroup (table, 0);
 
 					_Tables.push_back(table);
 
@@ -3759,7 +3759,7 @@ namespace NLGUI
 		newParagraph->setIndent(_Indent);
 
 		// Add to the group
-		addGroup (newParagraph, beginSpace);
+		addHtmlGroup (newParagraph, beginSpace);
 		_Paragraph = newParagraph;
 
 		paragraphChange ();
@@ -4545,7 +4545,7 @@ namespace NLGUI
 
 	// ***************************************************************************
 
-	void CGroupHTML::addGroup (CInterfaceGroup *group, uint beginSpace)
+	void CGroupHTML::addHtmlGroup (CInterfaceGroup *group, uint beginSpace)
 	{
 		if (!group)
 			return;

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;

code/nel/src/gui/widget_manager.cpp

@@ -1762,16 +1762,12 @@ namespace NLGUI
 
 		// *** According to best matching hotspot, and new screen resolution, move the window
 		// x
-		if(bestXHotSpot==Hotspot_xL)
+		if(bestXHotSpot==Hotspot_xM)
-			x= x;
-		else if(bestXHotSpot==Hotspot_xM)
 			x= newScreenW/2 + posXToMiddle - w/2;
 		else if(bestXHotSpot==Hotspot_xR)
 			x= newScreenW - posXToRight - w;
 		// y
-		if(bestYHotSpot==Hotspot_Bx)
+		if(bestYHotSpot==Hotspot_Mx)
-			y= y;
-		else if(bestYHotSpot==Hotspot_Mx)
 			y= newScreenH/2 + posYToMiddle + h/2;
 		else if(bestYHotSpot==Hotspot_Tx)
 			y= newScreenH - posYToTop;

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

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)

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 */)

code/nel/src/pacs/move_primitive.cpp

@@ -379,7 +379,7 @@ uint8 CMovePrimitive::getFirstWorldImageV () const
 
 uint8 CMovePrimitive::getNumWorldImageV () const
 {
-	return getNumWorldImageV ();
+	return getNumWorldImage ();
 }
 
 // ***************************************************************************

code/nel/src/sound/sample_bank_manager.cpp

@@ -81,7 +81,7 @@ void CSampleBankManager::init(NLGEORGES::UFormElm *mixerConfig)
 				{
 					TFilteredBank fb;
 					std::string	bankName;
-					NLGEORGES::UFormElm	*realBank;
+					NLGEORGES::UFormElm	*realBank = NULL;
 					realBank->getArrayNode(&realBank, j);
 
 					realBank->getValueByName(bankName, ".SampleBank");

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;
 
 
 };

code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp

@@ -2046,7 +2046,7 @@ int CLuaIHMRyzom::addShape(CLuaState &ls)
 	
 	float x = 0.0f, y = 0.0f, z = 0.0f;
 	float scale = 1.0f;
-	string context,url,skeleton,texture = "";
+	string context, url, skeleton, texture;
 	bool highlight, transparency, collision = false;
 	
 	if (ls.getTop() >= 2)
@@ -2068,7 +2068,7 @@ int CLuaIHMRyzom::addShape(CLuaState &ls)
 	}
 
 
-	if (x == 0 && y == 0)
+	if (x == 0.f && y == 0.f)
 	{
 		x = UserEntity->pos().x;
 		y = UserEntity->pos().y;

code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp

@@ -70,7 +70,7 @@ COperationDialog::COperationDialog(QWidget *parent):QDialog(parent), m_aborting(
 	connect(this, SIGNAL(progress(qint64, QString)), SLOT(onProgressProgress(qint64, QString)));
 	connect(this, SIGNAL(success(qint64)), SLOT(onProgressSuccess(qint64)));
 	connect(this, SIGNAL(fail(QString)), SLOT(onProgressFail(QString)));
-	connect(this, SIGNAL(done()), SLOT(onDone()));
+	connect(this, SIGNAL(operationDone()), SLOT(onDone()));
 
 	adjustSize();
 
@@ -446,7 +446,7 @@ void COperationDialog::onDownloadDone()
 {
 	renamePartFile();
 
-	emit done();
+	emit operationDone();
 }
 
 void COperationDialog::onProgressPrepare()
@@ -558,7 +558,7 @@ void COperationDialog::extractDownloadedData()
 
 	if (!extractor.exec()) return;
 
-	emit done();
+	emit operationDone();
 }
 
 void COperationDialog::downloadClient()
@@ -590,7 +590,7 @@ void COperationDialog::extractDownloadedClient()
 
 	launchUpgradeScript(destinationDirectory, server.clientFilename);
 
-	emit done();
+	emit operationDone();
 }
 
 void COperationDialog::copyDataFiles()
@@ -616,7 +616,7 @@ void COperationDialog::copyDataFiles()
 
 	if (!copier.exec()) return;
 
-	emit done();
+	emit operationDone();
 }
 
 void COperationDialog::copyProfileFiles()
@@ -649,7 +649,7 @@ void COperationDialog::copyProfileFiles()
 	// correct path to client_default.cfg
 	profile.createClientConfig();
 
-	emit done();
+	emit operationDone();
 }
 
 void COperationDialog::extractBnpClient()
@@ -671,7 +671,7 @@ void COperationDialog::extractBnpClient()
 
 	launchUpgradeScript(destinationDirectory, server.clientFilename);
 
-	emit done();
+	emit operationDone();
 }
 
 void COperationDialog::launchUpgradeScript(const QString &directory, const QString &executable)
@@ -796,7 +796,7 @@ void COperationDialog::copyInstaller()
 		config->setInstallerCopied(true);
 	}
 
-	emit done();
+	emit operationDone();
 }
 
 void COperationDialog::uninstallOldClient()
@@ -842,7 +842,7 @@ void COperationDialog::uninstallOldClient()
 	}
 #endif
 
-	emit done();
+	emit operationDone();
 }
 
 void COperationDialog::cleanFiles()
@@ -858,7 +858,7 @@ void COperationDialog::cleanFiles()
 	cleaner.setDirectory(server.getDirectory());
 	cleaner.exec();
 
-	emit done();
+	emit operationDone();
 }
 
 bool COperationDialog::createDefaultProfile()
@@ -915,7 +915,7 @@ bool COperationDialog::createDefaultProfile()
 	config->addProfile(profile);
 	config->save();
 
-	emit done();
+	emit operationDone();
 
 	return true;
 }
@@ -930,7 +930,7 @@ bool COperationDialog::createProfileShortcuts(const QString &profileId)
 
 	profile.createShortcuts();
 
-	emit done();
+	emit operationDone();
 
 	return true;
 }
@@ -968,7 +968,7 @@ bool COperationDialog::createAddRemoveEntry()
 
 	updateAddRemoveEntry();
 
-	emit done();
+	emit operationDone();
 
 	return true;
 }
@@ -1067,7 +1067,7 @@ void COperationDialog::deleteComponentsServers()
 	// delete Ryzom directory if all files have been deleted
 	if (isDirectoryEmpty(config->getInstallationDirectory(), true)) QDir(config->getInstallationDirectory()).removeRecursively();
 
-	emit done();
+	emit operationDone();
 }
 
 void COperationDialog::addComponentsProfiles()
@@ -1087,7 +1087,7 @@ void COperationDialog::addComponentsProfiles()
 	// clear list of all servers to uninstall
 	m_addComponents.profiles.clear();
 
-	emit done();
+	emit operationDone();
 }
 
 void COperationDialog::deleteComponentsProfiles()
@@ -1140,7 +1140,7 @@ void COperationDialog::deleteComponentsProfiles()
 	// delete profiles directory if all files have been deleted
 	if (isDirectoryEmpty(config->getProfileDirectory(), true)) QDir(config->getProfileDirectory()).removeRecursively();
 
-	emit done();
+	emit operationDone();
 }
 
 void COperationDialog::deleteComponentsInstaller()
@@ -1192,7 +1192,7 @@ void COperationDialog::deleteComponentsInstaller()
 	if (isDirectoryEmpty(config->getInstallationDirectory(), true)) QDir(config->getInstallationDirectory()).removeRecursively();
 
 	emit success(1);
-	emit done();
+	emit operationDone();
 }
 
 void COperationDialog::deleteComponentsDownloadedFiles()
@@ -1230,7 +1230,7 @@ void COperationDialog::deleteComponentsDownloadedFiles()
 	if (isDirectoryEmpty(config->getInstallationDirectory(), true)) QDir(config->getInstallationDirectory()).removeRecursively();
 
 	emit success(1);
-	emit done();
+	emit operationDone();
 }
 
 void COperationDialog::operationPrepare()
@@ -1270,7 +1270,7 @@ void COperationDialog::operationFail(const QString &error)
 
 void COperationDialog::operationContinue()
 {
-	emit done();
+	emit operationDone();
 }
 
 bool COperationDialog::operationShouldStop()

code/ryzom/tools/client/ryzom_installer/src/operationdialog.h

@@ -80,7 +80,7 @@ signals:
 	void fail(const QString &error);
 
 	// emitted when done and should process next step
-	void done();
+	void operationDone();
 
 protected:
 	void showEvent(QShowEvent *e);