Changed: Minor changes

--HG--
branch : develop

code/nel/include/nel/net/service.h

@@ -218,13 +218,13 @@ public:
 	static bool						isServiceInitialized() { return _Instance != NULL; }
 
 	/// Returns the current service short name (ie: TS)
-	const std::string				&getServiceShortName () const { return _ShortName; };
+	const std::string				&getServiceShortName () const { return _ShortName; }
 
 	/// Returns the current service long name (ie: test_serivce)
-	const std::string				&getServiceLongName () const { return _LongName; };
+	const std::string				&getServiceLongName () const { return _LongName; }
 
 	/// Returns the current service alias name setted by AES
-	const std::string				&getServiceAliasName () const { return _AliasName; };
+	const std::string				&getServiceAliasName () const { return _AliasName; }
 
 	/// Returns the current service unified name that is   alias/short-id or short-id if alias is empty
 	std::string						getServiceUnifiedName () const;
@@ -242,10 +242,10 @@ public:
 	uint32							getLaunchingDate () const;
 
 	/// Return true if this service don't use the NS (naming service)
-	bool							getDontUseNS() const { return _DontUseNS; };
+	bool							getDontUseNS() const { return _DontUseNS; }
 
 	/// Return true if this service don't use the AES (admin executor service)
-	bool							getDontUseAES() const { return _DontUseAES; };
+	bool							getDontUseAES() const { return _DontUseAES; }
 
 	/// Returns arguments of the program pass from the user to the program using parameters (ie: "myprog param1 param2")
 	const NLMISC::CVectorSString	&getArgs () const { return _Args; }

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

@@ -583,7 +583,6 @@ void			CLandscape::setDriver(IDriver *drv)
 		// Does the driver has sufficient requirements for Vegetable???
 		// only if VP supported by GPU, and Only if max vertices allowed.
 		_DriverOkForVegetable = _VertexShaderOk && (_Driver->getMaxVerticesByVertexBufferHard()>=(uint)NL3D_LANDSCAPE_VEGETABLE_MAX_AGP_VERTEX_MAX);
-
 	}
 }
 

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

@@ -611,7 +611,6 @@ void			CLandscapeVBAllocator::setupVBFormatAndVertexProgram(bool withVertexProgr
 			nlverify(_Driver->compileVertexProgram(_VertexProgram[1]));
 		}
 	}
-
 }
 
 

code/ryzom/client/src/CMakeLists.txt

@@ -1,4 +1,3 @@
-
 # Need clientsheets lib for sheets packer tool
 ADD_SUBDIRECTORY(client_sheets)
 

code/ryzom/client/src/commands.cpp

@@ -3890,7 +3890,6 @@ NLMISC_COMMAND(displayInventoryCounter, "display the Inventory counter to compar
 
 NLMISC_COMMAND(displayActionCounter, "display the action counters", "")
 {
-
 	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
 	CSPhraseManager		*pPM= CSPhraseManager::getInstance();
 

code/ryzom/client/src/connection.cpp

@@ -31,7 +31,7 @@
 // 3D Interface.
 #include "nel/3d/u_driver.h"
 #include "nel/3d/u_text_context.h"
-#include <nel/3d/stereo_display.h>
+#include "nel/3d/stereo_display.h"
 // Game Share
 //#include "game_share/gd_time.h"		// \todo GUIGUI : TO DELETE/CHANGE
 #include "game_share/gender.h"

code/ryzom/client/src/init.cpp

@@ -930,7 +930,6 @@ void prelogInit()
 		switch(ClientCfg.Driver3D)
 		{
 #ifdef NL_OS_WINDOWS
-
 			case CClientConfig::Direct3D:
 				driver = UDriver::Direct3d;
 			break;

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

@@ -815,7 +815,6 @@ public:
 		CurrentStackDst= NULL;
 		validateStackItem(pCSSrc, pCSDst, val, CurrentStackMode);
 	}
-
 };
 REGISTER_ACTION_HANDLER( CHandlerStackOk, "stack_item");
 

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

@@ -53,7 +53,6 @@ void CBotChatPageMission::init()
 		NLGUI::CDBManager::getInstance()->addBranchObserver("SERVER:CHOOSE_MISSIONS", &_MissionPagesObs);
 }
 
