diff --git a/code/nel/include/nel/3d/flare_shape.h b/code/nel/include/nel/3d/flare_shape.h index 044c53c11..b0c35257b 100644 --- a/code/nel/include/nel/3d/flare_shape.h +++ b/code/nel/include/nel/3d/flare_shape.h @@ -55,7 +55,7 @@ public: CFlareShape(); /// serial this shape - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); //@} diff --git a/code/nel/include/nel/3d/mesh.h b/code/nel/include/nel/3d/mesh.h index 780a455aa..25872a063 100644 --- a/code/nel/include/nel/3d/mesh.h +++ b/code/nel/include/nel/3d/mesh.h @@ -85,7 +85,7 @@ public: // This is slow but doesn't matter since used at mesh building.... CCorner(); - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; /// A Triangle face. @@ -94,7 +94,7 @@ public: CCorner Corner[3]; sint32 MaterialId; sint32 SmoothGroup; - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; @@ -118,7 +118,7 @@ public: } } - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; struct CVertLink @@ -203,7 +203,7 @@ public: CMeshBuild(); // Serialization - //void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + //void serial(NLMISC::IStream &f); }; //@} @@ -257,7 +257,7 @@ public: virtual void render(IDriver *drv, CTransformShape *trans, bool opaquePass); /// serial this mesh. - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); NLMISC_DECLARE_CLASS(CMesh); /// get trinagle count. @@ -370,7 +370,7 @@ public: virtual float getNumTriangles (float distance); /// serial this mesh. - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); NLMISC_DECLARE_CLASS(CMeshGeom); // profile diff --git a/code/nel/include/nel/3d/mesh_base.h b/code/nel/include/nel/3d/mesh_base.h index 816d8b7a4..9fb4f9029 100644 --- a/code/nel/include/nel/3d/mesh_base.h +++ b/code/nel/include/nel/3d/mesh_base.h @@ -146,7 +146,7 @@ public: CMeshBaseBuild(); // Serialization is not used - //void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + //void serial(NLMISC::IStream &f); }; //@} @@ -201,7 +201,7 @@ public: // @} /// serial the base Part of this mesh. - void serialMeshBase(NLMISC::IStream &f) throw(NLMISC::EStream); + void serialMeshBase(NLMISC::IStream &f); /// Flush textures void flushTextures (IDriver &driver, uint selectedTexture); diff --git a/code/nel/include/nel/3d/mesh_morpher.h b/code/nel/include/nel/3d/mesh_morpher.h index b9d8879e2..909d60586 100644 --- a/code/nel/include/nel/3d/mesh_morpher.h +++ b/code/nel/include/nel/3d/mesh_morpher.h @@ -43,7 +43,7 @@ public: std::vector VertRefs; // Array of vertices reference - void serial (NLMISC::IStream &f) throw(NLMISC::EStream); + void serial (NLMISC::IStream &f); }; // *************************************************************************** @@ -90,7 +90,7 @@ public: NLMISC::CObjectVector &vertexRemap, std::vector *pBSFactor); - void serial (NLMISC::IStream &f) throw(NLMISC::EStream); + void serial (NLMISC::IStream &f); private: diff --git a/code/nel/include/nel/3d/mesh_mrm.h b/code/nel/include/nel/3d/mesh_mrm.h index d0ce7d952..619908499 100644 --- a/code/nel/include/nel/3d/mesh_mrm.h +++ b/code/nel/include/nel/3d/mesh_mrm.h @@ -115,7 +115,7 @@ public: virtual float getNumTriangles (float distance); /// serial this meshGeom. - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); NLMISC_DECLARE_CLASS(CMeshMRMGeom); /// Scene profile @@ -579,11 +579,11 @@ private: /// load the header of this mesh. return the version of the header. - sint loadHeader(NLMISC::IStream &f) throw(NLMISC::EStream); + sint loadHeader(NLMISC::IStream &f); /// load this mesh. - void load(NLMISC::IStream &f) throw(NLMISC::EStream); + void load(NLMISC::IStream &f); /// save the entire mesh. - void save(NLMISC::IStream &f) throw(NLMISC::EStream); + void save(NLMISC::IStream &f); // Build bone Usage information for serialized mesh <= version 2. void buildBoneUsageVer2 (); @@ -702,7 +702,7 @@ public: virtual float getNumTriangles (float distance); /// serial this mesh. - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); NLMISC_DECLARE_CLASS(CMeshMRM); /// Get bbox. diff --git a/code/nel/include/nel/3d/mesh_multi_lod.h b/code/nel/include/nel/3d/mesh_multi_lod.h index 445941ed6..a79d5a63e 100644 --- a/code/nel/include/nel/3d/mesh_multi_lod.h +++ b/code/nel/include/nel/3d/mesh_multi_lod.h @@ -125,7 +125,7 @@ public: virtual void getAABBox(NLMISC::CAABBox &bbox) const; /// serial this mesh. - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); /// Declare name of the shape NLMISC_DECLARE_CLASS(CMeshMultiLod); @@ -238,7 +238,7 @@ private: std::vector CoarseTriangles; /// Serial - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); /// Is Opaque ? bool isOpaque() { return (Flags&IsOpaque)!=0; } diff --git a/code/nel/include/nel/3d/meshvp_per_pixel_light.h b/code/nel/include/nel/3d/meshvp_per_pixel_light.h index a234feddd..4533464a9 100644 --- a/code/nel/include/nel/3d/meshvp_per_pixel_light.h +++ b/code/nel/include/nel/3d/meshvp_per_pixel_light.h @@ -65,7 +65,7 @@ public: const NLMISC::CMatrix &invertedModelMat, const NLMISC::CVector &viewerPos); virtual void end(IDriver *drv); - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); virtual void setupForMaterial(const CMaterial &mat, IDriver *drv, CScene *scene, diff --git a/code/nel/include/nel/3d/meshvp_wind_tree.h b/code/nel/include/nel/3d/meshvp_wind_tree.h index d8e7598b7..790a2f774 100644 --- a/code/nel/include/nel/3d/meshvp_wind_tree.h +++ b/code/nel/include/nel/3d/meshvp_wind_tree.h @@ -90,7 +90,7 @@ public: virtual float getMaxVertexMove(); // Serial. - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); NLMISC_DECLARE_CLASS(CMeshVPWindTree); // @} diff --git a/code/nel/include/nel/3d/packed_world.h b/code/nel/include/nel/3d/packed_world.h index d76c180ba..a091c61fb 100644 --- a/code/nel/include/nel/3d/packed_world.h +++ b/code/nel/include/nel/3d/packed_world.h @@ -54,9 +54,9 @@ public: void build(std::vector &packesZones); bool raytrace(const NLMISC::CVector &start, const NLMISC::CVector &end, NLMISC::CVector &inter, std::vector *testedTriangles = NULL, NLMISC::CVector *normal = NULL); void getZones(std::vector &zones); - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); // just serialize the header, containing name of the zones this CPackedWorld was built from - void serialZoneNames(NLMISC::IStream &f) throw(NLMISC::EStream); + void serialZoneNames(NLMISC::IStream &f); /** Roughly select triangles that are within a convex 2D polygon (world coordinates) * Selection is not exact, because limited to the resolution of the grid into which is packed each zone. * Triangle that are within are guaranteed to be selected, however. @@ -68,7 +68,7 @@ private: public: TPackedZoneBaseSPtr Zone; uint32 RaytraceCounter; - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serialVersion(1); CPackedZoneBase *pz = Zone; @@ -81,7 +81,7 @@ private: { public: std::vector IDs; // make a class from this vector just for serialization - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serialCont(IDs); } diff --git a/code/nel/include/nel/3d/packed_zone.h b/code/nel/include/nel/3d/packed_zone.h index 2beb5f5ed..52f76097a 100644 --- a/code/nel/include/nel/3d/packed_zone.h +++ b/code/nel/include/nel/3d/packed_zone.h @@ -52,7 +52,7 @@ class CPackedVertex public: uint16 X, Y, Z; public: - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial(X, Y, Z); } @@ -68,7 +68,7 @@ class CPackedTri public: uint32 V0, V1, V2; public: - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial(V0, V1, V2); } @@ -79,7 +79,7 @@ class CPackedTri16 public: uint16 V0, V1, V2; public: - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial(V0, V1, V2); } @@ -101,7 +101,7 @@ public: sint32 ZoneY; public: virtual ~CPackedZoneBase() {} - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) = 0; + virtual void serial(NLMISC::IStream &f) = 0; // TMP For debug : render position covered by a frustum virtual void render(CVertexBuffer &vb, IDriver &drv, CMaterial &mat, CMaterial &wiredMaterial, const NLMISC::CMatrix &camMat, uint batchSize, const NLMISC::CVector localFrustCorners[8]) = 0; // raytracing test @@ -138,7 +138,7 @@ public: sint32 zoneX, sint32 zoneY ); - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); // TMP For debug : render porition covered by a frustum void render(CVertexBuffer &vb, IDriver &drv, CMaterial &mat, CMaterial &wiredMaterial, const NLMISC::CMatrix &camMat, uint batchSize, const NLMISC::CVector localFrustCorners[8]); // try to build a 16 bit version of this packed zone to save some more place @@ -183,7 +183,7 @@ public: NLMISC_DECLARE_CLASS(CPackedZone16) CPackedZone16(); // - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); // TMP For debug : render position covered by a frustum void render(CVertexBuffer &vb, IDriver &drv, CMaterial &mat, CMaterial &wiredMaterial, const NLMISC::CMatrix &camMat, uint batchSize, const NLMISC::CVector localFrustCorners[8]); // raytracing test diff --git a/code/nel/include/nel/3d/particle_system.h b/code/nel/include/nel/3d/particle_system.h index 50a8d8269..bd50514fc 100644 --- a/code/nel/include/nel/3d/particle_system.h +++ b/code/nel/include/nel/3d/particle_system.h @@ -84,7 +84,7 @@ public: /// dtor virtual ~CParticleSystem(); /// serialize this particle system - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); /** Merge this system with a system instanciated from the given shape * NB : This is for edition purpose, this is slow * \return true if the operation could be performed. It can fail when this cause the system the system to last forever, diff --git a/code/nel/include/nel/3d/particle_system_process.h b/code/nel/include/nel/3d/particle_system_process.h index 75aa6e0f1..0e52228ee 100644 --- a/code/nel/include/nel/3d/particle_system_process.h +++ b/code/nel/include/nel/3d/particle_system_process.h @@ -102,7 +102,7 @@ class CParticleSystemProcess : public NLMISC::IStreamable * Everything is saved, except for the fontManager and the fontGenerator. * They must be set again if the PSToolRender pass is used. */ - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) ; + virtual void serial(NLMISC::IStream &f); /// @} diff --git a/code/nel/include/nel/3d/particle_system_shape.h b/code/nel/include/nel/3d/particle_system_shape.h index a1c397975..c8fbc8a17 100644 --- a/code/nel/include/nel/3d/particle_system_shape.h +++ b/code/nel/include/nel/3d/particle_system_shape.h @@ -90,7 +90,7 @@ public: // @} /// serial the shape - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); NLMISC_DECLARE_CLASS(CParticleSystemShape); diff --git a/code/nel/include/nel/3d/ps_attrib.h b/code/nel/include/nel/3d/ps_attrib.h index cd691e719..8a0dcdda6 100644 --- a/code/nel/include/nel/3d/ps_attrib.h +++ b/code/nel/include/nel/3d/ps_attrib.h @@ -202,7 +202,7 @@ public: uint size() const { return _Size; } /// serialization - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { if (f.isReading()) { @@ -262,7 +262,7 @@ public: CPSAttrib(); /// Serialization method - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); // swap with another vector void swap(CPSAttrib &other); @@ -429,7 +429,7 @@ void CPSAttrib::remove(uint32 index) } template -void CPSAttrib::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSAttrib::serial(NLMISC::IStream &f) { // version 4 to 5 => bug with size being > capacity sint ver = f.serialVersion(5); diff --git a/code/nel/include/nel/3d/ps_attrib_maker.h b/code/nel/include/nel/3d/ps_attrib_maker.h index 56b393c2e..fb96cb86e 100644 --- a/code/nel/include/nel/3d/ps_attrib_maker.h +++ b/code/nel/include/nel/3d/ps_attrib_maker.h @@ -60,7 +60,7 @@ struct CPSInputType uint32 UserParamNum; }; - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serialEnum(InputType); switch(InputType) @@ -124,7 +124,7 @@ public: } /// serialisation of the object. Derivers MUST call this, (if they use the attribute of this class at least) - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + virtual void serial(NLMISC::IStream &f) { f.serialVersion(1); f.serial(_NbCycles); diff --git a/code/nel/include/nel/3d/ps_attrib_maker_bin_op.h b/code/nel/include/nel/3d/ps_attrib_maker_bin_op.h index f59d9c4e4..597b47457 100644 --- a/code/nel/include/nel/3d/ps_attrib_maker_bin_op.h +++ b/code/nel/include/nel/3d/ps_attrib_maker_bin_op.h @@ -103,7 +103,7 @@ public: uint32 srcStep = (1 << 16) ) const; - virtual void serial (NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial (NLMISC::IStream &f); virtual void deleteElement (uint32 index); virtual void newElement (const CPSEmitterInfo &info); virtual void resize (uint32 capacity, uint32 nbPresentElements); diff --git a/code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h b/code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h index 339a52e7f..00d675e4e 100644 --- a/code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h +++ b/code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h @@ -729,7 +729,7 @@ inline void CPSAttribMakerBinOp::makeN(CPSLocated *loc, //================================================================================================================= template -inline void CPSAttribMakerBinOp::serial (NLMISC::IStream &f) throw(NLMISC::EStream) +inline void CPSAttribMakerBinOp::serial (NLMISC::IStream &f) { if (f.isReading()) { diff --git a/code/nel/include/nel/3d/ps_attrib_maker_helper.h b/code/nel/include/nel/3d/ps_attrib_maker_helper.h index 73ab32a31..2a4f243b6 100644 --- a/code/nel/include/nel/3d/ps_attrib_maker_helper.h +++ b/code/nel/include/nel/3d/ps_attrib_maker_helper.h @@ -96,7 +96,7 @@ template class CPSAttribMakerT : public CPSAttribMaker /// serialization of the object - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + virtual void serial(NLMISC::IStream &f) { sint ver = f.serialVersion(2); CPSAttribMaker::serial(f); @@ -1624,7 +1624,7 @@ public: } /// serialisation of the object. Derivers MUST call this, (if they use the attribute of this class at least) - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + virtual void serial(NLMISC::IStream &f) { f.serialVersion(1); @@ -1744,7 +1744,7 @@ public: _MaxValue = other._MaxValue; } // serial. Should update min / max when reading - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); virtual uint32 getMinValue(void) const { return _MinValue; } virtual uint32 getMaxValue(void) const { return _MaxValue; } virtual void newElement(const CPSEmitterInfo &info); @@ -1767,7 +1767,7 @@ public: _MaxValue = other._MaxValue; } // serial. Should update min / max when reading - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); virtual sint32 getMinValue(void) const { return _MinValue; } virtual sint32 getMaxValue(void) const { return _MaxValue; } virtual void newElement(const CPSEmitterInfo &info); @@ -1790,7 +1790,7 @@ public: _MaxValue = other._MaxValue; } // serial. Should update min / max when reading - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); virtual float getMinValue(void) const { return _MinValue; } virtual float getMaxValue(void) const { return _MaxValue; } virtual void newElement(const CPSEmitterInfo &info); diff --git a/code/nel/include/nel/3d/ps_attrib_maker_template.h b/code/nel/include/nel/3d/ps_attrib_maker_template.h index c41931ab3..86213880c 100644 --- a/code/nel/include/nel/3d/ps_attrib_maker_template.h +++ b/code/nel/include/nel/3d/ps_attrib_maker_template.h @@ -93,7 +93,7 @@ public: CPSValueBlendFunc() {} /// serialization - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serialVersion(1); f.serial(_StartValue, _EndValue); @@ -228,7 +228,7 @@ public: CPSValueBlendSampleFunc() {} /// serialization - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serialVersion(1); if (f.isReading()) @@ -353,7 +353,7 @@ public: } /// serialization - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); T getMaxValue(void) const @@ -493,7 +493,7 @@ void CPSValueGradientFunc::setValuesUnpacked(const T *valueTab, uint32 numVal template -void CPSValueGradientFunc::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSValueGradientFunc::serial(NLMISC::IStream &f) { f.serialVersion(1); f.serial(_NbStages); diff --git a/code/nel/include/nel/3d/ps_color.h b/code/nel/include/nel/3d/ps_color.h index d05d9cf11..1be8fb329 100644 --- a/code/nel/include/nel/3d/ps_color.h +++ b/code/nel/include/nel/3d/ps_color.h @@ -66,7 +66,7 @@ public: { CPSValueBlendFunc::setValues(convertVBColor(startValue, _ColorType), convertVBColor(endValue, _ColorType)); } - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { setColorType(CVertexBuffer::TRGBA); CPSValueBlendFunc::serial(f); @@ -100,7 +100,7 @@ public: { CPSValueBlendSampleFunc::setValues(convertVBColor(startValue, _ColorType), convertVBColor(endValue, _ColorType)); } - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { setColorType(CVertexBuffer::TRGBA); CPSValueBlendSampleFunc::serial(f); @@ -124,7 +124,7 @@ public: NLMISC::CRGBA getValue(uint index) const; void setValues(const NLMISC::CRGBA *valueTab, uint32 numValues, uint32 nbStages); void setValuesUnpacked(const NLMISC::CRGBA *valueTab, uint32 numValues, uint32 nbStages); - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { setColorType(CVertexBuffer::TRGBA); CPSValueGradientFunc::serial(f); @@ -153,7 +153,7 @@ public: this->_F.setColorType(colorType); } // serialisation should always be done in RGBA mode, so enforce that - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + virtual void serial(NLMISC::IStream &f) { setColorType(CVertexBuffer::TRGBA); CPSAttribMakerT::serial(f); @@ -229,7 +229,7 @@ public: virtual void setColorType(CVertexBuffer::TVertexColorType colorType); virtual void setDefaultValue(NLMISC::CRGBA defaultValue); virtual NLMISC::CRGBA getDefaultValue(void) const; - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); protected: CVertexBuffer::TVertexColorType _ColorType; }; @@ -244,7 +244,7 @@ public: NLMISC_DECLARE_CLASS(CPSColorBinOp); CPSAttribMakerBase *clone() const { return new CPSColorBinOp(*this); } virtual void setColorType(CVertexBuffer::TVertexColorType colorType); - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); }; diff --git a/code/nel/include/nel/3d/ps_dot.h b/code/nel/include/nel/3d/ps_dot.h index d5201ab3b..2bdb7603a 100644 --- a/code/nel/include/nel/3d/ps_dot.h +++ b/code/nel/include/nel/3d/ps_dot.h @@ -46,7 +46,7 @@ public: NLMISC_DECLARE_CLASS(CPSDot); ///serialisation - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); /// return true if there are transparent faces in the object virtual bool hasTransparentFaces(void); diff --git a/code/nel/include/nel/3d/ps_emitter.h b/code/nel/include/nel/3d/ps_emitter.h index 7170be75a..b8d82bb45 100644 --- a/code/nel/include/nel/3d/ps_emitter.h +++ b/code/nel/include/nel/3d/ps_emitter.h @@ -171,7 +171,7 @@ public: const CPSAttribMaker *getGenNbScheme(void) const { return _GenNbScheme; } /// Serialization - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); ///\name Speed vector options //@{ @@ -424,7 +424,7 @@ class CPSModulatedEmitter bool useEmitteeSpeedScheme(void) const { return _EmitteeSpeedScheme != NULL; } /// serialization - void serialEmitteeSpeedScheme(NLMISC::IStream &f) throw(NLMISC::EStream); + void serialEmitteeSpeedScheme(NLMISC::IStream &f); protected: @@ -470,7 +470,7 @@ public: } /// Serialisation - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); NLMISC_DECLARE_CLASS(CPSEmitterDirectionnal); @@ -506,7 +506,7 @@ class CPSRadialEmitter : public CPSEmitterDirectionnal if (CParticleSystem::getSerializeIdentifierFlag()) _Name = std::string("RadialEmitter"); } /// Serialisation - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); NLMISC_DECLARE_CLASS(CPSRadialEmitter); virtual void emit(const NLMISC::CVector &srcPos, uint32 index, NLMISC::CVector &pos, NLMISC::CVector &speed); }; @@ -527,7 +527,7 @@ public: } /// Serialisation - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); NLMISC_DECLARE_CLASS(CPSEmitterOmni); @@ -561,7 +561,7 @@ class CPSEmitterRectangle : public CPSEmitter, public CPSModulatedEmitter, publi } /// Serialisation - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); NLMISC_DECLARE_CLASS(CPSEmitterRectangle); @@ -636,7 +636,7 @@ public: } /// Serialisation - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); NLMISC_DECLARE_CLASS(CPSEmitterConic); @@ -675,7 +675,7 @@ public: } /// Serialisation - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); NLMISC_DECLARE_CLASS(CPSSphericalEmitter); diff --git a/code/nel/include/nel/3d/ps_face.h b/code/nel/include/nel/3d/ps_face.h index b46299eb1..b62a9d50b 100644 --- a/code/nel/include/nel/3d/ps_face.h +++ b/code/nel/include/nel/3d/ps_face.h @@ -69,7 +69,7 @@ public: */ CPSFace(CSmartPtr tex = NULL); - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); NLMISC_DECLARE_CLASS(CPSFace); /** Tells that all faces are turning in the same manner, and only have a rotationnal bias diff --git a/code/nel/include/nel/3d/ps_face_look_at.h b/code/nel/include/nel/3d/ps_face_look_at.h index 3ae6a59e3..1d9b38a36 100644 --- a/code/nel/include/nel/3d/ps_face_look_at.h +++ b/code/nel/include/nel/3d/ps_face_look_at.h @@ -40,7 +40,7 @@ public: */ CPSFaceLookAt(CSmartPtr tex = NULL); - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); NLMISC_DECLARE_CLASS(CPSFaceLookAt); diff --git a/code/nel/include/nel/3d/ps_fan_light.h b/code/nel/include/nel/3d/ps_fan_light.h index 19f5baaa5..1de8beaa9 100644 --- a/code/nel/include/nel/3d/ps_fan_light.h +++ b/code/nel/include/nel/3d/ps_fan_light.h @@ -47,7 +47,7 @@ public: CPSFanLight(uint32 nbFans = 7); /// Dtor ~CPSFanLight(); - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); //@} // Set the number of fans used for drawing (minimum is 3, maximum is 128) diff --git a/code/nel/include/nel/3d/ps_float.h b/code/nel/include/nel/3d/ps_float.h index da8978af1..be5044d2d 100644 --- a/code/nel/include/nel/3d/ps_float.h +++ b/code/nel/include/nel/3d/ps_float.h @@ -104,7 +104,7 @@ class CPSFloatCurveFunctor CCtrlPoint(float date, float value) : Date(date), Value(value) { nlassert(Date >= 0 && Date <= 1); } float Date; float Value; - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial(Date, Value); } @@ -166,7 +166,7 @@ class CPSFloatCurveFunctor float getValue(float date) const; /// serialization - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); float getMinValue() const { return _MinValue; } float getMaxValue() const { return _MaxValue; } diff --git a/code/nel/include/nel/3d/ps_force.h b/code/nel/include/nel/3d/ps_force.h index e93c21361..14be72150 100644 --- a/code/nel/include/nel/3d/ps_force.h +++ b/code/nel/include/nel/3d/ps_force.h @@ -70,7 +70,7 @@ public: virtual void show() = 0; /// Serial the force definition. MUST be called by deriver during their serialisation - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); /// check whether this force is integrable over time. The default is false virtual bool isIntegrable(void) const { return false; } @@ -175,7 +175,7 @@ public: /// get the attribute maker for a non constant intensity CPSAttribMaker *getIntensityScheme(void) { return _IntensityScheme; } const CPSAttribMaker *getIntensityScheme(void) const { return _IntensityScheme; } - void serialForceIntensity(NLMISC::IStream &f) throw(NLMISC::EStream); + void serialForceIntensity(NLMISC::IStream &f); protected: @@ -209,7 +209,7 @@ protected: class CPSForceIntensityHelper : public CPSForce, public CPSForceIntensity { public: - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) ; + void serial(NLMISC::IStream &f); protected: virtual CPSLocated *getForceIntensityOwner(void) { return _Owner; } @@ -241,7 +241,7 @@ protected: * * // you can provide a serialization method. Note that that if the functor parameters are set before each use, * // it useless to serial something ... - * void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + * void serial(NLMISC::IStream &f) * * protected: * ... @@ -275,7 +275,7 @@ public: /// serialization - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + virtual void serial(NLMISC::IStream &f) { f.serialVersion(1); CPSForce::serial(f); @@ -354,7 +354,7 @@ class CPSDirectionnalForce : public CPSForceIntensityHelper, public CPSDirection } /// serialization - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); NLMISC_DECLARE_CLASS(CPSDirectionnalForce); @@ -397,7 +397,7 @@ public: } /// serialization - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); NLMISC_DECLARE_CLASS(CPSGravity); @@ -443,7 +443,7 @@ public: } /// serialization - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); NLMISC_DECLARE_CLASS(CPSCentralGravity); @@ -464,7 +464,7 @@ public: /// serialization - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); /// Compute the force on the targets @@ -498,7 +498,7 @@ public: speed -= (CParticleSystem::EllapsedTime * _K * invMass * speed); } - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + virtual void serial(NLMISC::IStream &f) { f.serialVersion(1); // we don't save intensity info : it is saved by the owning object (and set before each use of this functor) @@ -539,7 +539,7 @@ public: NLMISC_DECLARE_CLASS(CPSFluidFriction) - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + virtual void serial(NLMISC::IStream &f) { f.serialVersion(1); CIsotropicForceT::serial(f); @@ -571,7 +571,7 @@ public: NLMISC_DECLARE_CLASS(CPSBrownianForce) - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); /// We provide a kind of integration on a predefined sequence virtual bool isIntegrable(void) const; @@ -648,7 +648,7 @@ struct CPSTurbulForceFunc */ } - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + virtual void serial(NLMISC::IStream &f) { f.serialVersion(1); f.serial(_Scale, _NumOctaves); @@ -686,7 +686,7 @@ public: NLMISC_DECLARE_CLASS(CPSTurbul) - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + virtual void serial(NLMISC::IStream &f) { f.serialVersion(1); CIsotropicForceT::serial(f); @@ -758,7 +758,7 @@ public: // serialization - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); @@ -801,7 +801,7 @@ class CPSMagneticForce : public CPSDirectionnalForce } virtual void computeForces(CPSLocated &target); /// serialization - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); NLMISC_DECLARE_CLASS(CPSMagneticForce); }; diff --git a/code/nel/include/nel/3d/ps_light.h b/code/nel/include/nel/3d/ps_light.h index 31e159ae1..016dddaf9 100644 --- a/code/nel/include/nel/3d/ps_light.h +++ b/code/nel/include/nel/3d/ps_light.h @@ -42,7 +42,7 @@ public: ~CPSLight(); NLMISC_DECLARE_CLASS(CPSLight); /// Serialisation. Derivers must override this, and call their parent version - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); //@} virtual uint32 getType(void) const; virtual uint32 getPriority(void) const { return 600; } diff --git a/code/nel/include/nel/3d/ps_located.h b/code/nel/include/nel/3d/ps_located.h index 4245c5c81..e8bd62a20 100644 --- a/code/nel/include/nel/3d/ps_located.h +++ b/code/nel/include/nel/3d/ps_located.h @@ -356,7 +356,7 @@ public: void resize(uint32 newSize); /// serialization - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); /// Shortcut to get an instance of the 3d driver IDriver *getDriver() const; @@ -730,7 +730,7 @@ public: /// ctor CPSLocatedBindable(); /// serialization - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); /** this should be called before to delete any bindable inserted in a system, but this is done * by the system, so you should never need calling it. This has been introduced because calls in dtor are not polymorphic * to derived class (which are already destroyed anyway), and some infos are needed in some dtor. The default behaviour does nothing @@ -1010,7 +1010,7 @@ public: */ virtual void releaseTargetRsc(CPSLocated * /* target */) {} /// Seralization, must be called by derivers - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); /// Finalize this object : the default is to call releaseTargetRsc on targets virtual void finalize(void); virtual ~CPSTargetLocatedBindable(); diff --git a/code/nel/include/nel/3d/ps_mesh.h b/code/nel/include/nel/3d/ps_mesh.h index 6863903f9..7eef01012 100644 --- a/code/nel/include/nel/3d/ps_mesh.h +++ b/code/nel/include/nel/3d/ps_mesh.h @@ -82,7 +82,7 @@ public: std::string getShape(void) const { return _Shape; } /// serialisation. Derivers must override this, and call their parent version - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); virtual ~CPSMesh(); @@ -271,7 +271,7 @@ public: /// serialisation. Derivers must override this, and call their parent version - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); NLMISC_DECLARE_CLASS(CPSConstraintMesh); @@ -334,7 +334,7 @@ public: float WRotSpeed; /* = 0 */ float WRotAccel; /* = 0 */ CGlobalTexAnim(); - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); /// Build a texture matrix from a date and this obj. void buildMatrix(TAnimationTime date, NLMISC::CMatrix &dest); }; @@ -587,7 +587,7 @@ protected: struct CGlobalTexAnims { CGlobalTexAnim Anims[IDRV_MAT_MAXTEXTURES]; - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; typedef CUniquePtr PGlobalTexAnims; diff --git a/code/nel/include/nel/3d/ps_particle_basic.h b/code/nel/include/nel/3d/ps_particle_basic.h index 3674e6d9c..c7bdc242a 100644 --- a/code/nel/include/nel/3d/ps_particle_basic.h +++ b/code/nel/include/nel/3d/ps_particle_basic.h @@ -107,7 +107,7 @@ public: virtual uint32 getNumWantedTris() const = 0; /// serialisation. Derivers must override this, and call their parent version - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + virtual void serial(NLMISC::IStream &f) { /// version 3 : global color lighting /// version 2 : auto-lod saved @@ -210,7 +210,7 @@ class CPSColoredParticle virtual ~CPSColoredParticle(); /// serialization. - void serialColorScheme(NLMISC::IStream &f) throw(NLMISC::EStream); + void serialColorScheme(NLMISC::IStream &f); protected: @@ -273,7 +273,7 @@ class CPSSizedParticle virtual ~CPSSizedParticle(); /// serialization. We choose a different name because of multiple-inheritance - void serialSizeScheme(NLMISC::IStream &f) throw(NLMISC::EStream); + void serialSizeScheme(NLMISC::IStream &f); protected: @@ -335,7 +335,7 @@ class CPSRotated2DParticle virtual ~CPSRotated2DParticle(); /// serialization. We choose a different name because of multiple-inheritance - void serialAngle2DScheme(NLMISC::IStream &f) throw(NLMISC::EStream); + void serialAngle2DScheme(NLMISC::IStream &f); @@ -453,7 +453,7 @@ class CPSTexturedParticle virtual ~CPSTexturedParticle(); /// serialization. We choose a different name because of multiple-inheritance - void serialTextureScheme(NLMISC::IStream &f) throw(NLMISC::EStream); + void serialTextureScheme(NLMISC::IStream &f); void enumTexs(std::vector > &dest); @@ -576,7 +576,7 @@ public: } /// serial this object - void serialMultiTex(NLMISC::IStream &f) throw(NLMISC::EStream); + void serialMultiTex(NLMISC::IStream &f); /** setup a material from this object and a primary texture * drv is used to check the device caps. @@ -683,7 +683,7 @@ class CPSRotated3DPlaneParticle virtual ~CPSRotated3DPlaneParticle(); /// serialization. We choose a different name because of multiple-inheritance - void serialPlaneBasisScheme(NLMISC::IStream &f) throw(NLMISC::EStream); + void serialPlaneBasisScheme(NLMISC::IStream &f); protected: /// if this is false, constant size will be used instead of a scheme @@ -806,7 +806,7 @@ public: enum TBlendingMode { add, modulate, alphaBlend, alphaTest }; /// serialization (not named 'serial' because it will be used via multiple-inheritance) - void serialMaterial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serialMaterial(NLMISC::IStream &f); /// set the blending mode. The default is ass void setBlendingMode(CPSMaterial::TBlendingMode mode); diff --git a/code/nel/include/nel/3d/ps_plane_basis.h b/code/nel/include/nel/3d/ps_plane_basis.h index 41882e148..3a36876f7 100644 --- a/code/nel/include/nel/3d/ps_plane_basis.h +++ b/code/nel/include/nel/3d/ps_plane_basis.h @@ -66,7 +66,7 @@ struct CPlaneBasis } - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial(X, Y) ; } diff --git a/code/nel/include/nel/3d/ps_plane_basis_maker.h b/code/nel/include/nel/3d/ps_plane_basis_maker.h index 54770c9c9..e798c9885 100644 --- a/code/nel/include/nel/3d/ps_plane_basis_maker.h +++ b/code/nel/include/nel/3d/ps_plane_basis_maker.h @@ -128,7 +128,7 @@ class CPSPlaneBasisFollowSpeed : public CPSAttribMaker NLMISC_DECLARE_CLASS(CPSPlaneBasisFollowSpeed); /// serialization - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + virtual void serial(NLMISC::IStream &f) { // version 2 : added projection plane // version 1 : nothing to save here @@ -192,7 +192,7 @@ public: /// get the number of samples for the rotation uint32 getNumSamples(void) const; /// serial this object - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); protected: CPSVector::V _PBTab; uint32 _NbSamples; diff --git a/code/nel/include/nel/3d/ps_quad.h b/code/nel/include/nel/3d/ps_quad.h index 000ff32cc..76e9562e2 100644 --- a/code/nel/include/nel/3d/ps_quad.h +++ b/code/nel/include/nel/3d/ps_quad.h @@ -114,7 +114,7 @@ protected: void updateVbColNUVForRender(CVertexBuffer &vb, uint32 startIndex, uint32 numQuad, uint32 srcStep, IDriver &drv); /// DERIVERS MUST CALL this - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); virtual CPSLocated *getColorOwner(void) { return _Owner; } virtual CPSLocated *getSizeOwner(void) { return _Owner; } virtual CPSLocated *getTextureIndexOwner(void) { return _Owner; } diff --git a/code/nel/include/nel/3d/ps_ribbon.h b/code/nel/include/nel/3d/ps_ribbon.h index ccda62021..5383a1b4b 100644 --- a/code/nel/include/nel/3d/ps_ribbon.h +++ b/code/nel/include/nel/3d/ps_ribbon.h @@ -55,7 +55,7 @@ public: /// dtor ~CPSRibbon(); /// serialisation. Derivers must override this, and call their parent version - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); // NLMISC_DECLARE_CLASS(CPSRibbon); ///@} diff --git a/code/nel/include/nel/3d/ps_ribbon_base.h b/code/nel/include/nel/3d/ps_ribbon_base.h index ea3443060..5670a2d31 100644 --- a/code/nel/include/nel/3d/ps_ribbon_base.h +++ b/code/nel/include/nel/3d/ps_ribbon_base.h @@ -52,7 +52,7 @@ public: ///@{ CPSRibbonBase(); /// serialisation. Derivers must override this, and call their parent version - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); ///@} ///\name Behaviour diff --git a/code/nel/include/nel/3d/ps_ribbon_look_at.h b/code/nel/include/nel/3d/ps_ribbon_look_at.h index 2494fe04c..6da38694b 100644 --- a/code/nel/include/nel/3d/ps_ribbon_look_at.h +++ b/code/nel/include/nel/3d/ps_ribbon_look_at.h @@ -38,7 +38,7 @@ public: /// dtor ~CPSRibbonLookAt(); /// serialisation. Derivers must override this, and call their parent version - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); // NLMISC_DECLARE_CLASS(CPSRibbonLookAt); ///@} diff --git a/code/nel/include/nel/3d/ps_shockwave.h b/code/nel/include/nel/3d/ps_shockwave.h index b8329a239..54774c58f 100644 --- a/code/nel/include/nel/3d/ps_shockwave.h +++ b/code/nel/include/nel/3d/ps_shockwave.h @@ -54,7 +54,7 @@ public: float getRadiusCut(void) const { return _RadiusCut; } /// serialisation. Derivers must override this, and call their parent version - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); NLMISC_DECLARE_CLASS(CPSShockWave); diff --git a/code/nel/include/nel/3d/ps_sound.h b/code/nel/include/nel/3d/ps_sound.h index af5a7cc94..d1c990770 100644 --- a/code/nel/include/nel/3d/ps_sound.h +++ b/code/nel/include/nel/3d/ps_sound.h @@ -50,7 +50,7 @@ public: /// dtor ~CPSSound(); /// serialisation. Derivers must override this, and call their parent version - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); //@} /// return this bindable type diff --git a/code/nel/include/nel/3d/ps_tail_dot.h b/code/nel/include/nel/3d/ps_tail_dot.h index 3caf5fa96..a2aae6e83 100644 --- a/code/nel/include/nel/3d/ps_tail_dot.h +++ b/code/nel/include/nel/3d/ps_tail_dot.h @@ -37,7 +37,7 @@ public: /// dtor ~CPSTailDot(); /// serialisation. Derivers must override this, and call their parent version - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); // NLMISC_DECLARE_CLASS(CPSTailDot); ///@} diff --git a/code/nel/include/nel/3d/ps_zone.h b/code/nel/include/nel/3d/ps_zone.h index 0e0ff7274..032d5db62 100644 --- a/code/nel/include/nel/3d/ps_zone.h +++ b/code/nel/include/nel/3d/ps_zone.h @@ -82,7 +82,7 @@ public: /// serialization, DERIVER must override this, and call the parent version - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); /** Inherited from CPSTargetLocatedBindable. It's called when one of the targets has been detroyed or detached @@ -155,7 +155,7 @@ class CPSZonePlane : public CPSZone, public IPSMover virtual NLMISC::CVector getNormal(uint32 index); virtual void setNormal(uint32 index, NLMISC::CVector n); - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); protected: TPSAttribVector _Normal; @@ -176,7 +176,7 @@ struct CRadiusPair { // the adius, and the square radius float R, R2; - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial(R, R2); } @@ -205,7 +205,7 @@ class CPSZoneSphere : public CPSZone, public IPSMover - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); // inherited from IPSMover @@ -257,7 +257,7 @@ class CPSZoneDisc : public CPSZone, public IPSMover virtual NLMISC::CVector getNormal(uint32 index); virtual void setNormal(uint32 index, NLMISC::CVector n); - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); @@ -303,7 +303,7 @@ class CPSZoneCylinder : public CPSZone, public IPSMover virtual NLMISC::CVector getScale(uint32 k) const; // serialization - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); @@ -350,7 +350,7 @@ class CPSZoneRectangle : public CPSZone, public IPSMover // serialization - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); // inherited from IPSMover virtual bool supportUniformScaling(void) const { return true; } diff --git a/code/nel/include/nel/3d/seg_remanence_shape.h b/code/nel/include/nel/3d/seg_remanence_shape.h index 80d54b6ca..2f8a159ff 100644 --- a/code/nel/include/nel/3d/seg_remanence_shape.h +++ b/code/nel/include/nel/3d/seg_remanence_shape.h @@ -70,7 +70,7 @@ public: // assignement CSegRemanenceShape &operator = (const CSegRemanenceShape &other); - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); NLMISC_DECLARE_CLASS(CSegRemanenceShape); //@} diff --git a/code/nel/include/nel/3d/shape.h b/code/nel/include/nel/3d/shape.h index a8038e593..ec359aa7f 100644 --- a/code/nel/include/nel/3d/shape.h +++ b/code/nel/include/nel/3d/shape.h @@ -201,7 +201,7 @@ public: IShape* getShapePointer () const; /// serial the shape. - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); private: IShape* _Shape; }; diff --git a/code/nel/include/nel/3d/skeleton_shape.h b/code/nel/include/nel/3d/skeleton_shape.h index a47be7f17..359a51fd3 100644 --- a/code/nel/include/nel/3d/skeleton_shape.h +++ b/code/nel/include/nel/3d/skeleton_shape.h @@ -49,7 +49,7 @@ public: std::vector ActiveBones; public: - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; public: @@ -94,7 +94,7 @@ public: virtual float getNumTriangles (float distance); /// serial this skeletonshape. - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); NLMISC_DECLARE_CLASS(CSkeletonShape); /// flush textures used by this shape. diff --git a/code/nel/include/nel/3d/texture.h b/code/nel/include/nel/3d/texture.h index bb9b9165a..5b8e7ef37 100644 --- a/code/nel/include/nel/3d/texture.h +++ b/code/nel/include/nel/3d/texture.h @@ -359,7 +359,7 @@ public: virtual bool allowDegradation() const { return false; } /// serial ITexture basic infos (clamp ...). - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); /** Select a texture among several other (if this texture is a set of texture such as CTextureMultiFile) * The default does nothing diff --git a/code/nel/include/nel/3d/texture_blend.h b/code/nel/include/nel/3d/texture_blend.h index 7a910d91e..5dcc7c6ea 100644 --- a/code/nel/include/nel/3d/texture_blend.h +++ b/code/nel/include/nel/3d/texture_blend.h @@ -74,7 +74,7 @@ public: virtual void release(); // serial this texture datas - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); private: uint16 _BlendFactor; diff --git a/code/nel/include/nel/3d/texture_bump.h b/code/nel/include/nel/3d/texture_bump.h index 7e4a099c9..1fb6152de 100644 --- a/code/nel/include/nel/3d/texture_bump.h +++ b/code/nel/include/nel/3d/texture_bump.h @@ -47,7 +47,7 @@ public: const ITexture *getHeightMap() const { return _HeightMap; }; // serial this texture datas - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); virtual bool supportSharing() const; diff --git a/code/nel/include/nel/3d/texture_cube.h b/code/nel/include/nel/3d/texture_cube.h index 979defa1c..4958f6628 100644 --- a/code/nel/include/nel/3d/texture_cube.h +++ b/code/nel/include/nel/3d/texture_cube.h @@ -77,7 +77,7 @@ public: virtual bool isTextureCube() const { return true; } /// Save the texture file name. - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); NLMISC_DECLARE_CLASS(CTextureCube); /// If the face support multiple texture (such has CTextureMultiFile), this allow to select the active set diff --git a/code/nel/include/nel/3d/texture_dlm.h b/code/nel/include/nel/3d/texture_dlm.h index 18cf125a0..0c16d95f6 100644 --- a/code/nel/include/nel/3d/texture_dlm.h +++ b/code/nel/include/nel/3d/texture_dlm.h @@ -81,7 +81,7 @@ public: /// TextureDLM are system. Do not need to serialize them... // default ctor is required for compilation with NLMISC_DECLARE_CLASS, but never called... CTextureDLM() {nlstop;} - virtual void serial(NLMISC::IStream &/* f */) throw(NLMISC::EStream) {nlstop;} + virtual void serial(NLMISC::IStream &/* f */) {nlstop;} NLMISC_DECLARE_CLASS(CTextureDLM); diff --git a/code/nel/include/nel/3d/texture_emboss.h b/code/nel/include/nel/3d/texture_emboss.h index cdab6d648..fed99f52a 100644 --- a/code/nel/include/nel/3d/texture_emboss.h +++ b/code/nel/include/nel/3d/texture_emboss.h @@ -46,7 +46,7 @@ public: const ITexture *getHeightMap() const { return _HeightMap; }; // serial this texture datas - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); virtual bool supportSharing() const; virtual std::string getShareName() const; // diff --git a/code/nel/include/nel/3d/texture_far.h b/code/nel/include/nel/3d/texture_far.h index a55308b19..6fdb59f30 100644 --- a/code/nel/include/nel/3d/texture_far.h +++ b/code/nel/include/nel/3d/texture_far.h @@ -185,7 +185,7 @@ private: void rebuildPatch (const CVector2s texturePos, const CPatchIdent &pid); /// From IStreamable - virtual void serial(NLMISC::IStream &/* f */) throw(NLMISC::EStream) {} + virtual void serial(NLMISC::IStream &/* f */) {} // Some static buffers static NLMISC::CRGBA _LightmapExpanded[]; diff --git a/code/nel/include/nel/3d/texture_file.h b/code/nel/include/nel/3d/texture_file.h index c758b1d6c..6f3620f47 100644 --- a/code/nel/include/nel/3d/texture_file.h +++ b/code/nel/include/nel/3d/texture_file.h @@ -122,7 +122,7 @@ public: void doGenerate(bool async = false); /// Save the texture file name. - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); NLMISC_DECLARE_CLASS(CTextureFile); diff --git a/code/nel/include/nel/3d/texture_font.h b/code/nel/include/nel/3d/texture_font.h index 20353f236..e743bb137 100644 --- a/code/nel/include/nel/3d/texture_font.h +++ b/code/nel/include/nel/3d/texture_font.h @@ -112,7 +112,7 @@ private: /// Todo: serialize a font texture. public: - virtual void serial(NLMISC::IStream &/* f */) throw(NLMISC::EStream) {nlstop;} + virtual void serial(NLMISC::IStream &/* f */) {nlstop;} NLMISC_DECLARE_CLASS(CTextureFont); }; diff --git a/code/nel/include/nel/3d/texture_grouped.h b/code/nel/include/nel/3d/texture_grouped.h index 247dd455a..f6f9515a0 100644 --- a/code/nel/include/nel/3d/texture_grouped.h +++ b/code/nel/include/nel/3d/texture_grouped.h @@ -111,7 +111,7 @@ public: void doGenerate(bool async = false); /// serialization - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); /// a group of 4 uvs diff --git a/code/nel/include/nel/3d/texture_mem.h b/code/nel/include/nel/3d/texture_mem.h index 01ea393f1..d28218151 100644 --- a/code/nel/include/nel/3d/texture_mem.h +++ b/code/nel/include/nel/3d/texture_mem.h @@ -160,7 +160,7 @@ public: void setAllowDegradation(bool allow); /// Todo: serialize a mem texture. - virtual void serial(NLMISC::IStream &/* f */) throw(NLMISC::EStream) {nlstop;} + virtual void serial(NLMISC::IStream &/* f */) {nlstop;} NLMISC_DECLARE_CLASS(CTextureMem); /** This create a white square texture of 1x1 diff --git a/code/nel/include/nel/3d/texture_multi_file.h b/code/nel/include/nel/3d/texture_multi_file.h index 37549b997..a32207995 100644 --- a/code/nel/include/nel/3d/texture_multi_file.h +++ b/code/nel/include/nel/3d/texture_multi_file.h @@ -70,7 +70,7 @@ public: /// Generate the current selected texture, looking in CPath if necessary. virtual void doGenerate(bool async = false); /// Serial this object - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); NLMISC_DECLARE_CLASS(CTextureMultiFile); private: diff --git a/code/nel/include/nel/3d/texture_near.h b/code/nel/include/nel/3d/texture_near.h index 5a124b53b..0c47ecec7 100644 --- a/code/nel/include/nel/3d/texture_near.h +++ b/code/nel/include/nel/3d/texture_near.h @@ -77,7 +77,7 @@ public: /// TextureNear are system. Do not need to serialize them... // default ctor is required for compilation with NLMISC_DECLARE_CLASS, but never called... CTextureNear() {nlstop;} - virtual void serial(NLMISC::IStream &/* f */) throw(NLMISC::EStream) {nlstop;} + virtual void serial(NLMISC::IStream &/* f */) {nlstop;} NLMISC_DECLARE_CLASS(CTextureNear); private: diff --git a/code/nel/include/nel/3d/tile_bank.h b/code/nel/include/nel/3d/tile_bank.h index 1205c5940..7d4eda3a7 100644 --- a/code/nel/include/nel/3d/tile_bank.h +++ b/code/nel/include/nel/3d/tile_bank.h @@ -77,7 +77,7 @@ public: { return (_Flags&NL3D_CTILE_FREE_FLAG)!=0; } - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); void setFileName (TBitmap bitmapType, const std::string& name) { // not free @@ -180,7 +180,7 @@ public: void clear(){ _TileSet.clear(); } - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); private: // internal use @@ -210,7 +210,7 @@ public: { return _Tile; } - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); private: sint32 _Tile; @@ -236,7 +236,7 @@ public: void doubleSize (); bool operator== (const CTileBorder& border) const; void operator= (const CTileBorder& border); - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); bool isSet() const { return _Set; @@ -416,7 +416,7 @@ public: { return _ChildName.find(name)!=_ChildName.end(); } - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); private: static TFlagBorder getComplementaryBorder (TFlagBorder border); @@ -629,7 +629,7 @@ public: /// Postfix tile vegetable desc void postfixTileVegetableDesc (const char *filename); - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); private: sint createTile (); void freeTile (int tileIndex); diff --git a/code/nel/include/nel/3d/tile_far_bank.h b/code/nel/include/nel/3d/tile_far_bank.h index 35c04be8b..52f380439 100644 --- a/code/nel/include/nel/3d/tile_far_bank.h +++ b/code/nel/include/nel/3d/tile_far_bank.h @@ -94,7 +94,7 @@ public: } /// Serial this tile - void serial (class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial (NLMISC::IStream &f); private: /// RGBA Pixels vector @@ -141,7 +141,7 @@ public: } /// Serial this bank - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); /// The far tile vector std::vector _TileVector; diff --git a/code/nel/include/nel/3d/water_height_map.h b/code/nel/include/nel/3d/water_height_map.h index dcd38d90d..003aaac53 100644 --- a/code/nel/include/nel/3d/water_height_map.h +++ b/code/nel/include/nel/3d/water_height_map.h @@ -168,7 +168,7 @@ public: sint64 Date; /// serial the pools data's - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); /// Set this pool name. void setName(const std::string &name) { _Name = name; } diff --git a/code/nel/include/nel/3d/water_pool_manager.h b/code/nel/include/nel/3d/water_pool_manager.h index 569b5d59a..c8a0885c9 100644 --- a/code/nel/include/nel/3d/water_pool_manager.h +++ b/code/nel/include/nel/3d/water_pool_manager.h @@ -97,7 +97,7 @@ public: /// serial the pools data's - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); private: friend class CWaterShape; diff --git a/code/nel/include/nel/3d/water_shape.h b/code/nel/include/nel/3d/water_shape.h index dc7f20426..633da8611 100644 --- a/code/nel/include/nel/3d/water_shape.h +++ b/code/nel/include/nel/3d/water_shape.h @@ -108,7 +108,7 @@ public: /// serial this shape - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); //@} @@ -299,7 +299,7 @@ public: /// serial this shape - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); //@} diff --git a/code/nel/include/nel/logic/logic_condition.h b/code/nel/include/nel/logic/logic_condition.h index bb2af30ce..30c9d7c08 100644 --- a/code/nel/include/nel/logic/logic_condition.h +++ b/code/nel/include/nel/logic/logic_condition.h @@ -79,7 +79,7 @@ public: /** * serial */ - //void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + //void serial(NLMISC::IStream &f); void write (xmlNodePtr node) const; void read (xmlNodePtr node); @@ -160,7 +160,7 @@ public: /** * serial */ - //void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + //void serial(NLMISC::IStream &f); void write (xmlNodePtr node) const; void read (xmlNodePtr node); @@ -239,7 +239,7 @@ public: /** * serial */ - //void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + //void serial(NLMISC::IStream &f); /** * Destructor @@ -323,7 +323,7 @@ public: /** * serial */ - //void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + //void serial(NLMISC::IStream &f); void write (xmlNodePtr node) const; void read (xmlNodePtr node); diff --git a/code/nel/include/nel/logic/logic_event.h b/code/nel/include/nel/logic/logic_event.h index 66c125260..9f15d2f34 100644 --- a/code/nel/include/nel/logic/logic_event.h +++ b/code/nel/include/nel/logic/logic_event.h @@ -79,7 +79,7 @@ public: /** * serial */ - //void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + //void serial(NLMISC::IStream &f); void write (xmlNodePtr node, const char *subName = "") const; void read (xmlNodePtr node, const char *subName = ""); @@ -122,7 +122,7 @@ public: /** * serial */ - //void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + //void serial(NLMISC::IStream &f); void write (xmlNodePtr node) const; void read (xmlNodePtr node); @@ -181,7 +181,7 @@ public: /** * serial */ - //void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + //void serial(NLMISC::IStream &f); void write (xmlNodePtr node) const; void read (xmlNodePtr node); diff --git a/code/nel/include/nel/logic/logic_state.h b/code/nel/include/nel/logic/logic_state.h index dd9678f13..75e8572ac 100644 --- a/code/nel/include/nel/logic/logic_state.h +++ b/code/nel/include/nel/logic/logic_state.h @@ -149,7 +149,7 @@ public: /** * serial */ - //void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + //void serial(NLMISC::IStream &f); void write (xmlNodePtr node) const; void read (xmlNodePtr node); diff --git a/code/nel/include/nel/logic/logic_state_machine.h b/code/nel/include/nel/logic/logic_state_machine.h index f976ad405..7e87890b7 100644 --- a/code/nel/include/nel/logic/logic_state_machine.h +++ b/code/nel/include/nel/logic/logic_state_machine.h @@ -182,7 +182,7 @@ public: /** * serial */ - //void serial( NLMISC::IStream &f ) throw(NLMISC::EStream); + //void serial( NLMISC::IStream &f ); /** * Display the variables diff --git a/code/nel/include/nel/logic/logic_variable.h b/code/nel/include/nel/logic/logic_variable.h index 8ccc0923e..f64a9e775 100644 --- a/code/nel/include/nel/logic/logic_variable.h +++ b/code/nel/include/nel/logic/logic_variable.h @@ -104,7 +104,7 @@ public: /** * serial */ - //virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + //virtual void serial(NLMISC::IStream &f); virtual void write (xmlNodePtr node) const; virtual void read (xmlNodePtr node); @@ -186,7 +186,7 @@ public: /** * serial */ - //void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + //void serial(NLMISC::IStream &f); virtual void write (xmlNodePtr node) const; virtual void read (xmlNodePtr node); diff --git a/code/nel/include/nel/misc/array_2d.h b/code/nel/include/nel/misc/array_2d.h index e5492986d..3c65ffa4c 100644 --- a/code/nel/include/nel/misc/array_2d.h +++ b/code/nel/include/nel/misc/array_2d.h @@ -132,7 +132,7 @@ public: // See which parts of array will be discarded if the array is displaced by the given offset void getDiscardRects(sint moveOffsetX, sint moveOffsetY, std::vector &discardedRects); // - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); private: TArrayContainer _Array; uint _Width; @@ -157,7 +157,7 @@ void CArray2D::clear() //********************************************************************************* template -void CArray2D::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CArray2D::serial(NLMISC::IStream &f) { f.serialCont(_Array); uint32 width = _Width; diff --git a/code/nel/include/nel/misc/polygon.h b/code/nel/include/nel/misc/polygon.h index a0183d20d..08889c26d 100644 --- a/code/nel/include/nel/misc/polygon.h +++ b/code/nel/include/nel/misc/polygon.h @@ -66,7 +66,7 @@ public: float computeArea() const; /// Serial this polygon - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); /** * Convert a concave polygon into a list of convex polygons using a 2d projection. @@ -156,7 +156,7 @@ public: void getBestTriplet(uint &index0, uint &index1, uint &index2); /// Serial this polygon - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); typedef std::pair TRaster; typedef std::vector TRasterVect; diff --git a/code/nel/include/nel/misc/rgba.h b/code/nel/include/nel/misc/rgba.h index e4fc6b61e..006b1f102 100644 --- a/code/nel/include/nel/misc/rgba.h +++ b/code/nel/include/nel/misc/rgba.h @@ -86,7 +86,7 @@ public: * Serialisation. * \param f Stream used for serialisation. */ - void serial (class NLMISC::IStream &f); + void serial (NLMISC::IStream &f); /** * Blend two colors. @@ -451,7 +451,7 @@ public: * Serialisation. * \param f Stream used for serialisation. */ - void serial(class NLMISC::IStream &f); + void serial(NLMISC::IStream &f); /** * Blend two colors. @@ -676,7 +676,7 @@ public: * Serialisation. * \param f Stream used for serialisation. */ - void serial(class NLMISC::IStream &f); + void serial(NLMISC::IStream &f); /** * Set colors. diff --git a/code/nel/include/nel/misc/sheet_id.h b/code/nel/include/nel/misc/sheet_id.h index 7a735d3a4..8db0470af 100644 --- a/code/nel/include/nel/misc/sheet_id.h +++ b/code/nel/include/nel/misc/sheet_id.h @@ -146,8 +146,8 @@ public : /** * Serial */ - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); - void serialString(NLMISC::IStream &f, const std::string &defaultType = "") throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); + void serialString(NLMISC::IStream &f, const std::string &defaultType = ""); /** * Display the list of valid sheet ids with their associated file names diff --git a/code/nel/src/3d/flare_shape.cpp b/code/nel/src/3d/flare_shape.cpp index e8f74dc4e..1c4b864cd 100644 --- a/code/nel/src/3d/flare_shape.cpp +++ b/code/nel/src/3d/flare_shape.cpp @@ -63,7 +63,7 @@ CFlareShape::CFlareShape() : _Color(NLMISC::CRGBA::White), // *************************************************************************************************************** -void CFlareShape::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CFlareShape::serial(NLMISC::IStream &f) { // Version 4 : - added occlusion test mesh, size reduction, angle modification when object is occluded // - added lookat mode for first flare diff --git a/code/nel/src/3d/landscape.cpp b/code/nel/src/3d/landscape.cpp index 8112053d7..4b597fc2d 100644 --- a/code/nel/src/3d/landscape.cpp +++ b/code/nel/src/3d/landscape.cpp @@ -139,7 +139,7 @@ public: } // Dummy serial... - virtual void serial(NLMISC::IStream &/* f */) throw(NLMISC::EStream) {nlstop;} + virtual void serial(NLMISC::IStream &/* f */) { nlstop; } NLMISC_DECLARE_CLASS(CTextureCross); }; diff --git a/code/nel/src/3d/mesh.cpp b/code/nel/src/3d/mesh.cpp index cd3109733..51b07fdec 100644 --- a/code/nel/src/3d/mesh.cpp +++ b/code/nel/src/3d/mesh.cpp @@ -861,7 +861,7 @@ void CMeshGeom::renderSimpleWithMaterial(IDriver *drv, const CMatrix &worldMatri // *************************************************************************** -void CMeshGeom::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CMeshGeom::serial(NLMISC::IStream &f) { /* *********************************************** * WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance @@ -2389,7 +2389,7 @@ CMesh::CCorner::CCorner() // *************************************************************************** -void CMesh::CCorner::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CMesh::CCorner::serial(NLMISC::IStream &f) { nlassert(0); // not used f.serial(Vertex); @@ -2400,7 +2400,7 @@ void CMesh::CCorner::serial(NLMISC::IStream &f) throw(NLMISC::EStream) } // *************************************************************************** -void CMesh::CFace::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CMesh::CFace::serial(NLMISC::IStream &f) { for(int i=0;i<3;++i) f.serial(Corner[i]); @@ -2409,7 +2409,7 @@ void CMesh::CFace::serial(NLMISC::IStream &f) throw(NLMISC::EStream) } // *************************************************************************** -void CMesh::CSkinWeight::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CMesh::CSkinWeight::serial(NLMISC::IStream &f) { for(int i=0;i *pBSFactor) } // *************************************************************************** -void CMeshMorpher::serial (NLMISC::IStream &f) throw(NLMISC::EStream) +void CMeshMorpher::serial (NLMISC::IStream &f) { /* *********************************************** * WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance diff --git a/code/nel/src/3d/mesh_mrm.cpp b/code/nel/src/3d/mesh_mrm.cpp index 407d342b4..f31720f35 100644 --- a/code/nel/src/3d/mesh_mrm.cpp +++ b/code/nel/src/3d/mesh_mrm.cpp @@ -1604,7 +1604,7 @@ void CMeshMRMGeom::updateShiftedTriangleCache(CMeshMRMInstance *mi, sint curLodI // *************************************************************************** -void CMeshMRMGeom::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CMeshMRMGeom::serial(NLMISC::IStream &f) { // because of complexity, serial is separated in save / load. @@ -1618,7 +1618,7 @@ void CMeshMRMGeom::serial(NLMISC::IStream &f) throw(NLMISC::EStream) // *************************************************************************** -sint CMeshMRMGeom::loadHeader(NLMISC::IStream &f) throw(NLMISC::EStream) +sint CMeshMRMGeom::loadHeader(NLMISC::IStream &f) { /* Version 5: @@ -1748,7 +1748,7 @@ sint CMeshMRMGeom::loadHeader(NLMISC::IStream &f) throw(NLMISC::EStream) // *************************************************************************** -void CMeshMRMGeom::load(NLMISC::IStream &f) throw(NLMISC::EStream) +void CMeshMRMGeom::load(NLMISC::IStream &f) { // Load the header of the stream. // ================== @@ -1778,7 +1778,7 @@ void CMeshMRMGeom::load(NLMISC::IStream &f) throw(NLMISC::EStream) // *************************************************************************** -void CMeshMRMGeom::save(NLMISC::IStream &f) throw(NLMISC::EStream) +void CMeshMRMGeom::save(NLMISC::IStream &f) { /* Version 5: @@ -2968,7 +2968,7 @@ void CMeshMRM::render(IDriver *drv, CTransformShape *trans, bool passOpaque) // *************************************************************************** -void CMeshMRM::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CMeshMRM::serial(NLMISC::IStream &f) { /* Version 0: diff --git a/code/nel/src/3d/mesh_multi_lod.cpp b/code/nel/src/3d/mesh_multi_lod.cpp index f200e2bc6..b3d51cc52 100644 --- a/code/nel/src/3d/mesh_multi_lod.cpp +++ b/code/nel/src/3d/mesh_multi_lod.cpp @@ -288,7 +288,7 @@ void CMeshMultiLod::render(IDriver *drv, CTransformShape *trans, bool passOpaque // *************************************************************************** -void CMeshMultiLod::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CMeshMultiLod::serial(NLMISC::IStream &f) { /* *********************************************** * WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance @@ -405,7 +405,7 @@ void CMeshMultiLod::clear () // *************************************************************************** -void CMeshMultiLod::CMeshSlot::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CMeshMultiLod::CMeshSlot::serial(NLMISC::IStream &f) { // Check version (void)f.serialVersion (0); diff --git a/code/nel/src/3d/meshvp_per_pixel_light.cpp b/code/nel/src/3d/meshvp_per_pixel_light.cpp index 6bbcec5c6..3449d57d2 100644 --- a/code/nel/src/3d/meshvp_per_pixel_light.cpp +++ b/code/nel/src/3d/meshvp_per_pixel_light.cpp @@ -573,7 +573,7 @@ void CMeshVPPerPixelLight::end(IDriver *drv) //================================================================================= -void CMeshVPPerPixelLight::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CMeshVPPerPixelLight::serial(NLMISC::IStream &f) { (void)f.serialVersion(0); f.serial(SpecularLighting); diff --git a/code/nel/src/3d/meshvp_wind_tree.cpp b/code/nel/src/3d/meshvp_wind_tree.cpp index ba27216f0..620465a0a 100644 --- a/code/nel/src/3d/meshvp_wind_tree.cpp +++ b/code/nel/src/3d/meshvp_wind_tree.cpp @@ -194,7 +194,7 @@ CMeshVPWindTree::~CMeshVPWindTree() // *************************************************************************** -void CMeshVPWindTree::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CMeshVPWindTree::serial(NLMISC::IStream &f) { (void)f.serialVersion(0); diff --git a/code/nel/src/3d/packed_world.cpp b/code/nel/src/3d/packed_world.cpp index f1ad22ab2..830dc218e 100644 --- a/code/nel/src/3d/packed_world.cpp +++ b/code/nel/src/3d/packed_world.cpp @@ -153,7 +153,7 @@ void CPackedWorld::getZones(std::vector &zones) } // ************************************************************************************************* -void CPackedWorld::serialZoneNames(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPackedWorld::serialZoneNames(NLMISC::IStream &f) { f.serialVersion(1); f.serialCheck(NELID("OWPA")); @@ -161,7 +161,7 @@ void CPackedWorld::serialZoneNames(NLMISC::IStream &f) throw(NLMISC::EStream) } // ************************************************************************************************* -void CPackedWorld::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPackedWorld::serial(NLMISC::IStream &f) { serialZoneNames(f); f.serialCont(_Zones); diff --git a/code/nel/src/3d/particle_system.cpp b/code/nel/src/3d/particle_system.cpp index 477739e98..2c10f279b 100644 --- a/code/nel/src/3d/particle_system.cpp +++ b/code/nel/src/3d/particle_system.cpp @@ -752,7 +752,7 @@ void CParticleSystem::step(TPass pass, TAnimationTime ellapsedTime, CParticleSys ///======================================================================================= -void CParticleSystem::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CParticleSystem::serial(NLMISC::IStream &f) { CHECK_INTEGRITY NL_PS_FUNC_MAIN(CParticleSystem_serial) diff --git a/code/nel/src/3d/particle_system_process.cpp b/code/nel/src/3d/particle_system_process.cpp index 8150d56d1..9317f6a6b 100644 --- a/code/nel/src/3d/particle_system_process.cpp +++ b/code/nel/src/3d/particle_system_process.cpp @@ -129,7 +129,7 @@ const CFontManager *CParticleSystemProcess::getFontManager(void) const // *********************************************************************************************************** -void CParticleSystemProcess::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CParticleSystemProcess::serial(NLMISC::IStream &f) { NL_PS_FUNC(CParticleSystemProcess_serial) // version 2 : added matrix mode (just not fx world matrix or identity) diff --git a/code/nel/src/3d/particle_system_shape.cpp b/code/nel/src/3d/particle_system_shape.cpp index 94851c3eb..7da2e85f1 100644 --- a/code/nel/src/3d/particle_system_shape.cpp +++ b/code/nel/src/3d/particle_system_shape.cpp @@ -117,7 +117,7 @@ CParticleSystemShape::CParticleSystemShape() : _MaxViewDist(100.f), } ///=========================================================================== -void CParticleSystemShape::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CParticleSystemShape::serial(NLMISC::IStream &f) { /* *********************************************** * WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance diff --git a/code/nel/src/3d/ps_attrib_maker_helper.cpp b/code/nel/src/3d/ps_attrib_maker_helper.cpp index 56dd0ec84..aaa6b5a4d 100644 --- a/code/nel/src/3d/ps_attrib_maker_helper.cpp +++ b/code/nel/src/3d/ps_attrib_maker_helper.cpp @@ -26,7 +26,7 @@ namespace NL3D // *********************************************************************************** -void CPSAttribMakerMemory::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSAttribMakerMemory::serial(NLMISC::IStream &f) { CPSAttribMakerMemoryBase::serial(f); if (f.isReading()) @@ -59,7 +59,7 @@ void CPSAttribMakerMemory::newElement(const CPSEmitterInfo &info) } // *********************************************************************************** -void CPSAttribMakerMemory::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSAttribMakerMemory::serial(NLMISC::IStream &f) { CPSAttribMakerMemoryBase::serial(f); if (f.isReading()) @@ -92,7 +92,7 @@ void CPSAttribMakerMemory::newElement(const CPSEmitterInfo &info) } // *********************************************************************************** -void CPSAttribMakerMemory::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSAttribMakerMemory::serial(NLMISC::IStream &f) { CPSAttribMakerMemoryBase::serial(f); if (f.isReading()) diff --git a/code/nel/src/3d/ps_color.cpp b/code/nel/src/3d/ps_color.cpp index 4fbda508a..e93a85e4e 100644 --- a/code/nel/src/3d/ps_color.cpp +++ b/code/nel/src/3d/ps_color.cpp @@ -76,7 +76,7 @@ NLMISC::CRGBA CPSColorMemory::getDefaultValue(void) const } ///====================================================================================== -void CPSColorMemory::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSColorMemory::serial(NLMISC::IStream &f) { setColorType(CVertexBuffer::TRGBA); CPSAttribMakerMemory::serial(f); @@ -90,7 +90,7 @@ void CPSColorBinOp::setColorType(CVertexBuffer::TVertexColorType colorType) } ///====================================================================================== -void CPSColorBinOp::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSColorBinOp::serial(NLMISC::IStream &f) { setColorType(CVertexBuffer::TRGBA); CPSAttribMakerBinOp::serial(f); diff --git a/code/nel/src/3d/ps_dot.cpp b/code/nel/src/3d/ps_dot.cpp index bf1f51b4d..3082e506b 100644 --- a/code/nel/src/3d/ps_dot.cpp +++ b/code/nel/src/3d/ps_dot.cpp @@ -290,7 +290,7 @@ void CPSDot::resize(uint32 size) } ///=================================================================== -void CPSDot::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSDot::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSDot_IStream ) diff --git a/code/nel/src/3d/ps_emitter.cpp b/code/nel/src/3d/ps_emitter.cpp index 7fb5a6516..240be6f51 100644 --- a/code/nel/src/3d/ps_emitter.cpp +++ b/code/nel/src/3d/ps_emitter.cpp @@ -1917,7 +1917,7 @@ void CPSEmitter::bounceOccurred(uint32 index, TAnimationTime timeToNextSimStep) } ///========================================================================== -void CPSEmitter::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSEmitter::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSEmitter_serial) /// version 6 : the flag _EmitDirBasis no longer exist, it has been replaced by _UserMatrixModeForEmissionDirection @@ -2184,7 +2184,7 @@ bool CPSEmitter::testEmitForever() const // implementation of CPSModulatedEmitter // //////////////////////////////////////////// -void CPSModulatedEmitter::serialEmitteeSpeedScheme(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSModulatedEmitter::serialEmitteeSpeedScheme(NLMISC::IStream &f) { NL_PS_FUNC(CPSModulatedEmitter_IStream ) bool useScheme; @@ -2228,7 +2228,7 @@ void CPSEmitterOmni::emit(const NLMISC::CVector &srcPos, uint32 index, CVector & } ///========================================================================== -void CPSEmitterOmni::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSEmitterOmni::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSEmitterOmni_serial) f.serialVersion(1); @@ -2332,7 +2332,7 @@ void CPSEmitterDirectionnal::resize(uint32 capacity) } ///========================================================================== -void CPSEmitterDirectionnal::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSEmitterDirectionnal::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSEmitterDirectionnal_IStream ) f.serialVersion(1); @@ -2346,7 +2346,7 @@ void CPSEmitterDirectionnal::serial(NLMISC::IStream &f) throw(NLMISC::EStream) //////////////////////////////////////////// ///========================================================================== -void CPSEmitterRectangle::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSEmitterRectangle::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSEmitterRectangle_IStream ) f.serialVersion(1); @@ -2506,7 +2506,7 @@ void CPSEmitterRectangle::showTool(void) //////////////////////////////////// ///========================================================================== -void CPSEmitterConic::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSEmitterConic::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSEmitterConic_serial) f.serialVersion(1); @@ -2611,7 +2611,7 @@ CMatrix CPSSphericalEmitter::getMatrix(uint32 index) const } ///========================================================================== -void CPSSphericalEmitter::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSSphericalEmitter::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSSphericalEmitter_serial) f.serialVersion(1); @@ -2668,7 +2668,7 @@ void CPSSphericalEmitter::resize(uint32 size) ///////////////////////////////////// ///========================================================================== -void CPSRadialEmitter::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSRadialEmitter::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSRadialEmitter_serial) f.serialVersion(1); diff --git a/code/nel/src/3d/ps_face.cpp b/code/nel/src/3d/ps_face.cpp index 0d3ce6482..43bd921ab 100644 --- a/code/nel/src/3d/ps_face.cpp +++ b/code/nel/src/3d/ps_face.cpp @@ -293,7 +293,7 @@ void CPSFace::step(TPSProcessPass pass) ///====================================================================================== -void CPSFace::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSFace::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSFace_IStream ) f.serialVersion(1); diff --git a/code/nel/src/3d/ps_face_look_at.cpp b/code/nel/src/3d/ps_face_look_at.cpp index d6ac0ec0f..000db78e6 100644 --- a/code/nel/src/3d/ps_face_look_at.cpp +++ b/code/nel/src/3d/ps_face_look_at.cpp @@ -996,7 +996,7 @@ void CPSFaceLookAt::resize(uint32 capacity) ///=========================================================================================== -void CPSFaceLookAt::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSFaceLookAt::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSFaceLookAt_serial) // version 4 : added 'align on z-axis' flag diff --git a/code/nel/src/3d/ps_fan_light.cpp b/code/nel/src/3d/ps_fan_light.cpp index 6296373b6..a2a0dcf0b 100644 --- a/code/nel/src/3d/ps_fan_light.cpp +++ b/code/nel/src/3d/ps_fan_light.cpp @@ -393,7 +393,7 @@ void CPSFanLight::draw(bool opaque) } ///==================================================================================== -void CPSFanLight::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSFanLight::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSFanLight_serial) sint ver = f.serialVersion(2); diff --git a/code/nel/src/3d/ps_float.cpp b/code/nel/src/3d/ps_float.cpp index f4f0a7226..7c364f2b8 100644 --- a/code/nel/src/3d/ps_float.cpp +++ b/code/nel/src/3d/ps_float.cpp @@ -151,7 +151,7 @@ void CPSFloatCurveFunctor::updateTab(void) } ///======================================================================================= -void CPSFloatCurveFunctor::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSFloatCurveFunctor::serial(NLMISC::IStream &f) { f.serialVersion(1); f.serial(_NumSamples, _Smoothing); diff --git a/code/nel/src/3d/ps_force.cpp b/code/nel/src/3d/ps_force.cpp index bf0ca662d..fa42766b1 100644 --- a/code/nel/src/3d/ps_force.cpp +++ b/code/nel/src/3d/ps_force.cpp @@ -45,7 +45,7 @@ CPSForce::CPSForce() -void CPSForce::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSForce::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSForce_serial) f.serialVersion(1); @@ -189,7 +189,7 @@ void CPSForceIntensity::setIntensityScheme(CPSAttribMaker *scheme) if (getForceIntensityOwner() && scheme->hasMemory()) scheme->resize(getForceIntensityOwner()->getMaxSize(), getForceIntensityOwner()->getSize()); } -void CPSForceIntensity::serialForceIntensity(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSForceIntensity::serialForceIntensity(NLMISC::IStream &f) { NL_PS_FUNC(CPSForceIntensity_IStream ) f.serialVersion(1); @@ -229,7 +229,7 @@ void CPSForceIntensity::serialForceIntensity(NLMISC::IStream &f) throw(NLMISC::E //////////////////////////////////////// -void CPSForceIntensityHelper::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSForceIntensityHelper::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSForceIntensityHelper_serial) f.serialVersion(1); @@ -320,7 +320,7 @@ void CPSDirectionnalForce::show() } } -void CPSDirectionnalForce::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSDirectionnalForce::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSDirectionnalForce_serial) // Version 2 : added link to a global vector value @@ -488,7 +488,7 @@ void CPSGravity::show() } -void CPSGravity::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSGravity::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSGravity_IStream ) f.serialVersion(1); @@ -747,7 +747,7 @@ void CPSCentralGravity::show() displayIcon2d(tab, tabSize, sSize); } -void CPSCentralGravity::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSCentralGravity::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSCentralGravity_IStream ) f.serialVersion(1); @@ -785,7 +785,7 @@ void CPSSpring::computeForces(CPSLocated &target) } -void CPSSpring::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSSpring::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSSpring_serial) f.serialVersion(1); @@ -921,7 +921,7 @@ CMatrix CPSCylindricVortex::getMatrix(uint32 index) const } -void CPSCylindricVortex::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSCylindricVortex::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSCylindricVortex_IStream ) f.serialVersion(1); @@ -960,7 +960,7 @@ void CPSCylindricVortex::resize(uint32 size) * a magnetic field that has the given direction */ -void CPSMagneticForce::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSMagneticForce::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSMagneticForce_serial) f.serialVersion(1); @@ -1369,7 +1369,7 @@ void CPSBrownianForce::computeForces(CPSLocated &target) } ///======================================================================= -void CPSBrownianForce::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSBrownianForce::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSBrownianForce_serial) sint ver = f.serialVersion(3); diff --git a/code/nel/src/3d/ps_light.cpp b/code/nel/src/3d/ps_light.cpp index 034a5bfcb..48e579283 100644 --- a/code/nel/src/3d/ps_light.cpp +++ b/code/nel/src/3d/ps_light.cpp @@ -72,7 +72,7 @@ CPSLight::~CPSLight() } // *************************************************************************************************************** -void CPSLight::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSLight::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSLight_serial) CPSLocatedBindable::serial(f); diff --git a/code/nel/src/3d/ps_located.cpp b/code/nel/src/3d/ps_located.cpp index 8dbe2d823..1af7b370d 100644 --- a/code/nel/src/3d/ps_located.cpp +++ b/code/nel/src/3d/ps_located.cpp @@ -1411,7 +1411,7 @@ void CPSLocated::resize(uint32 newSize) class CDummyCollision { public: - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { NL_PS_FUNC(CDummyCollision_serial) f.serialVersion(1); @@ -1422,7 +1422,7 @@ public: }; /// *************************************************************************************** -void CPSLocated::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSLocated::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSLocated_serial) @@ -2710,7 +2710,7 @@ void CPSLocatedBindable::notifyTargetRemoved(CPSLocated *ptr) } /// *************************************************************************************** -void CPSLocatedBindable::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSLocatedBindable::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSLocatedBindable_IStream ) sint ver = f.serialVersion(4); @@ -2902,7 +2902,7 @@ void CPSLocatedBindable::releaseAllRef() ///////////////////////////////////////////// /// *************************************************************************************** -void CPSTargetLocatedBindable::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSTargetLocatedBindable::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSTargetLocatedBindable_serial) (void)f.serialVersion(1); diff --git a/code/nel/src/3d/ps_mesh.cpp b/code/nel/src/3d/ps_mesh.cpp index 3331ac315..6f21e2c25 100644 --- a/code/nel/src/3d/ps_mesh.cpp +++ b/code/nel/src/3d/ps_mesh.cpp @@ -158,7 +158,7 @@ static CMesh *CreateDummyMesh(void) //==================================================================================== -void CPSMesh::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSMesh::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSMesh_IStream ) (void)f.serialVersion(3); @@ -1448,7 +1448,7 @@ void CPSConstraintMesh::fillIndexesInPrecompBasis(void) //==================================================================================== /// serialisation. Derivers must override this, and call their parent version -void CPSConstraintMesh::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSConstraintMesh::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSConstraintMesh_IStream ) @@ -2267,7 +2267,7 @@ CPSConstraintMesh::CGlobalTexAnim::CGlobalTexAnim() : TransOffset(NLMISC::CVecto } //===================================================================================== -void CPSConstraintMesh::CGlobalTexAnim::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSConstraintMesh::CGlobalTexAnim::serial(NLMISC::IStream &f) { NL_PS_FUNC(CGlobalTexAnim_IStream ) // version 1 : added offset @@ -2365,7 +2365,7 @@ void CPSConstraintMesh::setTexAnimType(TTexAnimType type) } //===================================================================================== -void CPSConstraintMesh::CGlobalTexAnims::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSConstraintMesh::CGlobalTexAnims::serial(NLMISC::IStream &f) { NL_PS_FUNC(CGlobalTexAnims_IStream ) f.serialVersion(0); diff --git a/code/nel/src/3d/ps_particle_basic.cpp b/code/nel/src/3d/ps_particle_basic.cpp index 42e4d31c6..110b5963b 100644 --- a/code/nel/src/3d/ps_particle_basic.cpp +++ b/code/nel/src/3d/ps_particle_basic.cpp @@ -152,7 +152,7 @@ CPSColoredParticle::~CPSColoredParticle() } //======================================= -void CPSColoredParticle::serialColorScheme(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSColoredParticle::serialColorScheme(NLMISC::IStream &f) { NL_PS_FUNC(CPSColoredParticle_IStream ) f.serialVersion(1); @@ -213,7 +213,7 @@ CPSSizedParticle::~CPSSizedParticle() } //======================================= -void CPSSizedParticle::serialSizeScheme(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSSizedParticle::serialSizeScheme(NLMISC::IStream &f) { NL_PS_FUNC(CPSSizedParticle_serialSizeScheme) f.serialVersion(1); @@ -277,7 +277,7 @@ CPSRotated2DParticle::~CPSRotated2DParticle() } ///=================================================================================== -void CPSRotated2DParticle::serialAngle2DScheme(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSRotated2DParticle::serialAngle2DScheme(NLMISC::IStream &f) { NL_PS_FUNC(CPSRotated2DParticle_serialAngle2DScheme) f.serialVersion(1); @@ -387,7 +387,7 @@ CPSTexturedParticle::~CPSTexturedParticle() } ///=================================================================================== -void CPSTexturedParticle::serialTextureScheme(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSTexturedParticle::serialTextureScheme(NLMISC::IStream &f) { NL_PS_FUNC(CPSTexturedParticle_serialTextureScheme) f.serialVersion(1); @@ -489,7 +489,7 @@ CPSRotated3DPlaneParticle::~CPSRotated3DPlaneParticle() } ///=================================================================================== -void CPSRotated3DPlaneParticle::serialPlaneBasisScheme(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSRotated3DPlaneParticle::serialPlaneBasisScheme(NLMISC::IStream &f) { NL_PS_FUNC(CPSRotated3DPlaneParticle_serialPlaneBasisScheme) f.serialVersion(1); @@ -515,7 +515,7 @@ CPSMaterial::CPSMaterial() } ///=================================================================================== -void CPSMaterial::serialMaterial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSMaterial::serialMaterial(NLMISC::IStream &f) { NL_PS_FUNC(CPSMaterial_IStream ) // version 3 : added zbias @@ -726,7 +726,7 @@ void CPSMultiTexturedParticle::enableAlternateTex(bool enabled /*= true*/) } //======================================= -void CPSMultiTexturedParticle::serialMultiTex(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSMultiTexturedParticle::serialMultiTex(NLMISC::IStream &f) { NL_PS_FUNC(CPSMultiTexturedParticle_serialMultiTex) /// version 1 : bump factor diff --git a/code/nel/src/3d/ps_plane_basis_maker.cpp b/code/nel/src/3d/ps_plane_basis_maker.cpp index bdc99cd18..05df5821b 100644 --- a/code/nel/src/3d/ps_plane_basis_maker.cpp +++ b/code/nel/src/3d/ps_plane_basis_maker.cpp @@ -320,7 +320,7 @@ uint32 CSpinnerFunctor::getNumSamples(void) const } ///============================================================================ -void CSpinnerFunctor::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CSpinnerFunctor::serial(NLMISC::IStream &f) { f.serialVersion(1); f.serial(_Axis, _NbSamples); diff --git a/code/nel/src/3d/ps_quad.cpp b/code/nel/src/3d/ps_quad.cpp index 295c31c93..8ce6ce821 100644 --- a/code/nel/src/3d/ps_quad.cpp +++ b/code/nel/src/3d/ps_quad.cpp @@ -382,7 +382,7 @@ void CPSQuad::updateMatAndVbForColor(void) } //============================================================== -void CPSQuad::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSQuad::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSQuad_serial) sint ver = f.serialVersion(2); diff --git a/code/nel/src/3d/ps_ribbon.cpp b/code/nel/src/3d/ps_ribbon.cpp index 06bb08787..499991b5e 100644 --- a/code/nel/src/3d/ps_ribbon.cpp +++ b/code/nel/src/3d/ps_ribbon.cpp @@ -136,7 +136,7 @@ struct CDummy2DAngle : CPSRotated2DParticle }; ///================================================================================================================== -void CPSRibbon::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSRibbon::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSRibbon_serial) // Version 3 : - added brace mode diff --git a/code/nel/src/3d/ps_ribbon_base.cpp b/code/nel/src/3d/ps_ribbon_base.cpp index a3f70253b..e56ebc4d4 100644 --- a/code/nel/src/3d/ps_ribbon_base.cpp +++ b/code/nel/src/3d/ps_ribbon_base.cpp @@ -750,7 +750,7 @@ void CPSRibbonBase::initDateVect() //======================================================= -void CPSRibbonBase::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSRibbonBase::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSRibbonBase_serial) CPSParticle::serial(f); diff --git a/code/nel/src/3d/ps_ribbon_look_at.cpp b/code/nel/src/3d/ps_ribbon_look_at.cpp index 2e03acaf6..d7c646fc9 100644 --- a/code/nel/src/3d/ps_ribbon_look_at.cpp +++ b/code/nel/src/3d/ps_ribbon_look_at.cpp @@ -61,7 +61,7 @@ CPSRibbonLookAt::~CPSRibbonLookAt() } //======================================================= -void CPSRibbonLookAt::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSRibbonLookAt::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSRibbonLookAt_serial) /** Version 4 : added CPSRibbonBase has a base class instead of CPSParticle diff --git a/code/nel/src/3d/ps_shockwave.cpp b/code/nel/src/3d/ps_shockwave.cpp index dc94f5f96..cc7547c45 100644 --- a/code/nel/src/3d/ps_shockwave.cpp +++ b/code/nel/src/3d/ps_shockwave.cpp @@ -262,7 +262,7 @@ void CPSShockWave::setUFactor(float value) } ///================================================================================= -void CPSShockWave::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSShockWave::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSShockWave_serial) sint ver = f.serialVersion(2); diff --git a/code/nel/src/3d/ps_sound.cpp b/code/nel/src/3d/ps_sound.cpp index 873b3ed34..d0b82adb2 100644 --- a/code/nel/src/3d/ps_sound.cpp +++ b/code/nel/src/3d/ps_sound.cpp @@ -261,7 +261,7 @@ void CPSSound::setPitchScheme(CPSAttribMaker *pitch) } // *************************************************************************************************** -void CPSSound::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSSound::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSSound_serial) CPSLocatedBindable::serial(f); diff --git a/code/nel/src/3d/ps_tail_dot.cpp b/code/nel/src/3d/ps_tail_dot.cpp index 69caa8f71..e8146e582 100644 --- a/code/nel/src/3d/ps_tail_dot.cpp +++ b/code/nel/src/3d/ps_tail_dot.cpp @@ -79,7 +79,7 @@ CPSTailDot::~CPSTailDot() } //======================================================= -void CPSTailDot::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSTailDot::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSTailDot_serial) diff --git a/code/nel/src/3d/ps_zone.cpp b/code/nel/src/3d/ps_zone.cpp index 55a65d68f..7adf48b8f 100644 --- a/code/nel/src/3d/ps_zone.cpp +++ b/code/nel/src/3d/ps_zone.cpp @@ -47,7 +47,7 @@ CPSZone::CPSZone() : _BounceFactor(1.f), _CollisionBehaviour(bounce) NL_PS_FUNC(CPSZone_CPSZone) } -void CPSZone::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSZone::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSZone_serial) f.serialVersion(1); @@ -280,7 +280,7 @@ void CPSZonePlane::setNormal(uint32 index, CVector n) -void CPSZonePlane::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSZonePlane::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSZonePlane_serial) f.serialVersion(1); @@ -420,7 +420,7 @@ CVector CPSZoneSphere::getScale(uint32 k) const } -void CPSZoneSphere::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSZoneSphere::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSZoneSphere_serial) f.serialVersion(1); @@ -600,7 +600,7 @@ CVector CPSZoneDisc::getScale(uint32 k) const } -void CPSZoneDisc::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSZoneDisc::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSZoneDisc_serial) f.serialVersion(1); @@ -1089,7 +1089,7 @@ void CPSZoneCylinder::setScale(uint32 index, const CVector &s) } -void CPSZoneCylinder::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSZoneCylinder::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSZoneCylinder_serial) f.serialVersion(1); @@ -1269,7 +1269,7 @@ CVector CPSZoneRectangle::getScale(uint32 index) const -void CPSZoneRectangle::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPSZoneRectangle::serial(NLMISC::IStream &f) { NL_PS_FUNC(CPSZoneRectangle_IStream ) f.serialVersion(1); diff --git a/code/nel/src/3d/seg_remanence_shape.cpp b/code/nel/src/3d/seg_remanence_shape.cpp index f31b2c0b2..eb546177c 100644 --- a/code/nel/src/3d/seg_remanence_shape.cpp +++ b/code/nel/src/3d/seg_remanence_shape.cpp @@ -47,7 +47,7 @@ CSegRemanenceShape::CSegRemanenceShape() : _GeomTouched(true), } //=========================================================== -void CSegRemanenceShape::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CSegRemanenceShape::serial(NLMISC::IStream &f) { // version 2 : added default tracks // version 1 : rollup ratio diff --git a/code/nel/src/3d/shape.cpp b/code/nel/src/3d/shape.cpp index 6b0db63b8..93e0cccd7 100644 --- a/code/nel/src/3d/shape.cpp +++ b/code/nel/src/3d/shape.cpp @@ -116,7 +116,7 @@ IShape* CShapeStream::getShapePointer () const // *************************************************************************** -void CShapeStream::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CShapeStream::serial(NLMISC::IStream &f) { // First, serial an header or checking if it is correct f.serialCheck (NELID("PAHS")); diff --git a/code/nel/src/3d/skeleton_shape.cpp b/code/nel/src/3d/skeleton_shape.cpp index 230915407..afa7701af 100644 --- a/code/nel/src/3d/skeleton_shape.cpp +++ b/code/nel/src/3d/skeleton_shape.cpp @@ -33,7 +33,7 @@ namespace NL3D // *************************************************************************** -void CSkeletonShape::CLod::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CSkeletonShape::CLod::serial(NLMISC::IStream &f) { (void)f.serialVersion(0); @@ -175,7 +175,7 @@ CTransformShape *CSkeletonShape::createInstance(CScene &scene) } // *************************************************************************** -void CSkeletonShape::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CSkeletonShape::serial(NLMISC::IStream &f) { /* Version 1: diff --git a/code/nel/src/3d/texture.cpp b/code/nel/src/3d/texture.cpp index 3e248e521..c31fecdea 100644 --- a/code/nel/src/3d/texture.cpp +++ b/code/nel/src/3d/texture.cpp @@ -136,7 +136,7 @@ ITextureDrvInfos::~ITextureDrvInfos() // *************************************************************************** -void ITexture::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void ITexture::serial(NLMISC::IStream &f) { /* Version 1: diff --git a/code/nel/src/3d/texture_blend.cpp b/code/nel/src/3d/texture_blend.cpp index 0d85664d6..aad39cc6d 100644 --- a/code/nel/src/3d/texture_blend.cpp +++ b/code/nel/src/3d/texture_blend.cpp @@ -112,7 +112,7 @@ void CTextureBlend::doGenerate(bool async) // ************************************************************************ -void CTextureBlend::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CTextureBlend::serial(NLMISC::IStream &f) { f.serialVersion(0); ITexture::serial(f); diff --git a/code/nel/src/3d/texture_bump.cpp b/code/nel/src/3d/texture_bump.cpp index adc425c37..3707476b2 100644 --- a/code/nel/src/3d/texture_bump.cpp +++ b/code/nel/src/3d/texture_bump.cpp @@ -162,7 +162,7 @@ void CTextureBump::setHeightMap(ITexture *heightMap) ///============================================================================================== -void CTextureBump::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CTextureBump::serial(NLMISC::IStream &f) { /// version 2 : normalization flag sint ver = f.serialVersion(3); diff --git a/code/nel/src/3d/texture_cube.cpp b/code/nel/src/3d/texture_cube.cpp index f754aa2a0..34737af4f 100644 --- a/code/nel/src/3d/texture_cube.cpp +++ b/code/nel/src/3d/texture_cube.cpp @@ -147,7 +147,7 @@ void CTextureCube::release() } // *************************************************************************** -void CTextureCube::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CTextureCube::serial(NLMISC::IStream &f) { sint ver= f.serialVersion(2); diff --git a/code/nel/src/3d/texture_emboss.cpp b/code/nel/src/3d/texture_emboss.cpp index 1c9733bda..a106454f4 100644 --- a/code/nel/src/3d/texture_emboss.cpp +++ b/code/nel/src/3d/texture_emboss.cpp @@ -47,7 +47,7 @@ void CTextureEmboss::setHeightMap(ITexture *heightMap) } // *********************************************************************************************************** -void CTextureEmboss::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CTextureEmboss::serial(NLMISC::IStream &f) { f.serialVersion(0); ITexture::serial(f); diff --git a/code/nel/src/3d/texture_file.cpp b/code/nel/src/3d/texture_file.cpp index a30b21bb1..0e343ec8e 100644 --- a/code/nel/src/3d/texture_file.cpp +++ b/code/nel/src/3d/texture_file.cpp @@ -240,7 +240,7 @@ void CTextureFile::doGenerate(bool async) // *************************************************************************** -void CTextureFile::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CTextureFile::serial(NLMISC::IStream &f) { /* Version 1: diff --git a/code/nel/src/3d/texture_grouped.cpp b/code/nel/src/3d/texture_grouped.cpp index b6d42f3b1..273d383e8 100644 --- a/code/nel/src/3d/texture_grouped.cpp +++ b/code/nel/src/3d/texture_grouped.cpp @@ -309,7 +309,7 @@ std::string CTextureGrouped::getShareName() const } ///===================================================================================================== -void CTextureGrouped::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CTextureGrouped::serial(NLMISC::IStream &f) { f.serialVersion(1); diff --git a/code/nel/src/3d/texture_multi_file.cpp b/code/nel/src/3d/texture_multi_file.cpp index b2316cc73..cd05beb55 100644 --- a/code/nel/src/3d/texture_multi_file.cpp +++ b/code/nel/src/3d/texture_multi_file.cpp @@ -82,7 +82,7 @@ void CTextureMultiFile::doGenerate(bool async) } ///=========================================================== -void CTextureMultiFile::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CTextureMultiFile::serial(NLMISC::IStream &f) { (void)f.serialVersion(0); diff --git a/code/nel/src/3d/tile_bank.cpp b/code/nel/src/3d/tile_bank.cpp index 1260f3972..e2c488fe5 100644 --- a/code/nel/src/3d/tile_bank.cpp +++ b/code/nel/src/3d/tile_bank.cpp @@ -47,7 +47,7 @@ namespace NL3D // *************************************************************************** const sint CTileLand::_Version=0; // *************************************************************************** -void CTileLand::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CTileLand::serial(NLMISC::IStream &f) { (void)f.serialVersion(_Version); @@ -91,7 +91,7 @@ CTileBank::CTileBank () _DisplacementMap[0].setEmpty (); } // *************************************************************************** -void CTileBank::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CTileBank::serial(NLMISC::IStream &f) { f.serialCheck (std::string ("BANK")); @@ -753,7 +753,7 @@ void CTileBank::postfixTileVegetableDesc (const char *postfix) // *************************************************************************** const sint CTile::_Version=4; // *************************************************************************** -void CTile::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CTile::serial(NLMISC::IStream &f) { sint streamver = f.serialVersion(_Version); @@ -916,7 +916,7 @@ const std::string& CTileSet::getName () const return _Name; } // *************************************************************************** -void CTileSet::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CTileSet::serial(NLMISC::IStream &f) { sint streamver = f.serialVersion(_Version); @@ -1595,7 +1595,7 @@ void CTileSet::loadTileVegetableDesc() // *************************************************************************** const sint CTileBorder::_Version=0; // *************************************************************************** -void CTileBorder::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CTileBorder::serial(NLMISC::IStream &f) { (void)f.serialVersion(_Version); @@ -1824,7 +1824,7 @@ void CTileBorder::rotate() // *************************************************************************** const sint CTileSetTransition::_Version=1; // *************************************************************************** -void CTileSetTransition::serial(class NLMISC::IStream &f) throw(EStream) +void CTileSetTransition::serial(NLMISC::IStream &f) { sint streamver = f.serialVersion(_Version); diff --git a/code/nel/src/3d/tile_far_bank.cpp b/code/nel/src/3d/tile_far_bank.cpp index d8eceb21e..e86f18389 100644 --- a/code/nel/src/3d/tile_far_bank.cpp +++ b/code/nel/src/3d/tile_far_bank.cpp @@ -39,7 +39,7 @@ namespace NL3D { // *************************************************************************** const sint CTileFarBank::CTileFar::_Version=0x0; // *************************************************************************** -void CTileFarBank::CTileFar::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CTileFarBank::CTileFar::serial(NLMISC::IStream &f) { // Serial version (void)f.serialVersion(_Version); @@ -105,7 +105,7 @@ CTileFarBank::CTileFarBank() // *************************************************************************** const sint CTileFarBank::_Version=0x0; // *************************************************************************** -void CTileFarBank::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CTileFarBank::serial(NLMISC::IStream &f) { // Write/Check "FAR_BANK" in header of the stream f.serialCheck (NELID("_RAF")); diff --git a/code/nel/src/3d/water_height_map.cpp b/code/nel/src/3d/water_height_map.cpp index 3348ffd05..5f67ffce3 100644 --- a/code/nel/src/3d/water_height_map.cpp +++ b/code/nel/src/3d/water_height_map.cpp @@ -674,7 +674,7 @@ void CWaterHeightMap::setWaves(float intensity, float period, uint radius, bool //=========================================================================================== -void CWaterHeightMap::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CWaterHeightMap::serial(NLMISC::IStream &f) { f.xmlPushBegin("WaterHeightMap"); f.xmlSetAttrib ("NAME") ; diff --git a/code/nel/src/3d/water_pool_manager.cpp b/code/nel/src/3d/water_pool_manager.cpp index 8ca8e2bfc..361264f81 100644 --- a/code/nel/src/3d/water_pool_manager.cpp +++ b/code/nel/src/3d/water_pool_manager.cpp @@ -214,7 +214,7 @@ void CWaterPoolManager::removePool(uint32 ID) } //=============================================================================================== -void CWaterPoolManager::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CWaterPoolManager::serial(NLMISC::IStream &f) { f.xmlPush("WaterPoolManager"); (void)f.serialVersion(0); diff --git a/code/nel/src/3d/water_shape.cpp b/code/nel/src/3d/water_shape.cpp index df5e6dadf..6df5acb4c 100644 --- a/code/nel/src/3d/water_shape.cpp +++ b/code/nel/src/3d/water_shape.cpp @@ -523,7 +523,7 @@ const ITexture *CWaterShape::getHeightMap(uint k) const } //============================================ -void CWaterShape::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CWaterShape::serial(NLMISC::IStream &f) { /* *********************************************** * WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance @@ -763,7 +763,7 @@ CWaveMakerShape::~CWaveMakerShape() } //============================================ -void CWaveMakerShape::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CWaveMakerShape::serial(NLMISC::IStream &f) { f.serialVersion(0); f.serial(_Period, _Radius, _Intensity, _PoolID, _ImpulsionMode); diff --git a/code/nel/src/georges/form.cpp b/code/nel/src/georges/form.cpp index f5cbcc3a1..a02b9e8cd 100644 --- a/code/nel/src/georges/form.cpp +++ b/code/nel/src/georges/form.cpp @@ -263,7 +263,7 @@ const std::string &CForm::getComment () const // *************************************************************************** -void CForm::write (class NLMISC::IStream &stream) +void CForm::write (NLMISC::IStream &stream) { // Xml stream COXml xmlStream; diff --git a/code/nel/src/misc/polygon.cpp b/code/nel/src/misc/polygon.cpp index 16575073f..856255c34 100644 --- a/code/nel/src/misc/polygon.cpp +++ b/code/nel/src/misc/polygon.cpp @@ -113,7 +113,7 @@ void CPolygon::clip(const std::vector &planes) // *************************************************************************** -void CPolygon::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPolygon::serial(NLMISC::IStream &f) { f.serialVersion(0); f.serialCont(Vertices); @@ -1011,7 +1011,7 @@ void CPolygon2D::buildConvexHull(CPolygon2D &dest) const // *************************************************************************** -void CPolygon2D::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPolygon2D::serial(NLMISC::IStream &f) { (void)f.serialVersion(0); f.serialCont(Vertices); diff --git a/code/nel/src/misc/rgba.cpp b/code/nel/src/misc/rgba.cpp index d053887c4..277793489 100644 --- a/code/nel/src/misc/rgba.cpp +++ b/code/nel/src/misc/rgba.cpp @@ -50,7 +50,7 @@ const CRGBA CRGBA::Cyan(0, 255, 255) ; const CRGBA CRGBA::White(255, 255, 255) ; // *************************************************************************** -void CRGBA::serial(class NLMISC::IStream &f) +void CRGBA::serial(NLMISC::IStream &f) { f.serial (R); f.serial (G); @@ -581,7 +581,7 @@ void CRGBA::subtractColors(CRGBA *dest, const CRGBA *src1, const CRGBA *src2, ui // *************************************************************************** -void CBGRA::serial(class NLMISC::IStream &f) +void CBGRA::serial(NLMISC::IStream &f) { f.serial (B); f.serial (G); @@ -792,7 +792,7 @@ bool CRGBA::fromString( const std::string &s ) // *************************************************************************** -void CRGBAF::serial(class NLMISC::IStream &f) +void CRGBAF::serial(NLMISC::IStream &f) { f.serial (R); f.serial (G); diff --git a/code/nel/src/misc/sheet_id.cpp b/code/nel/src/misc/sheet_id.cpp index 1b3ca490f..2dd895153 100644 --- a/code/nel/src/misc/sheet_id.cpp +++ b/code/nel/src/misc/sheet_id.cpp @@ -561,7 +561,7 @@ string CSheetId::toString(bool ifNotFoundUseNumericId) const } // toString // -void CSheetId::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CSheetId::serial(NLMISC::IStream &f) { nlassert(!_DontHaveSheetKnowledge); @@ -576,7 +576,7 @@ void CSheetId::serial(NLMISC::IStream &f) throw(NLMISC::EStream) #endif } -void CSheetId::serialString(NLMISC::IStream &f, const std::string &defaultType) throw(NLMISC::EStream) +void CSheetId::serialString(NLMISC::IStream &f, const std::string &defaultType) { nlassert(_Initialised); diff --git a/code/nel/tools/3d/object_viewer/dup_ps.cpp b/code/nel/tools/3d/object_viewer/dup_ps.cpp index d942a3d6e..1d9f538c4 100644 --- a/code/nel/tools/3d/object_viewer/dup_ps.cpp +++ b/code/nel/tools/3d/object_viewer/dup_ps.cpp @@ -40,7 +40,7 @@ using namespace NL3D; * TODO maybe this could be used elsewhere ? */ template -static T *DupSerializable(const T *in) throw(NLMISC::EStream) +static T *DupSerializable(const T *in) { NLMISC::CMemStream ms; nlassert(!ms.isReading()); @@ -62,7 +62,7 @@ static T *DupSerializable(const T *in) throw(NLMISC::EStream) struct CDupObjPolicy { template - static void serial(T *&obj, NLMISC::IStream &dest) throw(NLMISC::EStream) + static void serial(T *&obj, NLMISC::IStream &dest) { dest.serialPtr(obj); /*if (dest.isReading()) @@ -84,7 +84,7 @@ struct CDupObjPolicy struct CDupPolymorphicObjPolicy { template - static void serial(T *&obj, NLMISC::IStream &dest) throw(NLMISC::EStream) + static void serial(T *&obj, NLMISC::IStream &dest) { dest.serialPolyPtr(obj); } diff --git a/code/nel/tools/3d/object_viewer/particle_workspace.cpp b/code/nel/tools/3d/object_viewer/particle_workspace.cpp index 54df32400..43be30812 100644 --- a/code/nel/tools/3d/object_viewer/particle_workspace.cpp +++ b/code/nel/tools/3d/object_viewer/particle_workspace.cpp @@ -260,7 +260,7 @@ void CParticleWorkspace::CNode::savePS() //*********************************************************************************************** -void CParticleWorkspace::CNode::savePSAs(const std::string &fullPath) throw(NLMISC::EStream) +void CParticleWorkspace::CNode::savePSAs(const std::string &fullPath) { nlassert(_WS); if (!_PS) return; @@ -415,7 +415,7 @@ void CParticleWorkspace::removeNode(CNode *ptr) } //*********************************************************************************************** -void CParticleWorkspace::save() throw(NLMISC::EStream) +void CParticleWorkspace::save() { NLMISC::COFile stream; stream.open(_Filename); @@ -437,7 +437,7 @@ void CParticleWorkspace::load() } //*********************************************************************************************** -void CParticleWorkspace::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CParticleWorkspace::serial(NLMISC::IStream &f) { f.xmlPush("PARTICLE_WORKSPACE"); f.serialVersion(0); diff --git a/code/nel/tools/3d/object_viewer/particle_workspace.h b/code/nel/tools/3d/object_viewer/particle_workspace.h index fb94b2e15..694aab986 100644 --- a/code/nel/tools/3d/object_viewer/particle_workspace.h +++ b/code/nel/tools/3d/object_viewer/particle_workspace.h @@ -60,15 +60,15 @@ public: // Serial node information into workspace stream. This does not save the particle system shape, only a reference to its file void serial(NLMISC::IStream &f); // Save the particle system target file - void savePS() throw(NLMISC::EStream); + void savePS(); // Save particle system with an arbitrary filename - void savePSAs(const std::string &fullPath) throw(NLMISC::EStream); + void savePSAs(const std::string &fullPath); // put back in the unloaded state void unload(); /** Load the particle system target file * \return true if loading succeed (false means that loading was ok, but this is not a particle system). Other cases throw an exception. */ - bool loadPS() throw(NLMISC::EStream); + bool loadPS(); // create an empty particle system void createEmptyPS(); // helper flag to know if a ps has been modified @@ -196,11 +196,11 @@ public: /** Save the workspace structure. The target file is the one given when this object was created * NB : ps shape are not saved, only the structure is. To save the shapes, call CNode::save() */ - void save() throw(NLMISC::EStream); + void save(); /** Load the workspace structure. The target file is the one given when this object was created * All nodes are in the 'unloaded" state, so it is to the caller to load them by calling load() on their node */ - void load() throw(NLMISC::EStream); + void load(); // Test whether the structure of the workspace has been modified (does not test if ps inside the workspace have been modified) bool isModified() const { return _Modified; } // Test whether the content of the workspace has ben modified @@ -229,7 +229,7 @@ private: std::string _Name; // workspace user name private: // serial the object - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); // set the 'modified flag' and call the callback void setModifiedFlag(bool modified); public: diff --git a/code/nel/tools/3d/object_viewer/range_manager.h b/code/nel/tools/3d/object_viewer/range_manager.h index 2bdac5189..338578ce4 100644 --- a/code/nel/tools/3d/object_viewer/range_manager.h +++ b/code/nel/tools/3d/object_viewer/range_manager.h @@ -62,7 +62,7 @@ public: } /// serialization - static void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + static void serial(NLMISC::IStream &f) { uint32 size; if (!f.isReading()) diff --git a/code/nel/tools/3d/object_viewer/scheme_manager.cpp b/code/nel/tools/3d/object_viewer/scheme_manager.cpp index e7f93b589..7c3d7a3ec 100644 --- a/code/nel/tools/3d/object_viewer/scheme_manager.cpp +++ b/code/nel/tools/3d/object_viewer/scheme_manager.cpp @@ -47,7 +47,7 @@ void CSchemeManager::getSchemes(const std::string &type, std::vector &dest); // serial this collection - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); // swap this collection with another one void swap(CSchemeManager &other); // remove a scheme from the bank, given a pointer on it diff --git a/code/ryzom/client/src/character_cl.cpp b/code/ryzom/client/src/character_cl.cpp index a473b4b80..59e1af1ba 100644 --- a/code/ryzom/client/src/character_cl.cpp +++ b/code/ryzom/client/src/character_cl.cpp @@ -8481,7 +8481,7 @@ void CCharacterCL::displayDebugPropertyStages(float x, float &y, float lineStep) // readWrite : // Read/Write Variables from/to the stream. //--------------------------------------------------- -void CCharacterCL::readWrite(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CCharacterCL::readWrite(NLMISC::IStream &f) { CEntityCL::readWrite(f); diff --git a/code/ryzom/client/src/character_cl.h b/code/ryzom/client/src/character_cl.h index e2057d693..280fd470e 100644 --- a/code/ryzom/client/src/character_cl.h +++ b/code/ryzom/client/src/character_cl.h @@ -949,7 +949,7 @@ protected: // Read/Write Variables from/to the stream. - virtual void readWrite(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void readWrite(NLMISC::IStream &f); // To call after a read from a stream to re-initialize the entity. virtual void load(); diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp index 3b7badcfc..4e644ff14 100644 --- a/code/ryzom/client/src/client_cfg.cpp +++ b/code/ryzom/client/src/client_cfg.cpp @@ -1865,7 +1865,7 @@ void CClientConfig::setValues() // serial : // Serialize CFG. //----------------------------------------------- -void CClientConfig::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CClientConfig::serial(NLMISC::IStream &f) { // Start the opening of a new node named ClientCFG. f.xmlPush("ClientCFG"); diff --git a/code/ryzom/client/src/client_cfg.h b/code/ryzom/client/src/client_cfg.h index dd150dd49..4d4d746e0 100644 --- a/code/ryzom/client/src/client_cfg.h +++ b/code/ryzom/client/src/client_cfg.h @@ -831,7 +831,7 @@ public: static void setValuesOnFileChange (); // called when cfg modified /// Serialize CFG. - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); /// End process void release (); diff --git a/code/ryzom/client/src/client_sheets/animation_fx_set_sheet.cpp b/code/ryzom/client/src/client_sheets/animation_fx_set_sheet.cpp index be688e6b5..d881c8f0b 100644 --- a/code/ryzom/client/src/client_sheets/animation_fx_set_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/animation_fx_set_sheet.cpp @@ -56,7 +56,7 @@ void CAnimationFXSetSheet::buildWithPrefix(const NLGEORGES::UFormElm &item, cons } // **************************************************************************************************** -void CAnimationFXSetSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CAnimationFXSetSheet::serial(NLMISC::IStream &f) { f.serialCont(FX); for(uint k = 0; k < MaxNumFX; ++k) diff --git a/code/ryzom/client/src/client_sheets/animation_fx_set_sheet.h b/code/ryzom/client/src/client_sheets/animation_fx_set_sheet.h index e5e1ba9fa..019ddeecf 100644 --- a/code/ryzom/client/src/client_sheets/animation_fx_set_sheet.h +++ b/code/ryzom/client/src/client_sheets/animation_fx_set_sheet.h @@ -46,7 +46,7 @@ public: // from CEntitySheet void build(const NLGEORGES::UFormElm &item); /// Serialize sheet into binary data file. - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; diff --git a/code/ryzom/client/src/client_sheets/animation_fx_sheet.cpp b/code/ryzom/client/src/client_sheets/animation_fx_sheet.cpp index 7a70b467c..f5a84490d 100644 --- a/code/ryzom/client/src/client_sheets/animation_fx_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/animation_fx_sheet.cpp @@ -92,7 +92,7 @@ void CAnimationFXSheet::build(const NLGEORGES::UFormElm &item) //----------------------------------------------- // serial //----------------------------------------------- -void CAnimationFXSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CAnimationFXSheet::serial(NLMISC::IStream &f) { f.serial(PSName); f.serial(StickMode); diff --git a/code/ryzom/client/src/client_sheets/animation_fx_sheet.h b/code/ryzom/client/src/client_sheets/animation_fx_sheet.h index cf02157a4..0e416fe20 100644 --- a/code/ryzom/client/src/client_sheets/animation_fx_sheet.h +++ b/code/ryzom/client/src/client_sheets/animation_fx_sheet.h @@ -60,7 +60,7 @@ public: /// Build the fx from an external script. void build(const NLGEORGES::UFormElm &item, const std::string &prefix); /// Serialize a CAnimationFX. - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; diff --git a/code/ryzom/client/src/client_sheets/animation_set_list_sheet.cpp b/code/ryzom/client/src/client_sheets/animation_set_list_sheet.cpp index 618c9da35..69ea921fd 100644 --- a/code/ryzom/client/src/client_sheets/animation_set_list_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/animation_set_list_sheet.cpp @@ -310,7 +310,7 @@ void CAnimationSheet::build(const NLGEORGES::UFormElm &item) //----------------------------------------------- // serial //----------------------------------------------- -void CAnimationSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CAnimationSheet::serial(NLMISC::IStream &f) { // serialize the animation name to be able to compute the animation when loading. AnimNames.serial(f, IdAnim); @@ -474,7 +474,7 @@ void CAnimationStateSheet::build(const NLGEORGES::UFormElm &item) //----------------------------------------------- // serial //----------------------------------------------- -void CAnimationStateSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CAnimationStateSheet::serial(NLMISC::IStream &f) { // Vector of animation. f.serialCont(Animations); @@ -600,7 +600,7 @@ void CAnimationSetSheet::build(const NLGEORGES::UFormElm &rootElmt) // serial : // serialize to disk or from disk the content of this class //----------------------------------------------- -void CAnimationSetSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CAnimationSetSheet::serial(NLMISC::IStream &f) { f.serial(Name); f.serialCont(AnimationStates); @@ -723,7 +723,7 @@ void CAnimationSetListSheet::build(const NLGEORGES::UFormElm &item) // serial : // serialize to disk or from disk the content of this class //----------------------------------------------- -void CAnimationSetListSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CAnimationSetListSheet::serial(NLMISC::IStream &f) { f.serialCont(AnimSetList); }// serial // diff --git a/code/ryzom/client/src/client_sheets/animation_set_list_sheet.h b/code/ryzom/client/src/client_sheets/animation_set_list_sheet.h index ad991dae1..19cf77639 100644 --- a/code/ryzom/client/src/client_sheets/animation_set_list_sheet.h +++ b/code/ryzom/client/src/client_sheets/animation_set_list_sheet.h @@ -91,7 +91,7 @@ public: void build(const NLGEORGES::UFormElm &item); /// Serialize sheet into binary data file. - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; @@ -300,7 +300,7 @@ public: void build(const NLGEORGES::UFormElm &item); /// Serialize sheet into binary data file. - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; @@ -331,7 +331,7 @@ public: void build(const NLGEORGES::UFormElm &item); /// Serialize sheet into binary data file. - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; @@ -353,7 +353,7 @@ public: virtual void build(const NLGEORGES::UFormElm &item); /// Serialize sheet into binary data file. - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); }; diff --git a/code/ryzom/client/src/client_sheets/attack_id_sheet.cpp b/code/ryzom/client/src/client_sheets/attack_id_sheet.cpp index d990162ec..4ad810fa4 100644 --- a/code/ryzom/client/src/client_sheets/attack_id_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/attack_id_sheet.cpp @@ -58,7 +58,7 @@ void CAttackIDSheet::build(const NLGEORGES::UFormElm &item, const std::string &p } // ***************************************************************************************** -void CAttackIDSheet::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CAttackIDSheet::serial(NLMISC::IStream &f) { f.serialEnum(Type); switch(Type) @@ -96,7 +96,7 @@ void CAttackIDSheet::CSpellInfo::build(const NLGEORGES::UFormElm &item, const st } // ***************************************************************************************** -void CAttackIDSheet::CSpellInfo::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CAttackIDSheet::CSpellInfo::serial(NLMISC::IStream &f) { f.serialEnum(Mode); f.serialEnum(ID); diff --git a/code/ryzom/client/src/client_sheets/attack_id_sheet.h b/code/ryzom/client/src/client_sheets/attack_id_sheet.h index 1dfe1b790..42b678a13 100644 --- a/code/ryzom/client/src/client_sheets/attack_id_sheet.h +++ b/code/ryzom/client/src/client_sheets/attack_id_sheet.h @@ -41,7 +41,7 @@ public: MAGICFX::TMagicFx ID; public: void build(const NLGEORGES::UFormElm &item, const std::string &prefix); - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; public: TType Type; @@ -54,7 +54,7 @@ public: }; public: virtual void build(const NLGEORGES::UFormElm &item, const std::string &prefix); - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); }; // compares spell infos diff --git a/code/ryzom/client/src/client_sheets/attack_list_sheet.cpp b/code/ryzom/client/src/client_sheets/attack_list_sheet.cpp index e398a3bb8..022b64777 100644 --- a/code/ryzom/client/src/client_sheets/attack_list_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/attack_list_sheet.cpp @@ -37,7 +37,7 @@ void CAttackListSheetEntry::build(const NLGEORGES::UFormElm &item, const std::st } // ******************************************************************************************* -void CAttackListSheetEntry::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CAttackListSheetEntry::serial(NLMISC::IStream &f) { f.serial(ID); f.serial(Attack); @@ -65,7 +65,7 @@ void CAttackListSheet::build(const NLGEORGES::UFormElm &item) } // ******************************************************************************************* -void CAttackListSheet::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CAttackListSheet::serial(NLMISC::IStream &f) { f.serialCont(Attacks); } diff --git a/code/ryzom/client/src/client_sheets/attack_list_sheet.h b/code/ryzom/client/src/client_sheets/attack_list_sheet.h index 434ca2f19..6e0df06aa 100644 --- a/code/ryzom/client/src/client_sheets/attack_list_sheet.h +++ b/code/ryzom/client/src/client_sheets/attack_list_sheet.h @@ -32,7 +32,7 @@ public: CAttackSheet Attack; public: void build(const NLGEORGES::UFormElm &item, const std::string &prefix); - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; @@ -49,7 +49,7 @@ public: public: CAttackListSheet(); virtual void build(const NLGEORGES::UFormElm &item); - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); }; diff --git a/code/ryzom/client/src/client_sheets/attack_sheet.cpp b/code/ryzom/client/src/client_sheets/attack_sheet.cpp index f65bf818b..8fd19ec53 100644 --- a/code/ryzom/client/src/client_sheets/attack_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/attack_sheet.cpp @@ -72,7 +72,7 @@ void CAttackSheet::build(const NLGEORGES::UFormElm &item, const std::string &pre } // ********************************************************************************************************* -void CAttackSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CAttackSheet::serial(NLMISC::IStream &f) { f.serialEnum(ProjectileMode); f.serial(AttackBeginFX); diff --git a/code/ryzom/client/src/client_sheets/attack_sheet.h b/code/ryzom/client/src/client_sheets/attack_sheet.h index 1b16a76a2..7db587a3a 100644 --- a/code/ryzom/client/src/client_sheets/attack_sheet.h +++ b/code/ryzom/client/src/client_sheets/attack_sheet.h @@ -57,7 +57,7 @@ public: // ctor CAttackSheet(); virtual void build(const NLGEORGES::UFormElm &item, const std::string &prefix); - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); }; diff --git a/code/ryzom/client/src/client_sheets/automaton_list_sheet.cpp b/code/ryzom/client/src/client_sheets/automaton_list_sheet.cpp index 1f0b6565c..013847fa2 100644 --- a/code/ryzom/client/src/client_sheets/automaton_list_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/automaton_list_sheet.cpp @@ -250,7 +250,7 @@ void CAutomatonStateSheet::build(const NLGEORGES::UFormElm &item, const string & // serial : // Serialize a CAutomatonStateSheet. //----------------------------------------------- -void CAutomatonStateSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CAutomatonStateSheet::serial(NLMISC::IStream &f) { f.serialEnum(MoveState); f.serialEnum(NextState); @@ -402,7 +402,7 @@ void CAutomatonSheet::build(const NLGEORGES::UFormElm &item) //----------------------------------------------- //----------------------------------------------- -void CAutomatonSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CAutomatonSheet::serial(NLMISC::IStream &f) { f.serialCont(_States); }// serial // @@ -540,7 +540,7 @@ void CAutomatonListSheet::build(const NLGEORGES::UFormElm &rootList) // version 1 : base version //----------------------------------------------- -void CAutomatonListSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CAutomatonListSheet::serial(NLMISC::IStream &f) { if (f.isReading()) { diff --git a/code/ryzom/client/src/client_sheets/automaton_list_sheet.h b/code/ryzom/client/src/client_sheets/automaton_list_sheet.h index 6bd629b64..7faa0de0e 100644 --- a/code/ryzom/client/src/client_sheets/automaton_list_sheet.h +++ b/code/ryzom/client/src/client_sheets/automaton_list_sheet.h @@ -60,7 +60,7 @@ public: } /// Serialize a CNextStateInf. - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serialEnum (NextStateKey); f.serial(Breakable); @@ -151,7 +151,7 @@ public: void build(const NLGEORGES::UFormElm &item, const std::string &baseKeyStr); /// Serialize a CMovingAutomatonState. - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); /** Return if there is a connection with the mode in parameter from the current automaton and filled the transition to use. * \param mode : is there a connection for this mode. @@ -182,7 +182,7 @@ public: void build(const NLGEORGES::UFormElm &item); /// Serialize sheet into binary data file. - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); /** * Return a pointer on the information about the state corresponding to the key. @@ -227,7 +227,7 @@ public: virtual void build(const NLGEORGES::UFormElm &item); /// Serialize sheet into binary data file. - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); /// Tool to read a dfn composed with an array of string static void readDfnStringArray(std::vector &states, const std::string &dfnName); diff --git a/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp b/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp index fb065e6df..d606a028a 100644 --- a/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp @@ -61,7 +61,7 @@ void CBodyToBoneSheet::build(const NLGEORGES::UFormElm &item, const std::string } // ********************************************************************************************* -void CBodyToBoneSheet::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CBodyToBoneSheet::serial(NLMISC::IStream &f) { ClientSheetsStrings.serial(f, Head); ClientSheetsStrings.serial(f, Chest); diff --git a/code/ryzom/client/src/client_sheets/body_to_bone_sheet.h b/code/ryzom/client/src/client_sheets/body_to_bone_sheet.h index 10e59ba72..0c9110d48 100644 --- a/code/ryzom/client/src/client_sheets/body_to_bone_sheet.h +++ b/code/ryzom/client/src/client_sheets/body_to_bone_sheet.h @@ -52,7 +52,7 @@ public: CBodyToBoneSheet(); // build that an external script void build(const NLGEORGES::UFormElm &item, const std::string &prefix); - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); /** From a body part and a side, retrieves bone name (or NULL if none). * The side is meaningless for part such as 'chest' */ diff --git a/code/ryzom/client/src/client_sheets/building_sheet.cpp b/code/ryzom/client/src/client_sheets/building_sheet.cpp index 06abbf87d..1f1fdfba5 100644 --- a/code/ryzom/client/src/client_sheets/building_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/building_sheet.cpp @@ -69,7 +69,7 @@ void CBuildingSheet::build(const NLGEORGES::UFormElm &item) // serial : // Serialize character sheet into binary data file. //----------------------------------------------- -void CBuildingSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CBuildingSheet::serial(NLMISC::IStream &f) { // Serialize class components. f.serial(BuildedIg); diff --git a/code/ryzom/client/src/client_sheets/building_sheet.h b/code/ryzom/client/src/client_sheets/building_sheet.h index 98b7211d2..2ccf941b1 100644 --- a/code/ryzom/client/src/client_sheets/building_sheet.h +++ b/code/ryzom/client/src/client_sheets/building_sheet.h @@ -55,7 +55,7 @@ public: virtual void build(const NLGEORGES::UFormElm &item); /// Serialize character sheet into binary data file. - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); }; diff --git a/code/ryzom/client/src/client_sheets/character_sheet.cpp b/code/ryzom/client/src/client_sheets/character_sheet.cpp index 0da928768..ab935268b 100644 --- a/code/ryzom/client/src/client_sheets/character_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/character_sheet.cpp @@ -658,7 +658,7 @@ void CCharacterSheet::build(const NLGEORGES::UFormElm &item) // serial : // Serialize character sheet into binary data file. //----------------------------------------------- -void CCharacterSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CCharacterSheet::serial(NLMISC::IStream &f) { // Serialize class components. // ClientSheetsStrings.serial(f, IdFirstName); diff --git a/code/ryzom/client/src/client_sheets/character_sheet.h b/code/ryzom/client/src/client_sheets/character_sheet.h index 119baf195..39221eaad 100644 --- a/code/ryzom/client/src/client_sheets/character_sheet.h +++ b/code/ryzom/client/src/client_sheets/character_sheet.h @@ -84,7 +84,7 @@ public: std::string getBindPoint() const { return ClientSheetsStrings.get(IdBindPoint); } /// Serialize character sheet into binary data file. - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + virtual void serial(NLMISC::IStream &f) { ClientSheetsStrings.serial(f, IdItem); @@ -208,7 +208,7 @@ public: public: NLMISC::CVector Origin; NLMISC::CVector Pos; - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial(Origin); f.serial(Pos); @@ -234,7 +234,7 @@ public: virtual void build(const NLGEORGES::UFormElm &item); /// Serialize character sheet into binary data file. - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); /// Return the list of all equipement possibles (body... + HairList). Pointers should be used localy void getWholeEquipmentList(std::vector &equipList) const; diff --git a/code/ryzom/client/src/client_sheets/continent_sheet.cpp b/code/ryzom/client/src/client_sheets/continent_sheet.cpp index 17868866c..aa2bdb142 100644 --- a/code/ryzom/client/src/client_sheets/continent_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/continent_sheet.cpp @@ -334,7 +334,7 @@ void CContinentParameters::buildFogMapBuild(const NLGEORGES::UFormElm &item) //========================================================================= -void CContinentParameters::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CContinentParameters::serial(NLMISC::IStream &f) { f.serial(Name); f.serial(PacsRBank); @@ -397,7 +397,7 @@ void CContinentParameters::serial(class NLMISC::IStream &f) throw(NLMISC::EStrea //========================================================================= -void CContinentParameters::CZC::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CContinentParameters::CZC::serial(NLMISC::IStream &f) { f.serial (Name); f.serial (ForceLoadDist); @@ -456,7 +456,7 @@ void CContinentSheet::build(const NLGEORGES::UFormElm &item) } //========================================================================= -void CContinentSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CContinentSheet::serial(NLMISC::IStream &f) { f.serial(Continent); f.serialCont(Villages); @@ -475,7 +475,7 @@ void CContinentSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) } //========================================================================= -void CLandMark::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CLandMark::serial(NLMISC::IStream &f) { f.serial(Pos, TitleTextID); } diff --git a/code/ryzom/client/src/client_sheets/continent_sheet.h b/code/ryzom/client/src/client_sheets/continent_sheet.h index 22a73471f..4a36b6a2d 100644 --- a/code/ryzom/client/src/client_sheets/continent_sheet.h +++ b/code/ryzom/client/src/client_sheets/continent_sheet.h @@ -39,7 +39,7 @@ public: std::string TitleTextID; // should be converted with CI18N to get the actual title in ucstring public: void build(const NLGEORGES::UFormElm &item); - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); };*/ // Parameters common to continent image in the client and to its sheet @@ -141,7 +141,7 @@ public: float LoadDist; float UnloadDist; bool EnableRuins; // Allow the display of shape of ruins (else building shape displayed through bot objects) - void serial (class NLMISC::IStream &f) throw (NLMISC::EStream); + void serial (NLMISC::IStream &f); CZC() { @@ -186,7 +186,7 @@ public: void build(const NLGEORGES::UFormElm &item); - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); private: @@ -206,7 +206,7 @@ public: CContinentSheet(); // from CEntitySheet virtual void build(const NLGEORGES::UFormElm &item); - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); }; #endif diff --git a/code/ryzom/client/src/client_sheets/emot_list_sheet.cpp b/code/ryzom/client/src/client_sheets/emot_list_sheet.cpp index 67959406c..99c12ef11 100644 --- a/code/ryzom/client/src/client_sheets/emot_list_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/emot_list_sheet.cpp @@ -91,7 +91,7 @@ void CEmotListSheet::build(const NLGEORGES::UFormElm &item) // serial : // Serialize a CAutomatonStateSheet. //----------------------------------------------- -void CEmotListSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CEmotListSheet::serial(NLMISC::IStream &f) { uint32 size; if (f.isReading ()) diff --git a/code/ryzom/client/src/client_sheets/emot_list_sheet.h b/code/ryzom/client/src/client_sheets/emot_list_sheet.h index 176e0a3fd..adac75e9f 100644 --- a/code/ryzom/client/src/client_sheets/emot_list_sheet.h +++ b/code/ryzom/client/src/client_sheets/emot_list_sheet.h @@ -50,7 +50,7 @@ public: virtual void build(const NLGEORGES::UFormElm &item); /// Serialize sheet into binary data file. - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); }; diff --git a/code/ryzom/client/src/client_sheets/entity_sheet.h b/code/ryzom/client/src/client_sheets/entity_sheet.h index 4e8a67d05..bb36fc04e 100644 --- a/code/ryzom/client/src/client_sheets/entity_sheet.h +++ b/code/ryzom/client/src/client_sheets/entity_sheet.h @@ -131,7 +131,7 @@ public: /// Serialize character sheet into binary data file. - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) = 0; + virtual void serial(NLMISC::IStream &f) = 0; }; diff --git a/code/ryzom/client/src/client_sheets/faction_sheet.cpp b/code/ryzom/client/src/client_sheets/faction_sheet.cpp index 56a8a135e..948c880ed 100644 --- a/code/ryzom/client/src/client_sheets/faction_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/faction_sheet.cpp @@ -39,7 +39,7 @@ void CFactionSheet::build(const NLGEORGES::UFormElm &item) GetFactionFormValue(item, Icon, "Icon"); } //======================================================================= -void CFactionSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CFactionSheet::serial(NLMISC::IStream &f) { f.serial(Icon); } diff --git a/code/ryzom/client/src/client_sheets/faction_sheet.h b/code/ryzom/client/src/client_sheets/faction_sheet.h index 1b1a3f3e5..d51026e95 100644 --- a/code/ryzom/client/src/client_sheets/faction_sheet.h +++ b/code/ryzom/client/src/client_sheets/faction_sheet.h @@ -42,7 +42,7 @@ public: void build(const NLGEORGES::UFormElm &item); /// Serialize character sheet into binary data file. - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; diff --git a/code/ryzom/client/src/client_sheets/flora_sheet.cpp b/code/ryzom/client/src/client_sheets/flora_sheet.cpp index 07ce872c8..445d0fbe8 100644 --- a/code/ryzom/client/src/client_sheets/flora_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/flora_sheet.cpp @@ -56,7 +56,7 @@ void CFloraSheet::build(const NLGEORGES::UFormElm &item) } // *************************************************************************************************** -void CFloraSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CFloraSheet::serial(NLMISC::IStream &f) { f.serialCont(_Plants); f.serial(MicroLifeThreshold); @@ -75,7 +75,7 @@ void CPlantInfo::build(const NLGEORGES::UFormElm &item) } // *************************************************************************************************** -void CPlantInfo::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CPlantInfo::serial(NLMISC::IStream &f) { f.serial(SheetName); f.serial(CumulatedWeight); diff --git a/code/ryzom/client/src/client_sheets/flora_sheet.h b/code/ryzom/client/src/client_sheets/flora_sheet.h index 73666f559..549656742 100644 --- a/code/ryzom/client/src/client_sheets/flora_sheet.h +++ b/code/ryzom/client/src/client_sheets/flora_sheet.h @@ -32,7 +32,7 @@ public: uint64 CumulatedWeight; // for sorting by weights public: virtual void build(const NLGEORGES::UFormElm &item); - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); }; inline bool operator < (const CPlantInfo &lhs, const CPlantInfo &rhs) { @@ -53,7 +53,7 @@ public: /// Build the sheet from an external script. virtual void build(const NLGEORGES::UFormElm &item); /// Serialize plant sheet into binary data file. - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); // Get total weight of plant infos uint64 getPlantInfoTotalWeight() const { return _TotalWeight; } /** Get plant info from weighted index diff --git a/code/ryzom/client/src/client_sheets/forage_source_sheet.cpp b/code/ryzom/client/src/client_sheets/forage_source_sheet.cpp index 344ed06b4..d8678e0d0 100644 --- a/code/ryzom/client/src/client_sheets/forage_source_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/forage_source_sheet.cpp @@ -63,7 +63,7 @@ void CForageSourceSheet::build(const NLGEORGES::UFormElm &item) /* * Serialize character sheet into binary data file. */ -void CForageSourceSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CForageSourceSheet::serial(NLMISC::IStream &f) { f.serial( FxFilename ); f.serial( FxSafeFilename ); diff --git a/code/ryzom/client/src/client_sheets/forage_source_sheet.h b/code/ryzom/client/src/client_sheets/forage_source_sheet.h index af8a5594e..179c89054 100644 --- a/code/ryzom/client/src/client_sheets/forage_source_sheet.h +++ b/code/ryzom/client/src/client_sheets/forage_source_sheet.h @@ -40,7 +40,7 @@ public: virtual void build(const NLGEORGES::UFormElm &item); /// Serialize character sheet into binary data file. - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); std::string FxFilename; std::string FxSafeFilename; diff --git a/code/ryzom/client/src/client_sheets/fx_sheet.cpp b/code/ryzom/client/src/client_sheets/fx_sheet.cpp index f0fc4e160..d647b686f 100644 --- a/code/ryzom/client/src/client_sheets/fx_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/fx_sheet.cpp @@ -203,7 +203,7 @@ void CFXSheet::build(const NLGEORGES::UFormElm &item) // serial : // Serialize FX sheet into binary data file. //----------------------------------------------- -void CFXSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CFXSheet::serial(NLMISC::IStream &f) { f.serialCont(TrailList); f.serialCont(PSList); diff --git a/code/ryzom/client/src/client_sheets/fx_sheet.h b/code/ryzom/client/src/client_sheets/fx_sheet.h index a6b18496d..c230f62ee 100644 --- a/code/ryzom/client/src/client_sheets/fx_sheet.h +++ b/code/ryzom/client/src/client_sheets/fx_sheet.h @@ -82,7 +82,7 @@ public: } /// Serialize character sheet into binary data file. - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + virtual void serial(NLMISC::IStream &f) { f.serial(UserParam0); f.serial(UserParam1); @@ -108,7 +108,7 @@ public: } /// Serialize character sheet into binary data file. - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + virtual void serial(NLMISC::IStream &f) { f.serial(PSName); f.serial(Anim); @@ -126,7 +126,7 @@ public: virtual void build(const NLGEORGES::UFormElm &item); /// Serialize character sheet into binary data file. - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); }; diff --git a/code/ryzom/client/src/client_sheets/fx_stick_mode.cpp b/code/ryzom/client/src/client_sheets/fx_stick_mode.cpp index fcdb9ea0e..ec56bf9d1 100644 --- a/code/ryzom/client/src/client_sheets/fx_stick_mode.cpp +++ b/code/ryzom/client/src/client_sheets/fx_stick_mode.cpp @@ -45,7 +45,7 @@ bool CFXStickMode::build(const NLGEORGES::UFormElm &item, const std::string &pre //----------------------------------------------- // serial //----------------------------------------------- -void CFXStickMode::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CFXStickMode::serial(NLMISC::IStream &f) { f.serialEnum(Mode); NLMISC::CStringMapper::serialString(f, UserBoneName); diff --git a/code/ryzom/client/src/client_sheets/fx_stick_mode.h b/code/ryzom/client/src/client_sheets/fx_stick_mode.h index c0aae32e9..f37607779 100644 --- a/code/ryzom/client/src/client_sheets/fx_stick_mode.h +++ b/code/ryzom/client/src/client_sheets/fx_stick_mode.h @@ -65,7 +65,7 @@ public: bool build(const NLGEORGES::UFormElm &item, const std::string &prefix = ""); /// Save and Load - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; #endif diff --git a/code/ryzom/client/src/client_sheets/ground_fx_sheet.cpp b/code/ryzom/client/src/client_sheets/ground_fx_sheet.cpp index 02985ea79..131b26e87 100644 --- a/code/ryzom/client/src/client_sheets/ground_fx_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/ground_fx_sheet.cpp @@ -33,7 +33,7 @@ bool CGroundFXSheet::build(const NLGEORGES::UFormElm &item) } // *************************************************************************** -void CGroundFXSheet::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CGroundFXSheet::serial(NLMISC::IStream &f) { f.serial(GroundID); ClientSheetsStrings.serial(f, IdFXName); diff --git a/code/ryzom/client/src/client_sheets/ground_fx_sheet.h b/code/ryzom/client/src/client_sheets/ground_fx_sheet.h index 5175216e7..f55eb0a0d 100644 --- a/code/ryzom/client/src/client_sheets/ground_fx_sheet.h +++ b/code/ryzom/client/src/client_sheets/ground_fx_sheet.h @@ -42,7 +42,7 @@ public: // build that sheet from a form bool build(const NLGEORGES::UFormElm &item); // serial this sheet - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; // operator < sort ground fx by ground type diff --git a/code/ryzom/client/src/client_sheets/id_to_string_array.cpp b/code/ryzom/client/src/client_sheets/id_to_string_array.cpp index 447ad153c..28b3fd6f3 100644 --- a/code/ryzom/client/src/client_sheets/id_to_string_array.cpp +++ b/code/ryzom/client/src/client_sheets/id_to_string_array.cpp @@ -51,7 +51,7 @@ void CIDToStringArraySheet::build(const NLGEORGES::UFormElm &item) } // ******************************************************************************************* -void CIDToStringArraySheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CIDToStringArraySheet::serial(NLMISC::IStream &f) { f.serialCont(Array); } @@ -64,7 +64,7 @@ void CIDToString::build(const NLGEORGES::UFormElm &item) } // ******************************************************************************************* -void CIDToString::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CIDToString::serial(NLMISC::IStream &f) { f.serial(ID); f.serial(String); diff --git a/code/ryzom/client/src/client_sheets/id_to_string_array.h b/code/ryzom/client/src/client_sheets/id_to_string_array.h index 501564fef..ab0bc7f62 100644 --- a/code/ryzom/client/src/client_sheets/id_to_string_array.h +++ b/code/ryzom/client/src/client_sheets/id_to_string_array.h @@ -32,7 +32,7 @@ public: std::string String; public: virtual void build(const NLGEORGES::UFormElm &item); - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); }; @@ -48,7 +48,7 @@ public: /// Build the entity from an external script. virtual void build(const NLGEORGES::UFormElm &item); /// Serialize character sheet into binary data file. - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); }; diff --git a/code/ryzom/client/src/client_sheets/item_fx_sheet.cpp b/code/ryzom/client/src/client_sheets/item_fx_sheet.cpp index bfd671bca..84ac859e4 100644 --- a/code/ryzom/client/src/client_sheets/item_fx_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/item_fx_sheet.cpp @@ -73,7 +73,7 @@ void CItemFXSheet::build(const NLGEORGES::UFormElm &item, const std::string &pre } // ******************************************************************************************* -void CItemFXSheet::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CItemFXSheet::serial(NLMISC::IStream &f) { f.serial(TrailMinSliceTime); f.serial(TrailMaxSliceTime); @@ -119,7 +119,7 @@ void CItemFXSheet::CStaticFX::build(const NLGEORGES::UFormElm &item) } // ******************************************************************************************* -void CItemFXSheet::CStaticFX::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CItemFXSheet::CStaticFX::serial(NLMISC::IStream &f) { ClientSheetsStrings.serial(f, Name); ClientSheetsStrings.serial(f, Bone); diff --git a/code/ryzom/client/src/client_sheets/item_fx_sheet.h b/code/ryzom/client/src/client_sheets/item_fx_sheet.h index 98683a723..f19edfa3f 100644 --- a/code/ryzom/client/src/client_sheets/item_fx_sheet.h +++ b/code/ryzom/client/src/client_sheets/item_fx_sheet.h @@ -42,7 +42,7 @@ public: CItemFXSheet(); // build that an external script void build(const NLGEORGES::UFormElm &item, const std::string &prefix); - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); // access to string ids values const char *getTrail() const; const char *getAdvantageFX() const; @@ -64,7 +64,7 @@ private: { } void build(const NLGEORGES::UFormElm &item); - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; NLMISC::TSStringId _Trail; // a trail that is displayed when the item is used to attack NLMISC::TSStringId _AdvantageFX; // fx to played on some items when the player master it diff --git a/code/ryzom/client/src/client_sheets/item_sheet.cpp b/code/ryzom/client/src/client_sheets/item_sheet.cpp index afc2f6413..e13d8e267 100644 --- a/code/ryzom/client/src/client_sheets/item_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/item_sheet.cpp @@ -611,7 +611,7 @@ void CItemSheet::build(const NLGEORGES::UFormElm &item) // serial : // Serialize character sheet into binary data file. //----------------------------------------------- -void CItemSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CItemSheet::serial(NLMISC::IStream &f) { ClientSheetsStrings.serial(f, IdShape); ClientSheetsStrings.serial(f, IdShapeFemale); diff --git a/code/ryzom/client/src/client_sheets/item_sheet.h b/code/ryzom/client/src/client_sheets/item_sheet.h index 250f8411e..c363c9756 100644 --- a/code/ryzom/client/src/client_sheets/item_sheet.h +++ b/code/ryzom/client/src/client_sheets/item_sheet.h @@ -401,7 +401,7 @@ public: virtual void build(const NLGEORGES::UFormElm &item); /// Serialize character sheet into binary data file. - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); /// true if the item can put in the slot e bool hasSlot(SLOTTYPE::TSlotType e) const {return (SlotBF&(SINT64_CONSTANT(1)< &dest); }; diff --git a/code/ryzom/client/src/client_sheets/sbrick_sheet.h b/code/ryzom/client/src/client_sheets/sbrick_sheet.h index 99322542a..e44d4d5f5 100644 --- a/code/ryzom/client/src/client_sheets/sbrick_sheet.h +++ b/code/ryzom/client/src/client_sheets/sbrick_sheet.h @@ -76,7 +76,7 @@ public: Value2=0.f; } - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial(Text); } @@ -104,7 +104,7 @@ public: Quantity = 0; } - void serial (NLMISC::IStream &s) throw(NLMISC::EStream) + void serial (NLMISC::IStream &s) { s.serialEnum(FaberTypeFilter); s.serial(Quantity); @@ -117,7 +117,7 @@ public: { NLMISC::CSheetId ItemRequired; uint32 Quantity; - void serial (NLMISC::IStream &s) throw(NLMISC::EStream) + void serial (NLMISC::IStream &s) { s.serial(ItemRequired); s.serial(Quantity); @@ -137,7 +137,7 @@ public: uint32 NbItemBuilt; - void serial (NLMISC::IStream &s) throw(NLMISC::EStream) + void serial (NLMISC::IStream &s) { s.serial(ItemBuilt); s.serialCont(ItemPartMps); @@ -344,7 +344,7 @@ public: // Georges Std build implementation virtual void build (const NLGEORGES::UFormElm &root); - virtual void serial (NLMISC::IStream &s) throw(NLMISC::EStream) + virtual void serial (NLMISC::IStream &s) { std::string sTmp; s.serialCont(UsedSkills); diff --git a/code/ryzom/client/src/client_sheets/skills_tree_sheet.h b/code/ryzom/client/src/client_sheets/skills_tree_sheet.h index 34cb01e5a..b65115148 100644 --- a/code/ryzom/client/src/client_sheets/skills_tree_sheet.h +++ b/code/ryzom/client/src/client_sheets/skills_tree_sheet.h @@ -44,7 +44,7 @@ public : MaxSkillValue = StageType = 0; } - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serialEnum (Skill); f.serial (SkillCode); @@ -87,7 +87,7 @@ public: virtual void build(const NLGEORGES::UFormElm &item); /// serialize - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + virtual void serial(NLMISC::IStream &f) { f.serialCont( SkillsTree ); } diff --git a/code/ryzom/client/src/client_sheets/sky_object_sheet.cpp b/code/ryzom/client/src/client_sheets/sky_object_sheet.cpp index 6173feb23..33cc6ef61 100644 --- a/code/ryzom/client/src/client_sheets/sky_object_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/sky_object_sheet.cpp @@ -33,7 +33,7 @@ void CSkyObjectSheet::CColorInfoSheet::build(const NLGEORGES::UFormElm &item, co } // ***************************************************************************************************** -void CSkyObjectSheet::CColorInfoSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CSkyObjectSheet::CColorInfoSheet::serial(NLMISC::IStream &f) { f.serial(MapName); f.serialEnum(Mode); @@ -62,7 +62,7 @@ void CSkyObjectSheet::CColorGradientInfoSheet::build(const NLGEORGES::UFormElm & } // ***************************************************************************************************** -void CSkyObjectSheet::CColorGradientInfoSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CSkyObjectSheet::CColorGradientInfoSheet::serial(NLMISC::IStream &f) { f.serial(TargetTextureStage); f.serialCont(WeatherToGradient); @@ -104,7 +104,7 @@ void CSkyObjectSheet::CVersionSheet::build(const NLGEORGES::UFormElm &item, cons } // ***************************************************************************************************** -void CSkyObjectSheet::CVersionSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CSkyObjectSheet::CVersionSheet::serial(NLMISC::IStream &f) { f.serial(ShapeName); f.serial(TransparencyPriority); @@ -145,7 +145,7 @@ void CSkyObjectSheet::build(const NLGEORGES::UFormElm &item, const std::string & } // ***************************************************************************************************** -void CSkyObjectSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CSkyObjectSheet::serial(NLMISC::IStream &f) { f.serial(Std); f.serial(FallbackPass[0]); diff --git a/code/ryzom/client/src/client_sheets/sky_object_sheet.h b/code/ryzom/client/src/client_sheets/sky_object_sheet.h index f4ea16d2e..d6a3bff7e 100644 --- a/code/ryzom/client/src/client_sheets/sky_object_sheet.h +++ b/code/ryzom/client/src/client_sheets/sky_object_sheet.h @@ -50,7 +50,7 @@ public: // Build from an external script void build(const NLGEORGES::UFormElm &item, const std::string &prefix); /// Serialize sheet into binary data file. - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; //////////////////////////////////////////////////////////////////////////////// // tells how a color gradient is computed in the shape (-> sky dome gradient) // @@ -71,7 +71,7 @@ public: // Build from an external script void build(const NLGEORGES::UFormElm &item, const std::string &prefix); /// Serialize sheet into binary data file. - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // A version of a sky object. If materials are too complex, a fallback version may be used instead (on gpu with 2 stages) // @@ -105,7 +105,7 @@ public: // Build from an external script void build(const NLGEORGES::UFormElm &item, const std::string &prefix); /// Serialize sheet into binary data file. - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// CVersionSheet Std; // standard version of the object @@ -118,7 +118,7 @@ public: // Build from an external script void build(const NLGEORGES::UFormElm &item, const std::string &prefix); /// Serialize sheet into binary data file. - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; #endif diff --git a/code/ryzom/client/src/client_sheets/sky_sheet.cpp b/code/ryzom/client/src/client_sheets/sky_sheet.cpp index 4d3c35caf..c6a04bd68 100644 --- a/code/ryzom/client/src/client_sheets/sky_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/sky_sheet.cpp @@ -56,7 +56,7 @@ void CSkySheet::build(const NLGEORGES::UFormElm &item, const std::string &prefix } // ***************************************************************************************************** -void CSkySheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CSkySheet::serial(NLMISC::IStream &f) { f.serial(InstanceGroupName); f.serial(AnimationName); diff --git a/code/ryzom/client/src/client_sheets/sky_sheet.h b/code/ryzom/client/src/client_sheets/sky_sheet.h index 3ec207f27..a99533580 100644 --- a/code/ryzom/client/src/client_sheets/sky_sheet.h +++ b/code/ryzom/client/src/client_sheets/sky_sheet.h @@ -47,7 +47,7 @@ public: /// From CEntitySheet virtual void build(const NLGEORGES::UFormElm &item); /// From CEntitySheet : serialize sheet into binary data file. - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); }; diff --git a/code/ryzom/client/src/client_sheets/sphrase_sheet.h b/code/ryzom/client/src/client_sheets/sphrase_sheet.h index 25fb7fae9..c7d91dae3 100644 --- a/code/ryzom/client/src/client_sheets/sphrase_sheet.h +++ b/code/ryzom/client/src/client_sheets/sphrase_sheet.h @@ -56,7 +56,7 @@ public: virtual void build (const NLGEORGES::UFormElm &root); - virtual void serial (NLMISC::IStream &s) throw(NLMISC::EStream) + virtual void serial (NLMISC::IStream &s) { s.serialCont (Bricks); s.serial(Castable); diff --git a/code/ryzom/client/src/client_sheets/success_table_sheet.h b/code/ryzom/client/src/client_sheets/success_table_sheet.h index 657cd82ac..842d63281 100644 --- a/code/ryzom/client/src/client_sheets/success_table_sheet.h +++ b/code/ryzom/client/src/client_sheets/success_table_sheet.h @@ -65,7 +65,7 @@ public: virtual void build(const NLGEORGES::UFormElm &root); /// serialize - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + virtual void serial(NLMISC::IStream &f) { f.serialCont(SuccessTable); } diff --git a/code/ryzom/client/src/client_sheets/text_emot_list_sheet.cpp b/code/ryzom/client/src/client_sheets/text_emot_list_sheet.cpp index ae5389f8b..159e10687 100644 --- a/code/ryzom/client/src/client_sheets/text_emot_list_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/text_emot_list_sheet.cpp @@ -108,7 +108,7 @@ void CTextEmotListSheet::build(const NLGEORGES::UFormElm &item) // serial : // Serialize a CAutomatonStateSheet. //----------------------------------------------- -void CTextEmotListSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CTextEmotListSheet::serial(NLMISC::IStream &f) { f.serialCont(TextEmotList); diff --git a/code/ryzom/client/src/client_sheets/text_emot_list_sheet.h b/code/ryzom/client/src/client_sheets/text_emot_list_sheet.h index 8533e14f5..7525d26c1 100644 --- a/code/ryzom/client/src/client_sheets/text_emot_list_sheet.h +++ b/code/ryzom/client/src/client_sheets/text_emot_list_sheet.h @@ -55,7 +55,7 @@ public: UsableFromClientUI = true; } - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial(Path); f.serial(Anim); @@ -77,7 +77,7 @@ public: virtual void build(const NLGEORGES::UFormElm &item); /// Serialize sheet into binary data file. - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); }; diff --git a/code/ryzom/client/src/client_sheets/unblock_titles_sheet.h b/code/ryzom/client/src/client_sheets/unblock_titles_sheet.h index 48c5cc5a9..32189f019 100644 --- a/code/ryzom/client/src/client_sheets/unblock_titles_sheet.h +++ b/code/ryzom/client/src/client_sheets/unblock_titles_sheet.h @@ -58,7 +58,7 @@ public : OrganizerRating = 0; } - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { uint i,j; @@ -188,7 +188,7 @@ public: virtual void build(const NLGEORGES::UFormElm &item); /// serialize - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + virtual void serial(NLMISC::IStream &f) { f.serialCont(TitlesUnblock); } diff --git a/code/ryzom/client/src/client_sheets/village_sheet.cpp b/code/ryzom/client/src/client_sheets/village_sheet.cpp index 6c1fd9321..d4f8c9836 100644 --- a/code/ryzom/client/src/client_sheets/village_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/village_sheet.cpp @@ -74,7 +74,7 @@ void CVillageSheet::build(const NLGEORGES::UFormElm &item) } } //======================================================================= -void CVillageSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CVillageSheet::serial(NLMISC::IStream &f) { f.serial(Zone); f.serial(Altitude); diff --git a/code/ryzom/client/src/client_sheets/village_sheet.h b/code/ryzom/client/src/client_sheets/village_sheet.h index d6120b1c3..7cddc6f12 100644 --- a/code/ryzom/client/src/client_sheets/village_sheet.h +++ b/code/ryzom/client/src/client_sheets/village_sheet.h @@ -25,7 +25,7 @@ struct CVillageIG { std::string IgName; std::string ParentName; - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial(IgName, ParentName); } @@ -63,7 +63,7 @@ struct CVillageSheet void build(const NLGEORGES::UFormElm &item); /// Serialize character sheet into binary data file. - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; diff --git a/code/ryzom/client/src/client_sheets/weather_function_params_sheet.cpp b/code/ryzom/client/src/client_sheets/weather_function_params_sheet.cpp index 7f106cdb9..b2eb09026 100644 --- a/code/ryzom/client/src/client_sheets/weather_function_params_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/weather_function_params_sheet.cpp @@ -38,7 +38,7 @@ void CWeatherFunctionParamsSheet::build(const NLGEORGES::UFormElm &item) } //======================================================================= -void CWeatherFunctionParamsSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CWeatherFunctionParamsSheet::serial(NLMISC::IStream &f) { CWeatherFunctionParamsSheetBase::serial(f); } diff --git a/code/ryzom/client/src/client_sheets/weather_function_params_sheet.h b/code/ryzom/client/src/client_sheets/weather_function_params_sheet.h index 005a92814..57193240c 100644 --- a/code/ryzom/client/src/client_sheets/weather_function_params_sheet.h +++ b/code/ryzom/client/src/client_sheets/weather_function_params_sheet.h @@ -31,7 +31,7 @@ public: CWeatherFunctionParamsSheet(); // from CEntitySheet virtual void build(const NLGEORGES::UFormElm &item); - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); }; diff --git a/code/ryzom/client/src/client_sheets/weather_setup_sheet.cpp b/code/ryzom/client/src/client_sheets/weather_setup_sheet.cpp index 29c59de03..9b2241ab1 100644 --- a/code/ryzom/client/src/client_sheets/weather_setup_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/weather_setup_sheet.cpp @@ -34,7 +34,7 @@ void CWeatherSetupSheet::build(const NLGEORGES::UFormElm &item) } //================================================================================== -void CWeatherSetupSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CWeatherSetupSheet::serial(NLMISC::IStream &f) { CWeatherSetupSheetBase::serial(f); } diff --git a/code/ryzom/client/src/client_sheets/weather_setup_sheet.h b/code/ryzom/client/src/client_sheets/weather_setup_sheet.h index 3e9021045..38ccb130e 100644 --- a/code/ryzom/client/src/client_sheets/weather_setup_sheet.h +++ b/code/ryzom/client/src/client_sheets/weather_setup_sheet.h @@ -39,7 +39,7 @@ public: // from CEntitySheet virtual void build(const NLGEORGES::UFormElm &item); /// Serialize character sheet into binary data file. - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); }; diff --git a/code/ryzom/client/src/client_sheets/world_sheet.cpp b/code/ryzom/client/src/client_sheets/world_sheet.cpp index cd5995591..1ae2f963f 100644 --- a/code/ryzom/client/src/client_sheets/world_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/world_sheet.cpp @@ -84,7 +84,7 @@ void CWorldSheet::build(const NLGEORGES::UFormElm &item) } //=============================================================================== -void CWorldSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CWorldSheet::serial(NLMISC::IStream &f) { f.serial(Name); f.serialCont(ContLocs); @@ -112,7 +112,7 @@ void SContLoc::build (const UFormElm *pItem) } //----------------------------------------------- -void SContLoc::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void SContLoc::serial(NLMISC::IStream &f) { f.serial(SelectionName); f.serial(ContinentName); @@ -156,7 +156,7 @@ void SMap::build(const NLGEORGES::UFormElm *pItem) } //----------------------------------------------- -void SMap::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void SMap::serial(NLMISC::IStream &f) { f.serial(Name); f.serial(ContinentName); @@ -176,7 +176,7 @@ void SMap::SChild::build(const NLGEORGES::UFormElm *pItem) } //----------------------------------------------- -void SMap::SChild::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void SMap::SChild::serial(NLMISC::IStream &f) { f.serial(Name); f.serial(ZoneName); diff --git a/code/ryzom/client/src/client_sheets/world_sheet.h b/code/ryzom/client/src/client_sheets/world_sheet.h index 1507db6c9..8e1bd7804 100644 --- a/code/ryzom/client/src/client_sheets/world_sheet.h +++ b/code/ryzom/client/src/client_sheets/world_sheet.h @@ -32,7 +32,7 @@ struct SContLoc SContLoc (); void build (const NLGEORGES::UFormElm *pItem); - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; // Hierarchical map node @@ -48,13 +48,13 @@ struct SMap std::string ZoneName; // Click Zone to be found in the region_*.primitive // ----------------------- void build (const NLGEORGES::UFormElm *pItem); - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; std::vector Children; // --------------------------------------------------------------------------------- SMap(); void build (const NLGEORGES::UFormElm *pItem); - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; /** Class that manage .world sheets @@ -74,7 +74,7 @@ public: CWorldSheet(); // from CEntitySheet; virtual void build(const NLGEORGES::UFormElm &item); - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); }; #endif diff --git a/code/ryzom/client/src/continent.h b/code/ryzom/client/src/continent.h index 838054481..7e0d599b4 100644 --- a/code/ryzom/client/src/continent.h +++ b/code/ryzom/client/src/continent.h @@ -126,7 +126,7 @@ public: /// Get user landmark color NLMISC::CRGBA getColor () const; - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial(Pos, Title, Type); } diff --git a/code/ryzom/client/src/continent_manager_build.h b/code/ryzom/client/src/continent_manager_build.h index 0f320588a..52719f9ad 100644 --- a/code/ryzom/client/src/continent_manager_build.h +++ b/code/ryzom/client/src/continent_manager_build.h @@ -52,7 +52,7 @@ public: Pos.y = 0.0f; } - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serialVersion(1); f.serialEnum(Type); diff --git a/code/ryzom/client/src/entities.cpp b/code/ryzom/client/src/entities.cpp index 2e5555b79..7d16e51dc 100644 --- a/code/ryzom/client/src/entities.cpp +++ b/code/ryzom/client/src/entities.cpp @@ -2165,7 +2165,7 @@ void CEntityManager::writeEntities() // serial // Serialize entities. //----------------------------------------------- -void CEntityManager::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CEntityManager::serial(NLMISC::IStream &f) { // Get nb max entities possible. f.serial(_NbMaxEntity); diff --git a/code/ryzom/client/src/entities.h b/code/ryzom/client/src/entities.h index 014020d6b..fb8504fc1 100644 --- a/code/ryzom/client/src/entities.h +++ b/code/ryzom/client/src/entities.h @@ -369,7 +369,7 @@ public: sint64 getLogStageChangeStartLocalTime() const; /// Serialize entities. - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); // remove all attached fx of all entities (so that they can be reloaded) virtual void removeAllAttachedFX(); diff --git a/code/ryzom/client/src/entity_animation_manager.cpp b/code/ryzom/client/src/entity_animation_manager.cpp index 98a56cc3c..02ed9969b 100644 --- a/code/ryzom/client/src/entity_animation_manager.cpp +++ b/code/ryzom/client/src/entity_animation_manager.cpp @@ -493,7 +493,7 @@ NL3D::UPlayList *CEntityAnimationManager::createPlayList() const // serial : // Serialize a CEntityAnimationManager. //----------------------------------------------- -void CEntityAnimationManager::serial(class NLMISC::IStream &/* f */) throw(NLMISC::EStream) +void CEntityAnimationManager::serial(NLMISC::IStream &/* f */) { }// serial // diff --git a/code/ryzom/client/src/entity_animation_manager.h b/code/ryzom/client/src/entity_animation_manager.h index 31c914cfe..369be3332 100644 --- a/code/ryzom/client/src/entity_animation_manager.h +++ b/code/ryzom/client/src/entity_animation_manager.h @@ -320,7 +320,7 @@ public : /// Serialize a CEntityAnimationManager. - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); /** Count the number of emot * \return uint : the number of emot already known. diff --git a/code/ryzom/client/src/entity_cl.cpp b/code/ryzom/client/src/entity_cl.cpp index f09dba9f3..98d4c619c 100644 --- a/code/ryzom/client/src/entity_cl.cpp +++ b/code/ryzom/client/src/entity_cl.cpp @@ -2176,7 +2176,7 @@ void CEntityCL::displayDebugPropertyStages(float /* x */, float &y, float /* lin // serial : // Serialize entity. //----------------------------------------------- -void CEntityCL::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CEntityCL::serial(NLMISC::IStream &f) { readWrite(f); if(f.isReading()) @@ -2187,7 +2187,7 @@ void CEntityCL::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) // readWrite : // Read/Write Variables from/to the stream. //----------------------------------------------- -void CEntityCL::readWrite(class NLMISC::IStream &f) throw(NLMISC::EStream) // virtual +void CEntityCL::readWrite(NLMISC::IStream &f) // virtual { f.serialVersion(4); diff --git a/code/ryzom/client/src/entity_cl.h b/code/ryzom/client/src/entity_cl.h index d9cdd5927..9d9b4481a 100644 --- a/code/ryzom/client/src/entity_cl.h +++ b/code/ryzom/client/src/entity_cl.h @@ -651,7 +651,7 @@ public: /// Serialize entity. - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); // return vector of ground fxs sorted by ground type, or NULL is ground fxs are not supported for the entity virtual const std::vector *getGroundFX() const { return NULL; } @@ -1210,7 +1210,7 @@ public: //@} // Read/Write Variables from/to the stream. - virtual void readWrite(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void readWrite(NLMISC::IStream &f); // To call after a read from a stream to re-initialize the entity. virtual void load(); diff --git a/code/ryzom/client/src/interface_v3/filtered_chat_summary.cpp b/code/ryzom/client/src/interface_v3/filtered_chat_summary.cpp index d4a00e8e4..826644f4e 100644 --- a/code/ryzom/client/src/interface_v3/filtered_chat_summary.cpp +++ b/code/ryzom/client/src/interface_v3/filtered_chat_summary.cpp @@ -20,7 +20,7 @@ #include "filtered_chat_summary.h" //=================================================================================== -void CFilteredChatSummary::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CFilteredChatSummary::serial(NLMISC::IStream &f) { sint ver= f.serialVersion(2); f.serialCheck(NELID("USHC")); @@ -39,7 +39,7 @@ void CFilteredChatSummary::serial(NLMISC::IStream &f) throw(NLMISC::EStream) } //=================================================================================== -void CFilteredDynChatSummary::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CFilteredDynChatSummary::serial(NLMISC::IStream &f) { sint ver = f.serialVersion(0); f.serialCheck(NELID("USHC")); diff --git a/code/ryzom/client/src/interface_v3/filtered_chat_summary.h b/code/ryzom/client/src/interface_v3/filtered_chat_summary.h index e4b357262..348522d99 100644 --- a/code/ryzom/client/src/interface_v3/filtered_chat_summary.h +++ b/code/ryzom/client/src/interface_v3/filtered_chat_summary.h @@ -36,7 +36,7 @@ public: // output CChatGroup::TGroupType Target; public: - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; // class for serialisation of user dyn chat (filtered chat) info @@ -48,7 +48,7 @@ public: // output CChatGroup::TGroupType Target; public: - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; diff --git a/code/ryzom/client/src/player_cl.cpp b/code/ryzom/client/src/player_cl.cpp index bfcb30f0e..e29a0a06e 100644 --- a/code/ryzom/client/src/player_cl.cpp +++ b/code/ryzom/client/src/player_cl.cpp @@ -1246,7 +1246,7 @@ void CPlayerCL::displayDebug(float x, float &y, float lineStep) // virtual // readWrite : // Read/Write Variables from/to the stream. //--------------------------------------------------- -void CPlayerCL::readWrite(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CPlayerCL::readWrite(NLMISC::IStream &f) { CCharacterCL::readWrite(f); diff --git a/code/ryzom/client/src/player_cl.h b/code/ryzom/client/src/player_cl.h index bb432e948..292461d3b 100644 --- a/code/ryzom/client/src/player_cl.h +++ b/code/ryzom/client/src/player_cl.h @@ -198,7 +198,7 @@ protected: virtual double getMaxSpeed() const; // Read/Write Variables from/to the stream. - virtual void readWrite(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void readWrite(NLMISC::IStream &f); // To call after a read from a stream to re-initialize the entity. virtual void load(); diff --git a/code/ryzom/client/src/player_r2_cl.cpp b/code/ryzom/client/src/player_r2_cl.cpp index d04c93012..3d0e6e4df 100644 --- a/code/ryzom/client/src/player_r2_cl.cpp +++ b/code/ryzom/client/src/player_r2_cl.cpp @@ -987,7 +987,7 @@ void CPlayerR2CL::displayDebug(float x, float &y, float lineStep) // virtual // readWrite : // Read/Write Variables from/to the stream. //--------------------------------------------------- -void CPlayerR2CL::readWrite(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CPlayerR2CL::readWrite(NLMISC::IStream &f) { CCharacterCL::readWrite(f); diff --git a/code/ryzom/client/src/player_r2_cl.h b/code/ryzom/client/src/player_r2_cl.h index a070afef9..9e00d40d0 100644 --- a/code/ryzom/client/src/player_r2_cl.h +++ b/code/ryzom/client/src/player_r2_cl.h @@ -179,7 +179,7 @@ protected: virtual double getMaxSpeed() const; // Read/Write Variables from/to the stream. - virtual void readWrite(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void readWrite(NLMISC::IStream &f); // To call after a read from a stream to re-initialize the entity. virtual void load(); diff --git a/code/ryzom/client/src/projectile_desc.h b/code/ryzom/client/src/projectile_desc.h index 83d0674ee..aca4805d2 100644 --- a/code/ryzom/client/src/projectile_desc.h +++ b/code/ryzom/client/src/projectile_desc.h @@ -39,7 +39,7 @@ public: /// Build the fx from an external script. void build(const NLGEORGES::UFormElm &item); /// Serialize a CAnimationFXSheet. - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); // build tracks for fxs, loading animation as necessary using the given animation set void buildTrack(NL3D::UAnimationSet *as); }; diff --git a/code/ryzom/client/src/stage.cpp b/code/ryzom/client/src/stage.cpp index 05db01768..71e4cd51d 100644 --- a/code/ryzom/client/src/stage.cpp +++ b/code/ryzom/client/src/stage.cpp @@ -152,7 +152,7 @@ bool CStage::getPos(NLMISC::CVectorD &pos) const // serial : // Serialize entities. //----------------------------------------------- -void CStage::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CStage::serial(NLMISC::IStream &f) { f.serial(_Time); f.serialCont(_Stage); @@ -272,7 +272,7 @@ CStage *CStageSet::addStage(NLMISC::TGameCycle gameCycle, uint property, sint64 // serial : // Serialize entities. //----------------------------------------------- -void CStageSet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CStageSet::serial(NLMISC::IStream &f) { // Serialize the map. f.serialCont(_StageSet); diff --git a/code/ryzom/client/src/stage.h b/code/ryzom/client/src/stage.h index b86a68cf2..0695721a7 100644 --- a/code/ryzom/client/src/stage.h +++ b/code/ryzom/client/src/stage.h @@ -112,7 +112,7 @@ public: sint32 getLCTImpact() const {return _LCTImpact;} /// Serialize entities. - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); }; /** @@ -145,7 +145,7 @@ public: CStage *addStage(NLMISC::TGameCycle gameCycle, uint property, sint64 value, NLMISC::TGameCycle predictedI); /// Serialize entities. - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); /// Remove Positions except for those with a mode. void removePosWithNoMode(); }; diff --git a/code/ryzom/client/src/user_entity.cpp b/code/ryzom/client/src/user_entity.cpp index 180832d7d..25096f304 100644 --- a/code/ryzom/client/src/user_entity.cpp +++ b/code/ryzom/client/src/user_entity.cpp @@ -3710,7 +3710,7 @@ bool CUserEntity::isVisible() const // virtual // readWrite : // Read/Write Variables from/to the stream. //--------------------------------------------------- -void CUserEntity::readWrite(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CUserEntity::readWrite(NLMISC::IStream &f) { CPlayerCL::readWrite(f); diff --git a/code/ryzom/client/src/user_entity.h b/code/ryzom/client/src/user_entity.h index 11501d2a0..ae4730f32 100644 --- a/code/ryzom/client/src/user_entity.h +++ b/code/ryzom/client/src/user_entity.h @@ -509,7 +509,7 @@ protected: _ServerFactor = 0.1; } - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) {f.serial(_Value);} + virtual void serial(NLMISC::IStream &f) {f.serial(_Value);} protected: /// Method called when the ping message is back. virtual void update(NLMISC::ICDBNode* leaf); @@ -527,7 +527,7 @@ protected: void release(); /// Return true if the mount can run. Precondition: UserEntity->isRiding(). bool canRun() const; - virtual void serial(class NLMISC::IStream &/* f */) throw(NLMISC::EStream) {} + virtual void serial(NLMISC::IStream &/* f */) {} }; class CMountSpeeds : public NLMISC::ICDBNode::IPropertyObserver @@ -686,7 +686,7 @@ protected: virtual double getMaxSpeed() const; /// Read/Write Variables from/to the stream. - virtual void readWrite(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void readWrite(NLMISC::IStream &f); /// To call after a read from a stream to re-initialize the entity. virtual void load(); diff --git a/code/ryzom/common/src/game_share/character_summary.cpp b/code/ryzom/common/src/game_share/character_summary.cpp index 7b0a9f958..005f488dd 100644 --- a/code/ryzom/common/src/game_share/character_summary.cpp +++ b/code/ryzom/common/src/game_share/character_summary.cpp @@ -17,7 +17,7 @@ #include "stdpch.h" #include "character_summary.h" -void CCharacterSummary::serial(class NLMISC::IStream &f) throw (NLMISC::EStream) +void CCharacterSummary::serial(NLMISC::IStream &f) { f.serialVersion(0); f.serial (Mainland); diff --git a/code/ryzom/common/src/game_share/character_summary.h b/code/ryzom/common/src/game_share/character_summary.h index bc990d45d..ff16ef728 100644 --- a/code/ryzom/common/src/game_share/character_summary.h +++ b/code/ryzom/common/src/game_share/character_summary.h @@ -77,7 +77,7 @@ struct CCharacterSummary bool InNewbieland; /// serialisation coming from a stream (net message) - void serial(class NLMISC::IStream &f) throw (NLMISC::EStream); + void serial(NLMISC::IStream &f) throw (NLMISC::EStream); }; #endif diff --git a/code/ryzom/common/src/game_share/dir_light_setup.h b/code/ryzom/common/src/game_share/dir_light_setup.h index 805c0b40a..208ab5cc0 100644 --- a/code/ryzom/common/src/game_share/dir_light_setup.h +++ b/code/ryzom/common/src/game_share/dir_light_setup.h @@ -54,7 +54,7 @@ struct CDirLightSetup */ bool build(const NLGEORGES::UFormElm &elm); // - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial(Ambiant, Diffuse, Specular, Direction); } diff --git a/code/ryzom/common/src/game_share/far_position.h b/code/ryzom/common/src/game_share/far_position.h index 36f46984b..f6b46fab3 100644 --- a/code/ryzom/common/src/game_share/far_position.h +++ b/code/ryzom/common/src/game_share/far_position.h @@ -94,7 +94,7 @@ public: /** * Serial */ - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial(X); f.serial(Y); @@ -150,7 +150,7 @@ public: /** * Serial */ - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial(SessionId); f.serial(PosState); diff --git a/code/ryzom/common/src/game_share/fog_map_build.cpp b/code/ryzom/common/src/game_share/fog_map_build.cpp index 9e715e7b3..8b7c930f9 100644 --- a/code/ryzom/common/src/game_share/fog_map_build.cpp +++ b/code/ryzom/common/src/game_share/fog_map_build.cpp @@ -20,7 +20,7 @@ #include "fog_map_build.h" //=================================================================== -void CFogMapBuild::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CFogMapBuild::serial(NLMISC::IStream &f) { for(uint k = 0; k < NumMap; ++k) { diff --git a/code/ryzom/common/src/game_share/fog_map_build.h b/code/ryzom/common/src/game_share/fog_map_build.h index 390f94737..c4585cd4e 100644 --- a/code/ryzom/common/src/game_share/fog_map_build.h +++ b/code/ryzom/common/src/game_share/fog_map_build.h @@ -33,7 +33,7 @@ public: std::string ZoneMin; std::string ZoneMax; public: - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; #endif diff --git a/code/ryzom/common/src/game_share/fog_of_war.cpp b/code/ryzom/common/src/game_share/fog_of_war.cpp index 6bc3c93aa..435f26256 100644 --- a/code/ryzom/common/src/game_share/fog_of_war.cpp +++ b/code/ryzom/common/src/game_share/fog_of_war.cpp @@ -61,7 +61,7 @@ void IFogOfWar::explore(float worldPosX, float worldPosY) } // **************************************************************************** -void IFogOfWar::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void IFogOfWar::serial(NLMISC::IStream &f) { f.serialVersion(0); diff --git a/code/ryzom/common/src/game_share/fog_of_war.h b/code/ryzom/common/src/game_share/fog_of_war.h index e7ed58663..56f8677be 100644 --- a/code/ryzom/common/src/game_share/fog_of_war.h +++ b/code/ryzom/common/src/game_share/fog_of_war.h @@ -63,7 +63,7 @@ public: // Serialize the map - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; #endif diff --git a/code/ryzom/common/src/game_share/light_cycle.h b/code/ryzom/common/src/game_share/light_cycle.h index d0fb108e7..c4682778f 100644 --- a/code/ryzom/common/src/game_share/light_cycle.h +++ b/code/ryzom/common/src/game_share/light_cycle.h @@ -41,7 +41,7 @@ struct CSeasonLightCycle // build from a Georges form void build(const NLGEORGES::UFormElm &item); // serial in a stream - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial(DayHour, DayToDuskHour, DuskToNightHour, NightHour, NightToDayHour); } @@ -64,7 +64,7 @@ struct CLightCycle // Build from a sheet file void build(const char *sheetName); // - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial(RealDayLength, NumHours, MaxNumColorSteps); for(uint k = 0; k < EGSPD::CSeason::Invalid; ++k) diff --git a/code/ryzom/common/src/game_share/mainland_summary.h b/code/ryzom/common/src/game_share/mainland_summary.h index a6ed6a9ca..81c001caa 100644 --- a/code/ryzom/common/src/game_share/mainland_summary.h +++ b/code/ryzom/common/src/game_share/mainland_summary.h @@ -53,7 +53,7 @@ struct CMainlandSummary bool Online; /// serialisation coming from a stream (net message) - void serial(class NLMISC::IStream &f) throw (NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial( Id ); f.serial( Name ); diff --git a/code/ryzom/common/src/game_share/r2_types.h b/code/ryzom/common/src/game_share/r2_types.h index c35e02b42..797629cf7 100644 --- a/code/ryzom/common/src/game_share/r2_types.h +++ b/code/ryzom/common/src/game_share/r2_types.h @@ -49,7 +49,7 @@ namespace R2 TR2TpInfos():UseTpMessage(false){} - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial(UseTpMessage); @@ -69,7 +69,7 @@ namespace R2 ucstring Comment; /// serial - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial( SheetId ); f.serial( Name ); @@ -84,7 +84,7 @@ namespace R2 uint32 Quantity; /// serial - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial( SheetId ); f.serial( Quantity ); @@ -203,7 +203,7 @@ namespace R2 uint32 LocationId; /// serial - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial( Name ); f.serial( Island ); @@ -229,7 +229,7 @@ namespace R2 uint32 Act; uint32 Id; - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial( Name ); f.serial( Act); @@ -354,7 +354,7 @@ namespace R2 typedef std::vector< std::pair< std::string ,std::string > > TValueType; public: TScenarioHeaderSerializer(TValueType value = TValueType() ):Value(value) {} - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { uint32 size = 0; if (!f.isReading() ) diff --git a/code/ryzom/common/src/game_share/seeds.h b/code/ryzom/common/src/game_share/seeds.h index fcb25aeb8..3c3a3dfcd 100644 --- a/code/ryzom/common/src/game_share/seeds.h +++ b/code/ryzom/common/src/game_share/seeds.h @@ -86,7 +86,7 @@ public: // Optimize a quantity of money so that the number of seeds is minimum void optimize(); // serial - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial( _LS, _MS, _BS, _VBS); } diff --git a/code/ryzom/common/src/game_share/skills_build.h b/code/ryzom/common/src/game_share/skills_build.h index 323330e0c..76dd8b7cc 100644 --- a/code/ryzom/common/src/game_share/skills_build.h +++ b/code/ryzom/common/src/game_share/skills_build.h @@ -37,7 +37,7 @@ struct CSkillSummary CSkillSummary(uint16 id, uint16 value) : ID(id), Value(value) {} uint16 ID; /* see enum ESkills in skills.h */ uint16 Value; - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + virtual void serial(NLMISC::IStream &f) { f.serial(ID, Value); } diff --git a/code/ryzom/common/src/game_share/time_weather_season/static_light_cycle.h b/code/ryzom/common/src/game_share/time_weather_season/static_light_cycle.h index b7aa6edbe..21e6b2d37 100644 --- a/code/ryzom/common/src/game_share/time_weather_season/static_light_cycle.h +++ b/code/ryzom/common/src/game_share/time_weather_season/static_light_cycle.h @@ -41,7 +41,7 @@ public: float NightToDayHour; /// serialize - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial( DayHour ); f.serial( DayToDuskHour ); @@ -54,7 +54,7 @@ public: std::vector< SLightCycle > LightCycles; /// serialize - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serialCont( LightCycles ); } diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_function_params_sheet_base.cpp b/code/ryzom/common/src/game_share/time_weather_season/weather_function_params_sheet_base.cpp index f5707b148..01e4d9ba5 100644 --- a/code/ryzom/common/src/game_share/time_weather_season/weather_function_params_sheet_base.cpp +++ b/code/ryzom/common/src/game_share/time_weather_season/weather_function_params_sheet_base.cpp @@ -55,7 +55,7 @@ void CWeatherFunctionParamsSheetBase::build(const NLGEORGES::UFormElm &item) } //======================================================================= -void CWeatherFunctionParamsSheetBase::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CWeatherFunctionParamsSheetBase::serial(NLMISC::IStream &f) { f.serial(DayLength); f.serial(CycleLength); diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_function_params_sheet_base.h b/code/ryzom/common/src/game_share/time_weather_season/weather_function_params_sheet_base.h index 695082eb5..34b8fae5a 100644 --- a/code/ryzom/common/src/game_share/time_weather_season/weather_function_params_sheet_base.h +++ b/code/ryzom/common/src/game_share/time_weather_season/weather_function_params_sheet_base.h @@ -50,7 +50,7 @@ public: CWeatherFunctionParamsSheetBase(); // void build(const NLGEORGES::UFormElm &item); - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); // void build(const std::string &sheetName); diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_function_sheet.cpp b/code/ryzom/common/src/game_share/time_weather_season/weather_function_sheet.cpp index 23f41abbb..0645b554e 100644 --- a/code/ryzom/common/src/game_share/time_weather_season/weather_function_sheet.cpp +++ b/code/ryzom/common/src/game_share/time_weather_season/weather_function_sheet.cpp @@ -103,7 +103,7 @@ void CWeatherFunctionSheet::build(const NLGEORGES::UFormElm &item) //============================================================================= -void CWeatherFunctionSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CWeatherFunctionSheet::serial(NLMISC::IStream &f) { f.serial(VegetableMinBendIntensity); f.serial(VegetableMaxBendIntensity); diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_function_sheet.h b/code/ryzom/common/src/game_share/time_weather_season/weather_function_sheet.h index 0f9ead2bb..03a9f70a5 100644 --- a/code/ryzom/common/src/game_share/time_weather_season/weather_function_sheet.h +++ b/code/ryzom/common/src/game_share/time_weather_season/weather_function_sheet.h @@ -69,7 +69,7 @@ public: CWeatherFunctionSheet(); void build(const NLGEORGES::UFormElm &item); - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.cpp b/code/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.cpp index 345b0e4a2..a1a56f18e 100644 --- a/code/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.cpp +++ b/code/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.cpp @@ -108,7 +108,7 @@ void CWeatherStateSheet::build(const NLGEORGES::UFormElm &item) //================================================================================== -void CWeatherStateSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CWeatherStateSheet::serial(NLMISC::IStream &f) { f.serial(BestSetupName); f.serial(FogRatio); @@ -163,7 +163,7 @@ void CCloudStateSheet::build(const NLGEORGES::UFormElm &item) } //================================================================================== -void CCloudStateSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CCloudStateSheet::serial(NLMISC::IStream &f) { f.serial(AmbientDay); f.serial(DiffuseDay); @@ -196,7 +196,7 @@ void CWeatherSetupSheetBase::build(const NLGEORGES::UFormElm &item) } //================================================================================== -void CWeatherSetupSheetBase::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CWeatherSetupSheetBase::serial(NLMISC::IStream &f) { f.serial(WeatherState, CloudState); if (f.isReading()) diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.h b/code/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.h index 9be26d11b..b7db00e01 100644 --- a/code/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.h +++ b/code/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.h @@ -48,7 +48,7 @@ public: CFXInfos() { Ratio = 0.0f; } - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial(Name, Ratio); } @@ -86,7 +86,7 @@ public: */ void build(const NLGEORGES::UFormElm &item); // - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; // state of weather, including clouds @@ -106,7 +106,7 @@ public: // Build from a georges sheet void build(const NLGEORGES::UFormElm &item); // - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; @@ -127,7 +127,7 @@ public: CWeatherSetupSheetBase(); // build from an external sheet void build(const NLGEORGES::UFormElm &item); - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); // void readGeorges (const NLGEORGES::UForm *form, const NLMISC::CSheetId &sheetId); diff --git a/code/ryzom/common/src/game_share/type_skill_mod.h b/code/ryzom/common/src/game_share/type_skill_mod.h index 8a37a4763..9e856f7da 100644 --- a/code/ryzom/common/src/game_share/type_skill_mod.h +++ b/code/ryzom/common/src/game_share/type_skill_mod.h @@ -29,7 +29,7 @@ struct CTypeSkillMod CTypeSkillMod() : Modifier(0),Type(EGSPD::CClassificationType::Unknown) {} - void serial(class NLMISC::IStream &f) + void serial(NLMISC::IStream &f) { f.serialEnum( Type ); f.serial( Modifier ); diff --git a/code/ryzom/common/src/game_share/visual_slot_manager.h b/code/ryzom/common/src/game_share/visual_slot_manager.h index ee9d8371a..4fd46cd81 100644 --- a/code/ryzom/common/src/game_share/visual_slot_manager.h +++ b/code/ryzom/common/src/game_share/visual_slot_manager.h @@ -59,7 +59,7 @@ public: NLMISC::CSheetId SheetId; /// Load/Save the values using the serial system - void serial(class NLMISC::IStream &s) throw(NLMISC::EStream) + void serial(NLMISC::IStream &s) { s.serial(Index); s.serial(SheetId); @@ -76,7 +76,7 @@ public: SheetIdToIndexMapType SheetIdToIndexMap; /// Load/Save the values using the serial system - void serial(class NLMISC::IStream &s) throw(NLMISC::EStream) + void serial(NLMISC::IStream &s) { s.serialCont(Element); } diff --git a/code/ryzom/server/src/ai_data_service/ai_manager.h b/code/ryzom/server/src/ai_data_service/ai_manager.h index 59bd507fd..339e044bc 100644 --- a/code/ryzom/server/src/ai_data_service/ai_manager.h +++ b/code/ryzom/server/src/ai_data_service/ai_manager.h @@ -56,7 +56,7 @@ public: } SMgrDfnElm(const SMgrDfnElm &other): Action(other.Action), Args(other.Args) {} - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { //f.xmlPushBegin("CMD"); std::string s=getAction(); @@ -106,7 +106,7 @@ public: Child(other.Child) {} - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial(Name); f.serialCont(Data); diff --git a/code/ryzom/server/src/ai_share/ai_actions.h b/code/ryzom/server/src/ai_share/ai_actions.h index aa245b5c1..98c387d43 100644 --- a/code/ryzom/server/src/ai_share/ai_actions.h +++ b/code/ryzom/server/src/ai_share/ai_actions.h @@ -105,7 +105,7 @@ public: return ""; } - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serialEnum(_type); switch(_type) diff --git a/code/ryzom/server/src/ai_share/ai_event.cpp b/code/ryzom/server/src/ai_share/ai_event.cpp index ea1745bcd..1d509397a 100644 --- a/code/ryzom/server/src/ai_share/ai_event.cpp +++ b/code/ryzom/server/src/ai_share/ai_event.cpp @@ -36,7 +36,7 @@ NL_INSTANCE_COUNTER_IMPL(CAIStunEndEvent); //-------------------------------------------------------------- // CAIStunEvent::serial() //-------------------------------------------------------------- -void CAIStunEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CAIStunEvent::serial(NLMISC::IStream &f) { if (f.isReading() ) { @@ -81,7 +81,7 @@ void CAIStunEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream) //-------------------------------------------------------------- // CAIAggroEvent::serial() //-------------------------------------------------------------- -void CAIAggroEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CAIAggroEvent::serial(NLMISC::IStream &f) { if (f.isReading() ) { @@ -133,7 +133,7 @@ void CAIAggroEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream) //-------------------------------------------------------------- // CAIStunEndEvent::serial() //-------------------------------------------------------------- -void CAIStunEndEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CAIStunEndEvent::serial(NLMISC::IStream &f) { if (f.isReading() ) { @@ -179,7 +179,7 @@ void CAIStunEndEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream) //-------------------------------------------------------------- // CAISurvivalInstinctEvent::serial() //-------------------------------------------------------------- -void CAISurvivalInstinctEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CAISurvivalInstinctEvent::serial(NLMISC::IStream &f) { if (f.isReading() ) { @@ -231,7 +231,7 @@ void CAISurvivalInstinctEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream) //-------------------------------------------------------------- // CAIFearEvent::serial() //-------------------------------------------------------------- -void CAIFearEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CAIFearEvent::serial(NLMISC::IStream &f) { if (f.isReading() ) { @@ -278,7 +278,7 @@ void CAIFearEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream) //-------------------------------------------------------------- // CAIFearEndEvent::serial() //-------------------------------------------------------------- -void CAIFearEndEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CAIFearEndEvent::serial(NLMISC::IStream &f) { if (f.isReading() ) { @@ -326,7 +326,7 @@ void CAIFearEndEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream) //-------------------------------------------------------------- // CAIHungerEvent::serial() //-------------------------------------------------------------- -void CAIHungerEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CAIHungerEvent::serial(NLMISC::IStream &f) { if (f.isReading() ) { diff --git a/code/ryzom/server/src/ai_share/ai_event.h b/code/ryzom/server/src/ai_share/ai_event.h index 55f179861..be567b8f2 100644 --- a/code/ryzom/server/src/ai_share/ai_event.h +++ b/code/ryzom/server/src/ai_share/ai_event.h @@ -115,7 +115,7 @@ public: return _val>other._val; } - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial(_val); } @@ -151,7 +151,7 @@ public: // serial() // note serial should serialise: // the 'read' version of the serial should test the to ensure version robustness - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) = 0; + virtual void serial(NLMISC::IStream &f) = 0; }; @@ -173,7 +173,7 @@ public: // serial() // note serial should serialise: // the 'read' version of the serial should test the to ensure version robustness - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); public: /// the stunned creature id @@ -199,7 +199,7 @@ public: // serial() // note serial should serialise: // the 'read' version of the serial should test the to ensure version robustness - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); public: /// the waked creature id @@ -227,7 +227,7 @@ public: // serial() // note serial should serialise: // the 'read' version of the serial should test the to ensure version robustness - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); public: /// the creature Id @@ -259,7 +259,7 @@ public: // serial() // note serial should serialise: // the 'read' version of the serial should test the to ensure version robustness - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); public: /// the affected creature id @@ -291,7 +291,7 @@ public: // serial() // note serial should serialise: // the 'read' version of the serial should test the to ensure version robustness - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); public: /// the creature id @@ -317,7 +317,7 @@ public: // serial() // note serial should serialise: // the 'read' version of the serial should test the to ensure version robustness - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); public: /// the creature id @@ -342,7 +342,7 @@ public: // serial() // note serial should serialise: // the 'read' version of the serial should test the to ensure version robustness - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); public: /// the affected creature id diff --git a/code/ryzom/server/src/entities_game_service/character_structure/character_sentence.h b/code/ryzom/server/src/entities_game_service/character_structure/character_sentence.h index 529f3acfc..cf9a9ec84 100644 --- a/code/ryzom/server/src/entities_game_service/character_structure/character_sentence.h +++ b/code/ryzom/server/src/entities_game_service/character_structure/character_sentence.h @@ -31,7 +31,7 @@ public: std::vector BricksIndexInSentence; /// Serialisation - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial( Name ); f.serialCont( BricksIds ); diff --git a/code/ryzom/server/src/entities_game_service/character_structure/pact_class.h b/code/ryzom/server/src/entities_game_service/character_structure/pact_class.h index 5c9fe4dba..413e401d4 100644 --- a/code/ryzom/server/src/entities_game_service/character_structure/pact_class.h +++ b/code/ryzom/server/src/entities_game_service/character_structure/pact_class.h @@ -57,7 +57,7 @@ struct CPact DECLARE_PERSISTENCE_METHODS - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial( PactNature ); f.serial( PactType ); diff --git a/code/ryzom/server/src/entities_game_service/creature_manager/harvestable.h b/code/ryzom/server/src/entities_game_service/creature_manager/harvestable.h index f966e6cb0..223b96edb 100644 --- a/code/ryzom/server/src/entities_game_service/creature_manager/harvestable.h +++ b/code/ryzom/server/src/entities_game_service/creature_manager/harvestable.h @@ -50,7 +50,7 @@ struct CCreatureRawMaterial /** * Serial */ - inline void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + inline void serial(NLMISC::IStream &f) { f.serial( MpCommon ); f.serial( Quantity ); @@ -88,7 +88,7 @@ public: /** * Serial */ - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serialCont( _Mps ); f.serialEnum( _HarvestSkill ); diff --git a/code/ryzom/server/src/entities_game_service/creature_manager/mp.h b/code/ryzom/server/src/entities_game_service/creature_manager/mp.h index 0f94bca00..6c91d2773 100644 --- a/code/ryzom/server/src/entities_game_service/creature_manager/mp.h +++ b/code/ryzom/server/src/entities_game_service/creature_manager/mp.h @@ -59,7 +59,7 @@ public: {} /// serial - void serial(class NLMISC::IStream &f) + void serial(NLMISC::IStream &f) { f.serial( Name ); f.serial( AssociatedItemName ); diff --git a/code/ryzom/server/src/entities_game_service/deposit.h b/code/ryzom/server/src/entities_game_service/deposit.h index 24ca5830d..b409bda32 100644 --- a/code/ryzom/server/src/entities_game_service/deposit.h +++ b/code/ryzom/server/src/entities_game_service/deposit.h @@ -200,7 +200,7 @@ struct CDepositState { float currentQuantity; uint32 nextRespawnDay; CDepositState() : alias(0), currentQuantity(0.f), nextRespawnDay(0) {} - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { if(f.isXML()) { diff --git a/code/ryzom/server/src/entities_game_service/deposit_raw_material.h b/code/ryzom/server/src/entities_game_service/deposit_raw_material.h index 967011ae2..de3766d33 100644 --- a/code/ryzom/server/src/entities_game_service/deposit_raw_material.h +++ b/code/ryzom/server/src/entities_game_service/deposit_raw_material.h @@ -34,7 +34,7 @@ struct CDepositRawMaterial } /// serialize -// void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +// void serial(NLMISC::IStream &f) // { // } }; diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_ai_action.cpp b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_ai_action.cpp index 57f4cca12..f61e11c6a 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_ai_action.cpp +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_ai_action.cpp @@ -206,7 +206,7 @@ namespace DURATION_TYPE //-------------------------------------------------------------- // CCombatParams::serial //-------------------------------------------------------------- -void CCombatParams::serial(class NLMISC::IStream &f) +void CCombatParams::serial(NLMISC::IStream &f) { f.serial(Melee); f.serial(SpeedFactor); @@ -325,7 +325,7 @@ void CCombatParams::readForm (const UFormElm &root, const NLMISC::CSheetId &shee //-------------------------------------------------------------- // CSpellParams::serial //-------------------------------------------------------------- -void CSpellParams::serial(class NLMISC::IStream &f) +void CSpellParams::serial(NLMISC::IStream &f) { f.serial(CastingTime); f.serial(PostActionTime); @@ -454,7 +454,7 @@ void COTSpellParams::readForm (const UFormElm &root, const NLMISC::CSheetId &she //-------------------------------------------------------------- // CEffectSpellParams::serial //-------------------------------------------------------------- -void CEffectSpellParams::serial(class NLMISC::IStream &f) +void CEffectSpellParams::serial(NLMISC::IStream &f) { CSpellParams::serial(f); @@ -500,7 +500,7 @@ void CEffectSpellParams::readForm (const UFormElm &root, const NLMISC::CSheetId //-------------------------------------------------------------- // COTEffectSpellParams::serial //-------------------------------------------------------------- -void COTEffectSpellParams::serial(class NLMISC::IStream &f) +void COTEffectSpellParams::serial(NLMISC::IStream &f) { COTSpellParams::serial(f); @@ -534,7 +534,7 @@ void COTEffectSpellParams::readForm (const UFormElm &root, const NLMISC::CSheetI //-------------------------------------------------------------- // TAiArea::serial //-------------------------------------------------------------- -void TAiArea::serial(class NLMISC::IStream &f) +void TAiArea::serial(NLMISC::IStream &f) { if (f.isReading() ) { @@ -674,7 +674,7 @@ void CStaticAiAction::readGeorges (const NLMISC::CSmartPtr &fo //-------------------------------------------------------------- // CStaticAiAction::readGeorges //-------------------------------------------------------------- -void CStaticAiAction::serial(class NLMISC::IStream &f) +void CStaticAiAction::serial(NLMISC::IStream &f) { f.serial(_SheetId); diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_ai_action.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_ai_action.h index 69f2eede9..b4504907d 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_ai_action.h +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_ai_action.h @@ -145,7 +145,7 @@ struct CCombatParams } /// Serial - void serial(class NLMISC::IStream &f); + void serial(NLMISC::IStream &f); /// read params from georges void readForm (const NLGEORGES::UFormElm &root, const NLMISC::CSheetId &sheetId, AI_ACTION::TAiActionType type); @@ -207,7 +207,7 @@ struct CSpellParams } /// Serial - void serial(class NLMISC::IStream &f); + void serial(NLMISC::IStream &f); /// read params from georges void readForm (const NLGEORGES::UFormElm &root, const NLMISC::CSheetId &sheetId, AI_ACTION::TAiActionType type); @@ -253,7 +253,7 @@ struct COTSpellParams : public CSpellParams } /// Serial - void serial(class NLMISC::IStream &f) + void serial(NLMISC::IStream &f) { CSpellParams::serial(f); f.serial(UpdateFrequency); @@ -300,7 +300,7 @@ struct CEffectSpellParams : public CSpellParams } /// Serial - void serial(class NLMISC::IStream &f); + void serial(NLMISC::IStream &f); /// read params from georges void readForm (const NLGEORGES::UFormElm &root, const NLMISC::CSheetId &sheetId, AI_ACTION::TAiActionType type); @@ -329,7 +329,7 @@ struct COTEffectSpellParams : public COTSpellParams } /// Serial - void serial(class NLMISC::IStream &f); + void serial(NLMISC::IStream &f); /// read params from georges void readForm (const NLGEORGES::UFormElm &root, const NLMISC::CSheetId &sheetId, AI_ACTION::TAiActionType type); @@ -362,7 +362,7 @@ struct TAiArea {} /// Serial - void serial(class NLMISC::IStream &f); + void serial(NLMISC::IStream &f); /// read params from georges void readForm (const NLGEORGES::UFormElm &root, const NLMISC::CSheetId &sheetId, AI_ACTION::TAiActionType type); @@ -408,7 +408,7 @@ public: inline static uint getVersion () { return 21; } /// Serial - void serial(class NLMISC::IStream &f); + void serial(NLMISC::IStream &f); /// Removed void removed() {} diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.cpp b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.cpp index b51031750..a1b0d8fb1 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.cpp +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.cpp @@ -90,7 +90,7 @@ CStaticBrick::~CStaticBrick() //-------------------------------------------------------------- // serial() //-------------------------------------------------------------- -void CStaticBrick::serial(class NLMISC::IStream &f) +void CStaticBrick::serial(NLMISC::IStream &f) { f.serial( Name ); f.serial( SheetId ); diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.h index 2eef41e0d..2474503fa 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.h +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.h @@ -104,7 +104,7 @@ public: // Quantity of this Mp needed uint16 Quantity; - void serial(class NLMISC::IStream &f) + void serial(NLMISC::IStream &f) { f.serialEnum( MpType ); f.serial( Quantity ); @@ -118,7 +118,7 @@ public: // Quantity of this Mp needed uint16 Quantity; - void serial(class NLMISC::IStream &f) + void serial(NLMISC::IStream &f) { f.serial( MpType ); f.serial( Quantity ); @@ -176,7 +176,7 @@ public: AllowPartialSuccess= true; } - void serial(class NLMISC::IStream &f) + void serial(NLMISC::IStream &f) { f.serial( CraftedItem ); f.serial( NbItemsPerUnit ); @@ -428,7 +428,7 @@ public: virtual ~CStaticBrick(); /// Serialisation - virtual void serial(class NLMISC::IStream &f); + virtual void serial(NLMISC::IStream &f); /// read georges sheet void readGeorges (const NLMISC::CSmartPtr &form, const NLMISC::CSheetId &sheetId); diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_deposit.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_deposit.h index c7af1da7f..a7ad38f5d 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_deposit.h +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_deposit.h @@ -39,7 +39,7 @@ public: NLMISC::CSheetId MaterialSheet; //uint16 MaxAmount; - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial( MaterialSheet ); //f.serial( MaxAmount ); @@ -71,7 +71,7 @@ public : void removed() {} /// Serialize deposit - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) {} };*/ diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_emot.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_emot.h index ce0c388ad..92a4e1251 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_emot.h +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_emot.h @@ -40,7 +40,7 @@ public: /// Return the version of this class, increments this value when the content of this class has changed inline static uint getVersion () { return 1; } /// Serial - void serial(class NLMISC::IStream &f) + void serial(NLMISC::IStream &f) { f.serialCont( _Anims ); if (f.isReading()) diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_encyclo.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_encyclo.h index 2a9b67180..2fee7560a 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_encyclo.h +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_encyclo.h @@ -46,7 +46,7 @@ public: /// Return the version of this class, increments this value when the content of this class has changed inline static uint getVersion () { return 1; } /// Serial - void serial(class NLMISC::IStream &f) + void serial(NLMISC::IStream &f) { f.serial( AlbumNumber ); f.serial( Title ); @@ -87,7 +87,7 @@ public: /// Return the version of this class, increments this value when the content of this class has changed inline static uint getVersion () { return 1; } /// Serial - void serial(class NLMISC::IStream &f) + void serial(NLMISC::IStream &f) { f.serial( ThemaNumber ); f.serial( Title ); diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.cpp b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.cpp index 8e81aa2cc..da47899ad 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.cpp +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.cpp @@ -89,7 +89,7 @@ namespace GUILD_OPTION } //-------------------------------------------------------------- -void CCosmetics::serial(class NLMISC::IStream &f) +void CCosmetics::serial(NLMISC::IStream &f) { f.serial( VPValue ); } @@ -107,7 +107,7 @@ IItemServiceData * IItemServiceData::buildItemServiceData(ITEM_SERVICE_TYPE::TIt } //-------------------------------------------------------------- -void CConsumable::serial(class NLMISC::IStream &f) +void CConsumable::serial(NLMISC::IStream &f) { f.serial(LoopTimer); f.serial(MaxNbLoops); @@ -155,7 +155,7 @@ void CConsumable::serial(class NLMISC::IStream &f) //-------------------------------------------------------------- -void CXpCatalyser::serial(class NLMISC::IStream &f) +void CXpCatalyser::serial(NLMISC::IStream &f) { f.serial(IsRingCatalyser); f.serial(XpBonus); @@ -212,7 +212,7 @@ bool SItemSpecialEffect::build(std::string const& str) return false; } -void SItemSpecialEffect::serial(class NLMISC::IStream &f) +void SItemSpecialEffect::serial(NLMISC::IStream &f) { // Don't forget to change the SItem version and the code here if no more 4. nlctassert(MaxEffectPerItem==4); @@ -229,7 +229,7 @@ void SItemSpecialEffect::serial(class NLMISC::IStream &f) f.serial( EffectArgString[3] ); } -void SItemSpecialEffects::serial(class NLMISC::IStream &f) +void SItemSpecialEffects::serial(NLMISC::IStream &f) { f.serialCont(Effects); } @@ -1223,7 +1223,7 @@ void loadCommandTicket( NLGEORGES::UFormElm &root, CStaticItem *item, const NLMI //-------------------------------------------------------------- // serial() //-------------------------------------------------------------- -void CStaticItem::serial(class NLMISC::IStream &f) +void CStaticItem::serial(NLMISC::IStream &f) { f.serial( SheetId ); f.serialEnum( Origin ); 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 96aae2e98..3fb6770e9 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 @@ -58,7 +58,7 @@ struct TCommandTicket NL_INSTANCE_COUNTER_DECL(TCommandTicket); public: - virtual void serial(class NLMISC::IStream &f) + virtual void serial(NLMISC::IStream &f) { f.serial( Command ); f.serial( Priviledge ); @@ -108,7 +108,7 @@ struct CGuildOption NL_INSTANCE_COUNTER_DECL(CGuildOption); public: - virtual void serial(class NLMISC::IStream &f) + virtual void serial(NLMISC::IStream &f) { // f.serial( XpCost ); f.serial( MoneyCost ); @@ -142,7 +142,7 @@ public: CConsumable() : Family(0), LoopTimer(0), MaxNbLoops(1), OverdoseTimer(0), Data(0), ConsumptionTime(0) {} - virtual void serial(class NLMISC::IStream &f); + virtual void serial(NLMISC::IStream &f); uint16 Family; // consumable family, this is NOT PERSISTENT, use FAMILY AS A STRING @@ -209,7 +209,7 @@ public: CXpCatalyser() : IsRingCatalyser(false), XpBonus(100) {} - virtual void serial(class NLMISC::IStream &f); + virtual void serial(NLMISC::IStream &f); // true if this catalyser comes from ring session bool IsRingCatalyser; @@ -223,7 +223,7 @@ struct CCosmetics NL_INSTANCE_COUNTER_DECL(CCosmetics); public: - virtual void serial(class NLMISC::IStream &f); + virtual void serial(NLMISC::IStream &f); uint32 VPValue; }; @@ -238,7 +238,7 @@ struct SItemSpecialEffect SItemSpecialEffect() { } // return false if the effect cannot be built. + warning inside bool build(std::string const& str); - virtual void serial(class NLMISC::IStream &f); + virtual void serial(NLMISC::IStream &f); }; struct SItemSpecialEffects @@ -247,7 +247,7 @@ struct SItemSpecialEffects public: std::vector Effects; - virtual void serial(class NLMISC::IStream &f); + virtual void serial(NLMISC::IStream &f); }; struct SWeapon @@ -270,7 +270,7 @@ struct SWeapon // damage factor (if fixed) float DamageFactor; - virtual void serial(class NLMISC::IStream &f) + virtual void serial(NLMISC::IStream &f) { f.serialEnum( WeaponType ); f.serialEnum( DamageType ); @@ -301,7 +301,7 @@ public: /// 'length' value of the weapon (french 'allonge') uint8 ReachValue; - virtual void serial(class NLMISC::IStream &f) + virtual void serial(NLMISC::IStream &f) { SWeapon::serial( f ); f.serial( RateOfFire ); @@ -317,7 +317,7 @@ public: virtual ~SRangeWeapon() {} - virtual void serial(class NLMISC::IStream &f) + virtual void serial(NLMISC::IStream &f) { SWeapon::serial( f ); f.serialEnum(AreaType); @@ -389,7 +389,7 @@ public: // ammo type (1 or 2) uint8 AmmoType; - virtual void serial(class NLMISC::IStream &f) + virtual void serial(NLMISC::IStream &f) { SWeapon::serial( f ); f.serial( ShortRangeLimit ); @@ -410,7 +410,7 @@ public: inline SArmor() : ArmorType( ARMORTYPE::UNKNOWN ),Protections(DMGTYPE::NBTYPES){} // serial - virtual void serial(class NLMISC::IStream &f) + virtual void serial(NLMISC::IStream &f) { f.serialEnum( ArmorType ); f.serialCont( Protections ); @@ -431,7 +431,7 @@ public: inline SShield() : SArmor(),ShieldType(SHIELDTYPE::NONE),Unbreakable(false){} - virtual void serial(class NLMISC::IStream &f) + virtual void serial(NLMISC::IStream &f) { SArmor::serial(f); f.serialEnum( ShieldType ); @@ -580,7 +580,7 @@ public: FocusBuff = 0; } - inline void serial(class NLMISC::IStream &f) + inline void serial(NLMISC::IStream &f) { f.serial( Durability ); f.serial( Weight ); @@ -647,7 +647,7 @@ public: }; }; - inline void serial(class NLMISC::IStream &f) + inline void serial(NLMISC::IStream &f) { f.serial( (uint32&)Family ); // The number never changes f.serialEnum( Ecosystem ); @@ -755,7 +755,7 @@ public: MaxDonkeys = 0; } - inline void serial(class NLMISC::IStream &f) + inline void serial(NLMISC::IStream &f) { f.serialEnum( Type ); f.serial( CommandRange ); @@ -824,7 +824,7 @@ public: virtual ~CStaticItem(); /// Serialisation - void serial(class NLMISC::IStream &f); + void serial(NLMISC::IStream &f); /// read georges sheet void readGeorges (const NLMISC::CSmartPtr &form, const NLMISC::CSheetId &sheetId); diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_sheet.cpp b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_sheet.cpp index a88ae94eb..4927db680 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_sheet.cpp +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_sheet.cpp @@ -195,7 +195,7 @@ void CStaticGameBrick::readGeorges( const CSmartPtr &form, const CSheetId // serial CStaticGameBrick // //----------------------------------------------- -void CStaticGameBrick::serial( NLMISC::IStream &f ) throw(NLMISC::EStream) +void CStaticGameBrick::serial( NLMISC::IStream &f ) { f.serial( FamilyId ); f.serial( IndexInFamily ); @@ -325,7 +325,7 @@ void CStaticXpStagesTable::readGeorges( const CSmartPtr &form, const CShe } // Serial SXpStage structure -void CStaticXpStagesTable::SXpStage::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CStaticXpStagesTable::SXpStage::serial(NLMISC::IStream &f) { f.serial( SkillLevel ); f.serial( XpForPointSkill ); @@ -333,13 +333,13 @@ void CStaticXpStagesTable::SXpStage::serial(class NLMISC::IStream &f) throw(NLMI } // Serial SStageTable structure -void CStaticXpStagesTable::SStageTable::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CStaticXpStagesTable::SStageTable::serial(NLMISC::IStream &f) { f.serialCont( StageTable ); } // Serial XpStagesTables structure -void CStaticXpStagesTable::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CStaticXpStagesTable::serial(NLMISC::IStream &f) { f.serialCont( XpStagesTables ); } @@ -910,7 +910,7 @@ uint CStaticCreatures::getVersion() } /////////////////////////////////////////////////////////////////////////// -void CStaticCreatures::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CStaticCreatures::serial(NLMISC::IStream &f) { CStaticHarvestable::serial(f); diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_sheet.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_sheet.h index 527f5ee09..8c94bd745 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_sheet.h +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_sheet.h @@ -126,7 +126,7 @@ public : } /// serial - void serial( NLMISC::IStream &f ) throw(NLMISC::EStream); + void serial( NLMISC::IStream &f ); /// called when the sheet is removed void removed() {} @@ -157,13 +157,13 @@ public : uint32 XpForPointSkill; float SpPointMultiplier; - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; struct SStageTable { std::vector< SXpStage > StageTable; - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; @@ -174,7 +174,7 @@ public : static uint getVersion () { return 2; } /// serialize - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); // return a reference on Xp stage corresponding to level and stage table const SXpStage* getXpStage( uint32 level, uint16 stage ) const; @@ -206,7 +206,7 @@ public : uint16 StageType; float Coeff; - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) { f.serial( StageType); f.serial( Coeff ); } + void serial(NLMISC::IStream &f) { f.serial( StageType); f.serial( Coeff ); } }; /// read sheet @@ -216,7 +216,7 @@ public : static uint getVersion () { return 2 + ( SKILLS::NUM_SKILLS << 16 ); } /// serialize - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) { f.serialCont( SkillToStageType ); } + void serial(NLMISC::IStream &f) { f.serialCont( SkillToStageType ); } /// destructor virtual ~CStaticStagesTypeSkillTable() {} @@ -245,7 +245,7 @@ public: uint16 LoseSkillsLevel; NLMISC::TGameCycle Duration; - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial( LoseHitPointsLevel); f.serial( LoseStaminaLevel ); @@ -262,7 +262,7 @@ public: static uint getVersion () { return 2; } /// serialize - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) { f.serialCont( PactLose ); } + void serial(NLMISC::IStream &f) { f.serialCont( PactLose ); } /// destructor virtual ~CStaticPacts() {} @@ -642,7 +642,7 @@ public: static uint getVersion (); /// serialize - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); /// called when the sheet is removed void removed() { } @@ -673,7 +673,7 @@ public: std::vector BricksIds; /// Serialisation - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial( Name ); f.serialCont( BricksIds ); @@ -698,7 +698,7 @@ public: SMirrorEquipment Ammo1; SMirrorEquipment Ammo2; - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial( Right ); f.serial( Left ); @@ -730,7 +730,7 @@ public: float RunSpeed; /// serialize - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serialEnum( Race ); f.serial( Gender ); @@ -800,7 +800,7 @@ public: uint16 Quantity; /// serialize - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial( Item ); f.serial( Level ); @@ -811,7 +811,7 @@ public: std::vector< SItemLoot > ItemLoot; /// serialize - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serialCont( ItemLoot ); } @@ -857,7 +857,7 @@ public: float MoneyDropProbability; /// serialize - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serialCont( LootSets ); f.serial( MoneyLvlFactor ); @@ -908,7 +908,7 @@ public: uint16 QuantityMax; /// serialize - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial( Item ); f.serial( Probability ); @@ -923,7 +923,7 @@ public: std::vector< SItemLoot > ItemLoot; /// serialize - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serialCont( ItemLoot ); } @@ -962,7 +962,7 @@ public: std::string DefaultFeet; std::string DefaultHair; - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial( DefaultFace ); f.serial( DefaultChest ); @@ -990,7 +990,7 @@ public: SDefaultEquipment FemaleDefaultEquipment; /// serialize - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serialEnum( Race ); for( int c = 0; c < CHARACTERISTICS::NUM_CHARACTERISTICS; ++c ) @@ -1048,7 +1048,7 @@ public: NLMISC::CSheetId sentence; // MEM_SET_TYPES::TMemorizationSetType memory; - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial( sentence ); // f.serialEnum( memory ); @@ -1067,7 +1067,7 @@ public: /// serialize - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial( Role ); f.serialEnum( Race ); @@ -1127,7 +1127,7 @@ public : SKILLS::ESkills ParentSkill; std::vector ChildSkills; - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serialEnum( Skill ); f.serial( SkillCode ); @@ -1164,7 +1164,7 @@ public : static uint getVersion () { return 1 + ( SKILLS::NUM_SKILLS << 16 ); } /// serialize - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) { f.serialCont( SkillsTree ); } + void serial(NLMISC::IStream &f) { f.serialCont( SkillsTree ); } /// destructor virtual ~CStaticSkillsTree() {} diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_guild_option.cpp b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_guild_option.cpp index cbccc4f30..43c212b50 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_guild_option.cpp +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_guild_option.cpp @@ -56,7 +56,7 @@ void CStaticGuildOption::readGeorges (const NLMISC::CSmartPtr } } -void CStaticGuildOption::serial(class NLMISC::IStream &f) +void CStaticGuildOption::serial(NLMISC::IStream &f) { f.serial(Price); if ( f.isReading() ) diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_guild_option.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_guild_option.h index a163d42da..2d765d96f 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_guild_option.h +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_guild_option.h @@ -64,7 +64,7 @@ public: void readGeorges (const NLMISC::CSmartPtr &form, const NLMISC::CSheetId &sheetId); /// Serial - void serial(class NLMISC::IStream &f); + void serial(NLMISC::IStream &f); /// Return the version of this class, increments this value when the content of this class has changed inline static uint getVersion () { return 1; } diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_harvestable.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_harvestable.h index f23803bd3..8eafbe75b 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_harvestable.h +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_harvestable.h @@ -57,7 +57,7 @@ struct CStaticCreatureRawMaterial /** * Serial */ - inline void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + inline void serial(NLMISC::IStream &f) { f.serial( MpCommon ); f.serial( UsageAndQuantity ); @@ -129,7 +129,7 @@ public: /** * Serial */ - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serialEnum( _HarvestSkill ); f.serialCont( _Mps ); diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_outpost.cpp b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_outpost.cpp index 146d4bae3..06149ccf0 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_outpost.cpp +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_outpost.cpp @@ -165,7 +165,7 @@ void CStaticOutpostBuilding::CDriller::readGeorges (const NLGEORGES::UFormElm *p } //---------------------------------------------------------------------------- -void CStaticOutpostBuilding::CDriller::serial(class NLMISC::IStream &f) +void CStaticOutpostBuilding::CDriller::serial(NLMISC::IStream &f) { for (uint i = 0; i < DRILLER_NB_LEVEL; ++i) f.serial(QualityFactor[i]); diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_outpost.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_outpost.h index 414116557..7650f1fe6 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_outpost.h +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_outpost.h @@ -117,7 +117,7 @@ public: /// Read georges sheet void readGeorges (const NLMISC::CSmartPtr &form, const NLMISC::CSheetId &sheetId); /// Serial - void serial(class NLMISC::IStream &f); + void serial(NLMISC::IStream &f); /// Return the version of this class, increments this value when the content of this class has changed static uint getVersion (); @@ -151,7 +151,7 @@ public: /// Read georges sheet void readGeorges (const NLMISC::CSmartPtr &form, const NLMISC::CSheetId &sheetId); /// Serial - void serial(class NLMISC::IStream &f); + void serial(NLMISC::IStream &f); /// Return the version of this class, increments this value when the content of this class has changed static uint getVersion (); diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_raw_material.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_raw_material.h index 5656493d0..f38ee61c3 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_raw_material.h +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_raw_material.h @@ -48,7 +48,7 @@ public: {} /// serial - void serial(class NLMISC::IStream &f) + void serial(NLMISC::IStream &f) { f.serial( Name ); f.serial( AssociatedItemName ); diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_rolemaster_phrase.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_rolemaster_phrase.h index 7436164da..d643b1824 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_rolemaster_phrase.h +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_rolemaster_phrase.h @@ -43,7 +43,7 @@ public: inline static uint getVersion () { return 4; } /// Serial - void serial(class NLMISC::IStream &f) + void serial(NLMISC::IStream &f) { f.serialCont( Bricks ); std::vector::const_iterator ib; diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_success_table.cpp b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_success_table.cpp index e5cb7a0be..51ae3a021 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_success_table.cpp +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_success_table.cpp @@ -134,7 +134,7 @@ void CStaticSuccessTable::initTables() //-------------------------------------------------------------- // serial //-------------------------------------------------------------- -void CStaticSuccessTable::serial(class NLMISC::IStream &f) +void CStaticSuccessTable::serial(NLMISC::IStream &f) { f.serial(_MaxSuccessFactor); f.serial(_MaxPartialSuccessFactor); diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_success_table.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_success_table.h index 6ff111278..a03fcdca4 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_success_table.h +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_success_table.h @@ -66,7 +66,7 @@ struct CSuccessXpLine uint8 PartialSuccessMaxDraw; float XpGain; - void serial(class NLMISC::IStream &f) + void serial(NLMISC::IStream &f) { f.serial(RelativeLevel); f.serial(SuccessProbability); @@ -85,7 +85,7 @@ class CStaticSuccessTable { public: /// Serialisation - virtual void serial(class NLMISC::IStream &f); + virtual void serial(NLMISC::IStream &f); /// read georges sheet void readGeorges (const NLMISC::CSmartPtr &form, const NLMISC::CSheetId &sheetId); diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_text_emotes.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_text_emotes.h index 64b237d73..8c6eacfb1 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_text_emotes.h +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_text_emotes.h @@ -69,7 +69,7 @@ public: /// true if this emote can be launched from client UI bool UsableFromClientUI; - void serial(class NLMISC::IStream &f) + void serial(NLMISC::IStream &f) { f.serial( EmoteId ); f.serial( TargetCrowd ); @@ -92,7 +92,7 @@ public: /// Return the version of this class, increments this value when the content of this class has changed inline static uint getVersion () { return 2; } /// Serial - void serial(class NLMISC::IStream &f) + void serial(NLMISC::IStream &f) { f.serialCont( _Phrases ); if (f.isReading()) diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_world.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_world.h index 5ea379b3c..d928b313a 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_world.h +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_world.h @@ -40,7 +40,7 @@ public: /// Return the version of this class, increments this value when the content of this class has changed inline static uint getVersion () { return 1; } /// Serial - void serial(class NLMISC::IStream &f) + void serial(NLMISC::IStream &f) { f.serialCont( Continents ); } @@ -68,7 +68,7 @@ public: /// Return the version of this class, increments this value when the content of this class has changed inline static uint getVersion () { return 1; } /// Serial - void serial(class NLMISC::IStream &f) + void serial(NLMISC::IStream &f) { f.serialCont(Outposts); } diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_xp_factor_table.cpp b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_xp_factor_table.cpp index 4d63d74a4..921fcbcd7 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_xp_factor_table.cpp +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_xp_factor_table.cpp @@ -29,7 +29,7 @@ using namespace NLGEORGES; //-------------------------------------------------------------- // serial //-------------------------------------------------------------- -void CStaticXpFactorTable::serial(class NLMISC::IStream &f) +void CStaticXpFactorTable::serial(NLMISC::IStream &f) { f.serialCont(_XpFactorTable); } // serial // diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_xp_factor_table.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_xp_factor_table.h index 7ced3ddf5..3515fa104 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_xp_factor_table.h +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_xp_factor_table.h @@ -36,7 +36,7 @@ class CStaticXpFactorTable { public: /// Serialisation - virtual void serial(class NLMISC::IStream &f); + virtual void serial(NLMISC::IStream &f); /// read georges sheet void readGeorges (const NLMISC::CSmartPtr &form, const NLMISC::CSheetId &sheetId); diff --git a/code/ryzom/server/src/entities_game_service/egs_static_continent.h b/code/ryzom/server/src/entities_game_service/egs_static_continent.h index 85db06c8e..3427a0b98 100644 --- a/code/ryzom/server/src/entities_game_service/egs_static_continent.h +++ b/code/ryzom/server/src/entities_game_service/egs_static_continent.h @@ -27,7 +27,7 @@ class CStaticWorld { public: /// Serialisation - void serial(class NLMISC::IStream &f); + void serial(NLMISC::IStream &f); /// read georges sheet void readGeorges (const NLMISC::CSmartPtr &form, const NLMISC::CSheetId &sheetId); diff --git a/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.cpp b/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.cpp index 6b2fe76bd..374b00295 100644 --- a/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.cpp +++ b/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.cpp @@ -120,7 +120,7 @@ CEquipmentSlots::CEquipmentSlots() // serial CEquipmentSlots properties: // //----------------------------------------------- -void CEquipmentSlots::serial( NLMISC::IStream &f ) throw(NLMISC::EStream) +void CEquipmentSlots::serial( NLMISC::IStream &f ) { f.serial( Headdress ); f.serial( Head ); @@ -1450,7 +1450,7 @@ void CEntityBase::setBehaviour( MBEHAV::CBehaviour behaviour, bool forceUpdate ) //--------------------------------------------------- // serial: reading off-mirror, writing from mirror //--------------------------------------------------- -void CEntityBase::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CEntityBase::serial(NLMISC::IStream &f) { f.xmlPush("CEntityBasePart"); f.xmlPush("CEntityBasePartVersion"); 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 3dac33ef7..05342be92 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 @@ -98,7 +98,7 @@ struct CEquipmentSlots /** * Serial */ - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; @@ -387,7 +387,7 @@ public: /** * Serial: reading off-mirror, writing from mirror */ - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); /** * Load George Sheet diff --git a/code/ryzom/server/src/entities_game_service/entity_structure/entity_persistant_data.cpp b/code/ryzom/server/src/entities_game_service/entity_structure/entity_persistant_data.cpp index 2526a899a..4622c3d44 100644 --- a/code/ryzom/server/src/entities_game_service/entity_structure/entity_persistant_data.cpp +++ b/code/ryzom/server/src/entities_game_service/entity_structure/entity_persistant_data.cpp @@ -30,14 +30,14 @@ using namespace NLMISC; //--------------------------------------------------- // serial: serial persistant part of CEntityBase for player character //--------------------------------------------------- -void CEntityBasePersistantData::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CEntityBasePersistantData::serial(NLMISC::IStream &f) { } //--------------------------------------------------- // serialXml: serial persistant part of CEntityBase for player character //--------------------------------------------------- -void CEntityBasePersistantData::serialXml(NLMISC::IStream &f) throw(NLMISC::EStream) +void CEntityBasePersistantData::serialXml(NLMISC::IStream &f) { f.xmlPush("CEntityBasePart"); f.xmlPush("CEntityBasePartVersion"); diff --git a/code/ryzom/server/src/entities_game_service/entity_structure/entity_persistant_data.h b/code/ryzom/server/src/entities_game_service/entity_structure/entity_persistant_data.h index 0e4fda066..20fec9c70 100644 --- a/code/ryzom/server/src/entities_game_service/entity_structure/entity_persistant_data.h +++ b/code/ryzom/server/src/entities_game_service/entity_structure/entity_persistant_data.h @@ -57,8 +57,8 @@ public: static inline uint16 getCurrentVersion(){ return 6; } // serial: reading off-mirror, writing from mirror - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); - void serialXml(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); + void serialXml(NLMISC::IStream &f); // Entity state ( X, Y, Z,T ) diff --git a/code/ryzom/server/src/entities_game_service/entity_structure/resists.cpp b/code/ryzom/server/src/entities_game_service/entity_structure/resists.cpp index b8f195857..40f370d01 100644 --- a/code/ryzom/server/src/entities_game_service/entity_structure/resists.cpp +++ b/code/ryzom/server/src/entities_game_service/entity_structure/resists.cpp @@ -34,7 +34,7 @@ uint16 CCreatureResists::ImmuneScore = 0xffff; //-------------------------------------------------------------- // serial() //-------------------------------------------------------------- -void CCreatureResists::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CCreatureResists::serial(NLMISC::IStream &f) { f.serial(Fear); f.serial(Sleep); diff --git a/code/ryzom/server/src/entities_game_service/entity_structure/resists.h b/code/ryzom/server/src/entities_game_service/entity_structure/resists.h index f89253435..16b5d5682 100644 --- a/code/ryzom/server/src/entities_game_service/entity_structure/resists.h +++ b/code/ryzom/server/src/entities_game_service/entity_structure/resists.h @@ -53,7 +53,7 @@ public: {} /// serialize - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); public: /// static value indicating the immune score (when someone cannot be affected at all by an effect type) diff --git a/code/ryzom/server/src/entities_game_service/entity_structure/role_persistant_data.h b/code/ryzom/server/src/entities_game_service/entity_structure/role_persistant_data.h index 2e6e420df..6c1d069de 100644 --- a/code/ryzom/server/src/entities_game_service/entity_structure/role_persistant_data.h +++ b/code/ryzom/server/src/entities_game_service/entity_structure/role_persistant_data.h @@ -39,7 +39,7 @@ // // SSkillsProgress() { LevelReached = SkillCap = 0; } // -// void serial(NLMISC::IStream &f) throw(NLMISC::EStream) +// void serial(NLMISC::IStream &f) // { // f.serial( LevelReached ); // f.serial( SkillCap ); @@ -57,7 +57,7 @@ // uint16 JobLevel; // NLMISC::CSheetId RoleSheet; // -// void serial(NLMISC::IStream &f) throw(NLMISC::EStream) +// void serial(NLMISC::IStream &f) // { // f.serialEnum( Job ); // f.serialEnum( JobStatus ); @@ -79,7 +79,7 @@ // }; // // // Serial -// void serial(NLMISC::IStream &f) throw(NLMISC::EStream) +// void serial(NLMISC::IStream &f) // { // f.serialCont( _Roles ); // f.serialCont( _LevelReached ); diff --git a/code/ryzom/server/src/entities_game_service/entity_structure/special_modifier.cpp b/code/ryzom/server/src/entities_game_service/entity_structure/special_modifier.cpp index 58859eb09..463683a64 100644 --- a/code/ryzom/server/src/entities_game_service/entity_structure/special_modifier.cpp +++ b/code/ryzom/server/src/entities_game_service/entity_structure/special_modifier.cpp @@ -85,7 +85,7 @@ void CSpecialModifiers::init() //----------------------------------------------- // CSpecialModifiers::serial //----------------------------------------------- -void CSpecialModifiers::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CSpecialModifiers::serial(NLMISC::IStream &f) { f.serial( MeleeAttackModifierOnEnemy ); f.serial( MeleeAttackModifierOnSelf ); diff --git a/code/ryzom/server/src/entities_game_service/entity_structure/special_modifier.h b/code/ryzom/server/src/entities_game_service/entity_structure/special_modifier.h index e38153f33..60615cd50 100644 --- a/code/ryzom/server/src/entities_game_service/entity_structure/special_modifier.h +++ b/code/ryzom/server/src/entities_game_service/entity_structure/special_modifier.h @@ -123,7 +123,7 @@ struct CSpecialModifiers /** * Serial */ - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); /** * init all the special modifiers diff --git a/code/ryzom/server/src/entities_game_service/entity_structure/statistic.cpp b/code/ryzom/server/src/entities_game_service/entity_structure/statistic.cpp index fe81ac0ff..7de7a06c3 100644 --- a/code/ryzom/server/src/entities_game_service/entity_structure/statistic.cpp +++ b/code/ryzom/server/src/entities_game_service/entity_structure/statistic.cpp @@ -100,7 +100,7 @@ SCharacteristicsAndScores::~SCharacteristicsAndScores() //----------------------------------------------- // SCharacteristicsAndScores serial //----------------------------------------------- -void SCharacteristicsAndScores::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void SCharacteristicsAndScores::serial(NLMISC::IStream &f) { f.serial( Base ); f.serial( Max ); @@ -139,7 +139,7 @@ void CPhysicalCharacteristics::clear() //----------------------------------------------- // serial : //----------------------------------------------- -void CPhysicalCharacteristics::serial( NLMISC::IStream &f ) throw(NLMISC::EStream) +void CPhysicalCharacteristics::serial( NLMISC::IStream &f ) { for(int i = 0; i < CHARACTERISTICS::NUM_CHARACTERISTICS; ++i ) { @@ -180,7 +180,7 @@ void CPhysicalScores::clear() //----------------------------------------------- // serial : //----------------------------------------------- -void CPhysicalScores::serial( NLMISC::IStream &f ) throw(NLMISC::EStream) +void CPhysicalScores::serial( NLMISC::IStream &f ) { for( int i = 0; i < SCORES::NUM_SCORES; ++i ) { @@ -267,7 +267,7 @@ void CSkills::clear() // serial : // //----------------------------------------------- -void CSkills::serial( NLMISC::IStream &f ) throw(NLMISC::EStream) +void CSkills::serial( NLMISC::IStream &f ) { uint32 size = SKILLS::NUM_SKILLS; f.serial( size ); diff --git a/code/ryzom/server/src/entities_game_service/entity_structure/statistic.h b/code/ryzom/server/src/entities_game_service/entity_structure/statistic.h index 6afed0e90..d3bccd11d 100644 --- a/code/ryzom/server/src/entities_game_service/entity_structure/statistic.h +++ b/code/ryzom/server/src/entities_game_service/entity_structure/statistic.h @@ -79,7 +79,7 @@ struct SCharacteristicsAndScores float KeepRegenerateDecimal; // Serial - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); // Constructor SCharacteristicsAndScores(); @@ -119,7 +119,7 @@ struct CPhysicalCharacteristics /** * Serial */ - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); /** * getCharacteristicStruct @@ -165,7 +165,7 @@ struct CPhysicalScores /** * Serial */ - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); std::vector< SCharacteristicsAndScores > _PhysicalScores; }; @@ -209,7 +209,7 @@ struct SSkill /** * Serial */ - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial( Base ); f.serial( Modifier ); @@ -254,7 +254,7 @@ struct CSkills /** * Serial */ - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); void clear(); diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp index 11b612781..22e204120 100644 --- a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp +++ b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp @@ -298,7 +298,7 @@ RM_FABER_STAT_TYPE::TRMStatType CItemCraftParameters::getBestItemStat() const } /// serial validated point for a character -void CItemCraftParameters::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CItemCraftParameters::serial(NLMISC::IStream &f) { uint32 version = CItemCraftParameters::getCurrentVersion(); f.serial( version ); diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.h b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.h index 7f28cfe62..1c1d90df8 100644 --- a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.h +++ b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.h @@ -233,7 +233,7 @@ struct CItemCraftParameters static inline uint32 getCurrentVersion() { return 4; } /// serial validated point for a character - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); // operator != bool operator!=(const CItemCraftParameters &p) const; diff --git a/code/ryzom/server/src/entities_game_service/harvest_info.h b/code/ryzom/server/src/entities_game_service/harvest_info.h index a932fc4c1..3c4d7c037 100644 --- a/code/ryzom/server/src/entities_game_service/harvest_info.h +++ b/code/ryzom/server/src/entities_game_service/harvest_info.h @@ -36,7 +36,7 @@ struct CHarvestInfos CHarvestInfos() : EndCherchingTime(0xffffffff), DepositIndex(0xffffffff), DepositIndexContent(0), Quantity(0),MinQuality(0),MaxQuality(0) {} - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial( EndCherchingTime ); f.serial( Sheet ); diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character.cpp b/code/ryzom/server/src/entities_game_service/player_manager/character.cpp index c75d6c2f0..362242b7c 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/character.cpp +++ b/code/ryzom/server/src/entities_game_service/player_manager/character.cpp @@ -2613,7 +2613,7 @@ void CCharacter::compassDatabaseUpdate() // serial: reading off-mirror, writing from mirror // //--------------------------------------------------- -void CCharacter::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CCharacter::serial(NLMISC::IStream &f) { nlerror("Serial method no longer exists!"); @@ -18638,7 +18638,7 @@ void CPetAnimal::clear() } //----------------------------------------------------------------------------- -void CPetAnimal::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPetAnimal::serial(NLMISC::IStream &f) { // ensure we won't save in this format anymore nlassertex( f.isReading(), (" you should not save in old format anymore!!!") ); diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character.h b/code/ryzom/server/src/entities_game_service/player_manager/character.h index b060bc0f2..c1f96a40b 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/character.h +++ b/code/ryzom/server/src/entities_game_service/player_manager/character.h @@ -183,7 +183,7 @@ struct SGameCoordinate sint32 Cell; uint8 Continent; - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial( X ); f.serial( Y ); @@ -304,7 +304,7 @@ struct CPetAnimal CPetAnimal(); void clear(); - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); // init found ticket item pointer with slot uint32 initLinkAnimalToTicket( CCharacter * c, uint8 index); @@ -660,7 +660,7 @@ public: /** * Serial: reading off-mirror, writing from mirror */ - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); // set player position to default respawn point of continent void setPositionToDefaultRespawnPoint(); diff --git a/code/ryzom/server/src/entities_game_service/player_manager/known_and_memorized_phrases.cpp b/code/ryzom/server/src/entities_game_service/player_manager/known_and_memorized_phrases.cpp index 86de5efa8..62d44decc 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/known_and_memorized_phrases.cpp +++ b/code/ryzom/server/src/entities_game_service/player_manager/known_and_memorized_phrases.cpp @@ -55,7 +55,7 @@ void CKnownPhrase::clear() //----------------------------------------------- // CKnownPhrase::serial //----------------------------------------------- -void CKnownPhrase::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CKnownPhrase::serial(NLMISC::IStream &f) { f.serial(PhraseDesc); f.serial(PhraseSheetId); @@ -89,7 +89,7 @@ void CMemorizedPhrase::clear() //----------------------------------------------- // CMemorizedPhrase::serial //----------------------------------------------- -void CMemorizedPhrase::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CMemorizedPhrase::serial(NLMISC::IStream &f) { f.serialCont(Bricks); f.serial(PhraseId); @@ -347,7 +347,7 @@ void CMemorizationSet::forgetAll() //----------------------------------------------- // CMemorizationSet::serial //----------------------------------------------- -void CMemorizationSet::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CMemorizationSet::serial(NLMISC::IStream &f) { f.serialContPtr(Phrases); } @@ -511,7 +511,7 @@ void CPlayerPhraseMemory::forgetAll() //----------------------------------------------- // CPlayerPhraseMemory::serial //----------------------------------------------- -void CPlayerPhraseMemory::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPlayerPhraseMemory::serial(NLMISC::IStream &f) { f.serialContPtr(_MemSets); } 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 ec6050cae..758c7f6f8 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 @@ -46,7 +46,7 @@ struct CKnownPhrase bool empty() const; void clear(); - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; @@ -70,7 +70,7 @@ public: explicit CMemorizedPhrase(const std::vector &bricks, uint16 id); void clear(); - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); std::vector Bricks; uint16 PhraseId; @@ -119,7 +119,7 @@ public: const std::vector &getMemorizedPhrases() const { return Phrases; } - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); private: std::vector Phrases; @@ -174,7 +174,7 @@ struct CPlayerPhraseMemory const std::vector &getMemorizationSets() const { return _MemSets; } - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); private: CMemorizationSet* getMemSet(uint32 idx); diff --git a/code/ryzom/server/src/entities_game_service/player_manager/modifiers_in_db.cpp b/code/ryzom/server/src/entities_game_service/player_manager/modifiers_in_db.cpp index 66793c08f..cd0bd75f9 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/modifiers_in_db.cpp +++ b/code/ryzom/server/src/entities_game_service/player_manager/modifiers_in_db.cpp @@ -43,7 +43,7 @@ void CModifierInDB::init() clear(); } -void CModifierInDB::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CModifierInDB::serial(NLMISC::IStream &f) { f.serial(Disabled); if(Disabled) @@ -70,7 +70,7 @@ void CModifiersInDB::clear() Malus[i].clear(); } -void CModifiersInDB::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CModifiersInDB::serial(NLMISC::IStream &f) { f.serialCont(Bonus); f.serialCont(Malus); diff --git a/code/ryzom/server/src/entities_game_service/player_manager/modifiers_in_db.h b/code/ryzom/server/src/entities_game_service/player_manager/modifiers_in_db.h index 7d60876d8..fd6b6159e 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/modifiers_in_db.h +++ b/code/ryzom/server/src/entities_game_service/player_manager/modifiers_in_db.h @@ -45,7 +45,7 @@ struct CModifierInDB void init(); - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; /// struct for disabled modifiers @@ -66,7 +66,7 @@ struct CModifiersInDB void clear(); - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); // write disabled effects in DB, used only in initDatabase void writeInDatabase(CCDBSynchronised &database); diff --git a/code/ryzom/server/src/entities_game_service/player_manager/powers_and_auras.cpp b/code/ryzom/server/src/entities_game_service/player_manager/powers_and_auras.cpp index 7c9108bc6..6ec0dabe7 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/powers_and_auras.cpp +++ b/code/ryzom/server/src/entities_game_service/player_manager/powers_and_auras.cpp @@ -28,7 +28,7 @@ //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -void CPowerActivationDate::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPowerActivationDate::serial(NLMISC::IStream &f) { f.serial( DeactivationDate ); f.serial( ActivationDate ); @@ -69,7 +69,7 @@ void CPowerActivationDateVector::clearConsumable() } //----------------------------------------------------------------------------- -void CPowerActivationDateVector::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CPowerActivationDateVector::serial(NLMISC::IStream &f) { if (f.isReading()) { @@ -200,7 +200,7 @@ void CAuraActivationDateVector::disableAura(POWERS::TPowerType type, NLMISC::TGa } //----------------------------------------------------------------------------- -void CAuraActivationDateVector::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CAuraActivationDateVector::serial(NLMISC::IStream &f) { if (f.isReading()) { diff --git a/code/ryzom/server/src/entities_game_service/player_manager/powers_and_auras.h b/code/ryzom/server/src/entities_game_service/player_manager/powers_and_auras.h index 8061d91b1..9feca7c84 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/powers_and_auras.h +++ b/code/ryzom/server/src/entities_game_service/player_manager/powers_and_auras.h @@ -43,7 +43,7 @@ struct CPowerActivationDate CPowerActivationDate(POWERS::TPowerType type, uint16 consumableFamilyId, NLMISC::TGameCycle dateOff, NLMISC::TGameCycle dateOn) : PowerType(type), ConsumableFamilyId(consumableFamilyId), DeactivationDate(dateOff), ActivationDate(dateOn) {} - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); }; /** @@ -70,7 +70,7 @@ struct CPowerActivationDateVector /// remove only consumable entries void clearConsumable(); - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); /// remove entries for which date has been reached void cleanVector(); @@ -110,7 +110,7 @@ public: void disableAura(POWERS::TPowerType type, NLMISC::TGameCycle startDate, NLMISC::TGameCycle endDate, const NLMISC::CEntityId &userId); - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); /// remove entries for which date has been reached void cleanVector(); diff --git a/code/ryzom/server/src/entities_game_service/position_flag_manager.cpp b/code/ryzom/server/src/entities_game_service/position_flag_manager.cpp index 1904ed2a0..8583bfdba 100644 --- a/code/ryzom/server/src/entities_game_service/position_flag_manager.cpp +++ b/code/ryzom/server/src/entities_game_service/position_flag_manager.cpp @@ -65,7 +65,7 @@ bool CPositionFlagManager::flagExists(const std::string & flagName) const return (_FlagPositions.find(flagName) != _FlagPositions.end()); } -void CPositionFlagManager::serial(NLMISC::IStream & f) throw(NLMISC::EStream) +void CPositionFlagManager::serial(NLMISC::IStream & f) { H_AUTO(CPositionFlagManagerSerial); diff --git a/code/ryzom/server/src/entities_game_service/position_flag_manager.h b/code/ryzom/server/src/entities_game_service/position_flag_manager.h index 4a43374ce..336ac4b06 100644 --- a/code/ryzom/server/src/entities_game_service/position_flag_manager.h +++ b/code/ryzom/server/src/entities_game_service/position_flag_manager.h @@ -51,7 +51,7 @@ public: bool flagExists(const std::string & flagName) const; /// serial flags and their positions - void serial(NLMISC::IStream & f) throw(NLMISC::EStream); + void serial(NLMISC::IStream & f); /// save flags to the given file void saveToFile(const std::string & fileName); diff --git a/code/ryzom/server/src/sabrina/static_sabrina_bricks.h b/code/ryzom/server/src/sabrina/static_sabrina_bricks.h index 97c7da0e8..ec2515d12 100644 --- a/code/ryzom/server/src/sabrina/static_sabrina_bricks.h +++ b/code/ryzom/server/src/sabrina/static_sabrina_bricks.h @@ -207,7 +207,7 @@ struct CSabrinaBrickCraftInfo // Quantity of this Mp needed uint8 Quantity; - void serial(class NLMISC::IStream &f) + void serial(NLMISC::IStream &f) { f.serialEnum( MpFamily ); f.serialEnum( MpType ); @@ -223,7 +223,7 @@ struct CSabrinaBrickCraftInfo NbItemsPerUnit = 1; } - void serial(class NLMISC::IStream &f) + void serial(NLMISC::IStream &f) { f.serialEnum( Skill ); f.serialEnum( ToolType ); @@ -382,7 +382,7 @@ public: virtual ~CStaticBrick(); /// Serialisation - virtual void serial(class NLMISC::IStream &f); + virtual void serial(NLMISC::IStream &f); /// read georges sheet void readGeorges (const NLMISC::CSmartPtr &form, const NLMISC::CSheetId &sheetId); diff --git a/code/ryzom/server/src/server_share/entity_state.h b/code/ryzom/server/src/server_share/entity_state.h index cb68c4427..d681e51ce 100644 --- a/code/ryzom/server/src/server_share/entity_state.h +++ b/code/ryzom/server/src/server_share/entity_state.h @@ -97,7 +97,7 @@ public: /** * Serial (read to temp storage, or write from mirror) */ - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { X.serialRTWM( f ); Y.serialRTWM( f ); diff --git a/code/ryzom/server/src/server_share/event_report.h b/code/ryzom/server/src/server_share/event_report.h index 4574b1608..9414912ae 100644 --- a/code/ryzom/server/src/server_share/event_report.h +++ b/code/ryzom/server/src/server_share/event_report.h @@ -69,7 +69,7 @@ struct SEventReport } /// Serialisation - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial( ActingEntity ); f.serial( TargetEntity ); diff --git a/code/ryzom/server/src/server_share/mirror_equipment.h b/code/ryzom/server/src/server_share/mirror_equipment.h index 3ede9e4e9..206ebeff8 100644 --- a/code/ryzom/server/src/server_share/mirror_equipment.h +++ b/code/ryzom/server/src/server_share/mirror_equipment.h @@ -68,7 +68,7 @@ public: return ( IdSheet != e.IdSheet || Quality != e.Quality); } - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serial( IdSheet ); f.serial( Quality ); diff --git a/code/ryzom/server/src/server_share/testing_tool_structures.h b/code/ryzom/server/src/server_share/testing_tool_structures.h index dfb98079f..6d342a8e3 100644 --- a/code/ryzom/server/src/server_share/testing_tool_structures.h +++ b/code/ryzom/server/src/server_share/testing_tool_structures.h @@ -47,7 +47,7 @@ struct SActorBeginTest std::vector< NLMISC::CSheetId > Sentence2; std::vector< NLMISC::CSheetId > Sentence3; - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { // f.serial( Role ); // f.serial( Level ); @@ -90,7 +90,7 @@ struct SLogReport uint32 StaminaLeft; // uint32 SapLeft; - void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serialCont( UsedBrick ); f.serial( Stop ); diff --git a/code/ryzom/server/src/shard_unifier_service/name_manager.h b/code/ryzom/server/src/shard_unifier_service/name_manager.h index 83e203d15..92854ee44 100644 --- a/code/ryzom/server/src/shard_unifier_service/name_manager.h +++ b/code/ryzom/server/src/shard_unifier_service/name_manager.h @@ -177,7 +177,7 @@ public: return ((UserId < charSlot.UserId) || (UserId == charSlot.UserId && CharIndex < charSlot.CharIndex)); } - void serial(NLMISC::IStream & f) throw(NLMISC::EStream) + void serial(NLMISC::IStream & f) { f.serial( UserId ); f.serial( CharIndex ); @@ -209,7 +209,7 @@ private: return ShardId < other.ShardId; } - void serial(NLMISC::IStream & f) throw(NLMISC::EStream) + void serial(NLMISC::IStream & f) { f.serial( GuildId ); f.serial( ShardId ); diff --git a/code/ryzom/tools/client/client_patcher/main.cpp b/code/ryzom/tools/client/client_patcher/main.cpp index 76fcc495b..fc440abf4 100644 --- a/code/ryzom/tools/client/client_patcher/main.cpp +++ b/code/ryzom/tools/client/client_patcher/main.cpp @@ -21,7 +21,7 @@ CClientConfig::CClientConfig() { } -void CClientConfig::serial(class NLMISC::IStream &/* f */) throw(NLMISC::EStream) +void CClientConfig::serial(NLMISC::IStream &/* f */) { } diff --git a/code/ryzom/tools/phrase_generator/skill_tree.h b/code/ryzom/tools/phrase_generator/skill_tree.h index 2839d35a3..90c78b0d8 100644 --- a/code/ryzom/tools/phrase_generator/skill_tree.h +++ b/code/ryzom/tools/phrase_generator/skill_tree.h @@ -55,7 +55,7 @@ public : SKILLS::ESkills ParentSkill; std::vector ChildSkills; - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) + void serial(NLMISC::IStream &f) { f.serialEnum( Skill ); f.serial( SkillCode ); @@ -92,7 +92,7 @@ public : static uint getVersion () { return 1 + ( SKILLS::NUM_SKILLS << 16 ); } /// serialize - void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) { f.serialCont( SkillsTree ); } + void serial(NLMISC::IStream &f) { f.serialCont( SkillsTree ); } /// destructor virtual ~CStaticSkillsTree() {} diff --git a/code/ryzom/tools/sheets_packer/sheets_packer_cfg.cpp b/code/ryzom/tools/sheets_packer/sheets_packer_cfg.cpp index b415205ce..913b09b7d 100644 --- a/code/ryzom/tools/sheets_packer/sheets_packer_cfg.cpp +++ b/code/ryzom/tools/sheets_packer/sheets_packer_cfg.cpp @@ -221,7 +221,7 @@ void setValues() // serial : // Serialize CFG. //----------------------------------------------- -void CClientConfig::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) +void CClientConfig::serial(NLMISC::IStream &f) { // Start the opening of a new node named ClientCFG. f.xmlPush("ClientCFG"); diff --git a/code/ryzom/tools/sheets_packer/sheets_packer_cfg.h b/code/ryzom/tools/sheets_packer/sheets_packer_cfg.h index dc100658c..bc3fcb439 100644 --- a/code/ryzom/tools/sheets_packer/sheets_packer_cfg.h +++ b/code/ryzom/tools/sheets_packer/sheets_packer_cfg.h @@ -64,7 +64,7 @@ public: friend void setValues (); /// Serialize CFG. - virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); + virtual void serial(NLMISC::IStream &f); /// End process void release (); diff --git a/code/studio/src/plugins/object_viewer/particle_system/dup_ps.cpp b/code/studio/src/plugins/object_viewer/particle_system/dup_ps.cpp index 086607fac..f3c4d6db1 100644 --- a/code/studio/src/plugins/object_viewer/particle_system/dup_ps.cpp +++ b/code/studio/src/plugins/object_viewer/particle_system/dup_ps.cpp @@ -39,7 +39,7 @@ using namespace NL3D; * TODO maybe this could be used elsewhere ? */ template -static T *DupSerializable(const T *in) throw(NLMISC::EStream) +static T *DupSerializable(const T *in) { NLMISC::CMemStream ms; nlassert(!ms.isReading()); @@ -61,7 +61,7 @@ static T *DupSerializable(const T *in) throw(NLMISC::EStream) struct CDupObjPolicy { template - static void serial(T *&obj, NLMISC::IStream &dest) throw(NLMISC::EStream) + static void serial(T *&obj, NLMISC::IStream &dest) { dest.serialPtr(obj); /*if (dest.isReading()) @@ -83,7 +83,7 @@ struct CDupObjPolicy struct CDupPolymorphicObjPolicy { template - static void serial(T *&obj, NLMISC::IStream &dest) throw(NLMISC::EStream) + static void serial(T *&obj, NLMISC::IStream &dest) { dest.serialPolyPtr(obj); } diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_node.cpp b/code/studio/src/plugins/object_viewer/particle_system/particle_node.cpp index 084358f52..7bffe2fa3 100644 --- a/code/studio/src/plugins/object_viewer/particle_system/particle_node.cpp +++ b/code/studio/src/plugins/object_viewer/particle_system/particle_node.cpp @@ -240,12 +240,12 @@ void CWorkspaceNode::serial(NLMISC::IStream &f) f.xmlPop(); } -void CWorkspaceNode::savePS() throw(NLMISC::EStream) +void CWorkspaceNode::savePS() { savePSAs(getFullPath()); } -void CWorkspaceNode::savePSAs(const std::string &fullPath) throw(NLMISC::EStream) +void CWorkspaceNode::savePSAs(const std::string &fullPath) { nlassert(_WS); if (!_PS) return; @@ -263,7 +263,7 @@ std::string CWorkspaceNode::getFullPath() const return _WS->getPath() + _RelativePath.c_str(); } -bool CWorkspaceNode::loadPS() throw(NLMISC::EStream) +bool CWorkspaceNode::loadPS() { nlassert(_WS); // manually load the PS shape (so that we can deal with exceptions) @@ -390,7 +390,7 @@ void CParticleWorkspace::removeNode(CWorkspaceNode *ptr) removeNode((uint) index); } -void CParticleWorkspace::save() throw(NLMISC::EStream) +void CParticleWorkspace::save() { NLMISC::COFile stream; stream.open(_Filename); @@ -400,7 +400,7 @@ void CParticleWorkspace::save() throw(NLMISC::EStream) clearModifiedFlag(); } -void CParticleWorkspace::load() throw(NLMISC::EStream) +void CParticleWorkspace::load() { NLMISC::CIFile stream; stream.open(_Filename); @@ -410,7 +410,7 @@ void CParticleWorkspace::load() throw(NLMISC::EStream) clearModifiedFlag(); } -void CParticleWorkspace::serial(NLMISC::IStream &f) throw(NLMISC::EStream) +void CParticleWorkspace::serial(NLMISC::IStream &f) { f.xmlPush("PARTICLE_WORKSPACE"); f.serialVersion(0); diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_node.h b/code/studio/src/plugins/object_viewer/particle_system/particle_node.h index 9ae36fd49..033802a44 100644 --- a/code/studio/src/plugins/object_viewer/particle_system/particle_node.h +++ b/code/studio/src/plugins/object_viewer/particle_system/particle_node.h @@ -80,17 +80,17 @@ public: void serial(NLMISC::IStream &f); /// Save the particle system target file - void savePS() throw(NLMISC::EStream); + void savePS(); /// Save particle system with an arbitrary filename - void savePSAs(const std::string &fullPath) throw(NLMISC::EStream); + void savePSAs(const std::string &fullPath); /// put back in the unloaded state void unload(); /// Load the particle system target file /// @return true if loading succeed (false means that loading was ok, but this is not a particle system). Other cases throw an exception. - bool loadPS() throw(NLMISC::EStream); + bool loadPS(); /// Create an empty particle system void createEmptyPS(); @@ -296,11 +296,11 @@ public: /// Save the workspace structure. The target file is the one given when this object was created /// NB : ps shape are not saved, only the structure is. To save the shapes, call CNode::save() - void save() throw(NLMISC::EStream); + void save(); /// Load the workspace structure. The target file is the one given when this object was created /// All nodes are in the 'unloaded" state, so it is to the caller to load them by calling load() on their node - void load() throw(NLMISC::EStream); + void load(); /// Test whether the structure of the workspace has been modified (does not test if ps inside the workspace have been modified) bool isModified() const @@ -348,7 +348,7 @@ private: std::string _Name; /// serial the object - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); /// set the 'modified flag' and call the callback void setModifiedFlag(bool modified); diff --git a/code/studio/src/plugins/object_viewer/particle_system/scheme_manager.cpp b/code/studio/src/plugins/object_viewer/particle_system/scheme_manager.cpp index b859d9d66..e9f0e77b9 100644 --- a/code/studio/src/plugins/object_viewer/particle_system/scheme_manager.cpp +++ b/code/studio/src/plugins/object_viewer/particle_system/scheme_manager.cpp @@ -47,7 +47,7 @@ void CSchemeManager::getSchemes(const std::string &type, std::vector &dest); // serial this collection - void serial(NLMISC::IStream &f) throw(NLMISC::EStream); + void serial(NLMISC::IStream &f); // swap this collection with another one void swap(CSchemeManager &other); // remove a scheme from the bank, given a pointer on it