From 4201191e4442d2e85734f006851703fa4833ac69 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 8 Jun 2016 08:54:43 +0100 Subject: [PATCH] Fixed -Wextra warnings --- src/osgPlugins/bsp/Q3BSPReader.cpp | 2 +- src/osgPlugins/bsp/VBSPData.cpp | 32 +++++++++++++++--------------- src/osgPlugins/bsp/VBSPData.h | 32 +++++++++++++++--------------- src/osgPlugins/bsp/VBSPReader.cpp | 4 ++-- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/osgPlugins/bsp/Q3BSPReader.cpp b/src/osgPlugins/bsp/Q3BSPReader.cpp index 296893611..2ef43bf59 100644 --- a/src/osgPlugins/bsp/Q3BSPReader.cpp +++ b/src/osgPlugins/bsp/Q3BSPReader.cpp @@ -167,7 +167,7 @@ public: osg::Geode* Q3BSPReader::convertFromBSP( Q3BSPLoad& aLoadData, - const osgDB::ReaderWriter::Options* options) const + const osgDB::ReaderWriter::Options* /*options*/) const { std::vector texture_array; diff --git a/src/osgPlugins/bsp/VBSPData.cpp b/src/osgPlugins/bsp/VBSPData.cpp index 7c1dc6242..9cc050c61 100644 --- a/src/osgPlugins/bsp/VBSPData.cpp +++ b/src/osgPlugins/bsp/VBSPData.cpp @@ -23,7 +23,7 @@ void VBSPData::addEntity(std::string & newEntity) } -const int VBSPData::getNumEntities() const +int VBSPData::getNumEntities() const { return entity_list.size(); } @@ -41,7 +41,7 @@ void VBSPData::addModel(Model & newModel) } -const int VBSPData::getNumModels() const +int VBSPData::getNumModels() const { return model_list.size(); } @@ -59,7 +59,7 @@ void VBSPData::addPlane(bsp::Plane & newPlane) } -const int VBSPData::getNumPlanes() const +int VBSPData::getNumPlanes() const { return plane_list.size(); } @@ -78,7 +78,7 @@ void VBSPData::addVertex(osg::Vec3f & newVertex) } -const int VBSPData::getNumVertices() const +int VBSPData::getNumVertices() const { return vertex_list.size(); } @@ -96,7 +96,7 @@ void VBSPData::addEdge(Edge & newEdge) } -const int VBSPData::getNumEdges() const +int VBSPData::getNumEdges() const { return edge_list.size(); } @@ -114,13 +114,13 @@ void VBSPData::addSurfaceEdge(int & newSurfEdge) } -const int VBSPData::getNumSurfaceEdges() const +int VBSPData::getNumSurfaceEdges() const { return surface_edge_list.size(); } -const int VBSPData::getSurfaceEdge(int index) const +int VBSPData::getSurfaceEdge(int index) const { return surface_edge_list[index]; } @@ -132,7 +132,7 @@ void VBSPData::addFace(Face & newFace) } -const int VBSPData::getNumFaces() const +int VBSPData::getNumFaces() const { return face_list.size(); } @@ -150,7 +150,7 @@ void VBSPData::addTexInfo(TexInfo & newTexInfo) } -const int VBSPData::getNumTexInfos() const +int VBSPData::getNumTexInfos() const { return texinfo_list.size(); } @@ -168,7 +168,7 @@ void VBSPData::addTexData(TexData & newTexData) } -const int VBSPData::getNumTexDatas() const +int VBSPData::getNumTexDatas() const { return texdata_list.size(); } @@ -186,7 +186,7 @@ void VBSPData::addTexDataString(std::string & newTexDataString) } -const int VBSPData::getNumTexDataStrings() const +int VBSPData::getNumTexDataStrings() const { return texdata_string_list.size(); } @@ -204,7 +204,7 @@ void VBSPData::addDispInfo(DisplaceInfo & newDispInfo) } -const int VBSPData::getNumDispInfos() const +int VBSPData::getNumDispInfos() const { return dispinfo_list.size(); } @@ -222,7 +222,7 @@ void VBSPData::addDispVertex(DisplacedVertex & newDispVertex) } -const int VBSPData::getNumDispVertices() const +int VBSPData::getNumDispVertices() const { return displaced_vertex_list.size(); } @@ -240,7 +240,7 @@ void VBSPData::addStaticPropModel(std::string & newModel) } -const int VBSPData::getNumStaticPropModels() const +int VBSPData::getNumStaticPropModels() const { return static_prop_model_list.size(); } @@ -272,7 +272,7 @@ void VBSPData::addStaticProp(StaticProp & newProp) } -const int VBSPData::getNumStaticProps() const +int VBSPData::getNumStaticProps() const { return static_prop_list.size(); } @@ -290,7 +290,7 @@ void VBSPData::addStateSet(StateSet * stateSet) } -const int VBSPData::getNumStateSets() const +int VBSPData::getNumStateSets() const { return state_set_list.size(); } diff --git a/src/osgPlugins/bsp/VBSPData.h b/src/osgPlugins/bsp/VBSPData.h index 23a3b9438..d137888de 100644 --- a/src/osgPlugins/bsp/VBSPData.h +++ b/src/osgPlugins/bsp/VBSPData.h @@ -218,64 +218,64 @@ public: VBSPData(); void addEntity(std::string & newEntity); - const int getNumEntities() const; + int getNumEntities() const; const std::string & getEntity(int index) const; void addModel(Model & newModel); - const int getNumModels() const; + int getNumModels() const; const Model & getModel(int index) const; void addPlane(Plane & newPlane); - const int getNumPlanes() const; + int getNumPlanes() const; const Plane & getPlane(int index) const; void addVertex(osg::Vec3f & newVertex); - const int getNumVertices() const; + int getNumVertices() const; const osg::Vec3f & getVertex(int index) const; void addEdge(Edge & newEdge); - const int getNumEdges() const; + int getNumEdges() const; const Edge & getEdge(int index) const; void addSurfaceEdge(int & newSurfEdge); - const int getNumSurfaceEdges() const; - const int getSurfaceEdge(int index) const; + int getNumSurfaceEdges() const; + int getSurfaceEdge(int index) const; void addFace(Face & newFace); - const int getNumFaces() const; + int getNumFaces() const; const Face & getFace(int index) const; void addTexInfo(TexInfo & newTexInfo); - const int getNumTexInfos() const; + int getNumTexInfos() const; const TexInfo & getTexInfo(int index) const; void addTexData(TexData & newTexData); - const int getNumTexDatas() const; + int getNumTexDatas() const; const TexData & getTexData(int index) const; void addTexDataString(std::string & newTexDataString); - const int getNumTexDataStrings() const; + int getNumTexDataStrings() const; const std::string & getTexDataString(int index) const; void addDispInfo(DisplaceInfo & newDispInfo); - const int getNumDispInfos() const; + int getNumDispInfos() const; const DisplaceInfo & getDispInfo(int index) const; void addDispVertex(DisplacedVertex & newDispVert); - const int getNumDispVertices() const; + int getNumDispVertices() const; const DisplacedVertex & getDispVertex(int index) const; void addStaticPropModel(std::string & newModel); - const int getNumStaticPropModels() const; + int getNumStaticPropModels() const; const std::string & getStaticPropModel(int index) const; void addStaticProp(StaticPropV4 & newProp); void addStaticProp(StaticProp & newProp); - const int getNumStaticProps() const; + int getNumStaticProps() const; const StaticProp & getStaticProp(int index) const; void addStateSet(osg::StateSet * stateSet); - const int getNumStateSets() const; + int getNumStateSets() const; osg::StateSet * getStateSet(int index) const; }; diff --git a/src/osgPlugins/bsp/VBSPReader.cpp b/src/osgPlugins/bsp/VBSPReader.cpp index df60ded40..cb1f45664 100644 --- a/src/osgPlugins/bsp/VBSPReader.cpp +++ b/src/osgPlugins/bsp/VBSPReader.cpp @@ -436,7 +436,7 @@ void VBSPReader::processDispVerts(std::istream & str, int offset, int length) } -void VBSPReader::processGameData(std::istream & str, int offset, int length) +void VBSPReader::processGameData(std::istream & str, int offset, int /*length*/) { GameHeader gameHeader; GameLump * gameLumps; @@ -467,7 +467,7 @@ void VBSPReader::processGameData(std::istream & str, int offset, int length) } -void VBSPReader::processStaticProps(std::istream & str, int offset, int length, +void VBSPReader::processStaticProps(std::istream & str, int offset, int /*length*/, int lumpVersion) { StaticPropModelNames sprpModelNames;