-
 // ***************************************************************************************
 void CBotChatPageMission::begin()
 {

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

@@ -1808,7 +1808,6 @@ void	CBotChatPageTrade::giveFocusToMaxEBChangeBuyFilterDialog()
 	setFocusOnEditBox(ig->getGroup("edit_max:eb"));
 }
 
-
 // ***************************************************************************
 void		CBotChatPageTrade::startChangeBuyFilterMPDialog()
 {
@@ -1822,7 +1821,6 @@ void		CBotChatPageTrade::startChangeBuyFilterMPDialog()
 	CWidgetManager::getInstance()->enableModalWindow(NULL, ig);
 }
 
-
 // ***************************************************************************
 void		CBotChatPageTrade::confirmChangeBuyFilterMPDialog(uint ft)
 {
@@ -1840,7 +1838,6 @@ void		CBotChatPageTrade::confirmChangeBuyFilterMPDialog(uint ft)
 	CWidgetManager::getInstance()->disableModalWindow();
 }
 
-
 // ***************************************************************************
 void	CBotChatPageTrade::resetItemPartAndTypeFilters()
 {

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

@@ -601,7 +601,7 @@ void CChatGroupWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CC
 					if (pos == ucstring::npos || (colonpos < pos))
 					{
 						// No timestamp, so put it right after the color and add a space
-						pos = newmsg.find(ucstring("}"));;
+						pos = newmsg.find(ucstring("}"));
 						prefix += " ";
 					}
 					newmsg = newmsg.substr(0, pos + 1) + prefix + newmsg.substr(pos + 1);

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

@@ -1741,7 +1741,6 @@ void CDBCtrlSheet::resetCharBitmaps()
 	_CharBitmaps.clear();
 }
 
-
 // ***************************************************************************
 void CDBCtrlSheet::setupCharBitmaps(sint32 maxW, sint32 maxLine, sint32 maxWChar, bool topDown)
 {

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

@@ -175,7 +175,6 @@ void CDBGroupListSheetTextShare::CSheetChildShare::init(CDBGroupListSheetText *p
 	pNL = NLGUI::CDBManager::getInstance()->getDbProp(sTmp, false);
 	nlassert(pNL != NULL);
 	CurrentWanted.link ( sTmp.c_str() );
-
 }
 
 

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

@@ -728,7 +728,6 @@ void CDBGroupListSheetTrade::sort()
 	}
 }
 
-
 bool CDBGroupListSheetTrade::needCheckAllItems()
 {
 	if (_LastFamePriceFactor != _FamePriceFactorLeaf->getValue16())

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

@@ -159,10 +159,8 @@ void CSkillManager::initInGame()
 	_TrackSkillChange= NLGUI::CDBManager::getInstance()->getDbProp("UI:VARIABLES:TRACK_SKILL_CHANGE", true);
 	// Add a branch observer on skill value change
 	NLGUI::CDBManager::getInstance()->addBranchObserver( "SERVER:CHARACTER_INFO:SKILLS", &_SkillChangeObs );
-
 }
 
