From 0f7b988352ab7d2e41ad73adc0f7d965b999e8d8 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 13 Nov 2010 18:33:01 +0100 Subject: [PATCH] Changed: #878 Fix typos in comments/code --- code/nel/include/nel/misc/path.h | 4 ++-- code/nel/include/nel/misc/stl_block_allocator.h | 2 +- .../3d/driver/opengl/driver_opengl_extension.cpp | 2 +- code/nel/src/3d/landscape_vegetable_block.cpp | 2 +- code/nel/src/3d/mesh.cpp | 8 ++++---- code/nel/src/3d/mesh_mrm.cpp | 8 ++++---- code/nel/src/3d/mesh_mrm_skin.cpp | 2 +- code/nel/src/3d/mesh_mrm_skinned.cpp | 2 +- code/nel/src/3d/scene.cpp | 2 +- code/nel/src/3d/skeleton_model.cpp | 2 +- code/nel/src/misc/sheet_id.cpp | 2 +- .../3d/build_clodtex/lod_texture_builder.cpp | 2 +- code/nel/tools/3d/build_interface/main.cpp | 2 +- code/nel/tools/3d/tile_edit/View.cpp | 7 ++++--- code/nel/tools/3d/tile_edit_qt/pic/Pic_Manage.c | 2 +- .../tools/3d/zone_check_bind/zone_check_bind.cpp | 4 ++-- code/nel/tools/3d/zone_welder/internal_weld.cpp | 4 ++-- .../logic/logic_editor_dll/ConditionsView.cpp | 3 ++- .../tools/misc/make_sheet_id/make_sheet_id.cpp | 2 +- code/ryzom/client/src/cdb_branch.cpp | 2 +- code/ryzom/client/src/character_cl.cpp | 4 ++-- code/ryzom/client/src/forage_source_cl.cpp | 2 +- .../src/interface_v3/action_handler_help.cpp | 6 +++--- code/ryzom/client/src/interface_v3/chat_filter.h | 2 +- code/ryzom/client/src/interface_v3/ctrl_scroll.h | 2 +- code/ryzom/client/src/interface_v3/dbctrl_sheet.h | 2 +- .../client/src/interface_v3/dbgroup_list_sheet.h | 2 +- code/ryzom/client/src/interface_v3/group_html.cpp | 3 ++- .../client/src/interface_v3/group_in_scene.h | 2 +- .../src/interface_v3/group_in_scene_bubble.cpp | 2 +- .../src/interface_v3/group_in_scene_user_info.cpp | 2 +- .../client/src/interface_v3/macrocmd_manager.cpp | 6 ++++-- code/ryzom/client/src/login_patch.cpp | 15 ++++++++++----- code/ryzom/client/src/login_patch.h | 4 ++-- code/ryzom/client/src/outpost.cpp | 2 +- .../client/src/r2/dmc/client_edition_module.h | 6 +++--- code/ryzom/client/src/r2/editor.cpp | 2 +- code/ryzom/client/src/r2/tool_choose_pos.cpp | 2 +- code/ryzom/client/src/sheet_manager.h | 2 +- code/ryzom/common/src/game_share/bot_chat_types.h | 2 +- .../ryzom/common/src/game_share/persistent_data.h | 2 +- code/ryzom/common/src/game_share/r2_basic_types.h | 4 ++-- code/ryzom/common/src/game_share/ring_access.cpp | 2 +- code/ryzom/common/src/game_share/rm_family.cpp | 2 +- code/ryzom/server/src/ai_service/ai.h | 2 +- code/ryzom/server/src/ai_service/ai_player.h | 2 +- .../server/src/ai_service/continent_inline.h | 12 ++++++++---- code/ryzom/server/src/ai_service/nf_grp.cpp | 6 +++--- code/ryzom/server/src/ai_share/ai_types.h | 2 +- .../entity_manager/entity_base.h | 2 +- .../player_manager/character.h | 2 +- code/ryzom/server/src/pd_lib/db_delta_file.cpp | 2 +- .../georges_editor_qt/src/filesystem_model.cpp | 2 +- .../georges_editor_qt/src/formdelegate.cpp | 14 +++++++------- .../src/georges_dirtree_dialog.cpp | 2 +- .../src/georges_treeview_dialog.cpp | 11 ++++++----- .../georges_editor_qt/src/georgesform_model.cpp | 6 +++--- .../georges_editor_qt/src/main_window.cpp | 4 ++-- .../georges_editor_qt/src/objectviewer_dialog.cpp | 6 ++---- .../georges_editor_qt/src/settings_dialog.cpp | 2 +- .../tools/translation_tools/extract_bot_names.cpp | 3 +-- 61 files changed, 118 insertions(+), 106 deletions(-) diff --git a/code/nel/include/nel/misc/path.h b/code/nel/include/nel/misc/path.h index f19050c90..a136161fc 100644 --- a/code/nel/include/nel/misc/path.h +++ b/code/nel/include/nel/misc/path.h @@ -588,7 +588,7 @@ struct CFile static bool createEmptyFile (const std::string& filename); /** - * Return a new filename that doesn't exists. It's used for screenshot filename for example. + * Return a new filename that doesn't exist. It's used for screenshot filename for example. * example: findNewFile("foobar.tga"); * will try foobar001.tga, if the file exists, try foobar002.tga and so on until it finds an unexistant file. */ @@ -700,7 +700,7 @@ struct CFile static bool createDirectoryTree(const std::string &dirname); /** Try to set the file access to read/write if not already set. - * return true if the file doesn't exists or if the file already have RW access. + * return true if the file doesn't exist or if the file already have RW access. * Work actually only on Windows and returns always true on other platforms. * \return true if RW access is granted */ diff --git a/code/nel/include/nel/misc/stl_block_allocator.h b/code/nel/include/nel/misc/stl_block_allocator.h index b61278e79..97486c20c 100644 --- a/code/nel/include/nel/misc/stl_block_allocator.h +++ b/code/nel/include/nel/misc/stl_block_allocator.h @@ -34,7 +34,7 @@ namespace NLMISC { * with list<>/set<> etc... node allocations. * * NB: if used with a vector<> or a deque<> (ie if allocate(..,n) is called with n>1), it's still work, - * but it's use malloc()/free() instead, so it is fully unuseful in this case :) + * but it's use malloc()/free() instead, so it is fully useless in this case :) * * CSTLBlockAllocator use a pointer on a CBlockMemory, so multiple containers can share the same * blockMemory, for maximum space/speed efficiency. diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp index f13d33c7b..b65cf5f28 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp @@ -1341,7 +1341,7 @@ void registerGlExtensions(CGlExtensions &ext) // VBHard swap without flush of the VAR. ext.NVStateVARWithoutFlush= GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV; else - // VBHard with unuseful flush of the VAR. + // VBHard with useless flush of the VAR. ext.NVStateVARWithoutFlush= GL_VERTEX_ARRAY_RANGE_NV; // Check NV_occlusion_query diff --git a/code/nel/src/3d/landscape_vegetable_block.cpp b/code/nel/src/3d/landscape_vegetable_block.cpp index cf3b5d61d..7af995c57 100644 --- a/code/nel/src/3d/landscape_vegetable_block.cpp +++ b/code/nel/src/3d/landscape_vegetable_block.cpp @@ -242,7 +242,7 @@ void CLandscapeVegetableBlock::createVegetableIGForDistType(uint i, CVegetable // generate _Patch->generateTileVegetable(vegetIg, i, tms, tmt, vbCreateCtx); - // If the ig is empty, delete him. This optimize rendering because no unuseful ig are + // If the ig is empty, delete him. This optimize rendering because no useless ig are // tested for rendering. This speed up some 1/10 of ms... if(vegetIg->isEmpty()) { diff --git a/code/nel/src/3d/mesh.cpp b/code/nel/src/3d/mesh.cpp index 40cb58700..0f57a8816 100644 --- a/code/nel/src/3d/mesh.cpp +++ b/code/nel/src/3d/mesh.cpp @@ -1692,7 +1692,7 @@ void CMeshGeom::bkupOriginalSkinVertices() // Copy VBuffer content into Original vertices normals. if(_VBuffer.getVertexFormat() & CVertexBuffer::PositionFlag) { - // copy vertices from VBuffer. (NB: unuseful geomorphed vertices are still copied, but doesn't matter). + // copy vertices from VBuffer. (NB: useless geomorphed vertices are still copied, but doesn't matter). _OriginalSkinVertices.resize(numVertices); for(uint i=0; i slowdown...) diff --git a/code/nel/src/misc/sheet_id.cpp b/code/nel/src/misc/sheet_id.cpp index 2d0f1d192..0eaad3a7a 100644 --- a/code/nel/src/misc/sheet_id.cpp +++ b/code/nel/src/misc/sheet_id.cpp @@ -192,7 +192,7 @@ void CSheetId::loadSheetId () removednbfiles++; } } - nlinfo ("SHEETID: Removed %d files on %d from CSheetId because these files doesn't exists", removednbfiles, nbfiles); + nlinfo ("SHEETID: Removed %d files on %d from CSheetId because these files don't exist", removednbfiles, nbfiles); } // Convert the map to one big string and 1 static map (id to name) diff --git a/code/nel/tools/3d/build_clodtex/lod_texture_builder.cpp b/code/nel/tools/3d/build_clodtex/lod_texture_builder.cpp index e3d4abba9..c51ec7f46 100644 --- a/code/nel/tools/3d/build_clodtex/lod_texture_builder.cpp +++ b/code/nel/tools/3d/build_clodtex/lod_texture_builder.cpp @@ -24,7 +24,7 @@ using namespace NL3D; // *************************************************************************** -// Quality factor. Usefull to get maximum of interseting values in the range 0..255. +// Quality factor. Useful to get maximum of interseting values in the range 0..255. #define NL_LTB_MAX_DISTANCE_QUALITY_FACTOR 0.05f // The bigger, the lower the influence of the normal is. must be >=0 #define NL_LTB_NORMAL_BIAS 1.f diff --git a/code/nel/tools/3d/build_interface/main.cpp b/code/nel/tools/3d/build_interface/main.cpp index 2e6452f39..b9e9b44f3 100644 --- a/code/nel/tools/3d/build_interface/main.cpp +++ b/code/nel/tools/3d/build_interface/main.cpp @@ -319,7 +319,7 @@ int main(int nNbArg, char **ppArgs) UVMax[i].U = (float)x+AllMaps[i]->getWidth(); UVMax[i].V = (float)y+AllMaps[i]->getHeight(); - /* // Do not remove this is usefull for debugging + /* // Do not remove this is useful for debugging { NLMISC::COFile outTga; string fmtName = ppArgs[1]; diff --git a/code/nel/tools/3d/tile_edit/View.cpp b/code/nel/tools/3d/tile_edit/View.cpp index a7c91fbbd..0271e1db8 100644 --- a/code/nel/tools/3d/tile_edit/View.cpp +++ b/code/nel/tools/3d/tile_edit/View.cpp @@ -1094,7 +1094,7 @@ void CTView::OnDropFiles(HDROP hDropInfo) { Browse *parent = (Browse*)this->GetParent(); char FileName[256]; - int count=DragQueryFile(hDropInfo,0xffffffff,FileName,256); //count = nombre de fichiers dans le drop + int count=DragQueryFile(hDropInfo,0xffffffff,FileName,256); //count = files number in drop queue POINT pos; @@ -1491,9 +1491,10 @@ LRESULT CTView::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) _chdir (LastPath.c_str()); CFileDialog load(true, NULL, LastPath.c_str(), OFN_ENABLESIZING | OFN_ALLOWMULTISELECT, "Targa bitmap (*.tga)|*.tga|All files (*.*)|*.*||",NULL); - load.m_ofn.lpstrFile = new char[10000]; //le buffer contient la list de tous les noms de fichier + load.m_ofn.lpstrFile = new char[10000]; // buffer contains filenames list load.m_ofn.lpstrFile[0] = 0; - //avec 10ko on devrait tranquille ... si l'ensemble des noms des fichiers depassent 10000 cara, l'insertion n'a pas lieu + // with 10 KB we should be large enough... + // if all files are exceeding 10000 characters, insert would be skipped load.m_ofn.nMaxFile = 10000-1; if (load.DoModal()==IDOK) { diff --git a/code/nel/tools/3d/tile_edit_qt/pic/Pic_Manage.c b/code/nel/tools/3d/tile_edit_qt/pic/Pic_Manage.c index 4765809ff..6efaf0f03 100644 --- a/code/nel/tools/3d/tile_edit_qt/pic/Pic_Manage.c +++ b/code/nel/tools/3d/tile_edit_qt/pic/Pic_Manage.c @@ -96,7 +96,7 @@ unsigned long PIC_Load(char* FileName, unsigned char Quantize) if ( !strcmp(ext,"JPG") ) { type=1; - } + } else if ( !strcmp(ext,"TGA") ) { type=2; diff --git a/code/nel/tools/3d/zone_check_bind/zone_check_bind.cpp b/code/nel/tools/3d/zone_check_bind/zone_check_bind.cpp index dd58d946a..8ed8be957 100644 --- a/code/nel/tools/3d/zone_check_bind/zone_check_bind.cpp +++ b/code/nel/tools/3d/zone_check_bind/zone_check_bind.cpp @@ -241,9 +241,9 @@ static uint CheckZone(std::string middleZoneFile, float weldThreshold, float mid } } - //////////////////////////////////////////////// + ///////////////////////////////////////////////// // check whether each patch is correctly bound // - //////////////////////////////////////////////// + ///////////////////////////////////////////////// for (l = 0; l < zoneInfos[0].Patchs.size(); ++l) { diff --git a/code/nel/tools/3d/zone_welder/internal_weld.cpp b/code/nel/tools/3d/zone_welder/internal_weld.cpp index 5db5164e9..4af2957a7 100644 --- a/code/nel/tools/3d/zone_welder/internal_weld.cpp +++ b/code/nel/tools/3d/zone_welder/internal_weld.cpp @@ -305,9 +305,9 @@ void CleanZone ( std::vector &zoneInfos, uint zoneId, const CAABBoxE } } - //////////////////////////////////////////////// + ///////////////////////////////////////////////// // check whether each patch is correctly bound // - //////////////////////////////////////////////// + ///////////////////////////////////////////////// uint pass = 0; while (1) { diff --git a/code/nel/tools/logic/logic_editor_dll/ConditionsView.cpp b/code/nel/tools/logic/logic_editor_dll/ConditionsView.cpp index 231371c88..b36a11151 100644 --- a/code/nel/tools/logic/logic_editor_dll/ConditionsView.cpp +++ b/code/nel/tools/logic/logic_editor_dll/ConditionsView.cpp @@ -351,7 +351,8 @@ void CConditionsView::OnUpdate(CView* pSender, LPARAM lHint, CObject* pHint) break; } - } while (subPos == NULL); + } + while (subPos == NULL); if (pNode == NULL) break; diff --git a/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp b/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp index 215dafa9e..50dcf910a 100644 --- a/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp +++ b/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp @@ -238,7 +238,7 @@ void makeId( list& dirs ) if( hFind == INVALID_HANDLE_VALUE ) { nlwarning ("Invalid File Handle"); - } + } else { do diff --git a/code/ryzom/client/src/cdb_branch.cpp b/code/ryzom/client/src/cdb_branch.cpp index ece4866c0..06501e940 100644 --- a/code/ryzom/client/src/cdb_branch.cpp +++ b/code/ryzom/client/src/cdb_branch.cpp @@ -956,7 +956,7 @@ void CCDBNodeBranch::removeBranchInfoIt(TObsList::iterator it) //----------------------------------------------- -// Usefull for find +// Useful for find //----------------------------------------------- class CCDBNodeBranchComp : public std::binary_function { diff --git a/code/ryzom/client/src/character_cl.cpp b/code/ryzom/client/src/character_cl.cpp index 146520c78..734d9778e 100644 --- a/code/ryzom/client/src/character_cl.cpp +++ b/code/ryzom/client/src/character_cl.cpp @@ -2075,13 +2075,13 @@ double CCharacterCL::computeSpeed() // Compute and return the speed factor to apply to the animation. // \param speedToDest : evaluted speed to destination. // \return double : the speed factor to use for the current animation. -// \todo GUIGUI : revoir les histoire de scale, faire ca mieux. +// \todo GUIGUI : review this scale problem and optimize it. //----------------------------------------------- double CCharacterCL::computeSpeedFactor(double speedToDest) { double speedFactor = 1.0; - // \todo GUIGUI : faire cette histoire de emote beaucoup mieux, C NULL. + // \todo GUIGUI : optimize emotes, currently it's badly designed. const CAnimationState *animStatePtr; // If the current animation is an emote, get the right animation state. if(animState(MOVE) == CAnimationStateSheet::Emote) diff --git a/code/ryzom/client/src/forage_source_cl.cpp b/code/ryzom/client/src/forage_source_cl.cpp index 2f0aa8dda..a62509aab 100644 --- a/code/ryzom/client/src/forage_source_cl.cpp +++ b/code/ryzom/client/src/forage_source_cl.cpp @@ -359,7 +359,7 @@ NLMISC_VARIABLE( float, ForageSourceUP3, "" ); */ void CForageSourceCL::updateVisualPropertyBars(const NLMISC::TGameCycle &/* gameCycle */, const sint64 &prop) { - // NB: forage don't use CBarManager for 2 reasons: unusefull (forage bars exist only through VP), + // NB: forage don't use CBarManager for 2 reasons: useless (forage bars exist only through VP), // and complicated since updated at each frame on client (because of smooth transition code below) bool setBarsNow = (_BarDestValues[0] == BarNotInit); diff --git a/code/ryzom/client/src/interface_v3/action_handler_help.cpp b/code/ryzom/client/src/interface_v3/action_handler_help.cpp index 63a94f342..3c2e1c18e 100644 --- a/code/ryzom/client/src/interface_v3/action_handler_help.cpp +++ b/code/ryzom/client/src/interface_v3/action_handler_help.cpp @@ -2056,7 +2056,7 @@ void getItemText (CDBCtrlSheet *item, ucstring &itemText, const CItemSheet*pIS) // *************************************************************************** static void setupEnchantedItem(CSheetHelpSetup &setup, ucstring &itemText) { - // if don't find the tag in the text (eg: if not usefull), no-op + // if don't find the tag in the text (eg: if not useful), no-op static const ucstring enchantTag("%enchantment"); if( itemText.find(enchantTag) == ucstring::npos ) return; @@ -2147,7 +2147,7 @@ static void setupRawMaterialStats(CSheetHelpSetup &setup) } // force reset, but try to keep the precedent selection - // (usefull to test same item-part from different MPs) + // (useful to test same item-part from different MPs) sint32 precSel= pCB->getSelection(); pCB->setSelection(1); pCB->setSelection(0); @@ -3126,7 +3126,7 @@ void setupSabrinaPhraseHelp(CSheetHelpSetup &setup, const CSPhraseCom &phrase, u // get the phraseText ucstring phraseText; // if required, add the .sphrase requirements. - // NB: don't add if from bot chat validation (unsusefull cause already filtered by server) + // NB: don't add if from bot chat validation (useless cause already filtered by server) pPM->buildPhraseDesc(phraseText, phrase, phraseSheetId, !setup.FromBotChat); diff --git a/code/ryzom/client/src/interface_v3/chat_filter.h b/code/ryzom/client/src/interface_v3/chat_filter.h index 2e73eaa8f..7524d6c7f 100644 --- a/code/ryzom/client/src/interface_v3/chat_filter.h +++ b/code/ryzom/client/src/interface_v3/chat_filter.h @@ -69,7 +69,7 @@ public: bool isListeningPeopleList(CPeopleList *pl) const; //@} - // For ChatGroup, usefull to know for which chat it is destinated + // For ChatGroup, useful to know for which chat it is destinated CChatGroup::TGroupType FilterType; // If FilterType==CChatGroup::dyn_chat, gives the index of dynchat uint32 DynamicChatDbIndex; diff --git a/code/ryzom/client/src/interface_v3/ctrl_scroll.h b/code/ryzom/client/src/interface_v3/ctrl_scroll.h index b51853466..5f80598a8 100644 --- a/code/ryzom/client/src/interface_v3/ctrl_scroll.h +++ b/code/ryzom/client/src/interface_v3/ctrl_scroll.h @@ -51,7 +51,7 @@ public: sint32 moveTrackY (sint32 dy); /** Move the Target Ofs with a Delta, and recompute TrackPos from this Ofs. - * Usefull for finer controled group scrolling when the list is very big (with mouseWheel or scroll buttons) + * Useful for finer controled group scrolling when the list is very big (with mouseWheel or scroll buttons) */ void moveTargetX (sint32 dx); void moveTargetY (sint32 dy); diff --git a/code/ryzom/client/src/interface_v3/dbctrl_sheet.h b/code/ryzom/client/src/interface_v3/dbctrl_sheet.h index 3134ec5c3..5f4425419 100644 --- a/code/ryzom/client/src/interface_v3/dbctrl_sheet.h +++ b/code/ryzom/client/src/interface_v3/dbctrl_sheet.h @@ -667,7 +667,7 @@ protected: uint32 _PackedArmourColor; - // For an Item only. Usefull for LeftHand Filtering: must have a pointer to the right hand + // For an Item only. Useful for LeftHand Filtering: must have a pointer to the right hand CDBCtrlSheet *_OtherHandItemFilter; // This String is optional and usage dependent for Item, Macro, or Sentence diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.h b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.h index bb1a346a3..d0edc49d9 100644 --- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.h +++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.h @@ -74,7 +74,7 @@ public: virtual void sort() { } void needToSort() { _NeedToSort = true; invalidateCoords(); } - /** (usefull for list only) Force the validity of an element, even if its sheetId==0 + /** (useful for list only) Force the validity of an element, even if its sheetId==0 * (empty slot displayed instead) * NB: invalidateCoords() called if state is changed */ diff --git a/code/ryzom/client/src/interface_v3/group_html.cpp b/code/ryzom/client/src/interface_v3/group_html.cpp index 00caed7e7..43ff1ca75 100644 --- a/code/ryzom/client/src/interface_v3/group_html.cpp +++ b/code/ryzom/client/src/interface_v3/group_html.cpp @@ -367,7 +367,8 @@ void dolibcurltest() addImageDownload("http://www.ryzom.com/fr/"); addImageDownload("http://www.ryzom.com/de/"); - do { + do + { checkImageDownload(); nlwarning("continue to sleep"); nlSleep(300); diff --git a/code/ryzom/client/src/interface_v3/group_in_scene.h b/code/ryzom/client/src/interface_v3/group_in_scene.h index 3a734ff46..76c0f03e7 100644 --- a/code/ryzom/client/src/interface_v3/group_in_scene.h +++ b/code/ryzom/client/src/interface_v3/group_in_scene.h @@ -50,7 +50,7 @@ public: // Position of the group in world space NLMISC::CVector Position; - // usefull only if getUserScale()==true + // useful only if getUserScale()==true float Scale; void setUserScale(bool us); diff --git a/code/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp b/code/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp index 0209d3694..85238ad7d 100644 --- a/code/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp +++ b/code/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp @@ -863,7 +863,7 @@ void CGroupInSceneBubbleManager::dynChatOpen (uint32 nBotUID, uint32 nBotName, c nlassert( (DynStrs.size() >= 1) && (DynStrs.size() <= 9)); CInterfaceManager *pIM = CInterfaceManager::getInstance(); - // If the character doesn't exists in view field -> do not display the bubble + // If the character doesn't exist in view field -> do not display the bubble CEntityCL *pEntity = EntitiesMngr.getEntityByCompressedIndex(nBotUID); if (ClientCfg.Local) pEntity = EntitiesMngr.entity(1); diff --git a/code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp b/code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp index f68fded1e..5da9794cc 100644 --- a/code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp +++ b/code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp @@ -999,7 +999,7 @@ void CGroupInSceneUserInfo::updateDynamicData () // or directly from the forage source else { - // NB: forage don't use CBarManager for 2 reasons: unusefull (forage bars exist only through VP), + // NB: forage don't use CBarManager for 2 reasons: useless (forage bars exist only through VP), // and complicated since updated at each frame on client (because of smooth transition code) CForageSourceCL *forageSource = static_cast(_Entity); barInfo.Score[SCORES::hit_points]= forageSource->getTimeBar(); // Map TimeBar to HP diff --git a/code/ryzom/client/src/interface_v3/macrocmd_manager.cpp b/code/ryzom/client/src/interface_v3/macrocmd_manager.cpp index 64228ede7..352d0ca0d 100644 --- a/code/ryzom/client/src/interface_v3/macrocmd_manager.cpp +++ b/code/ryzom/client/src/interface_v3/macrocmd_manager.cpp @@ -217,7 +217,8 @@ void CMacroCmdManager::initInGame() for (nOpt = 0; nOpt < 3; nOpt++) { i = 0; - do { + do + { sTmp = pIO->getValStr(prefix[nOpt]+NLMISC::toString(i)); if (!sTmp.empty()) { @@ -225,7 +226,8 @@ void CMacroCmdManager::initInGame() wheretostock[nOpt]->push_back(nTexId); } ++i; - } while (!sTmp.empty()); + } + while (!sTmp.empty()); } } diff --git a/code/ryzom/client/src/login_patch.cpp b/code/ryzom/client/src/login_patch.cpp index cd27fd00b..877c2963e 100644 --- a/code/ryzom/client/src/login_patch.cpp +++ b/code/ryzom/client/src/login_patch.cpp @@ -3636,7 +3636,8 @@ void CInstallThread::run() pPM->renameFile(patchName, sourceName); pPM->applyDate(sourceName, lastFileDate); } - } catch ( const std::exception& e) + } + catch ( const std::exception& e) { nlwarning("%s", e.what()); pPM->setState(true, ucstring(e.what()) ); @@ -3668,27 +3669,31 @@ void CInstallThread::run() NLMISC::CFile::deleteFile(vFiles[i]); } // Delete all directory from tmp directory - do { + do + { vFiles.clear(); CPath::getPathContent(install, true, true, false, vFiles); for (uint32 i = 0; i < vFiles.size(); ++i) { NLMISC::CFile::deleteDirectory(vFiles[i]); } - } while ( !vFiles.empty() ); + } + while ( !vFiles.empty() ); // delete tmp directory NLMISC::CFile::deleteDirectory(install); // delete libtorrent_logs directory if exist (not activate) if (NLMISC::CFile::fileExists("libtorrent_logs")) { - do { + do + { vFiles.clear(); CPath::getPathContent("libtorrent_logs", true, true, false, vFiles); for (uint32 i = 0; i < vFiles.size(); ++i) { NLMISC::CFile::deleteDirectory(vFiles[i]); } - } while ( !vFiles.empty() ); + } + while ( !vFiles.empty() ); NLMISC::CFile::deleteDirectory("libtorrent_logs"); } diff --git a/code/ryzom/client/src/login_patch.h b/code/ryzom/client/src/login_patch.h index 3e6abc8cf..07b2e9486 100644 --- a/code/ryzom/client/src/login_patch.h +++ b/code/ryzom/client/src/login_patch.h @@ -440,7 +440,7 @@ private: std::string CurrentFile; - // Usefull pathes and names + // Useful pathes and names /// Now deprecated : the launcher is the client ryzom std::string RyzomFilename; @@ -450,7 +450,7 @@ private: std::string ClientPatchPath; std::string ClientDataPath; - /// Output usefull information for debugging in the log file + /// Output useful information for debugging in the log file bool VerboseLog; bool MustLaunchBatFile; // And then relaunch ryzom diff --git a/code/ryzom/client/src/outpost.cpp b/code/ryzom/client/src/outpost.cpp index ebbf33db9..5adadf67b 100644 --- a/code/ryzom/client/src/outpost.cpp +++ b/code/ryzom/client/src/outpost.cpp @@ -52,7 +52,7 @@ COutpost::COutpost(const COutpost &other) // *************************************************************************** bool COutpost::setupOutpost(const CContinentParameters::CZC &zone, sint32 outpostId, CVillage *village) { - // Yoyo. legacy code. should no more be needed now. Still let for check (usefull?) + // Yoyo. legacy code. should no more be needed now. Still let for check (useful?) NLMISC::CVector2f zonePos; if (!getPosFromZoneName(zone.Name, zonePos)) { diff --git a/code/ryzom/client/src/r2/dmc/client_edition_module.h b/code/ryzom/client/src/r2/dmc/client_edition_module.h index 2b12e1541..0e0f045f3 100644 --- a/code/ryzom/client/src/r2/dmc/client_edition_module.h +++ b/code/ryzom/client/src/r2/dmc/client_edition_module.h @@ -571,7 +571,7 @@ public: //! For some messages, data are cut in small message then send to DSS via SBS. //! Fragmentation enable to implement a progression bar. //! Communication via SBS disable bandwith limitation caused by FS - //! Using sendMsgToDss is usefull only for big message like uploading Scenario or uploading runtime scenario + //! Using sendMsgToDss is useful only for big message like uploading Scenario or uploading runtime scenario //! { /*! Cut a messag in small chunk then send it to DSS via SBS. \param msg The message that will be cut in small chunk an send via sbs. @@ -743,7 +743,7 @@ public: Called withou param this function update the DM action bar. Called with as parameter DESPAWN_NPC, ADD_HP, KILL_NPC, ADD_HP, GRP_KILL, GRP_HEAL, CONTROL, STOP_CONTROL, TALK_AS, STOP_TALK it launch DM function \see CClientEditionModule for more info - \parm args a list of optional argument may be empty or one of "DESPAWN_NPC" "ADD_HP" "KILL_NPC" "ADD_HP" "GRP_KILL" "GRP_HEAL" "CONTROL" "STOP_CONTROL" "TALK_AS" "STOP_TALK". Multi param could be usefull for setting the aggro distance (NIY). + \parm args a list of optional argument may be empty or one of "DESPAWN_NPC" "ADD_HP" "KILL_NPC" "ADD_HP" "GRP_KILL" "GRP_HEAL" "CONTROL" "STOP_CONTROL" "TALK_AS" "STOP_TALK". Multi param could be useful for setting the aggro distance (NIY). */ void dssTarget( std::vector& args); @@ -896,7 +896,7 @@ public: This system enables to register class definition by registerGenerator. Then the call to newComponent generates a CObjectTable using the template that have been save by registerGenerator. The method getPropertyValue on a CObjectTable first look in the table of the object. Then in the palette. Then in its default value of the property then an thoses of his parents. - The function getPropertyList enables to know all properties of an object (usefull for debug) + The function getPropertyList enables to know all properties of an object (useful for debug) You can add an palette Element to the editor by addPaletteElement. A palette element is like a template that you clone and put in the scene. Palette element are mainly defined in r2_palette.lua (binding is done via CComLuaModule diff --git a/code/ryzom/client/src/r2/editor.cpp b/code/ryzom/client/src/r2/editor.cpp index 646705f78..8d3a314e3 100644 --- a/code/ryzom/client/src/r2/editor.cpp +++ b/code/ryzom/client/src/r2/editor.cpp @@ -5257,7 +5257,7 @@ void CEditor::onEditionModeDisconnected() delete _NewScenario; _NewScenario = NULL; CHECK_EDITOR - // Usefull only for the pionner that does not do requestTranslateFeatures() + // Useful only for the pionner that does not do requestTranslateFeatures() // Because avec using the button the currentScenario = 0 try { diff --git a/code/ryzom/client/src/r2/tool_choose_pos.cpp b/code/ryzom/client/src/r2/tool_choose_pos.cpp index 7637322ee..966b54d5a 100644 --- a/code/ryzom/client/src/r2/tool_choose_pos.cpp +++ b/code/ryzom/client/src/r2/tool_choose_pos.cpp @@ -308,7 +308,7 @@ void CToolChoosePos::updateBeforeRender() } // see if all pos are accessible and update the _Valid flag // NB NICO : THE FOLLOWING CODE IS WORKING BUT - // see with others if it's usefull to check this type of collisions + // see with others if it's useful to check this type of collisions // finally -> since check is never done, limited/no interest ... /* if (shown && entity->getPrimitive()) diff --git a/code/ryzom/client/src/sheet_manager.h b/code/ryzom/client/src/sheet_manager.h index c0ba386a2..1a3b64a23 100644 --- a/code/ryzom/client/src/sheet_manager.h +++ b/code/ryzom/client/src/sheet_manager.h @@ -192,7 +192,7 @@ public: sint nbHairColor() {return _NbHairColor;} - /// Get all sheets (usefull for other managers (skill, brick, ...)) + /// Get all sheets (useful for other managers (skill, brick, ...)) // @{ const TEntitySheetMap & getSheets() { return _EntitySheetContainer; } // @} diff --git a/code/ryzom/common/src/game_share/bot_chat_types.h b/code/ryzom/common/src/game_share/bot_chat_types.h index 0971ee512..779bc8ba3 100644 --- a/code/ryzom/common/src/game_share/bot_chat_types.h +++ b/code/ryzom/common/src/game_share/bot_chat_types.h @@ -64,7 +64,7 @@ namespace BOTCHATTYPE // Same than user and item can be retired UserRetirable, // this item was created and sold by the player who whatch the list. appears only in the "Resale list". - // but usefull to know that it belongs to the player and therefore PRICE_RETIRE and RESALE_TIME_LEFT are relevant + // but useful to know that it belongs to the player and therefore PRICE_RETIRE and RESALE_TIME_LEFT are relevant ResaleAndUser, // same then ResaleAndUser and item can be retired ResaleAndUserRetirable, diff --git a/code/ryzom/common/src/game_share/persistent_data.h b/code/ryzom/common/src/game_share/persistent_data.h index ac107a462..d86643a8b 100644 --- a/code/ryzom/common/src/game_share/persistent_data.h +++ b/code/ryzom/common/src/game_share/persistent_data.h @@ -501,7 +501,7 @@ private: // class CPersistentDataRecordRyzomStore //----------------------------------------------------------------------------- // This is just a specialisation of the class that register it into the "RyzomTokenFamily" -// Use it only to store (else unusefull copy of default string table at clear()) +// Use it only to store (else useless copy of default string table at clear()) class CPersistentDataRecordRyzomStore : public CPersistentDataRecord { diff --git a/code/ryzom/common/src/game_share/r2_basic_types.h b/code/ryzom/common/src/game_share/r2_basic_types.h index 1013f46b8..956a4f42d 100644 --- a/code/ryzom/common/src/game_share/r2_basic_types.h +++ b/code/ryzom/common/src/game_share/r2_basic_types.h @@ -39,13 +39,13 @@ private: uint32 _Id; }; -// Usefull because if not defined the compiler do not chose between +// Useful because if not defined the compiler do not chose between // lh.operator uint32() < rh or lh < CSessionId(rh) inline bool operator<(const CSessionId& lh, uint32 rh) { return lh.asInt() < rh; } inline bool operator==(const CSessionId& lh, uint32 rh) { return lh.asInt() == rh; } inline bool operator!=(const CSessionId& lh, uint32 rh) { return lh.asInt() != rh; } -// usefull for lh != 0 +// useful for lh != 0 inline bool operator!=(const CSessionId& lh, int rh) { return lh.asInt() != uint32(rh); } typedef CSessionId TSessionId; diff --git a/code/ryzom/common/src/game_share/ring_access.cpp b/code/ryzom/common/src/game_share/ring_access.cpp index eb6bf1d4c..9eda38010 100644 --- a/code/ryzom/common/src/game_share/ring_access.cpp +++ b/code/ryzom/common/src/game_share/ring_access.cpp @@ -117,7 +117,7 @@ void CRingAccess::init() _R2PlotItemSheetId.insert( CSheetId( NLMISC::toString("r2_plot_item_%d.sitem", i))); } - _SheetIdToAccess.clear();//only usefull when manualy re init file + _SheetIdToAccess.clear();//only useful when manualy re init file // File stream CIFile file; diff --git a/code/ryzom/common/src/game_share/rm_family.cpp b/code/ryzom/common/src/game_share/rm_family.cpp index 0bbc01f02..474dfaaec 100644 --- a/code/ryzom/common/src/game_share/rm_family.cpp +++ b/code/ryzom/common/src/game_share/rm_family.cpp @@ -290,7 +290,7 @@ namespace RM_FABER_STAT_TYPE return CI18N::get("mpstat" + NLMISC::toString((uint)stats)); } - // Array saying for which item part built, what stat is usefull + // Array saying for which item part built, what stat is useful class CItemPartToStat { public: diff --git a/code/ryzom/server/src/ai_service/ai.h b/code/ryzom/server/src/ai_service/ai.h index 3d907d82c..f06271c17 100644 --- a/code/ryzom/server/src/ai_service/ai.h +++ b/code/ryzom/server/src/ai_service/ai.h @@ -107,7 +107,7 @@ public: * Return ~0 if the instance number is already in use. */ uint32 createAIInstance(const std::string &continentName, uint32 instanceNumber); - /** destroy an AI Instance (usefull for ring creation / destruction of session) + /** destroy an AI Instance (useful for ring creation / destruction of session) @param instanceNumber is the AiInstance Id @param displayWarningIfInstanceNotExist If false nothing happends when the specified instance do not exist */ diff --git a/code/ryzom/server/src/ai_service/ai_player.h b/code/ryzom/server/src/ai_service/ai_player.h index 430396b16..d7ad18684 100644 --- a/code/ryzom/server/src/ai_service/ai_player.h +++ b/code/ryzom/server/src/ai_service/ai_player.h @@ -175,7 +175,7 @@ public: } private: - TPlayerMap _spawnedPlayers; // hum .. still usefull ? + TPlayerMap _spawnedPlayers; // hum .. still useful ? /// Team composition. typedef CHashMap > TTeamMap; TTeamMap _teams; diff --git a/code/ryzom/server/src/ai_service/continent_inline.h b/code/ryzom/server/src/ai_service/continent_inline.h index 13c31bca4..0dd3ca8f2 100644 --- a/code/ryzom/server/src/ai_service/continent_inline.h +++ b/code/ryzom/server/src/ai_service/continent_inline.h @@ -775,11 +775,13 @@ CGroupNpc* CGroupDesc::createNpcGroup(CMgrNpc* mgr, CAIVector const& po RYAI_MAP_CRUNCH::CWorldMap const& worldMap = CWorldContainer::getWorldMap(); RYAI_MAP_CRUNCH::CWorldPosition wp; uint32 maxTries = 100; - do { + do + { rpos = pos; rpos += randomPos(dispersionRadius); --maxTries; - } while (!worldMap.setWorldPosition(AITYPES::vp_auto, wp, rpos) && maxTries>0); + } + while (!worldMap.setWorldPosition(AITYPES::vp_auto, wp, rpos) && maxTries>0); if (maxTries<=0) rpos = pos; } @@ -804,11 +806,13 @@ CGroupNpc* CGroupDesc::createNpcGroup(CMgrNpc* mgr, CAIVector const& po RYAI_MAP_CRUNCH::CWorldMap const& worldMap = CWorldContainer::getWorldMap(); RYAI_MAP_CRUNCH::CWorldPosition wp; uint32 maxTries = 100; - do { + do + { rpos = pos; rpos += randomPos(dispersionRadius); --maxTries; - } while (!worldMap.setWorldPosition(AITYPES::vp_auto, wp, rpos) && maxTries>0); + } + while (!worldMap.setWorldPosition(AITYPES::vp_auto, wp, rpos) && maxTries>0); if (maxTries<=0) rpos = pos; } diff --git a/code/ryzom/server/src/ai_service/nf_grp.cpp b/code/ryzom/server/src/ai_service/nf_grp.cpp index ff779543e..74305e5ef 100644 --- a/code/ryzom/server/src/ai_service/nf_grp.cpp +++ b/code/ryzom/server/src/ai_service/nf_grp.cpp @@ -3042,7 +3042,7 @@ void setManagerAggroListTarget_ss_(CStateInstance* entity, CScriptStack& stack) @subsection getBotIndexByName_s_f -Get the index of a bot of a group by its name (or return -1). Mainly usefull for scripted boss. +Get the index of a bot of a group by its name (or return -1). Mainly useful for scripted boss. botIndex begins at zero for the first member of the group, -1 if the bot is not found. @@ -3228,7 +3228,7 @@ void isPlayerAlived_s_f(CStateInstance* entity, CScriptStack& stack) @subsection getServerTimeStr__s Gets the server time as string "eg 21:17:14 the x" -This function is usefull for stat purpose or debug (to know when a boss is down) +This function is useful for stat purpose or debug (to know when a boss is down) Arguments: > s(serverTime) @@ -4284,7 +4284,7 @@ void getBotEid_f_s(CStateInstance* entity, CScriptStack& stack) @subsection getBotIndex_s_f Get the bot Index by its entityId. Entity Id of a bot can be given via getCurrentSpeackerEid(). -It can be usefull to Known the index of the bot in the group with the EntityId. +It can be useful to Known the index of the bot in the group with the EntityId. Arguments: s(botEid) -> f(botIndex), diff --git a/code/ryzom/server/src/ai_share/ai_types.h b/code/ryzom/server/src/ai_share/ai_types.h index 2e04f23f6..17452e9bd 100644 --- a/code/ryzom/server/src/ai_share/ai_types.h +++ b/code/ryzom/server/src/ai_share/ai_types.h @@ -491,7 +491,7 @@ namespace AITYPES // if (FamilyTag < other.FamilyTag) // return true; // if ( FamilyTag==other.FamilyTag -// && FamilyTag==family_tribe ) // usefull ? +// && FamilyTag==family_tribe ) // useful ? // return TribeName < other.TribeName; // return false; // } diff --git a/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.h b/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.h index cd341b61a..81e5b6cd8 100644 --- a/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.h +++ b/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.h @@ -260,7 +260,7 @@ public: /** * Add the properties to the mirror (except the entity state) - * If keepSheetId is false, the sheet id in the object will not be used (usefull to take the value in the mirror instead) + * If keepSheetId is false, the sheet id in the object will not be used (useful to take the value in the mirror instead) */ void addPropertiesToMirror( const TDataSetRow& entityIndex, bool keepSheetId=true ); diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character.h b/code/ryzom/server/src/entities_game_service/player_manager/character.h index 3fb7795c6..88896eead 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/character.h +++ b/code/ryzom/server/src/entities_game_service/player_manager/character.h @@ -2578,7 +2578,7 @@ public: // End of methods from "character_inventory_manipulation.h" //////////////////////////////////////////////////////////////// - /// Ring stuff <=> useful to update the player DB to indicateds the current speed of the incarnated creature + /// Ring stuff <=> useful to update the player DB to indicate the current speed of the incarnated creature void setNpcControl(const NLMISC::CEntityId& eid); void setStopNpcControl(); diff --git a/code/ryzom/server/src/pd_lib/db_delta_file.cpp b/code/ryzom/server/src/pd_lib/db_delta_file.cpp index 53100174d..a413c228d 100644 --- a/code/ryzom/server/src/pd_lib/db_delta_file.cpp +++ b/code/ryzom/server/src/pd_lib/db_delta_file.cpp @@ -221,7 +221,7 @@ bool CDBDeltaFile::preload() // check file exists if (!CFile::fileExists(filepath)) { - nlwarning("CDBDeltaFile::read(): failed, file '%s' doesn't exists", filepath.c_str()); + nlwarning("CDBDeltaFile::read(): failed, file '%s' doesn't exist", filepath.c_str()); return false; } diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/filesystem_model.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/filesystem_model.cpp index 67033af2c..fc0bd4669 100644 --- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/filesystem_model.cpp +++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/filesystem_model.cpp @@ -65,7 +65,7 @@ namespace NLQT if(parent.isValid()) { return 0; - } + } else { return qMin(QFileSystemModel::rowCount(parent),1); diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/formdelegate.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/formdelegate.cpp index ff48889fc..f5ce78726 100644 --- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/formdelegate.cpp +++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/formdelegate.cpp @@ -77,7 +77,7 @@ namespace NLQT editor->addItem(label); } return editor; - } + } else { switch (type->getType()) @@ -144,7 +144,7 @@ namespace NLQT QComboBox *cb = static_cast(editor); cb->setCurrentIndex(cb->findText(value)); //cb->setIconSize() - } + } else { switch (type->getType()) @@ -193,14 +193,14 @@ namespace NLQT if (value == oldValue) { // nothing's changed - } + } else { nldebug(QString("setModelData from %1 to %2") .arg(oldValue).arg(value).toStdString().c_str()); model->setData(index, value, Qt::EditRole); } - } + } else { switch (type->getType()) @@ -214,7 +214,7 @@ namespace NLQT if (QString("%1").arg(value) == oldValue) { // nothing's changed - } + } else { nldebug(QString("setModelData from %1 to %2") @@ -231,7 +231,7 @@ namespace NLQT if (QString("%1").arg(value) == oldValue) { // nothing's changed - } + } else { nldebug(QString("setModelData from %1 to %2") @@ -252,7 +252,7 @@ namespace NLQT if (value == oldValue) { // nothing's changed - } + } else { nldebug(QString("setModelData from %1 to %2") diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_dirtree_dialog.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_dirtree_dialog.cpp index d05ebd605..6d1c999f6 100644 --- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_dirtree_dialog.cpp +++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_dirtree_dialog.cpp @@ -129,7 +129,7 @@ namespace NLQT _ui.dirTree->setModel(_dirModel); _dirModel->setRootPath(_ldPath); _ui.dirTree->setRootIndex(_dirModel->index(_ldPath)); - } + } else { _dirModel = new CFileSystemModel(""); diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp index b163799d2..fa94dc88e 100644 --- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp +++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp @@ -183,7 +183,7 @@ namespace NLQT //flushValueChange (); //UpdateAllViews (NULL); //return TRUE; - } + } else if (loadedForm.contains(".dfn")) { //nlassert (Dfn != NULL); @@ -198,7 +198,7 @@ namespace NLQT //modify (NULL, NULL, false); //UpdateAllViews (NULL); //return TRUE; - } + } else { nlassert (_form != NULL); @@ -239,7 +239,8 @@ namespace NLQT void CGeorgesTreeViewDialog::doubleClicked ( const QModelIndex & index ) { - if (index.column() == 1) { + if (index.column() == 1) + { //QTreeView::doubleClicked(index); return; } @@ -298,7 +299,7 @@ namespace NLQT // if (newState == Qt::Checked) // { // _ui.treeView->setRowHidden(in.row(),in.parent(),false); - // } + // } // else // { // _ui.treeView->setRowHidden(in.row(),in.parent(),true); @@ -314,7 +315,7 @@ namespace NLQT // if (newState == Qt::Checked) // { // _ui.treeView->setRowHidden(in2.row(),in,false); - // } + // } // else // { // _ui.treeView->setRowHidden(in2.row(),in,true); diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_model.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_model.cpp index 79fe69319..e93bca792 100644 --- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_model.cpp +++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_model.cpp @@ -133,7 +133,7 @@ namespace NLQT if (value.contains(".shape")) { return QIcon(":/images/pqrticles.png"); - } + } else if(value.contains(".tga") || value.contains(".png")) { qDebug() << p_index << p_role; @@ -444,8 +444,8 @@ namespace NLQT //columnData << QString(elmName.c_str()) << QString("default") << QString("default"); //parent->appendChild(new CFormItem(elmt, columnData, parent, UFormElm::ValueDefaultDfn, UFormElm::NodeDfn)); - } - } + } + } else { nlinfo("getNodeByName returned false"); diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/main_window.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/main_window.cpp index b6aafe4d8..57c0c3fe2 100644 --- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/main_window.cpp +++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/main_window.cpp @@ -142,7 +142,7 @@ namespace NLQT { _emptyView->deleteLater(); tabifyDockWidget(_emptyView, newView); - } + } else { tabifyDockWidget(_currentView,newView); @@ -216,7 +216,7 @@ namespace NLQT { loadFile(*it, skelFileName); ++it; - } + } _AnimationSetDialog->updateListObject(); _AnimationSetDialog->updateListAnim(); _SlotManagerDialog->updateUiSlots(); diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp index 3137187d2..e44a7739c 100644 --- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp +++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp @@ -138,10 +138,8 @@ namespace NLQT done = false; } } - - - - } while (!done); + } + while (!done); } void CObjectViewerDialog::updateRender() diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/settings_dialog.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/settings_dialog.cpp index 9d3772242..13a2f8a00 100644 --- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/settings_dialog.cpp +++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/settings_dialog.cpp @@ -142,7 +142,7 @@ namespace NLQT if (list.empty()) { Modules::config().getConfigFile().getVar("SearchPaths").forceAsString(""); - } + } else { Modules::config().getConfigFile().getVar("SearchPaths").forceAsString(""); diff --git a/code/ryzom/tools/translation_tools/extract_bot_names.cpp b/code/ryzom/tools/translation_tools/extract_bot_names.cpp index 0b0913d43..1b8e69d94 100644 --- a/code/ryzom/tools/translation_tools/extract_bot_names.cpp +++ b/code/ryzom/tools/translation_tools/extract_bot_names.cpp @@ -615,8 +615,7 @@ int extractBotNames(int argc, char *argv[]) if (transName.find(ucstring("$")) != ucstring::npos) { transName = fctsTitleId; - } - + } } else {