diff --git a/code/nel/include/nel/misc/speaker_listener.h b/code/nel/include/nel/misc/speaker_listener.h index 7481e12c8..5f9f86352 100644 --- a/code/nel/include/nel/misc/speaker_listener.h +++ b/code/nel/include/nel/misc/speaker_listener.h @@ -118,7 +118,7 @@ namespace NLMISC _Speaker->registerListener(this); } - void unregisterListener(ISpeaker *speaker) + void unregisterListener(ISpeaker * /* speaker */) { nlassert(_Speaker != NULL); _Speaker->unregisterListener(this); diff --git a/code/nel/include/nel/sound/source_common.h b/code/nel/include/nel/sound/source_common.h index 7781cfb02..34e3f084a 100644 --- a/code/nel/include/nel/sound/source_common.h +++ b/code/nel/include/nel/sound/source_common.h @@ -99,15 +99,15 @@ public: /// \name Streaming source controls //@{ /// Set the sample format. (channels = 1, 2, ...; bitsPerSample = 8, 16; frequency = samples per second, 44100, ...) - virtual void setFormat(uint8 channels, uint8 bitsPerSample, uint32 frequency) { nlassert(false); } + virtual void setFormat(uint8 /* channels */, uint8 /* bitsPerSample */, uint32 /* frequency */) { nlassert(false); } /// Return the sample format information. - virtual void getFormat(uint8 &channels, uint8 &bitsPerSample, uint32 &frequency) const { nlassert(false); } + virtual void getFormat(uint8 &/* channels */, uint8 &/* bitsPerSample */, uint32 &/* frequency */) const { nlassert(false); } /// Get a writable pointer to the buffer of specified size. Use capacity to specify the required bytes. Returns NULL when all the buffer space is already filled. Call setFormat() first. - virtual uint8 *lock(uint capacity) { nlassert(false); return NULL; } + virtual uint8 *lock(uint /* capacity */) { nlassert(false); return NULL; } /// Notify that you are done writing to the locked buffer, so it can be copied over to hardware if needed. Set size to the number of bytes actually written to the buffer. Returns true if ok. - virtual bool unlock(uint size) { nlassert(false); return false; } + virtual bool unlock(uint /* size */) { nlassert(false); return false; } /// Get the recommended buffer size to use with lock()/unlock() - virtual void getRecommendedBufferSize(uint &samples, uint &bytes) const { nlassert(false); } + virtual void getRecommendedBufferSize(uint &/* samples */, uint &/* bytes */) const { nlassert(false); } /// Get the recommended sleep time based on the size of the last submitted buffer and the available buffer space virtual uint32 getRecommendedSleepTime() const { nlassert(false); return 0; } /// Return if there are still buffers available for playback. diff --git a/code/nel/include/nel/sound/stream_sound.h b/code/nel/include/nel/sound/stream_sound.h index 39e6c733c..4b0debe0c 100644 --- a/code/nel/include/nel/sound/stream_sound.h +++ b/code/nel/include/nel/sound/stream_sound.h @@ -46,7 +46,7 @@ public: virtual void importForm(const std::string& filename, NLGEORGES::UFormElm& formRoot); /// Used by the george sound plugin to check sound recursion (ie sound 'toto' use sound 'titi' witch also use sound 'toto' ...). - virtual void getSubSoundList(std::vector > &subsounds) const { } + virtual void getSubSoundList(std::vector > &/* subsounds */) const { } /// Serialize the sound data. virtual void serial(NLMISC::IStream &s); diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_file.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_file.h index 7527b5dbd..7695ebc2f 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_file.h +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_file.h @@ -74,7 +74,7 @@ public: * Append the header to a created bnp file * \param filename (consisting the whole path) */ - void appendHeader (const std::string &filename) {}; + void appendHeader (const std::string &filename) {} /** * Create a vector of all packed files inside the bnp file diff --git a/code/nel/tools/3d/tile_edit_qt/tile_listwidgetitem.h b/code/nel/tools/3d/tile_edit_qt/tile_listwidgetitem.h index b12be6437..4cf6ee1ae 100644 --- a/code/nel/tools/3d/tile_edit_qt/tile_listwidgetitem.h +++ b/code/nel/tools/3d/tile_edit_qt/tile_listwidgetitem.h @@ -21,17 +21,17 @@ #include "ui_tile_widget_qt.h" class CTile_ListWidgetItem : public QListWidgetItem - { - public: - CTile_ListWidgetItem ( QListWidget * parent, int type = Type ):QListWidgetItem(parent,type){}; +{ +public: + CTile_ListWidgetItem ( QListWidget * parent, int type = Type ):QListWidgetItem(parent,type){} CTile_ListWidgetItem(QWidget *parent = 0); void initWidget(const QPixmap&, const QString&); - private: - Ui::TileWidget ui; +private: + Ui::TileWidget ui; // Qpixmap tilePixmap; // QString tileLabel; - }; +}; #endif \ No newline at end of file diff --git a/code/nelns/login_service/mysql_helper.h b/code/nelns/login_service/mysql_helper.h index cc81f4647..7f6893b4a 100644 --- a/code/nelns/login_service/mysql_helper.h +++ b/code/nelns/login_service/mysql_helper.h @@ -70,7 +70,7 @@ public: private: //we don't want user to do a copy - CMysqlResult(const CMysqlResult &mysqlResult){}; + CMysqlResult(const CMysqlResult &mysqlResult){} MYSQL_RES *Result; }; diff --git a/code/nelns/login_system/nel_launcher_windows_ext/BarTabsWnd.h b/code/nelns/login_system/nel_launcher_windows_ext/BarTabsWnd.h index eefb93653..2437ae854 100644 --- a/code/nelns/login_system/nel_launcher_windows_ext/BarTabsWnd.h +++ b/code/nelns/login_system/nel_launcher_windows_ext/BarTabsWnd.h @@ -14,9 +14,9 @@ class CTabsObserver { public: - CTabsObserver() {}; + CTabsObserver() {} - virtual void OnTab(int iTab) {}; + virtual void OnTab(int iTab) {} }; class CBarTabsWnd : public CWnd diff --git a/code/ryzom/client/src/interface_v3/chat_filter.h b/code/ryzom/client/src/interface_v3/chat_filter.h index 7524d6c7f..d717d9fb5 100644 --- a/code/ryzom/client/src/interface_v3/chat_filter.h +++ b/code/ryzom/client/src/interface_v3/chat_filter.h @@ -37,7 +37,7 @@ class CChatInputFilter : public NLMISC::CRefCount, public CChatWindow::IObserver { public: CChatInputFilter() {FilterType= CChatGroup::say; DynamicChatDbIndex= 0;} - ~CChatInputFilter(); + virtual ~CChatInputFilter(); /** Display a msg in the chat. The msg will be forwarded to all the listening windows * Listening windows will blick only if there isnt a single visible listening window, so that the player can know if there's a message * \param windowVisible is not NULL, points a bool that will be filled with true if one of the window on the which the msg was displayed is visible. diff --git a/code/ryzom/client/src/interfaces_manager/scroll_bar.h b/code/ryzom/client/src/interfaces_manager/scroll_bar.h index f9e42473a..5b2e248df 100644 --- a/code/ryzom/client/src/interfaces_manager/scroll_bar.h +++ b/code/ryzom/client/src/interfaces_manager/scroll_bar.h @@ -44,7 +44,7 @@ public: CScrollBar(uint id, float x, float y, float x_pixel, float y_pixel, float w, float h, float w_pixel, float h_pixel, bool vertical = true,CScrollableControl *ctrl = NULL); /// destructor - virtual ~CScrollBar() {}; + virtual ~CScrollBar() {} /// Display the control virtual void display(); diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/Platform.h b/code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/Platform.h index 5a07d109a..8a8d25ff0 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/Platform.h +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/Platform.h @@ -277,8 +277,8 @@ private: Surface(const Surface &) {} Surface &operator=(const Surface &) { return *this; } public: - Surface() {}; - virtual ~Surface() {}; + Surface() {} + virtual ~Surface() {} static Surface *Allocate(); virtual void Init()=0; diff --git a/code/ryzom/server/src/admin_modules/admin_modules_itf.h b/code/ryzom/server/src/admin_modules/admin_modules_itf.h index 3f430ed43..248ba6834 100644 --- a/code/ryzom/server/src/admin_modules/admin_modules_itf.h +++ b/code/ryzom/server/src/admin_modules/admin_modules_itf.h @@ -1829,9 +1829,9 @@ namespace ADMIN // unused interceptors std::string fwdBuildModuleManifest() const { return std::string(); } - void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}; + void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {} // process module message interceptor bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message); @@ -1969,9 +1969,9 @@ namespace ADMIN // unused interceptors std::string fwdBuildModuleManifest() const { return std::string(); } - void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}; + void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {} // process module message interceptor bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message); @@ -2202,9 +2202,9 @@ namespace ADMIN // unused interceptors std::string fwdBuildModuleManifest() const { return std::string(); } - void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}; + void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {} // process module message interceptor bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message); diff --git a/code/ryzom/server/src/ai_service/ai_logic_action.h b/code/ryzom/server/src/ai_service/ai_logic_action.h index 631f9f620..452087b18 100644 --- a/code/ryzom/server/src/ai_service/ai_logic_action.h +++ b/code/ryzom/server/src/ai_service/ai_logic_action.h @@ -46,7 +46,7 @@ public: // note that actions are NOT responsible for deleting child actions virtual ~IAILogicAction() - {}; + {} // this is the execute 'callback' for the action type. // NOTE: This code should be fast and compact as it may be called very large numbers of times diff --git a/code/ryzom/server/src/ai_service/ai_profile_npc.h b/code/ryzom/server/src/ai_service/ai_profile_npc.h index 9fed6e662..f8ec911f4 100644 --- a/code/ryzom/server/src/ai_service/ai_profile_npc.h +++ b/code/ryzom/server/src/ai_service/ai_profile_npc.h @@ -633,7 +633,7 @@ public CMoveProfile { public: CGrpProfileFollowPlayer(CProfileOwner* owner, TDataSetRow const& playerRow, uint32 dispersionRadius); - virtual ~CGrpProfileFollowPlayer() {}; + virtual ~CGrpProfileFollowPlayer() {} void setBotStandProfile(AITYPES::TProfiles botStandProfileType, IAIProfileFactory* botStandProfileFactory); @@ -641,16 +641,16 @@ public: //@{ virtual void beginProfile(); virtual void updateProfile(uint ticksSinceLastUpdate); - virtual void endProfile() {}; + virtual void endProfile() {} virtual AITYPES::TProfiles getAIProfileType() const { return AITYPES::BOT_FOLLOW_POS; } virtual std::string getOneLineInfoString() const { return std::string("follow_player group profile"); } //@} - void stateChangeProfile() {}; + void stateChangeProfile() {} bool destinationReach() const; - void addBot (CBot* bot) {}; - void removeBot (CBot* bot) {}; + void addBot (CBot* bot) {} + void removeBot (CBot* bot) {} CPathCont* getPathCont (CBot const* bot) { return NULL; }; diff --git a/code/ryzom/server/src/ai_service/continent.h b/code/ryzom/server/src/ai_service/continent.h index a9a265e7d..8b92cf6b9 100644 --- a/code/ryzom/server/src/ai_service/continent.h +++ b/code/ryzom/server/src/ai_service/continent.h @@ -529,6 +529,7 @@ class CLazyProcess : public NLMISC::CRefCount { public: + virtual ~CLazyProcess() {} /// Used to update some dependencies for instance road connections when the first next update of CContinent is called. virtual void update() const = 0; /// Used to check if there's no need to add another lazyprocess. @@ -1052,6 +1053,7 @@ class IGroupDesc : public NLMISC::CRefCount { public: + virtual ~IGroupDesc() {} virtual uint32 groupEnergyValue() const = 0; virtual float groupEnergyCoef() const = 0; virtual bool getCountMultiplierFlag() const = 0; diff --git a/code/ryzom/server/src/ai_service/family_profile.h b/code/ryzom/server/src/ai_service/family_profile.h index a07acab8a..b4df92d92 100644 --- a/code/ryzom/server/src/ai_service/family_profile.h +++ b/code/ryzom/server/src/ai_service/family_profile.h @@ -87,15 +87,15 @@ public: virtual void update() =0; /// Fill a vector of outpost id name assigned to tribe - virtual void fillOutpostNames(std::vector outpostNames) {}; + virtual void fillOutpostNames(std::vector outpostNames) {} /// Add an outpost for the tribe (nb : the family must be a tribe) - virtual void outpostAdd(NLMISC::TStringId outpostName) {}; + virtual void outpostAdd(NLMISC::TStringId outpostName) {} /// Remove an from the tribe - virtual void outpostRemove(NLMISC::TStringId outpostName) {}; + virtual void outpostRemove(NLMISC::TStringId outpostName) {} - virtual void outpostEvent(NLMISC::TStringId outpostName, ZCSTATE::TZcState state) {}; + virtual void outpostEvent(NLMISC::TStringId outpostName, ZCSTATE::TZcState state) {} - virtual void spawnBoss(NLMISC::TStringId outpostName) {}; + virtual void spawnBoss(NLMISC::TStringId outpostName) {} CGroupNpc *createNpcGroup(const CNpcZone *const zone, const CGroupDesc *const groupDesc); diff --git a/code/ryzom/server/src/ai_service/fx_entity.h b/code/ryzom/server/src/ai_service/fx_entity.h index 3fbf66b92..78f4bb37b 100644 --- a/code/ryzom/server/src/ai_service/fx_entity.h +++ b/code/ryzom/server/src/ai_service/fx_entity.h @@ -28,7 +28,7 @@ class CFxEntity { public: CFxEntity(CAIPos const& pos, NLMISC::CSheetId const& sheet); - ~CFxEntity(); + virtual ~CFxEntity(); NLMISC::CEntityId const& id() const; bool spawn(); void despawn(); diff --git a/code/ryzom/server/src/ai_service/sheets.h b/code/ryzom/server/src/ai_service/sheets.h index 7526218c0..0473af4a9 100644 --- a/code/ryzom/server/src/ai_service/sheets.h +++ b/code/ryzom/server/src/ai_service/sheets.h @@ -644,6 +644,7 @@ class IRaceStats : public NLMISC::CRefCount { public: + virtual ~IRaceStats() {} virtual NLMISC::CSheetId SheetId() const = 0; virtual std::string Race() const = 0; }; diff --git a/code/ryzom/server/src/entities_game_service/building_manager/building_physical.h b/code/ryzom/server/src/entities_game_service/building_manager/building_physical.h index d37966aeb..d635ecd71 100644 --- a/code/ryzom/server/src/entities_game_service/building_manager/building_physical.h +++ b/code/ryzom/server/src/entities_game_service/building_manager/building_physical.h @@ -73,9 +73,9 @@ public: /// fill the icon param, send the description text to the user and store the resulting text id in the textId param. virtual void getClientDescription(uint16 roomIdx, uint16 ownerIndex, CCharacter * user, uint64 & icon, uint32 & textId )const = 0; /// callback called when all the appartments of a user must be removed - virtual void onPlayerDeletion( const NLMISC::CEntityId & userId ){}; + virtual void onPlayerDeletion( const NLMISC::CEntityId & userId ){} /// callback called when all the appartments of a guild must be removed - virtual void onGuildDeletion( uint32 guild ){}; + virtual void onGuildDeletion( uint32 guild ){} /// return true if the user is allowed to go in the building virtual bool isUserAllowed(CCharacter * user, uint16 ownerIdx, uint16 roomIdx) = 0; ///return the number of owner in this building ( return 1 for common buildings ) diff --git a/code/ryzom/server/src/entities_game_service/creature_manager/creature_manager.h b/code/ryzom/server/src/entities_game_service/creature_manager/creature_manager.h index 75b40c5c3..388c9f3b4 100644 --- a/code/ryzom/server/src/entities_game_service/creature_manager/creature_manager.h +++ b/code/ryzom/server/src/entities_game_service/creature_manager/creature_manager.h @@ -121,14 +121,14 @@ public: /// exception thrown when creature is unknown struct ECreature : public NLMISC::Exception { - ECreature( const NLMISC::CEntityId& id ) : Exception ("The creature "+id.toString()+" doesn't exist") {}; + ECreature( const NLMISC::CEntityId& id ) : Exception ("The creature "+id.toString()+" doesn't exist") {} }; /// structure describing an unaffected fauna group ( because the description is received before mirror update ) struct SUnaffectedFaunaGroup { SUnaffectedFaunaGroup(const TDataSetRow& entityIndex,TAIAlias groupAlias) - :EntityIndex( entityIndex ),GroupAlias( groupAlias ){}; + :EntityIndex( entityIndex ),GroupAlias( groupAlias ){} TDataSetRow EntityIndex; TAIAlias GroupAlias; }; diff --git a/code/ryzom/server/src/entities_game_service/egs_progress_callback.h b/code/ryzom/server/src/entities_game_service/egs_progress_callback.h index bb1fc9de6..78cbc356e 100644 --- a/code/ryzom/server/src/entities_game_service/egs_progress_callback.h +++ b/code/ryzom/server/src/entities_game_service/egs_progress_callback.h @@ -31,7 +31,7 @@ class CEGSProgressCallback : public NLMISC::IProgressCallback { public: CEGSProgressCallback():IProgressCallback() {} - virtual void progress (float progressValue) {}; + virtual void progress (float progressValue) {} virtual ~CEGSProgressCallback() {} }; diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_sheets.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_sheets.h index 41c1bcec4..a1619f5f4 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_sheets.h +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_sheets.h @@ -74,7 +74,7 @@ public : /// exception thrown when a sheet is unknown struct ESheet : public NLMISC::Exception { - ESheet( const NLMISC::CSheetId& sheetId ) : Exception ("The sheet "+sheetId.toString()+" is unknown") {}; + ESheet( const NLMISC::CSheetId& sheetId ) : Exception ("The sheet "+sheetId.toString()+" is unknown") {} }; public: diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.h index 0ef0e0335..0840d01d1 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.h +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.h @@ -429,7 +429,7 @@ struct SShield : public SArmor NL_INSTANCE_COUNTER_DECL(SShield); public: - inline SShield() : SArmor(),ShieldType(SHIELDTYPE::NONE),Unbreakable(false){}; + inline SShield() : SArmor(),ShieldType(SHIELDTYPE::NONE),Unbreakable(false){} virtual void serial(class NLMISC::IStream &f) { 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 81e5b6cd8..fc3cd5903 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 @@ -140,7 +140,7 @@ public: _ExceptionString = std::string(" : Invalid stat name ") + var; return _ExceptionString.c_str(); } - virtual ~EInvalidStat() throw() {}; + virtual ~EInvalidStat() throw() {} private: mutable std::string _ExceptionString; }; @@ -820,7 +820,7 @@ public: /// Return the damage using current armor, done by an explosion (e.g. forage source explosion) virtual float getActualDamageFromExplosionWithArmor( float dmg ) const =0; - inline virtual void clearCurrentAction() {}; + inline virtual void clearCurrentAction() {} inline virtual void setCurrentAction(CLIENT_ACTION_TYPE::TClientActionType,NLMISC::TGameCycle) {} diff --git a/code/ryzom/server/src/entities_game_service/entity_manager/entity_manager.h b/code/ryzom/server/src/entities_game_service/entity_manager/entity_manager.h index 88f893c91..cf5422f1a 100644 --- a/code/ryzom/server/src/entities_game_service/entity_manager/entity_manager.h +++ b/code/ryzom/server/src/entities_game_service/entity_manager/entity_manager.h @@ -59,7 +59,7 @@ public: /// exception thrown when entity is unknown struct EEntity : public NLMISC::Exception { - EEntity( const NLMISC::CEntityId& id ) : Exception ("The entity "+id.toString()+" doesn't exist") {}; + EEntity( const NLMISC::CEntityId& id ) : Exception ("The entity "+id.toString()+" doesn't exist") {} }; /* // Success table for calculation of success probability and associate xp-gains diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item_manager.h b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item_manager.h index a0aee63fc..8bd4e6b90 100644 --- a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item_manager.h +++ b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item_manager.h @@ -61,7 +61,7 @@ public : /// exception thrown when a sheet is unknown struct ESheet : public NLMISC::Exception { - ESheet( const NLMISC::CSheetId& sheetId ) : Exception ("The sheet "+sheetId.toString()+" is unknown") {}; + ESheet( const NLMISC::CSheetId& sheetId ) : Exception ("The sheet "+sheetId.toString()+" is unknown") {} }; public: diff --git a/code/ryzom/server/src/entities_game_service/guild_manager/guild_unifier_itf.h b/code/ryzom/server/src/entities_game_service/guild_manager/guild_unifier_itf.h index 1280fe6c2..98a4f9229 100644 --- a/code/ryzom/server/src/entities_game_service/guild_manager/guild_unifier_itf.h +++ b/code/ryzom/server/src/entities_game_service/guild_manager/guild_unifier_itf.h @@ -490,9 +490,9 @@ namespace GU // unused interceptors std::string fwdBuildModuleManifest() const { return std::string(); } - void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}; + void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {} // process module message interceptor bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message); diff --git a/code/ryzom/server/src/entities_game_service/guild_manager/guild_version_adapter.h b/code/ryzom/server/src/entities_game_service/guild_manager/guild_version_adapter.h index 2bb3464de..8b59b2a97 100644 --- a/code/ryzom/server/src/entities_game_service/guild_manager/guild_version_adapter.h +++ b/code/ryzom/server/src/entities_game_service/guild_manager/guild_version_adapter.h @@ -50,7 +50,7 @@ private: void adaptToVersion4(CGuild &guild) const; private: - CGuildVersionAdapter(){}; + CGuildVersionAdapter(){} /// unique instance static CGuildVersionAdapter* _Instance; }; diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_event.h b/code/ryzom/server/src/entities_game_service/mission_manager/mission_event.h index a0f9e77d7..b5bb0fccd 100644 --- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_event.h +++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_event.h @@ -94,7 +94,7 @@ public: static bool simMissionEvent(const std::vector< std::string > & script, NLMISC::CLog & log ); protected: - CMissionEvent(){}; + CMissionEvent(){} /// build an event from a script virtual bool buildFromScript( const std::vector< std::string > & script,NLMISC::CLog& log ) = 0; @@ -114,7 +114,7 @@ public: uint32 Mission; protected: friend class CMissionEvent; - CMissionEventMissionDone(){}; + CMissionEventMissionDone(){} bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log); }; @@ -130,7 +130,7 @@ public: std::string ScenarioTag; protected: friend class CMissionEvent; - CMissionEventTaggedRingScenarioDone(){}; + CMissionEventTaggedRingScenarioDone(){} bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log); }; @@ -158,7 +158,7 @@ public: uint32 Amount; protected: friend class CMissionEvent; - CMissionEventGiveMoney(){}; + CMissionEventGiveMoney(){} bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log); }; @@ -171,7 +171,7 @@ public: uint32 PlaceId; protected: friend class CMissionEvent; - CMissionEventVisitPlace(){}; + CMissionEventVisitPlace(){} bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log); }; @@ -184,7 +184,7 @@ public: std::vector Bricks; protected: friend class CMissionEvent; - CMissionEventCast(){}; + CMissionEventCast(){} bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log); }; @@ -196,7 +196,7 @@ public: :CMissionEvent(Kill, targetEntity, restriction){} protected: friend class CMissionEvent; - CMissionEventKill(){}; + CMissionEventKill(){} bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log); }; @@ -209,7 +209,7 @@ public: :CMissionEvent(KillPlayer, victimId){} protected: friend class CMissionEvent; - CMissionEventKillPlayer(){}; + CMissionEventKillPlayer(){} bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log); }; @@ -225,7 +225,7 @@ public: uint16 Quality; protected: friend class CMissionEvent; - CMissionEventBuyItem(){}; + CMissionEventBuyItem(){} bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log); }; @@ -241,7 +241,7 @@ public: uint16 Quality; protected: friend class CMissionEvent; - CMissionEventSellItem(){}; + CMissionEventSellItem(){} bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log); }; @@ -257,7 +257,7 @@ public: uint16 Quality; protected: friend class CMissionEvent; - CMissionEventForage(){}; + CMissionEventForage(){} bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log); }; @@ -283,7 +283,7 @@ public: uint Level; protected: friend class CMissionEvent; - CMissionEventSkillProgress(){}; + CMissionEventSkillProgress(){} bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log); }; @@ -295,7 +295,7 @@ public: :CMissionEvent(Target,targetEntity ){} protected: friend class CMissionEvent; - CMissionEventTarget(){}; + CMissionEventTarget(){} bool buildFromScript( const std::vector< std::string > & script,NLMISC::CLog& log ); }; @@ -311,7 +311,7 @@ public: uint16 Quality; protected: friend class CMissionEvent; - CMissionEventCraft(){}; + CMissionEventCraft(){} bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log); }; @@ -351,7 +351,7 @@ public: uint16 Quality; protected: friend class CMissionEvent; - CMissionEventLootItem(){}; + CMissionEventLootItem(){} bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log); }; @@ -366,7 +366,7 @@ public: uint16 Quality; protected: friend class CMissionEvent; - CMissionEventLootRm(){}; + CMissionEventLootRm(){} bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log); }; @@ -379,7 +379,7 @@ public: TAIAlias Alias; protected: friend class CMissionEvent; - CMissionEventKillGroup(){}; + CMissionEventKillGroup(){} bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log); }; diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_template.h b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_template.h index 132463bec..6e92fb23f 100644 --- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_template.h +++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_template.h @@ -102,7 +102,7 @@ public: ///\name accessors //@{ /// return the step actions - inline const std::vector< IMissionAction* > & getActions(){ return _Actions; }; + inline const std::vector< IMissionAction* > & getActions(){ return _Actions; } /// set the out of order index of the step ( it is the index of the OOO/ANY bloc embedding the step ) 0xFF is invalid inline void setOOOStepIndex(uint32 idx){ _OOOStepIndex = idx; } ///\return the OOO index ( see previous line ) @@ -120,9 +120,9 @@ public: ///\set displayed value void setIconDisplayedOnStepNPC(bool displayed){ _IconDisplayedOnStepNPC = displayed;} /// return true if the step is in an OOO block which text wad overriden - bool isInOverridenOOO() { return _IsInOverridenOOO; }; + bool isInOverridenOOO() { return _IsInOverridenOOO; } /// set the isInOverridenOOO flag ( see previous method ) - void setAsInOverridenOOO() { _IsInOverridenOOO = true; }; + void setAsInOverridenOOO() { _IsInOverridenOOO = true; } /// return true if there is a roleplay text in this step bool isThereRoleplayText() { return !_RoleplayText.empty(); } /// check if the current player gift is ok @@ -130,7 +130,7 @@ public: /// retrieve the escort groups - virtual void getEscortGroups( std::vector< TAIAlias > & groups ){}; + virtual void getEscortGroups( std::vector< TAIAlias > & groups ){} virtual bool checkEscortFailure( bool groupWiped ){return false;} /// check the consistency of a text step diff --git a/code/ryzom/server/src/entities_game_service/modules/r2_give_item.h b/code/ryzom/server/src/entities_game_service/modules/r2_give_item.h index 9e56b8aea..a5d46c766 100644 --- a/code/ryzom/server/src/entities_game_service/modules/r2_give_item.h +++ b/code/ryzom/server/src/entities_game_service/modules/r2_give_item.h @@ -81,7 +81,7 @@ public: typedef std::map< TCreatureRowId, TCreatureItemRequest > TPendingRequest; // constructor - CR2GiveItem() {}; + CR2GiveItem() {} // destructor ~CR2GiveItem() {} diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/faber_phrase.h b/code/ryzom/server/src/entities_game_service/phrase_manager/faber_phrase.h index 80a2cf5fb..9458a540d 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/faber_phrase.h +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/faber_phrase.h @@ -75,10 +75,10 @@ public: ///\unused basic methods from CSPhrase //@{ - virtual void setPrimaryItem( CGameItemPtr itemPtr ){}; - virtual void setSecondaryItem( CGameItemPtr itemPtr ){}; - virtual void addConsumableItem( CGameItemPtr itemPtr ){}; - virtual void setPrimaryTarget( const TDataSetRow& ) {}; + virtual void setPrimaryItem( CGameItemPtr itemPtr ){} + virtual void setSecondaryItem( CGameItemPtr itemPtr ){} + virtual void addConsumableItem( CGameItemPtr itemPtr ){} + virtual void setPrimaryTarget( const TDataSetRow& ) {} //@} // Craft methodes diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/fg_extraction_phrase.h b/code/ryzom/server/src/entities_game_service/phrase_manager/fg_extraction_phrase.h index 250481562..e8941a6ac 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/fg_extraction_phrase.h +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/fg_extraction_phrase.h @@ -60,7 +60,7 @@ public: /** * set the actor */ - virtual void setActor( const TDataSetRow &entityRowId ){}; + virtual void setActor( const TDataSetRow &entityRowId ){} /** * called at the end of the latency time diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/fg_prospection_phrase.h b/code/ryzom/server/src/entities_game_service/phrase_manager/fg_prospection_phrase.h index 48e27234f..1f202910c 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/fg_prospection_phrase.h +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/fg_prospection_phrase.h @@ -86,7 +86,7 @@ public: /** * set the actor */ - virtual void setActor( const TDataSetRow &entityRowId ){}; + virtual void setActor( const TDataSetRow &entityRowId ){} //@} diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/harvest_phrase.h b/code/ryzom/server/src/entities_game_service/phrase_manager/harvest_phrase.h index c5cc5afaf..fc011a623 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/harvest_phrase.h +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/harvest_phrase.h @@ -62,10 +62,10 @@ public: ///\unused basic methods from CSPhrase //@{ - virtual void setPrimaryItem( CGameItemPtr itemPtr ){}; - virtual void setSecondaryItem( CGameItemPtr itemPtr ){}; - virtual void addConsumableItem( CGameItemPtr itemPtr ){}; - virtual void setPrimaryTarget( const TDataSetRow& ) {}; + virtual void setPrimaryItem( CGameItemPtr itemPtr ){} + virtual void setSecondaryItem( CGameItemPtr itemPtr ){} + virtual void addConsumableItem( CGameItemPtr itemPtr ){} + virtual void setPrimaryTarget( const TDataSetRow& ) {} //@} //@} diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/s_effect.h b/code/ryzom/server/src/entities_game_service/phrase_manager/s_effect.h index 7062a0dfd..9a73a3a07 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/s_effect.h +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/s_effect.h @@ -149,7 +149,7 @@ public: } // callback called when the effect is actually removed. Does nothing by default - virtual void removed(){}; + virtual void removed(){} ///\name read accessors //@{ diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/s_phrase.h b/code/ryzom/server/src/entities_game_service/phrase_manager/s_phrase.h index 0b5ca1862..9d6ecd5f1 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/s_phrase.h +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/s_phrase.h @@ -113,7 +113,7 @@ public: * set the primary target * \param entityId id of the primary target */ - virtual void setPrimaryTarget( const TDataSetRow &entityRowId ) {}; + virtual void setPrimaryTarget( const TDataSetRow &/* entityRowId */ ) {} /** * evaluate phrase @@ -188,9 +188,9 @@ public: /** Return true if the phrase if grammatically valid (otherwise, send a msg to the player actorRowId) * TODO: anti-hacking */ - static bool validateSabrinaGrammar( const std::vector< const CStaticBrick* >& bricks, TDataSetRow actorRowId ) { return true; } + static bool validateSabrinaGrammar( const std::vector< const CStaticBrick* >& /* bricks */, TDataSetRow /* actorRowId */ ) { return true; } - virtual void setBrickSheets( const std::vector & bricks){} + virtual void setBrickSheets( const std::vector & /* bricks */){} virtual void setEnchantMode(bool){} inline void cyclic(bool b) { _CyclicPhrase = b; } diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/toxic_cloud.h b/code/ryzom/server/src/entities_game_service/phrase_manager/toxic_cloud.h index f0bcb46c5..d1cd98246 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/toxic_cloud.h +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/toxic_cloud.h @@ -36,7 +36,7 @@ class CToxicCloud : public CEnvironmentalEffect NL_INSTANCE_COUNTER_DECL(CToxicCloud); public: - CToxicCloud() {}; + CToxicCloud() {} /// Init inline void init( const NLMISC::CVector& pos, float radius, sint32 dmgPerHit, NLMISC::TGameCycle updateFrequency, NLMISC::TGameCycle lifetime=ToxicCloudDefaultLifetime) diff --git a/code/ryzom/server/src/entities_game_service/player_manager/cdb.h b/code/ryzom/server/src/entities_game_service/player_manager/cdb.h index d1f7fd8f1..a2af677f7 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/cdb.h +++ b/code/ryzom/server/src/entities_game_service/player_manager/cdb.h @@ -216,7 +216,7 @@ public : /** * Inform a node of its parenthood */ - virtual void setParent(CCDBStructNodeBranch *parent) { nlassertex(0,("setParent() not overloaded for given node type!")); } + virtual void setParent(CCDBStructNodeBranch * /* parent */) { nlassertex(0,("setParent() not overloaded for given node type!")); } /** * get the parent of a node @@ -248,7 +248,7 @@ public : * Browse the tree, and for each atom branch encountered, call the callback passing the argument * provided and the index of the atom branch. */ - virtual void foreachAtomBranchCall( void (*callback)(void*,TCDBDataIndex), void *arg ) const {}; + virtual void foreachAtomBranchCall( void (*callback)(void*,TCDBDataIndex), void *arg ) const {} /** * Browse the tree, building the text id, and for each leaf encountered, call the callback diff --git a/code/ryzom/server/src/entities_game_service/player_manager/cdb_synchronised.h b/code/ryzom/server/src/entities_game_service/player_manager/cdb_synchronised.h index 3968515d2..8e09617ad 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/cdb_synchronised.h +++ b/code/ryzom/server/src/entities_game_service/player_manager/cdb_synchronised.h @@ -50,12 +50,12 @@ public: /// exception thrown when database is not initialized struct EDBNotInit : public NLMISC::Exception { - EDBNotInit() : Exception("CDB: Property Database not initialized") {}; + EDBNotInit() : Exception("CDB: Property Database not initialized") {} }; struct ECDBNotFound : public NLMISC::Exception { - ECDBNotFound() : Exception("CDB: Property not found") {}; + ECDBNotFound() : Exception("CDB: Property not found") {} }; /*struct CPropForClientOnly diff --git a/code/ryzom/server/src/entities_game_service/player_manager/known_and_memorized_phrases.h b/code/ryzom/server/src/entities_game_service/player_manager/known_and_memorized_phrases.h index 646913107..f7fd1d851 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/known_and_memorized_phrases.h +++ b/code/ryzom/server/src/entities_game_service/player_manager/known_and_memorized_phrases.h @@ -126,7 +126,7 @@ private: private: // prevent copy constructor - CMemorizationSet(const CMemorizationSet &other) {}; + CMemorizationSet(const CMemorizationSet &other) {} // prevent copy operator CMemorizationSet &operator =(const CMemorizationSet&other) { return *this;} }; @@ -183,7 +183,7 @@ private: private: // prevent copy constructor - CPlayerPhraseMemory(const CMemorizationSet &other) {}; + CPlayerPhraseMemory(const CMemorizationSet &other) {} // prevent copy operator CPlayerPhraseMemory &operator =(const CMemorizationSet&other) { return *this;} }; diff --git a/code/ryzom/server/src/entities_game_service/player_manager/player_manager.h b/code/ryzom/server/src/entities_game_service/player_manager/player_manager.h index ecacee896..33e4a8ac9 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/player_manager.h +++ b/code/ryzom/server/src/entities_game_service/player_manager/player_manager.h @@ -166,13 +166,13 @@ public : /// exception thrown when player is unknown struct EPlayer : public NLMISC::Exception { - EPlayer( uint32 userId ) : Exception ("Player "+NLMISC::toString(userId)+" not found") {}; + EPlayer( uint32 userId ) : Exception ("Player "+NLMISC::toString(userId)+" not found") {} }; /// exception thrown when player's char is unknown struct EChar : public NLMISC::Exception { - EChar( const NLMISC::CEntityId& id ) : Exception ("The char "+id.toString()+" doesn't exist") {}; + EChar( const NLMISC::CEntityId& id ) : Exception ("The char "+id.toString()+" doesn't exist") {} }; ///init the manager diff --git a/code/ryzom/server/src/entities_game_service/progression/progression_pve.h b/code/ryzom/server/src/entities_game_service/progression/progression_pve.h index 4526c67f6..54cd5f0f2 100644 --- a/code/ryzom/server/src/entities_game_service/progression/progression_pve.h +++ b/code/ryzom/server/src/entities_game_service/progression/progression_pve.h @@ -64,7 +64,7 @@ public: }; /// ctor - CSkillProgress() {}; + CSkillProgress() {} /// dtor virtual ~CSkillProgress() { _SkillsProgress.clear(); } @@ -97,7 +97,7 @@ public: typedef std::map< TDataSetRow, CSkillProgress * > TSkillProgressPerOpponentContainer; /// ctor - CCharacterActions() {}; + CCharacterActions() {} /// dtor+ virtual ~CCharacterActions(); diff --git a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_base.h b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_base.h index c26b9f8bc..d48dcdb96 100644 --- a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_base.h +++ b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_base.h @@ -56,6 +56,8 @@ public: QuitTeam, }; + virtual ~IPVP() {} + /// get PVP mode to send to the client virtual PVP_MODE::TPVPMode getPVPMode() const = 0; diff --git a/code/ryzom/server/src/entities_game_service/shop_type/item_for_sale.h b/code/ryzom/server/src/entities_game_service/shop_type/item_for_sale.h index fac7fa505..b01bfaa9b 100644 --- a/code/ryzom/server/src/entities_game_service/shop_type/item_for_sale.h +++ b/code/ryzom/server/src/entities_game_service/shop_type/item_for_sale.h @@ -33,7 +33,7 @@ class IItemTrade : public NLMISC::CRefCount public: // virtual destructor - virtual ~IItemTrade() {}; + virtual ~IItemTrade() {} // sheet id virtual NLMISC::CSheetId getSheetId() const = 0; diff --git a/code/ryzom/server/src/entities_game_service/world_instances.h b/code/ryzom/server/src/entities_game_service/world_instances.h index eb8c2728c..63a70204d 100644 --- a/code/ryzom/server/src/entities_game_service/world_instances.h +++ b/code/ryzom/server/src/entities_game_service/world_instances.h @@ -56,7 +56,7 @@ public: struct IAIInstanceReady { virtual void onAiInstanceReady(const CReportStaticAIInstanceMsg &msg) = 0; - virtual void onAiInstanceDown(const CReportStaticAIInstanceMsg &msg) {}; // not mandatory + virtual void onAiInstanceDown(const CReportStaticAIInstanceMsg &msg) {} // not mandatory }; /// Singleton access diff --git a/code/ryzom/server/src/entities_game_service/zone_manager.h b/code/ryzom/server/src/entities_game_service/zone_manager.h index 5aeb2a4a0..065e4548f 100644 --- a/code/ryzom/server/src/entities_game_service/zone_manager.h +++ b/code/ryzom/server/src/entities_game_service/zone_manager.h @@ -318,7 +318,7 @@ public: }; // default constructor - CZoneManager() : DepositSearchTime(50) {}; + CZoneManager() : DepositSearchTime(50) {} ~CZoneManager(); diff --git a/code/ryzom/server/src/frontend_service/selection_generator.h b/code/ryzom/server/src/frontend_service/selection_generator.h index 6f94e2e68..048e391a4 100644 --- a/code/ryzom/server/src/frontend_service/selection_generator.h +++ b/code/ryzom/server/src/frontend_service/selection_generator.h @@ -42,10 +42,10 @@ public: typedef TSelectionLevel result_type; /// Initialization of a selection cycle - virtual void init( TSelectionLevel nblevels ) {}; + virtual void init( TSelectionLevel nblevels ) {} /// Change the number of levels without restarting the cycle - virtual void changeNbLevels( TSelectionLevel nblevels ) {}; + virtual void changeNbLevels( TSelectionLevel nblevels ) {} /// Return the next level to select virtual TSelectionLevel getNext() = 0; diff --git a/code/ryzom/server/src/general_utilities_service/gus_chat.h b/code/ryzom/server/src/general_utilities_service/gus_chat.h index 077f24506..2c49c14f8 100644 --- a/code/ryzom/server/src/general_utilities_service/gus_chat.h +++ b/code/ryzom/server/src/general_utilities_service/gus_chat.h @@ -71,6 +71,7 @@ namespace GUS //----------------------------------------------------------------------------- // Public interface //----------------------------------------------------------------------------- + virtual ~CChatChannel() {} // open the chat channel on all clients and set its name // If historySize is set other than 0, the the chat channel is diff --git a/code/ryzom/server/src/general_utilities_service/gus_mirror.h b/code/ryzom/server/src/general_utilities_service/gus_mirror.h index 096685d50..97e8d97c6 100644 --- a/code/ryzom/server/src/general_utilities_service/gus_mirror.h +++ b/code/ryzom/server/src/general_utilities_service/gus_mirror.h @@ -40,15 +40,15 @@ namespace GUS { public: // General callback - virtual void mirrorIsReady(CGusMirror *gusMirror) {}; - virtual void serviceMirrorUp(CGusMirror *gusMirror, const std::string &serviceName, NLNET::TServiceId serviceId) {}; - virtual void serviceMirrorDown(CGusMirror *gusMirror, const std::string &serviceName, NLNET::TServiceId serviceId) {}; - virtual void mirrorTickUpdate(CGusMirror *gusMirror) {}; + virtual void mirrorIsReady(CGusMirror *gusMirror) {} + virtual void serviceMirrorUp(CGusMirror *gusMirror, const std::string &serviceName, NLNET::TServiceId serviceId) {} + virtual void serviceMirrorDown(CGusMirror *gusMirror, const std::string &serviceName, NLNET::TServiceId serviceId) {} + virtual void mirrorTickUpdate(CGusMirror *gusMirror) {} // mirror updates - virtual void entityAdded(CGusMirror *gusMirror, CMirroredDataSet *dataSet, const TDataSetRow &entityIndex) {}; - virtual void entityRemoved(CGusMirror *gusMirror, CMirroredDataSet *dataSet, const TDataSetRow &entityIndex, const NLMISC::CEntityId *entityId) {}; - virtual void propertyChanged(CGusMirror *gusMirror, CMirroredDataSet *dataSet, const TDataSetRow &entityIndex, TPropertyIndex propIndex) {}; + virtual void entityAdded(CGusMirror *gusMirror, CMirroredDataSet *dataSet, const TDataSetRow &entityIndex) {} + virtual void entityRemoved(CGusMirror *gusMirror, CMirroredDataSet *dataSet, const TDataSetRow &entityIndex, const NLMISC::CEntityId *entityId) {} + virtual void propertyChanged(CGusMirror *gusMirror, CMirroredDataSet *dataSet, const TDataSetRow &entityIndex, TPropertyIndex propIndex) {} IMirrorModuleCallback(); virtual ~IMirrorModuleCallback(); diff --git a/code/ryzom/server/src/general_utilities_service/gus_module_factory.h b/code/ryzom/server/src/general_utilities_service/gus_module_factory.h index 57c39bf06..fc9a62d38 100644 --- a/code/ryzom/server/src/general_utilities_service/gus_module_factory.h +++ b/code/ryzom/server/src/general_utilities_service/gus_module_factory.h @@ -41,7 +41,7 @@ namespace GUS class IModuleBuilder: public NLMISC::CRefCount { public: - virtual ~IModuleBuilder() {}; + virtual ~IModuleBuilder() {} virtual const NLMISC::CSString& getName() const=0; virtual const NLMISC::CSString& getArgs() const=0; virtual const NLMISC::CSString& getDescription() const=0; diff --git a/code/ryzom/server/src/general_utilities_service/stat_char_commands.cpp b/code/ryzom/server/src/general_utilities_service/stat_char_commands.cpp index f72db4bbd..4a3b98bcd 100644 --- a/code/ryzom/server/src/general_utilities_service/stat_char_commands.cpp +++ b/code/ryzom/server/src/general_utilities_service/stat_char_commands.cpp @@ -128,7 +128,7 @@ NLMISC_CATEGORISED_COMMAND(Stats,listCharNames,"display the names of the charact std::vector files; NLMISC::CPath::getPathContent(STAT_GLOBALS::getInputFilePath().c_str(),false,false,true,files); - for (uint32 i=files.size();i--;) + for (uint32 i=(uint32)files.size();i--;) { if (!NLMISC::testWildCard(NLMISC::CFile::getFilename(files[i]),wildcard)) { @@ -227,7 +227,8 @@ NLMISC_CATEGORISED_COMMAND(Stats,jobsPromote,"pause execution of jobs","" if (args.size()!=1) return false; - uint32 idx= atoi(args[0].c_str()); + uint32 idx; + NLMISC::fromString(args[0], idx); if ( (idx==0 && args[0]!="0") ) { nlwarning("Argument is not a valid job id - should be a number"); @@ -249,7 +250,8 @@ NLMISC_CATEGORISED_COMMAND(Stats,JobUpdatesPerUpdate,"set or display the number if (args.size()==1) { - uint32 count= atoi(args[0].c_str()); + uint32 count; + NLMISC::fromString(args[0], count); if ( (count==0 && args[0]!="0") ) { nlwarning("Argument is not a valid number"); @@ -311,7 +313,8 @@ NLMISC_CATEGORISED_COMMAND(Stats,jobsDisplayDetails,"display detailed info for t case 1: { - uint32 idx= atoi(args[0].c_str()); + uint32 idx; + NLMISC::fromString(args[0], idx); if ( (idx==0 && args[0]!="0") ) { nlwarning("Argument is not a valid job id - should be a number"); @@ -476,8 +479,11 @@ NLMISC_CATEGORISED_COMMAND(Stats,charScanScriptDeleteLine,"","") return false; } + uint32 line; + NLMISC::fromString(args[0], line); + // line numbering starts at 1 so an invalid number will be inored anyway - return TheCharScanScriptFile->deleteLine(atoi(args[0].c_str())); + return TheCharScanScriptFile->deleteLine(line); } NLMISC_CATEGORISED_COMMAND(Stats,charScanScriptAddInfoExtractor,""," []") @@ -761,7 +767,7 @@ NLMISC_CATEGORISED_COMMAND(Stats,charScanScriptTestFilteredFileList,"list the se return false; // generating a new file list - if (args[0]==CSString("generate").left(args[0].size())) + if (args[0]==CSString("generate").left((uint)args[0].size())) { if (TheCharScanScriptFile==NULL) { @@ -796,7 +802,7 @@ NLMISC_CATEGORISED_COMMAND(Stats,charScanScriptTestFilteredFileList,"list the se } // displaying the last generated file list - if (args[0]==CSString("display").left(args[0].size())) + if (args[0]==CSString("display").left((uint)args[0].size())) { nlinfo("Filtered file list for the current job"); fdc.display(&log); diff --git a/code/ryzom/server/src/general_utilities_service/stat_char_filter_factory.cpp b/code/ryzom/server/src/general_utilities_service/stat_char_filter_factory.cpp index 6902fe6ad..7c5f850fe 100644 --- a/code/ryzom/server/src/general_utilities_service/stat_char_filter_factory.cpp +++ b/code/ryzom/server/src/general_utilities_service/stat_char_filter_factory.cpp @@ -63,7 +63,7 @@ void CCharFilterFactory::displayFilterList(NLMISC::CLog* log) { std::string s= _Filters[i]->getName(); if (s.size()>longestName) - longestName=s.size(); + longestName=(uint32)s.size(); } // iterate over the filters displaying names and description @@ -75,7 +75,7 @@ void CCharFilterFactory::displayFilterList(NLMISC::CLog* log) uint32 CCharFilterFactory::getFilterBuilderCount() { - return _Filters.size(); + return (uint32)_Filters.size(); } ICharFilterBuilder* CCharFilterFactory::getFilterBuilder(uint32 idx) diff --git a/code/ryzom/server/src/general_utilities_service/stat_char_filter_factory.h b/code/ryzom/server/src/general_utilities_service/stat_char_filter_factory.h index 656cc0cca..a96b7d6a5 100644 --- a/code/ryzom/server/src/general_utilities_service/stat_char_filter_factory.h +++ b/code/ryzom/server/src/general_utilities_service/stat_char_filter_factory.h @@ -52,6 +52,7 @@ public: class ICharFilterBuilder: public NLMISC::CRefCount { public: + virtual ~ICharFilterBuilder() {} virtual const char* getName()=0; virtual const char* getDescription()=0; virtual ICharFilter* build(const std::string& rawArgs)=0; diff --git a/code/ryzom/server/src/general_utilities_service/stat_char_info_extractor_factory.cpp b/code/ryzom/server/src/general_utilities_service/stat_char_info_extractor_factory.cpp index 0ff961def..da481cf03 100644 --- a/code/ryzom/server/src/general_utilities_service/stat_char_info_extractor_factory.cpp +++ b/code/ryzom/server/src/general_utilities_service/stat_char_info_extractor_factory.cpp @@ -63,7 +63,7 @@ void CCharInfoExtractorFactory::displayInfoExtractorList(NLMISC::CLog* log) { std::string s= _InfoExtractors[i]->getName(); if (s.size()>longestName) - longestName=s.size(); + longestName=(uint32)s.size(); } // iterate over the infoExtractors displaying names and description @@ -75,7 +75,7 @@ void CCharInfoExtractorFactory::displayInfoExtractorList(NLMISC::CLog* log) uint32 CCharInfoExtractorFactory::getInfoExtractorBuilderCount() { - return _InfoExtractors.size(); + return (uint32)_InfoExtractors.size(); } ICharInfoExtractorBuilder* CCharInfoExtractorFactory::getInfoExtractorBuilder(uint32 idx) diff --git a/code/ryzom/server/src/general_utilities_service/stat_char_info_extractor_factory.h b/code/ryzom/server/src/general_utilities_service/stat_char_info_extractor_factory.h index 868004c39..cd182c169 100644 --- a/code/ryzom/server/src/general_utilities_service/stat_char_info_extractor_factory.h +++ b/code/ryzom/server/src/general_utilities_service/stat_char_info_extractor_factory.h @@ -56,6 +56,7 @@ public: class ICharInfoExtractorBuilder: public NLMISC::CRefCount { public: + virtual ~ICharInfoExtractorBuilder() {} virtual const char* getName() const=0; virtual const char* getDescription() const=0; virtual const char* getFields() const=0; diff --git a/code/ryzom/server/src/general_utilities_service/stat_char_scan_script.cpp b/code/ryzom/server/src/general_utilities_service/stat_char_scan_script.cpp index 48db0b447..030239d1e 100644 --- a/code/ryzom/server/src/general_utilities_service/stat_char_scan_script.cpp +++ b/code/ryzom/server/src/general_utilities_service/stat_char_scan_script.cpp @@ -298,7 +298,7 @@ void CCharScanScriptCommandRegistry::displayScriptCommands(NLMISC::CLog* log) { std::string s= _ScriptCommands[i]->getName(); if (s.size()>longestName) - longestName=s.size(); + longestName=(uint32)s.size(); } // iterate over the script commands displaying names and description diff --git a/code/ryzom/server/src/general_utilities_service/stat_character_scan_job.cpp b/code/ryzom/server/src/general_utilities_service/stat_character_scan_job.cpp index 4b01b8574..9b85fb3b3 100644 --- a/code/ryzom/server/src/general_utilities_service/stat_character_scan_job.cpp +++ b/code/ryzom/server/src/general_utilities_service/stat_character_scan_job.cpp @@ -293,7 +293,7 @@ bool CCharacterScanJob::runForFile(const std::string& fileName) c.apply(pdr); // iterate over the filters executing their core code - for (uint32 i=_Filters.size();i--;) + for (uint32 i=(uint32)_Filters.size();i--;) { if (!_Filters[i]->evaluate(&c)) return true; diff --git a/code/ryzom/server/src/general_utilities_service/stat_file_list_builder_factory.cpp b/code/ryzom/server/src/general_utilities_service/stat_file_list_builder_factory.cpp index e6e860966..c05576c22 100644 --- a/code/ryzom/server/src/general_utilities_service/stat_file_list_builder_factory.cpp +++ b/code/ryzom/server/src/general_utilities_service/stat_file_list_builder_factory.cpp @@ -63,7 +63,7 @@ void CFileListBuilderFactory::displayFileListBuilderList(NLMISC::CLog* log) { std::string s= _FileLists[i]->getName(); if (s.size()>longestName) - longestName=s.size(); + longestName=(uint32)s.size(); } // iterate over the filters displaying names and description @@ -75,7 +75,7 @@ void CFileListBuilderFactory::displayFileListBuilderList(NLMISC::CLog* log) uint32 CFileListBuilderFactory::getFileListBuilderCount() { - return _FileLists.size(); + return (uint32)_FileLists.size(); } IFileListBuilderBuilder* CFileListBuilderFactory::getFileListBuilder(uint32 idx) diff --git a/code/ryzom/server/src/general_utilities_service/stat_file_list_builder_factory.h b/code/ryzom/server/src/general_utilities_service/stat_file_list_builder_factory.h index fbfb5dc61..367c0caa2 100644 --- a/code/ryzom/server/src/general_utilities_service/stat_file_list_builder_factory.h +++ b/code/ryzom/server/src/general_utilities_service/stat_file_list_builder_factory.h @@ -54,6 +54,7 @@ public: class IFileListBuilderBuilder: public NLMISC::CRefCount { public: + virtual ~IFileListBuilderBuilder() {} virtual const char* getName()=0; virtual const char* getDescription()=0; virtual IFileListBuilder* build(const std::string& rawArgs)=0; diff --git a/code/ryzom/server/src/general_utilities_service/stat_globals.cpp b/code/ryzom/server/src/general_utilities_service/stat_globals.cpp index af1150b0f..a959fb751 100644 --- a/code/ryzom/server/src/general_utilities_service/stat_globals.cpp +++ b/code/ryzom/server/src/general_utilities_service/stat_globals.cpp @@ -61,19 +61,19 @@ namespace STAT_GLOBALS NLMISC::CSString getInputFilePath(const NLMISC::CSString& path) { NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(InputFileDirectory.get()); - return (path.left(pathRoot.size())==pathRoot)? path: pathRoot+path; + return (path.left((uint)pathRoot.size())==pathRoot)? path: pathRoot+path; } NLMISC::CSString getScriptFilePath(const NLMISC::CSString& path) { NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(ScriptDirectory.get()); - return (path.left(pathRoot.size())==pathRoot)? path: pathRoot+path; + return (path.left((uint)pathRoot.size())==pathRoot)? path: pathRoot+path; } NLMISC::CSString getOutputFilePath(const NLMISC::CSString& path) { NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(OutputDirectory.get()); - return (path.left(pathRoot.size())==pathRoot)? path: pathRoot+path; + return (path.left((uint)pathRoot.size())==pathRoot)? path: pathRoot+path; } diff --git a/code/ryzom/server/src/general_utilities_service/stat_job_manager.cpp b/code/ryzom/server/src/general_utilities_service/stat_job_manager.cpp index 818c509d7..6c5a8c008 100644 --- a/code/ryzom/server/src/general_utilities_service/stat_job_manager.cpp +++ b/code/ryzom/server/src/general_utilities_service/stat_job_manager.cpp @@ -131,7 +131,7 @@ void CJobManager::serviceUpdate() uint32 CJobManager::addJob(NLMISC::CSmartPtr job) { nlassert(job!=NULL); - uint32 id= _Jobs.size(); + uint32 id= (uint32)_Jobs.size(); _UnfinishedJobs.push_back(id); _Jobs.push_back(job); return id; diff --git a/code/ryzom/server/src/general_utilities_service/stat_user_file_list_builders.cpp b/code/ryzom/server/src/general_utilities_service/stat_user_file_list_builders.cpp index 3f3bbb8c7..c2a5658d5 100644 --- a/code/ryzom/server/src/general_utilities_service/stat_user_file_list_builders.cpp +++ b/code/ryzom/server/src/general_utilities_service/stat_user_file_list_builders.cpp @@ -73,7 +73,8 @@ FILE_LIST_BUILDER(MinFileSize,"") return false; } - for (uint32 i=fdc.size();i--;) + uint32 ttlNumFiles= fdc.size(); + for (uint32 i=ttlNumFiles;i--;) { if (fdc[i].FileSize") return false; } - for (uint32 i=fdc.size();i--;) + uint32 ttlNumFiles= fdc.size(); + for (uint32 i=ttlNumFiles;i--;) { if (fdc[i].FileSize>maxSize) fdc.removeFile(i); diff --git a/code/ryzom/server/src/general_utilities_service/stats_guild_scan_job.h b/code/ryzom/server/src/general_utilities_service/stats_guild_scan_job.h index e75564e49..ebcc43e7e 100644 --- a/code/ryzom/server/src/general_utilities_service/stats_guild_scan_job.h +++ b/code/ryzom/server/src/general_utilities_service/stats_guild_scan_job.h @@ -53,7 +53,7 @@ public: private: // private data - internal to job - typedef enum { INIT, WORK, CLOSED, ERROR } TState; + enum TState { INIT, WORK, CLOSED, ERROR }; TState _State; uint32 _NextFile; CFileDescriptionContainer _Files; diff --git a/code/ryzom/server/src/gpm_service/cell.h b/code/ryzom/server/src/gpm_service/cell.h index 054156dbc..a4846a7a6 100644 --- a/code/ryzom/server/src/gpm_service/cell.h +++ b/code/ryzom/server/src/gpm_service/cell.h @@ -34,7 +34,7 @@ class CCell { public: /// default constructor - CCell() : _LastVisionUpdate(0) {}; + CCell() : _LastVisionUpdate(0) {} /// initialisation void init( sint32 cellId ) diff --git a/code/ryzom/server/src/input_output_service/chat_manager.h b/code/ryzom/server/src/input_output_service/chat_manager.h index 8fbc34deb..811bdc710 100644 --- a/code/ryzom/server/src/input_output_service/chat_manager.h +++ b/code/ryzom/server/src/input_output_service/chat_manager.h @@ -58,13 +58,13 @@ public : /// exception thrown when client is unknown struct EChatClient : public NLMISC::Exception { - EChatClient( const NLMISC::CEntityId& id ) : Exception ("Don't have chat infos for the char "+id.toString()) {}; + EChatClient( const NLMISC::CEntityId& id ) : Exception ("Don't have chat infos for the char "+id.toString()) {} }; /// exception thrown when group is unknown struct EChatGroup : public NLMISC::Exception { - EChatGroup( const TGroupId& gId ) : Exception ("Can't find the group "+gId.toString()) {}; + EChatGroup( const TGroupId& gId ) : Exception ("Can't find the group "+gId.toString()) {} }; /** diff --git a/code/ryzom/server/src/patchman_service/module_admin_itf.h b/code/ryzom/server/src/patchman_service/module_admin_itf.h index d9649f603..a0d4aa34e 100644 --- a/code/ryzom/server/src/patchman_service/module_admin_itf.h +++ b/code/ryzom/server/src/patchman_service/module_admin_itf.h @@ -71,9 +71,9 @@ namespace PATCHMAN // unused interceptors std::string fwdBuildModuleManifest() const { return std::string(); } - void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}; + void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {} // process module message interceptor bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message); @@ -211,9 +211,9 @@ namespace PATCHMAN // unused interceptors std::string fwdBuildModuleManifest() const { return std::string(); } - void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}; + void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {} // process module message interceptor bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message); @@ -371,9 +371,9 @@ namespace PATCHMAN // unused interceptors std::string fwdBuildModuleManifest() const { return std::string(); } - void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}; + void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {} // process module message interceptor bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message); @@ -504,9 +504,9 @@ namespace PATCHMAN // unused interceptors std::string fwdBuildModuleManifest() const { return std::string(); } - void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}; + void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {} // process module message interceptor bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message); @@ -711,9 +711,9 @@ namespace PATCHMAN // unused interceptors std::string fwdBuildModuleManifest() const { return std::string(); } - void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}; + void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {} // process module message interceptor bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message); @@ -911,9 +911,9 @@ namespace PATCHMAN // unused interceptors std::string fwdBuildModuleManifest() const { return std::string(); } - void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}; + void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {} // process module message interceptor bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message); diff --git a/code/ryzom/server/src/pd_support_service/stat_char_filter_factory.h b/code/ryzom/server/src/pd_support_service/stat_char_filter_factory.h index 656cc0cca..a96b7d6a5 100644 --- a/code/ryzom/server/src/pd_support_service/stat_char_filter_factory.h +++ b/code/ryzom/server/src/pd_support_service/stat_char_filter_factory.h @@ -52,6 +52,7 @@ public: class ICharFilterBuilder: public NLMISC::CRefCount { public: + virtual ~ICharFilterBuilder() {} virtual const char* getName()=0; virtual const char* getDescription()=0; virtual ICharFilter* build(const std::string& rawArgs)=0; diff --git a/code/ryzom/server/src/pd_support_service/stat_char_info_extractor_factory.h b/code/ryzom/server/src/pd_support_service/stat_char_info_extractor_factory.h index 868004c39..cd182c169 100644 --- a/code/ryzom/server/src/pd_support_service/stat_char_info_extractor_factory.h +++ b/code/ryzom/server/src/pd_support_service/stat_char_info_extractor_factory.h @@ -56,6 +56,7 @@ public: class ICharInfoExtractorBuilder: public NLMISC::CRefCount { public: + virtual ~ICharInfoExtractorBuilder() {} virtual const char* getName() const=0; virtual const char* getDescription() const=0; virtual const char* getFields() const=0; diff --git a/code/ryzom/server/src/pd_support_service/stat_file_list_builder_factory.h b/code/ryzom/server/src/pd_support_service/stat_file_list_builder_factory.h index fbfb5dc61..367c0caa2 100644 --- a/code/ryzom/server/src/pd_support_service/stat_file_list_builder_factory.h +++ b/code/ryzom/server/src/pd_support_service/stat_file_list_builder_factory.h @@ -54,6 +54,7 @@ public: class IFileListBuilderBuilder: public NLMISC::CRefCount { public: + virtual ~IFileListBuilderBuilder() {} virtual const char* getName()=0; virtual const char* getDescription()=0; virtual IFileListBuilder* build(const std::string& rawArgs)=0; diff --git a/code/ryzom/server/src/sabrina/faber_phrase.h b/code/ryzom/server/src/sabrina/faber_phrase.h index 8069dc4f6..4d85e8b53 100644 --- a/code/ryzom/server/src/sabrina/faber_phrase.h +++ b/code/ryzom/server/src/sabrina/faber_phrase.h @@ -64,21 +64,21 @@ public: /** * set the actor */ - virtual void setActor( const TDataSetRow &entityRowId ){}; + virtual void setActor( const TDataSetRow &entityRowId ){} /** * called at the end of the latency time */ - virtual void end(){}; + virtual void end(){} //@} ///\unused basic methods from CSPhrase //@{ - virtual void setPrimaryItem( CGameItemPtr itemPtr ){}; - virtual void setSecondaryItem( CGameItemPtr itemPtr ){}; - virtual void addConsumableItem( CGameItemPtr itemPtr ){}; - virtual void setPrimaryTarget( const TDataSetRow& ) {}; - virtual void addTargetEntity( const TDataSetRow& ) {}; + virtual void setPrimaryItem( CGameItemPtr itemPtr ){} + virtual void setSecondaryItem( CGameItemPtr itemPtr ){} + virtual void addConsumableItem( CGameItemPtr itemPtr ){} + virtual void setPrimaryTarget( const TDataSetRow& ) {} + virtual void addTargetEntity( const TDataSetRow& ) {} //@} inline const TDataSetRow & getActor() { return _ActorRowId;} diff --git a/code/ryzom/server/src/sabrina/harvest_phrase.h b/code/ryzom/server/src/sabrina/harvest_phrase.h index b5f290019..c300b1abd 100644 --- a/code/ryzom/server/src/sabrina/harvest_phrase.h +++ b/code/ryzom/server/src/sabrina/harvest_phrase.h @@ -62,11 +62,11 @@ public: ///\unused basic methods from CSPhrase //@{ - virtual void setPrimaryItem( CGameItemPtr itemPtr ){}; - virtual void setSecondaryItem( CGameItemPtr itemPtr ){}; - virtual void addConsumableItem( CGameItemPtr itemPtr ){}; - virtual void setPrimaryTarget( const TDataSetRow& ) {}; - virtual void addTargetEntity( const TDataSetRow& ) {}; + virtual void setPrimaryItem( CGameItemPtr itemPtr ){} + virtual void setSecondaryItem( CGameItemPtr itemPtr ){} + virtual void addConsumableItem( CGameItemPtr itemPtr ){} + virtual void setPrimaryTarget( const TDataSetRow& ) {} + virtual void addTargetEntity( const TDataSetRow& ) {} //@} //@} @@ -74,7 +74,7 @@ public: /** * set the actor */ - virtual void setActor( const TDataSetRow &entityRowId ){}; + virtual void setActor( const TDataSetRow &entityRowId ){} /** * called at the end of the latency time diff --git a/code/ryzom/server/src/sabrina/magic_phrase.h b/code/ryzom/server/src/sabrina/magic_phrase.h index fbfe5dee2..45ee645cd 100644 --- a/code/ryzom/server/src/sabrina/magic_phrase.h +++ b/code/ryzom/server/src/sabrina/magic_phrase.h @@ -78,17 +78,17 @@ public: virtual void execute(); virtual void apply(); virtual void stop(); - virtual void setPrimaryTarget( const TDataSetRow &entityRowId ){ _Targets[0] = entityRowId; }; - virtual void addTargetEntity( const TDataSetRow &entityRowId ){ _Targets.push_back(entityRowId);}; + virtual void setPrimaryTarget( const TDataSetRow &entityRowId ){ _Targets[0] = entityRowId; } + virtual void addTargetEntity( const TDataSetRow &entityRowId ){ _Targets.push_back(entityRowId);} //@} /// \name Unused virtual methods from CSPhrase //@{ virtual void setActor( const TDataSetRow & actorRowId ){ } - virtual void end(){}; - virtual void setPrimaryItem( CGameItemPtr itemPtr ){ }; - virtual void setSecondaryItem( CGameItemPtr itemPtr ){ }; - virtual void addConsumableItem( CGameItemPtr itemPtr ){ }; + virtual void end(){} + virtual void setPrimaryItem( CGameItemPtr itemPtr ){ } + virtual void setSecondaryItem( CGameItemPtr itemPtr ){ } + virtual void addConsumableItem( CGameItemPtr itemPtr ){ } //@} private: diff --git a/code/ryzom/server/src/sabrina/s_effect.h b/code/ryzom/server/src/sabrina/s_effect.h index ca34245ee..c706756eb 100644 --- a/code/ryzom/server/src/sabrina/s_effect.h +++ b/code/ryzom/server/src/sabrina/s_effect.h @@ -55,7 +55,7 @@ public: virtual bool update( uint32 & updateFlag ) = 0; /// callback called when the effect is actually removed. Does nothing by default - virtual void removed(){}; + virtual void removed(){} ///\name accessors //@{ diff --git a/code/ryzom/server/src/server_share/backup_service_itf.h b/code/ryzom/server/src/server_share/backup_service_itf.h index ed6aadc0d..5b1ffe352 100644 --- a/code/ryzom/server/src/server_share/backup_service_itf.h +++ b/code/ryzom/server/src/server_share/backup_service_itf.h @@ -63,9 +63,9 @@ namespace BS // unused interceptors std::string fwdBuildModuleManifest() const { return std::string(); } - void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}; + void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {} // process module message interceptor bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message); @@ -185,9 +185,9 @@ namespace BS // unused interceptors std::string fwdBuildModuleManifest() const { return std::string(); } - void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}; + void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {} // process module message interceptor bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message); diff --git a/code/ryzom/server/src/server_share/char_name_mapper_itf.h b/code/ryzom/server/src/server_share/char_name_mapper_itf.h index b7133fe9a..456bcc0c7 100644 --- a/code/ryzom/server/src/server_share/char_name_mapper_itf.h +++ b/code/ryzom/server/src/server_share/char_name_mapper_itf.h @@ -217,9 +217,9 @@ namespace CNM // unused interceptors std::string fwdBuildModuleManifest() const { return std::string(); } - void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}; + void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {} // process module message interceptor bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message); @@ -330,9 +330,9 @@ namespace CNM // unused interceptors std::string fwdBuildModuleManifest() const { return std::string(); } - void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}; + void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {} // process module message interceptor bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message); diff --git a/code/ryzom/server/src/server_share/chat_unifier_itf.h b/code/ryzom/server/src/server_share/chat_unifier_itf.h index 8b736a082..f284c8fbb 100644 --- a/code/ryzom/server/src/server_share/chat_unifier_itf.h +++ b/code/ryzom/server/src/server_share/chat_unifier_itf.h @@ -214,9 +214,9 @@ namespace CHATUNI // unused interceptors std::string fwdBuildModuleManifest() const { return std::string(); } - void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}; + void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {} // process module message interceptor bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message); @@ -331,9 +331,9 @@ namespace CHATUNI // unused interceptors std::string fwdBuildModuleManifest() const { return std::string(); } - void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}; + void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {} // process module message interceptor bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message); diff --git a/code/ryzom/server/src/server_share/command_executor_itf.h b/code/ryzom/server/src/server_share/command_executor_itf.h index dce7dce44..58a7f1c51 100644 --- a/code/ryzom/server/src/server_share/command_executor_itf.h +++ b/code/ryzom/server/src/server_share/command_executor_itf.h @@ -63,9 +63,9 @@ namespace CMDEXE // unused interceptors std::string fwdBuildModuleManifest() const { return std::string(); } - void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}; + void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {} // process module message interceptor bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message); diff --git a/code/ryzom/server/src/server_share/entity_locator_itf.h b/code/ryzom/server/src/server_share/entity_locator_itf.h index 59459a82d..317ad5199 100644 --- a/code/ryzom/server/src/server_share/entity_locator_itf.h +++ b/code/ryzom/server/src/server_share/entity_locator_itf.h @@ -139,9 +139,9 @@ namespace ENTITYLOC // unused interceptors std::string fwdBuildModuleManifest() const { return std::string(); } - void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}; + void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {} // process module message interceptor bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message); @@ -384,9 +384,9 @@ namespace ENTITYLOC // unused interceptors std::string fwdBuildModuleManifest() const { return std::string(); } - void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}; + void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {} // process module message interceptor bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message); diff --git a/code/ryzom/server/src/server_share/logger_service_itf.h b/code/ryzom/server/src/server_share/logger_service_itf.h index 8996c1369..051cc85cb 100644 --- a/code/ryzom/server/src/server_share/logger_service_itf.h +++ b/code/ryzom/server/src/server_share/logger_service_itf.h @@ -983,9 +983,9 @@ namespace LGS // unused interceptors std::string fwdBuildModuleManifest() const { return std::string(); } - void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}; + void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {} // process module message interceptor bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message); diff --git a/code/ryzom/server/src/server_share/mail_forum_itf.h b/code/ryzom/server/src/server_share/mail_forum_itf.h index aeaf0709b..b16cd7d24 100644 --- a/code/ryzom/server/src/server_share/mail_forum_itf.h +++ b/code/ryzom/server/src/server_share/mail_forum_itf.h @@ -63,9 +63,9 @@ namespace MFS // unused interceptors std::string fwdBuildModuleManifest() const { return std::string(); } - void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}; - void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}; + void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {} + void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {} // process module message interceptor bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message); diff --git a/code/ryzom/server/src/server_share/mission_messages.h b/code/ryzom/server/src/server_share/mission_messages.h index d779b709d..9c03f1f91 100644 --- a/code/ryzom/server/src/server_share/mission_messages.h +++ b/code/ryzom/server/src/server_share/mission_messages.h @@ -56,7 +56,7 @@ public: property ("Length", PropUInt8, (uint8)0,Length); } - virtual void callback (const std::string &name, uint8 id) {}; + virtual void callback (const std::string &name, uint8 id) {} }; */ @@ -115,7 +115,7 @@ public: property ("RewardType", PropUInt8, (uint8)MISSION_DESC::NbReward, RewardType); } - virtual void callback (const std::string &name, uint8 id) {}; + virtual void callback (const std::string &name, uint8 id) {} }; */ diff --git a/code/ryzom/server/src/server_share/msg_ai_service.h b/code/ryzom/server/src/server_share/msg_ai_service.h index a442b5234..132e56e1c 100644 --- a/code/ryzom/server/src/server_share/msg_ai_service.h +++ b/code/ryzom/server/src/server_share/msg_ai_service.h @@ -49,7 +49,7 @@ public: propertyCont ("Character", PropDataSetRow, Character); propertyCont ("Creature", PropDataSetRow, Creature); } - virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}; + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- diff --git a/code/ryzom/server/src/server_share/msg_gpm_service.h b/code/ryzom/server/src/server_share/msg_gpm_service.h index c4039be97..d985c8781 100644 --- a/code/ryzom/server/src/server_share/msg_gpm_service.h +++ b/code/ryzom/server/src/server_share/msg_gpm_service.h @@ -73,7 +73,7 @@ public: property("Type", PropUInt32, (uint32)Player, Type); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {}; + virtual void callback (const std::string &name, NLNET::TServiceId id) {} }; diff --git a/code/ryzom/server/src/server_share/npc_description_messages.h b/code/ryzom/server/src/server_share/npc_description_messages.h index 051cbeb44..1c838ad80 100644 --- a/code/ryzom/server/src/server_share/npc_description_messages.h +++ b/code/ryzom/server/src/server_share/npc_description_messages.h @@ -47,8 +47,9 @@ std::string buildChatDebugString(const std::vector &ShopCategories, class CNpcChatProfile { public: - CNpcChatProfile() : /*_guildCreator(false),*/ /*_dynamicMissionGiver(false),*/ _Organization(0), _FilterExplicitActionTradeByPlayerRace(false), - _ExplicitActionSPType(EGSPD::CSPType::Unknown), _FilterExplicitActionTradeByBotRace(true){} + CNpcChatProfile() : /*_guildCreator(false),*/ /*_dynamicMissionGiver(false),*/ _FilterExplicitActionTradeByPlayerRace(false), + _ExplicitActionSPType(EGSPD::CSPType::Unknown), _FilterExplicitActionTradeByBotRace(true), + _DynamicMissionGiver(false), _Organization(0) {} CNpcChatProfile(const CNpcChatProfile &other0,const CNpcChatProfile &other1); virtual ~CNpcChatProfile() {} @@ -84,7 +85,7 @@ public: const std::string &getWebPageName() const { return _WebPageName; } const NLMISC::CSheetId &getOutpost() const { return _Outpost; } - const uint32 getOrganization() const { return _Organization; } + uint32 getOrganization() const { return _Organization; } protected: std::vector< RYMSG::TExplicitSale > _ExplicitSales; @@ -146,7 +147,7 @@ struct CCharacterBotChatBeginEnd : public CMirrorTransportClass propertyCont ("botChatEnd", PropUInt32, BotChatEnd); } - virtual void callback (const std::string &name, NLNET::TServiceId id) { } + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) { } }; struct CCharacterDynChatBeginEnd : public CMirrorTransportClass @@ -162,7 +163,7 @@ struct CCharacterDynChatBeginEnd : public CMirrorTransportClass propertyCont ("dnChatEnd", PropUInt32, DynChatEnd); } - virtual void callback (const std::string &name, NLNET::TServiceId id) { } + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) { } }; struct CCustomElementId diff --git a/code/ryzom/server/src/server_share/stat_db_tree.h b/code/ryzom/server/src/server_share/stat_db_tree.h index 8faaa85ee..7472a2092 100644 --- a/code/ryzom/server/src/server_share/stat_db_tree.h +++ b/code/ryzom/server/src/server_share/stat_db_tree.h @@ -95,13 +95,13 @@ class CStatDBLeaf : public IStatDBNode public: virtual ~CStatDBLeaf() {} - bool setNode(const std::string & path, IStatDBNodePtr node) { return false; } - IStatDBNodePtr getNode(const std::string & path) { return NULL; } - void getNodes(const std::string & pathPattern, std::vector & matchingNodes, - const std::string & currentPath) {} - IStatDBNodePtr removeNode(const std::string & path) { return NULL; } + bool setNode(const std::string & /* path */, IStatDBNodePtr /* node */) { return false; } + IStatDBNodePtr getNode(const std::string & /* path */) { return NULL; } + void getNodes(const std::string & /* pathPattern */, std::vector & /* matchingNodes */, + const std::string & /* currentPath */) {} + IStatDBNodePtr removeNode(const std::string & /* path */) { return NULL; } - virtual void acceptVisitor(CStatDBNodeVisitor & visitor, const std::string & currentPath) {} + virtual void acceptVisitor(CStatDBNodeVisitor & /* visitor */, const std::string & /* currentPath */) {} }; /** diff --git a/code/ryzom/server/src/server_share/stat_db_tree_visitor.h b/code/ryzom/server/src/server_share/stat_db_tree_visitor.h index 1d57a6491..98e7455d3 100644 --- a/code/ryzom/server/src/server_share/stat_db_tree_visitor.h +++ b/code/ryzom/server/src/server_share/stat_db_tree_visitor.h @@ -34,9 +34,9 @@ class CStatDBTableLeaf; class CStatDBNodeVisitor { public: - virtual void visitBranch(CStatDBBranch * branch, const std::string & path) {} - virtual void visitValueLeaf(CStatDBValueLeaf * valueLeaf, const std::string & path) {} - virtual void visitTableLeaf(CStatDBTableLeaf * tableLeaf, const std::string & path) {} + virtual void visitBranch(CStatDBBranch * /* branch */, const std::string & /* path */) {} + virtual void visitValueLeaf(CStatDBValueLeaf * /* valueLeaf */, const std::string & /* path */) {} + virtual void visitTableLeaf(CStatDBTableLeaf * /* tableLeaf */, const std::string & /* path */) {} protected: CStatDBNodeVisitor() {} diff --git a/code/ryzom/server/src/shard_unifier_service/database_mapping.h b/code/ryzom/server/src/shard_unifier_service/database_mapping.h index d6f9b8689..61df29e9a 100644 --- a/code/ryzom/server/src/shard_unifier_service/database_mapping.h +++ b/code/ryzom/server/src/shard_unifier_service/database_mapping.h @@ -111,9 +111,9 @@ namespace RSMGR CKnownUserPtr() : _FileName(NULL), _LineNum(0), - _Ptr(NULL), _NextPtr(NULL), - _PrevPtr(NULL) + _PrevPtr(NULL), + _Ptr(NULL) { } @@ -1091,9 +1091,9 @@ namespace RSMGR CGuildInvitePtr() : _FileName(NULL), _LineNum(0), - _Ptr(NULL), _NextPtr(NULL), - _PrevPtr(NULL) + _PrevPtr(NULL), + _Ptr(NULL) { } @@ -1231,9 +1231,9 @@ namespace RSMGR CPlayerRatingPtr() : _FileName(NULL), _LineNum(0), - _Ptr(NULL), _NextPtr(NULL), - _PrevPtr(NULL) + _PrevPtr(NULL), + _Ptr(NULL) { } @@ -1371,9 +1371,9 @@ namespace RSMGR CJournalEntryPtr() : _FileName(NULL), _LineNum(0), - _Ptr(NULL), _NextPtr(NULL), - _PrevPtr(NULL) + _PrevPtr(NULL), + _Ptr(NULL) { } diff --git a/code/ryzom/tools/client/client_config/base_dialog.h b/code/ryzom/tools/client/client_config/base_dialog.h index c81c8a207..4082968b4 100644 --- a/code/ryzom/tools/client/client_config/base_dialog.h +++ b/code/ryzom/tools/client/client_config/base_dialog.h @@ -34,7 +34,7 @@ class CBaseDialog : public CDialog public: /// Constructor - CBaseDialog (uint id, CWnd* pParent = NULL) : CDialog(id, pParent) {}; + CBaseDialog (uint id, CWnd* pParent = NULL) : CDialog(id, pParent) {} /// On ok virtual void OnOK (); diff --git a/code/ryzom/tools/leveldesign/georges_convert/string_ex.h b/code/ryzom/tools/leveldesign/georges_convert/string_ex.h index 69489c4ac..a395e8f42 100644 --- a/code/ryzom/tools/leveldesign/georges_convert/string_ex.h +++ b/code/ryzom/tools/leveldesign/georges_convert/string_ex.h @@ -26,9 +26,9 @@ class CStringEx : public std::basic_string, std::al { public: - CStringEx() : std::basic_string, std::allocator >() {;} - CStringEx( char* _pc ) : std::basic_string, std::allocator >( (char *)_pc ) {}; - CStringEx( std::string _s ) : std::basic_string, std::allocator >( (std::string)_s) {}; + CStringEx() : std::basic_string, std::allocator >() {} + CStringEx( char* _pc ) : std::basic_string, std::allocator >( (char *)_pc ) {} + CStringEx( std::string _s ) : std::basic_string, std::allocator >( (std::string)_s) {} CStringEx( const char _c, int _i ) { append( _i, _c ); } virtual ~CStringEx(); diff --git a/code/ryzom/tools/leveldesign/georges_dll/edit_list_ctrl.h b/code/ryzom/tools/leveldesign/georges_dll/edit_list_ctrl.h index 8b61618a1..08b477e38 100644 --- a/code/ryzom/tools/leveldesign/georges_dll/edit_list_ctrl.h +++ b/code/ryzom/tools/leveldesign/georges_dll/edit_list_ctrl.h @@ -84,12 +84,12 @@ public: uint Item, SubItem, ColumnCount; uint DlgIndex; - virtual TItemEdit getItemEditMode (uint item, uint subItem) {return EditFixedCombo;}; + virtual TItemEdit getItemEditMode (uint item, uint subItem) {return EditFixedCombo;} virtual void getComboBoxStrings (uint item, uint subItem, std::vector &retStrings); - virtual void getMemComboBoxProp (uint item, uint subItem, std::string ®Adr, bool &browse) { regAdr = ""; browse = false; }; - virtual void getNewItemText (uint item, uint subItem, std::string &ret) { ret = "new"; }; - virtual void getBrowseInfo (uint item, uint subItem, std::string &defExt, std::string &defFilename, std::string &defDir, std::string &filter) { defExt=""; defFilename=""; filter=""; defDir="";}; - virtual void onItemChanged (uint item, uint subItem) {}; + virtual void getMemComboBoxProp (uint item, uint subItem, std::string ®Adr, bool &browse) { regAdr = ""; browse = false; } + virtual void getNewItemText (uint item, uint subItem, std::string &ret) { ret = "new"; } + virtual void getBrowseInfo (uint item, uint subItem, std::string &defExt, std::string &defFilename, std::string &defDir, std::string &filter) { defExt=""; defFilename=""; filter=""; defDir="";} + virtual void onItemChanged (uint item, uint subItem) {} void memComboBoxAsChange (bool selChange); void closeMemComboBox (bool update); diff --git a/code/ryzom/tools/leveldesign/georges_dll/form_dialog.h b/code/ryzom/tools/leveldesign/georges_dll/form_dialog.h index 0fe05ab8c..29e10aa00 100644 --- a/code/ryzom/tools/leveldesign/georges_dll/form_dialog.h +++ b/code/ryzom/tools/leveldesign/georges_dll/form_dialog.h @@ -66,7 +66,7 @@ public: IFormWidget (CFormDialog *dialog, uint structId, const char *formName, TTypeSrc typeSrc, uint slot); // Destructor - virtual ~IFormWidget () {}; + virtual ~IFormWidget () {} // Update the text of the base label void updateLabel (); @@ -90,8 +90,8 @@ public: virtual bool extendableHeight () const; // Ok / cancel hit - virtual void onOk () {}; - virtual void onCancel () {}; + virtual void onOk () {} + virtual void onCancel () {} // Update widget date virtual void updateData (bool update = true) = 0; diff --git a/code/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.h b/code/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.h index 649a2927d..b6f9ef7f6 100644 --- a/code/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.h +++ b/code/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.h @@ -311,7 +311,7 @@ public: class CGeorgesEditDocType : public CGeorgesEditDoc { protected: // create from serialization only - CGeorgesEditDocType() {}; + CGeorgesEditDocType() {} DECLARE_DYNCREATE(CGeorgesEditDocType) // Document is a type ? @@ -341,7 +341,7 @@ protected: class CGeorgesEditDocDfn : public CGeorgesEditDoc { protected: // create from serialization only - CGeorgesEditDocDfn() {}; + CGeorgesEditDocDfn() {} DECLARE_DYNCREATE(CGeorgesEditDocDfn) // Document is a dfn ? @@ -371,7 +371,7 @@ protected: class CGeorgesEditDocForm : public CGeorgesEditDoc { protected: // create from serialization only - CGeorgesEditDocForm() {}; + CGeorgesEditDocForm() {} DECLARE_DYNCREATE(CGeorgesEditDocForm) // Docuemnt is a form ? diff --git a/code/ryzom/tools/leveldesign/georges_dll/georges_interface.h b/code/ryzom/tools/leveldesign/georges_dll/georges_interface.h index 28ab22042..fbac91024 100644 --- a/code/ryzom/tools/leveldesign/georges_dll/georges_interface.h +++ b/code/ryzom/tools/leveldesign/georges_dll/georges_interface.h @@ -61,7 +61,7 @@ enum TUI class IGeorges { public: - virtual ~IGeorges() {}; + virtual ~IGeorges() {} // Init the UI virtual void initUI (int m_nCmdShow, bool exeStandalone, HWND parent=NULL)=0; diff --git a/code/ryzom/tools/leveldesign/georges_dll/output_console_dlg.h b/code/ryzom/tools/leveldesign/georges_dll/output_console_dlg.h index a796e7fe6..47d447c59 100644 --- a/code/ryzom/tools/leveldesign/georges_dll/output_console_dlg.h +++ b/code/ryzom/tools/leveldesign/georges_dll/output_console_dlg.h @@ -36,8 +36,8 @@ public: void outputString (const char *message); // From CDialog - void OnOK () {}; - void OnCancel (); + void OnOK () {} + void OnCancel () // Dialog Data //{{AFX_DATA(COutputConsoleDlg) diff --git a/code/ryzom/tools/leveldesign/georges_dll/plugin_interface.h b/code/ryzom/tools/leveldesign/georges_dll/plugin_interface.h index 4908d9474..36ad36062 100644 --- a/code/ryzom/tools/leveldesign/georges_dll/plugin_interface.h +++ b/code/ryzom/tools/leveldesign/georges_dll/plugin_interface.h @@ -65,7 +65,7 @@ public: /** * Destructor must uninitialise the plugin interface */ - virtual ~IEditPlugin () {}; + virtual ~IEditPlugin () {} /// Window related @@ -157,7 +157,7 @@ public: /** * Destructor must uninitialise the plugin interface */ - virtual ~IEditDocumentPlugin () {}; + virtual ~IEditDocumentPlugin () {} /// Event message diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBase.h b/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBase.h index 4cee69902..6af4bc18c 100644 --- a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBase.h +++ b/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBase.h @@ -62,7 +62,7 @@ public: /// The master dialog call this method when the document is changed/updated static void docChanged(); /// The docChanged static method call this method on each page. - virtual void onDocChanged() {}; + virtual void onDocChanged() {} }; diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFades.h b/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFades.h index 306f39293..43a339225 100644 --- a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFades.h +++ b/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFades.h @@ -33,7 +33,7 @@ class CPageBgFades : public CPageBase // Construction public: - CPageBgFades() {}; + CPageBgFades() {} CPageBgFades(NLGEORGES::CSoundDialog *soundDialog); ~CPageBgFades(); diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFlags.h b/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFlags.h index 6fab075c3..6e5c2488c 100644 --- a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFlags.h +++ b/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFlags.h @@ -46,7 +46,7 @@ class CPageBgFlags : public CPageBase // Construction public: - CPageBgFlags() {}; + CPageBgFlags() {} CPageBgFlags(NLGEORGES::CSoundDialog *soundDialog); ~CPageBgFlags(); diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageComplex.h b/code/ryzom/tools/leveldesign/georges_plugin_sound/PageComplex.h index 7f9ed68ad..26ee864de 100644 --- a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageComplex.h +++ b/code/ryzom/tools/leveldesign/georges_plugin_sound/PageComplex.h @@ -35,7 +35,7 @@ class CPageComplex : public CPageBase // Construction public: - CPageComplex(){}; + CPageComplex(){} CPageComplex(NLGEORGES::CSoundDialog *soundDialog); ~CPageComplex(); diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageComtext.h b/code/ryzom/tools/leveldesign/georges_plugin_sound/PageComtext.h index c34d6ef64..3c99f9089 100644 --- a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageComtext.h +++ b/code/ryzom/tools/leveldesign/georges_plugin_sound/PageComtext.h @@ -34,7 +34,7 @@ class CPageComtext : public CPageBase // Construction public: - CPageComtext(){}; + CPageComtext(){} CPageComtext(NLGEORGES::CSoundDialog *soundDialog); ~CPageComtext(); diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PagePosition.h b/code/ryzom/tools/leveldesign/georges_plugin_sound/PagePosition.h index 88f21c614..1510c2ea8 100644 --- a/code/ryzom/tools/leveldesign/georges_plugin_sound/PagePosition.h +++ b/code/ryzom/tools/leveldesign/georges_plugin_sound/PagePosition.h @@ -41,7 +41,7 @@ class CPagePosition : public CPageBase // Construction public: - CPagePosition(){}; + CPagePosition(){} CPagePosition(NLGEORGES::CSoundDialog *soundDialog); ~CPagePosition(); diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageSimple.h b/code/ryzom/tools/leveldesign/georges_plugin_sound/PageSimple.h index 8da0328dc..935f33acb 100644 --- a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageSimple.h +++ b/code/ryzom/tools/leveldesign/georges_plugin_sound/PageSimple.h @@ -36,7 +36,7 @@ class CPageSimple : public CPageBase // Construction public: - CPageSimple() {}; + CPageSimple() {} CPageSimple(NLGEORGES::CSoundDialog *soundDialog); ~CPageSimple(); diff --git a/code/ryzom/tools/leveldesign/mission_compiler_lib/step.h b/code/ryzom/tools/leveldesign/mission_compiler_lib/step.h index fdb1db4be..3a38f8689 100644 --- a/code/ryzom/tools/leveldesign/mission_compiler_lib/step.h +++ b/code/ryzom/tools/leveldesign/mission_compiler_lib/step.h @@ -89,7 +89,7 @@ public: IStep(CMissionData &md, NLLIGO::IPrimitive *prim); virtual ~IStep() {} - virtual void init(CMissionData &md, NLLIGO::IPrimitive *prim) {}; + virtual void init(CMissionData &md, NLLIGO::IPrimitive *prim) {} /// Get the step name diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/action.h b/code/ryzom/tools/leveldesign/world_editor/world_editor/action.h index 511f2a16e..9145f4af4 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor/action.h +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/action.h @@ -32,7 +32,7 @@ class IAction public: // Virtual destructor - virtual ~IAction () {}; + virtual ~IAction () {} // Do / undo virtual void undo () = 0; diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/plugin_interface.h b/code/ryzom/tools/leveldesign/world_editor/world_editor/plugin_interface.h index d2c38ca58..2bbe143c1 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor/plugin_interface.h +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/plugin_interface.h @@ -163,7 +163,7 @@ public: /// Init the plugin. The plugin receive the world editor interface. virtual void init(IPluginAccess *pluginAccess) =0; /// Delete the plugin. - virtual ~IPluginCallback() {}; + virtual ~IPluginCallback() {} /// The current region has changed. // virtual void primRegionChanged(const std::vector ®ions) = 0; diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.h b/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.h index 1ea94a512..7fcb78fc1 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.h +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.h @@ -51,9 +51,9 @@ public: CPrimitivePlugin(); - virtual void positionMoved(const NLMISC::CVector &position) {}; - virtual void lostPositionControl() {}; - virtual void onIdle() {}; + virtual void positionMoved(const NLMISC::CVector &position) {} + virtual void lostPositionControl() {} + virtual void onIdle() {} virtual void drawPrimitive(const NLLIGO::IPrimitive *primitive, const TRenderContext &renderContext); @@ -72,9 +72,9 @@ private: void serial (NLMISC::IStream &s); - static uint getVersion (); + static uint getVersion () - void removed() {}; + void removed() {} }; std::map _CreatureInfos; diff --git a/code/ryzom/tools/stats_scan/char_filter_factory.h b/code/ryzom/tools/stats_scan/char_filter_factory.h index ebfd2a964..642c0dfde 100644 --- a/code/ryzom/tools/stats_scan/char_filter_factory.h +++ b/code/ryzom/tools/stats_scan/char_filter_factory.h @@ -51,6 +51,7 @@ public: class ICharFilterBuilder: public NLMISC::CRefCount { public: + virtual ~ICharFilterBuilder() {} virtual const char* getName()=0; virtual const char* getDescription()=0; virtual ICharFilter* build(const std::string& rawArgs)=0; diff --git a/code/ryzom/tools/stats_scan/char_info_extractor_factory.h b/code/ryzom/tools/stats_scan/char_info_extractor_factory.h index 781a3d2d3..920c4344b 100644 --- a/code/ryzom/tools/stats_scan/char_info_extractor_factory.h +++ b/code/ryzom/tools/stats_scan/char_info_extractor_factory.h @@ -53,6 +53,7 @@ public: class ICharInfoExtractorBuilder: public NLMISC::CRefCount { public: + virtual ~ICharInfoExtractorBuilder() {} virtual const char* getName()=0; virtual const char* getDescription()=0; virtual const char* getFields()=0; diff --git a/code/ryzom/tools/stats_scan/job_manager.h b/code/ryzom/tools/stats_scan/job_manager.h index 136ac77be..a318cffdc 100644 --- a/code/ryzom/tools/stats_scan/job_manager.h +++ b/code/ryzom/tools/stats_scan/job_manager.h @@ -31,6 +31,9 @@ public: class IJob: public NLMISC::CRefCount { public: + // virtual dtor + virtual ~IJob() {} + // return true if the job is finished -> the job object can be deleted virtual bool finished()=0;