-
 // ***************************************************************************
 void CSkillManager::uninitInGame()
 {

code/ryzom/client/src/misc.h

@@ -225,6 +225,7 @@ uint getCurrentColorDepth();
 // get maximized
 bool isWindowMaximized();
 
+// get all supported video modes
 sint getRyzomModes(std::vector<NL3D::UDriver::CMode> &videoModes, std::vector<std::string> &stringModeList);
 
 #endif // CL_MISC_H

code/ryzom/client/src/player_cl.cpp

@@ -673,7 +673,7 @@ void CPlayerCL::updateVisualPropertyVpa(const NLMISC::TGameCycle &/* gameCycle *
 	}
 
 	// update title when gender changed
-	const ucstring replacement(STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw,_Gender == GSGENDER::female));
+	const ucstring replacement(STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw, _Gender == GSGENDER::female));
 	if (!replacement.empty() || !ClientCfg.DebugStringManager)
 	{
 		// Get extended name

code/ryzom/client/src/r2/editor.cpp

@@ -5293,10 +5293,8 @@ void  CEditor::onTestModeDisconnected(TSessionId sessionId, uint32 lastAct, TSce
 	//H_AUTO(R2_CEditor_onTestModeDisconnected)
 	CHECK_EDITOR
 	_DMC->CDynamicMapClient::onTestModeDisconnected(sessionId, lastAct, sessionType);
-
 }
 
-
 // *********************************************************************************************************
 void CEditor::nodeInserted(const std::string& instanceId, const std::string& attrName, sint32 position, const std::string& key, CObject* value)
 {
@@ -6611,7 +6609,7 @@ NLMISC::CVectorD getVectorD(const CObject *obj)
 CObject *buildVector(const NLMISC::CVectorD &vector, const std::string &instanceId /*= ""*/)
 {
 	CObject *table;
-	if (instanceId.empty() )
+	if (instanceId.empty())
 	{
 		table = getEditor().getDMC().newComponent("Position");
 		table->set("x", vector.x);

code/ryzom/client/src/time_client.h

@@ -48,7 +48,7 @@ extern sint64	DT64;		// Diff time with current and last frame in ms.
 extern float	DT;			// Diff time with current and last frame in sec.
 extern TTime	TSend;		// Next Time to send motions.
 extern TTime	DTSend;		// Delta of time to generate the next time to send motions.
-                                 extern double	TimeInSec;	// Time for the current frame in second.
+extern double	TimeInSec;	// Time for the current frame in second.
 extern double	FirstTimeInSec;	// Game local origin time
 
 

code/ryzom/server/src/ai_service/ai_bot_npc.cpp

@@ -875,9 +875,9 @@ Colors are something like that:
 2:	VERT CITRON		VERT CITRON			GREEN 
 3:	VERT			VERT				TURQUOISE 
 4:	BLEU			BLEU				BLUE 
-5:	ROUGE fonce		ROUGE (tout court)	CRIMSON 
+5:	ROUGE dark		ROUGE (normal)		CRIMSON 
 6:	BLANC			JAUNE				WHITE 
-7:	NOIR			BLEU tres fonce		BLACK
+7:	NOIR			BLEU very dark		BLACK
 
 3D column is (probably) used for equipment
 */

code/ryzom/server/src/ai_service/generic_logic_action.cpp

@@ -1407,8 +1407,8 @@ public:
 			return false;
 		}
 
-		//	check if its a number or a var.
+		// check if it's a number or a var.
-		//TODO: et les variables negatives?
+		//TODO: and negative values ?
 		if ((str[0]<='9' && str[0]>='0')||(str[0]=='-'))	//	its a number
 		{
 			var.Type = constant;

code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.cpp

@@ -211,13 +211,16 @@ std::vector<TChanID> CPVPManager2::getCharacterChannels(CCharacter * user)
 	result.clear();
 
 	// Add lang channel, should be first.
-	if (!user->getLangChannel().empty()) {
+	if (!user->getLangChannel().empty())
+	{
 		TMAPExtraFactionChannel::iterator it = _ExtraFactionChannel.find(user->getLangChannel());
 		if (it != _ExtraFactionChannel.end())
 		{
 			result.push_back((*it).second);
 		}
-	} else {
+	}
+	else
+	{
 		TMAPExtraFactionChannel::iterator it = _ExtraFactionChannel.find("en");
 		if (it != _ExtraFactionChannel.end())
 		{

code/ryzom/server/src/entities_game_service/shop_type/character_shopping_list.cpp

@@ -460,9 +460,9 @@ void CCharacterShoppingList::initPageToUpdate( uint32 nbSlotPerPage )
 void CCharacterShoppingList::fillTradePage( uint16 session )
 {
 /*
-- Ajout de TRADING:*:PRICE_RETIRE (utile que si SELLER_TYPE == User ou ResaleAndUser). Note: Prix UNITAIRE (si MP, Ammo etc..)
+- Added TRADING:*:PRICE_RETIRE (only useful if SELLER_TYPE == User or ResaleAndUser). Note: UNIT price (if Raw Mats, Ammo, etc..)
-- Si SELLER_TYPE==User seulement: Si PRICE==-1, alors cela veut dire " Item Sold "  (pour afficher la liste des items vendus les plus récents)
+- If SELLER_TYPE==User only: if PRICE==-1, then it means " Item Sold "  (to display list of more recent sold items)
-- Note: TRADING:*:PRICE reste un Prix UNITAIRE (si MP, Ammo etc..) (cela devait déja être le cas)
+- Note: TRADING:*:PRICE is wtill a UNIT price (if Raw Mats, Ammo, etc..) (it should already be the case)
 */
 
 	// get page to update if any

code/ryzom/tools/leveldesign/georges_editor_qt/src/configuration.cpp

@@ -53,7 +53,8 @@ namespace NLQT {
 	{	
 		// load config
 		QFile file(NLQT_CONFIG_FILE);
-		if (!file.exists()) {
+		if (!file.exists())
+		{
 			file.open( QIODevice::WriteOnly | QIODevice::Text );
 			file.write("GraphicsDrivers = { \"OpenGL\", \"Direct3D\" };");
 			file.write("\nSearchPaths = {\"\"};");
@@ -64,9 +65,12 @@ namespace NLQT {
 			file.close();
 		}
 
-		try {
+		try
+		{
 			ConfigFile.load(NLQT_CONFIG_FILE);
-		} catch(...) {
+		}
+		catch(...)
+		{
 		}
 
 		addLeveldesignPath();
@@ -213,7 +217,8 @@ namespace NLQT {
 		uint listsize = tmpList->size();
 		for (uint i = 0; i < listsize; ++i) 
 		{
-			if(_progressCB) {
+			if(_progressCB)
+			{
 				_progressCB->DisplayString = tmpList->at(i);
 				CPath::addSearchPath(tmpList->at(i), true, false, _progressCB);
 			}

code/ryzom/tools/leveldesign/georges_editor_qt/src/formdelegate.cpp

@@ -60,7 +60,8 @@ namespace NLQT
 
 		CFormItem* curItem = m->getItem(mp->mapToSource(index));
 		NLGEORGES::UFormElm *curElm = curItem->getFormElm();
-		if (!curElm) {
+		if (!curElm)
+		{
 			// TODO: create new Element
 			return 0;
 		}

code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp

@@ -377,7 +377,8 @@ namespace NLQT
 		nlinfo("CGeorgesTreeViewDialog::filterRows");
 		CGeorgesFormProxyModel * mp = dynamic_cast<CGeorgesFormProxyModel *>(_ui.treeView->model());
 		CGeorgesFormModel *m = dynamic_cast<CGeorgesFormModel *>(mp->sourceModel());
-		if (m) {
+		if (m)
+		{
 			m->setShowParents(_ui.checkBoxParent->isChecked());
 			m->setShowDefaults(_ui.checkBoxDefaults->isChecked());
 		}

code/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_model.cpp

@@ -352,7 +352,8 @@ namespace NLQT
 
 	/******************************************************************************/
 
-	void CGeorgesFormModel::loadFormData(UFormElm *root, CFormItem *parent) {
+	void CGeorgesFormModel::loadFormData(UFormElm *root, CFormItem *parent)
+	{
 
 		if (!root) 
 			return;
@@ -390,7 +391,8 @@ namespace NLQT
 								elmtType = "Array";						
 							if (elmt->isStruct())
 								elmtType = "Struct";
-							if (elmt->isAtom()) {
+							if (elmt->isAtom())
+							{
 								elmtType = "Atom";
 								uint numDefinitions = 0;
 								const UType *type = elmt->getType();
@@ -433,7 +435,8 @@ namespace NLQT
 										tmpValue = v.c_str();
 										if (type->getType() == UType::SignedInt) 
 										{
-											if (QString("%1").arg(value.c_str()).toDouble() == tmpValue.toDouble()) {
+											if (QString("%1").arg(value.c_str()).toDouble() == tmpValue.toDouble())
+											{
 												value = l;
 												break;
 											}
@@ -482,7 +485,8 @@ namespace NLQT
 							}
 							columnData << QString(elmName.c_str()) << QString(value.c_str()) << "" << elmtType;
 							parent->appendChild(new CFormItem(elmt, columnData, parent, *whereV, *whereN));
-							//if (parents.last()->childCount() > 0) {
+							//if (parents.last()->childCount() > 0)
+							//{
 							//	parents << parents.last()->child(parents.last()->childCount()-1);
 							//}
 							loadFormData(elmt, parent->child(parent->childCount()-1));
@@ -549,7 +553,8 @@ namespace NLQT
 					{
 						if (elmt->isArray())
 							elmtType = "Array";
-						if (elmt->isStruct()) {
+						if (elmt->isStruct())
+						{
 							elmtType = "Struct";
 						}
 						if (elmt->isAtom()) 
@@ -593,25 +598,32 @@ namespace NLQT
 		CFormItem *fi_dep = new CFormItem(_rootElm, QList<QVariant>() << "dependencies", _rootItem);
 		_rootItem->appendChild(fi_dep);
 
-		if (!dfns.isEmpty()) {
+		if (!dfns.isEmpty())
+		{
 			CFormItem *fi_dfn = new CFormItem(_rootElm, QList<QVariant>() << "dfn", fi_dep);
 			fi_dep->appendChild(fi_dfn);
-		foreach(QString str, dfns) {
+			foreach(QString str, dfns)
+			{
 				fi_dfn->appendChild(new CFormItem(_rootElm, QList<QVariant>() << str, fi_dfn));
 			}
 		}
-		if (!typs.isEmpty()) {
+		if (!typs.isEmpty())
+		{
 			CFormItem *fi_typ = new CFormItem(_rootElm, QList<QVariant>() << "typ", fi_dep);
 			fi_dep->appendChild(fi_typ);
-		foreach(QString str, typs) {
+			foreach(QString str, typs)
+			{
 				fi_typ->appendChild(new CFormItem(_rootElm, QList<QVariant>() << str, fi_typ));
 			}
 		}
-		if (!_dependencies.isEmpty()) {
+		if (!_dependencies.isEmpty())
+		{
 			CFormItem *fi_other = new CFormItem(_rootElm, QList<QVariant>() << "other", fi_dep);
 			fi_dep->appendChild(fi_other);
-		foreach(QStringList list, _dependencies) {
+			foreach(QStringList list, _dependencies)
-		foreach(QString str, list) {
+			{
+				foreach(QString str, list)
+				{
 					fi_other->appendChild(new CFormItem(_rootElm, QList<QVariant>() << str, fi_other));
 				}
 			}

code/ryzom/tools/leveldesign/georges_editor_qt/src/main_window.cpp

@@ -338,7 +338,8 @@ namespace NLQT
 		_aboutQtAction->setStatusTip(tr("Show the Qt library's About box"));
 		connect(_aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
 
-		for (int i = 0; i < MaxRecentFiles; ++i) {
+		for (int i = 0; i < MaxRecentFiles; ++i)
+		{
 			recentFileActs[i] = new QAction(this);
 			recentFileActs[i]->setVisible(false);
 			connect(recentFileActs[i], SIGNAL(triggered()),

code/ryzom/tools/leveldesign/georges_editor_qt/src/new_dialog.cpp

@@ -333,7 +333,8 @@ namespace NLQT
 		return -1;
 	}
 
-	void CGeorgesNewDialog::validateParentCombo() {
+	void CGeorgesNewDialog::validateParentCombo()
+	{
 		// TODO: clear if no valid text
 		//if (!_filelist.contains(_ui.parentLineEdit->text()))
 		//	_ui.parentLineEdit->clear();

code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp

@@ -77,7 +77,8 @@ namespace NLQT
 		}
 	}
 
-	void CObjectViewerDialog::topLevelChanged ( bool topLevel ) {
+	void CObjectViewerDialog::topLevelChanged ( bool topLevel )
+	{
 		//nldebug("topLevel:%d",topLevel);
 		//_georges->init();
 	}
@@ -100,7 +101,8 @@ namespace NLQT
 	{
 		//nldebug("%d %d",_nlw->width(), _nlw->height());
 		QDockWidget::resizeEvent(resizeEvent);
-		if (Modules::objViewInt()) {
+		if (Modules::objViewInt())
+		{
 			if (Modules::objViewInt()->getDriver())
 				Modules::objViewInt()->setSizeViewport(resizeEvent->size().width(), resizeEvent->size().height());
 		}

code/ryzom/tools/leveldesign/georges_editor_qt/src/qt_displayer.cpp

@@ -39,8 +39,8 @@ namespace NLQT
 		;
 	}
 
-	CQtDisplayer::~CQtDisplayer() {
+	CQtDisplayer::~CQtDisplayer()
-		;
+	{
 	}
 
 	void CQtDisplayer::setParam (QPlainTextEdit *dlgDebug, bool eraseLastLog)
@@ -59,7 +59,8 @@ namespace NLQT
 
 		QTextCharFormat format;
 
-		if (args.Date != 0 && !_Raw) {
+		if (args.Date != 0 && !_Raw)
+		{
 			str += dateToHumanString(args.Date);
 			needSpace = true;
 		}
@@ -76,24 +77,28 @@ namespace NLQT
 		}
 
 		// Write thread identifier
-		/*if ( args.ThreadId != 0 && !_Raw) {
+		/*if ( args.ThreadId != 0 && !_Raw)
+		{
 			if (needSpace) { str += " "; needSpace = false; }
 			str += NLMISC::toString(args.ThreadId);
 			needSpace = true;
 		}*/
-		/*if (!args.ProcessName.empty() && !_Raw) {
+		/*if (!args.ProcessName.empty() && !_Raw)
+		{
 			if (needSpace) { str += " "; needSpace = false; }
 			str += args.ProcessName;
 			needSpace = true;
 		}*/
 
-		//if (args.FileName != NULL && !_Raw) {
+		//if (args.FileName != NULL && !_Raw)
+		//{
 		//	if (needSpace) { str += " "; needSpace = false; }
 		//	str += NLMISC::CFile::getFilename(args.FileName);
 		//	needSpace = true;
 		//}
 
-		/*if (args.Line != -1 && !_Raw) {
+		/*if (args.Line != -1 && !_Raw)
+		{
 			if (needSpace) { str += " "; needSpace = false; }
 			str += NLMISC::toString(args.Line);
 			needSpace = true;

code/ryzom/tools/translation_tools/main.cpp

@@ -96,7 +96,8 @@ const std::string	historyDir("history/");
 string				diffVersion;
 
 #ifndef NL_OS_WINDOWS
-char* itoa(int val, char *buffer, int base){ 
+char* itoa(int val, char *buffer, int base)
+{
 	static char buf[32] = {0};
 	int i = 30;
 	for(; val && i ; --i, val /= base)