kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Mesh: modernize C++: replace 'typedef' with 'using'

Browse Source
This commit is contained in:
wmayer
2022-08-29 18:30:53 +02:00
parent e205daa43d
commit fd4e2c967b
30 changed files with 103 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Mesh/App/Core/Algorithm.cpp
View File

@@ -1454,7 +1454,7 @@ bool MeshAlgorithm::CutWithPlane (const Base::Vector3f &clBase, const Base::Vect
bool MeshAlgorithm::ConnectLines (std::list<std::pair<Base::Vector3f, Base::Vector3f> > &rclLines,
std::list<std::vector<Base::Vector3f> > &rclPolylines, float fMinEps) const
{
typedef std::list<std::pair<Base::Vector3f, Base::Vector3f> >::iterator TCIter;
using TCIter = std::list<std::pair<Base::Vector3f, Base::Vector3f> >::iterator;
// square search radius
// const float fMinEps = 1.0e-2f; // := 10 micrometer distance
@@ -1552,7 +1552,7 @@ bool MeshAlgorithm::ConnectLines (std::list<std::pair<Base::Vector3f, Base::Vect
}
// remove all polylines with too few length
typedef std::list<std::vector<Base::Vector3f> >::iterator TPIter;
using TPIter = std::list<std::vector<Base::Vector3f> >::iterator;
std::list<TPIter> _clPolyToDelete;
for (TPIter pJ = rclPolylines.begin(); pJ != rclPolylines.end(); ++pJ) {
if (pJ->size() == 2) { // only one line segment

2
src/Mod/Mesh/App/Core/Algorithm.h
View File

@@ -514,7 +514,7 @@ protected:
return false;
}
};
typedef std::pair<FacetIndex, FacetIndex> MeshFacetPair;
using MeshFacetPair = std::pair<FacetIndex, FacetIndex>;
const MeshKernel &_rclMesh; /**< The mesh kernel. */
std::map<MeshEdge, MeshFacetPair, EdgeOrder> _map;
};

2
src/Mod/Mesh/App/Core/Approximation.h
View File

@@ -492,7 +492,7 @@ public:
/**
* WildMagic library uses function with this interface
*/
typedef double (*Function)(double,double,double);
using Function = double (*)(double,double,double);
/**
* The constructor expects an array of quadric coefficients.
* @param pKoef Pointer to the quadric coefficients

2
src/Mod/Mesh/App/Core/Builder.cpp
View File

@@ -328,7 +328,7 @@ void MeshFastBuilder::AddFacet (const MeshGeomFacet& facetPoints)
void MeshFastBuilder::Finish ()
{
typedef QVector<Private::Vertex>::size_type size_type;
using size_type = QVector<Private::Vertex>::size_type;
QVector<Private::Vertex>& verts = p->verts;
size_type ulCtPts = verts.size();
for (size_type i=0; i < ulCtPts; ++i) {

4
src/Mod/Mesh/App/Core/Builder.h
View File

@@ -105,7 +105,7 @@ private:
Base::SequencerLauncher* _seq;
// keep an array of iterators pointing to the vertex inside the set to save memory
typedef std::pair<std::set<MeshPoint>::iterator, bool> MeshPointIterator;
using MeshPointIterator = std::pair<std::set<MeshPoint>::iterator, bool>;
std::vector<MeshPointIterator> _pointsIterator;
size_t _ptIdx;
@@ -189,7 +189,7 @@ private:
MeshKernel& _meshKernel;
public:
typedef int size_type;
using size_type = int;
explicit MeshFastBuilder(MeshKernel &rclM);
~MeshFastBuilder();

2
src/Mod/Mesh/App/Core/CylinderFit.h
View File

@@ -30,7 +30,7 @@
// -------------------------------------------------------------------------------
namespace MeshCoreFit {
typedef Eigen::Matrix<double,5,5,Eigen::RowMajor> Matrix5x5;
using Matrix5x5 = Eigen::Matrix<double,5,5,Eigen::RowMajor>;
/**
* Best-fit cylinder for a given set of points.

4
src/Mod/Mesh/App/Core/Definitions.h
View File

@@ -71,8 +71,8 @@ public:
MeshExport static const Prec PI;
};
typedef Math<float> Mathf;
typedef Math<double> Mathd;
using Mathf = Math<float>;
using Mathd = Math<double>;
/**
* Global defined tolerances used to compare points

12
src/Mod/Mesh/App/Core/Degeneration.cpp
View File

@@ -95,7 +95,7 @@ bool MeshFixInvalids::Fixup()
namespace MeshCore {
typedef MeshPointArray::_TConstIterator VertexIterator;
using VertexIterator = MeshPointArray::_TConstIterator;
/*
* When building up a mesh then usually the class MeshBuilder is used. This
* class uses internally a std::set<MeshPoint> which uses the '<' operator of
@@ -271,7 +271,7 @@ bool MeshFixNaNPoints::Fixup()
namespace MeshCore {
typedef MeshFacetArray::_TConstIterator FaceIterator;
using FaceIterator = MeshFacetArray::_TConstIterator;
/*
* The facet with the lowset index is regarded as 'less'.
*/
@@ -509,8 +509,8 @@ bool MeshFixDegeneratedFacets::Fixup()
bool MeshRemoveNeedles::Fixup()
{
typedef std::pair<unsigned long, int> FaceEdge; // (face, edge) pair
typedef std::pair<float, FaceEdge> FaceEdgePriority;
using FaceEdge = std::pair<unsigned long, int>; // (face, edge) pair
using FaceEdgePriority = std::pair<float, FaceEdge>;
MeshTopoAlgorithm topAlg(_rclMesh);
MeshRefPointToFacets vf_it(_rclMesh);
@@ -609,8 +609,8 @@ bool MeshRemoveNeedles::Fixup()
bool MeshFixCaps::Fixup()
{
typedef std::pair<unsigned long, int> FaceVertex; // (face, vertex) pair
typedef std::pair<float, FaceVertex> FaceVertexPriority;
using FaceVertex = std::pair<unsigned long, int>; // (face, vertex) pair
using FaceVertexPriority = std::pair<float, FaceVertex>;
MeshTopoAlgorithm topAlg(_rclMesh);
const MeshFacetArray &rclFAry = _rclMesh.GetFacets();

38
src/Mod/Mesh/App/Core/Elements.h
View File

@@ -69,7 +69,7 @@ public:
};
/** MeshEdge just a pair of two point indices */
typedef std::pair<PointIndex, PointIndex> MeshEdge;
using MeshEdge = std::pair<PointIndex, PointIndex>;
struct MeshExport EdgeCollapse
{
@@ -567,7 +567,7 @@ public:
unsigned long _ulProp; /**< Free usable property. */
};
typedef std::vector<MeshPoint> TMeshPointArray;
using TMeshPointArray = std::vector<MeshPoint>;
/**
* Stores all data points of the mesh structure.
*/
@@ -575,8 +575,8 @@ class MeshExport MeshPointArray: public TMeshPointArray
{
public:
// Iterator interface
typedef std::vector<MeshPoint>::iterator _TIterator;
typedef std::vector<MeshPoint>::const_iterator _TConstIterator;
using _TIterator = std::vector<MeshPoint>::iterator;
using _TConstIterator = std::vector<MeshPoint>::const_iterator;
/** @name Construction */
//@{
@@ -620,7 +620,7 @@ public:
PointIndex GetOrAddIndex (const MeshPoint &rclPoint);
};
typedef std::vector<MeshFacet> TMeshFacetArray;
using TMeshFacetArray = std::vector<MeshFacet>;
/**
* Stores all facets of the mesh data-structure.
@@ -629,8 +629,8 @@ class MeshExport MeshFacetArray: public TMeshFacetArray
{
public:
// Iterator interface
typedef std::vector<MeshFacet>::iterator _TIterator;
typedef std::vector<MeshFacet>::const_iterator _TConstIterator;
using _TIterator = std::vector<MeshFacet>::iterator;
using _TConstIterator = std::vector<MeshFacet>::const_iterator;
/** @name Construction */
//@{
@@ -1118,9 +1118,9 @@ template <class TCLASS>
class MeshIsFlag
{
public:
typedef TCLASS first_argument_type;
typedef typename TCLASS::TFlagType second_argument_type;
typedef bool result_type;
using first_argument_type = TCLASS;
using second_argument_type = typename TCLASS::TFlagType;
using result_type = bool;
bool operator () (const TCLASS& rclElem, typename TCLASS::TFlagType tFlag) const
{ return rclElem.IsFlag(tFlag); }
};
@@ -1132,9 +1132,9 @@ template <class TCLASS>
class MeshIsNotFlag
{
public:
typedef TCLASS first_argument_type;
typedef typename TCLASS::TFlagType second_argument_type;
typedef bool result_type;
using first_argument_type = TCLASS;
using second_argument_type = typename TCLASS::TFlagType;
using result_type = bool;
bool operator () (const TCLASS& rclElem, typename TCLASS::TFlagType tFlag) const
{ return !rclElem.IsFlag(tFlag); }
};
@@ -1146,9 +1146,9 @@ template <class TCLASS>
class MeshSetFlag
{
public:
typedef TCLASS first_argument_type;
typedef typename TCLASS::TFlagType second_argument_type;
typedef bool result_type;
using first_argument_type = TCLASS;
using second_argument_type = typename TCLASS::TFlagType;
using result_type = bool;
bool operator () (const TCLASS& rclElem, typename TCLASS::TFlagType tFlag) const
{ rclElem.SetFlag(tFlag); return true; }
};
@@ -1160,9 +1160,9 @@ template <class TCLASS>
class MeshResetFlag
{
public:
typedef TCLASS first_argument_type;
typedef typename TCLASS::TFlagType second_argument_type;
typedef bool result_type;
using first_argument_type = TCLASS;
using second_argument_type = typename TCLASS::TFlagType;
using result_type = bool;
bool operator () (const TCLASS& rclElem, typename TCLASS::TFlagType tFlag) const
{ rclElem.ResetFlag(tFlag); return true; }
};

2
src/Mod/Mesh/App/Core/Helpers.h
View File

@@ -89,7 +89,7 @@ struct MeshExport MeshHelpBuilderEdge
*/
struct MeshEdgeBuilder: public std::vector<MeshHelpBuilderEdge>
{
typedef std::vector<MeshHelpBuilderEdge>::iterator _TIterator;
using _TIterator = std::vector<MeshHelpBuilderEdge>::iterator;
inline void Add (PointIndex ulInd1, PointIndex ulInd2, FacetIndex ulSide, FacetIndex ulFInd);
};

4
src/Mod/Mesh/App/Core/KDTree.cpp
View File

@@ -35,7 +35,7 @@ using namespace MeshCore;
struct Point3d
{
typedef float value_type;
using value_type = float;
Point3d(const Base::Vector3f& f, PointIndex i) : p(f), i(i)
{
@@ -84,7 +84,7 @@ struct Point3d
PointIndex i;
};
typedef KDTree::KDTree<3, Point3d> MyKDTree;
using MyKDTree = KDTree::KDTree<3, Point3d>;
class MeshKDTree::Private
{

6
src/Mod/Mesh/App/Core/MeshIO.cpp
View File

@@ -787,9 +787,9 @@ namespace MeshCore {
};
struct Property
{
typedef std::pair<std::string, int> first_argument_type;
typedef std::string second_argument_type;
typedef bool result_type;
using first_argument_type = std::pair<std::string, int>;
using second_argument_type = std::string;
using result_type = bool;
bool operator()(const std::pair<std::string, int>& x,
const std::string& y) const

4
src/Mod/Mesh/App/Core/Segmentation.h
View File

@@ -35,7 +35,7 @@ class PlaneFit;
class CylinderFit;
class SphereFit;
class MeshFacet;
typedef std::vector<FacetIndex> MeshSegment;
using MeshSegment = std::vector<FacetIndex>;
class MeshExport MeshSurfaceSegment
{
@@ -56,7 +56,7 @@ protected:
std::vector<MeshSegment> segments;
unsigned long minFacets;
};
typedef std::shared_ptr<MeshSurfaceSegment> MeshSurfaceSegmentPtr;
using MeshSurfaceSegmentPtr = std::shared_ptr<MeshSurfaceSegment>;
// --------------------------------------------------------

2
src/Mod/Mesh/App/Core/Simplify.h
View File

@@ -17,7 +17,7 @@
#define _USE_MATH_DEFINES
#endif
typedef Base::Vector3f vec3f;
using vec3f = Base::Vector3f;
class SymmetricMatrix {

2
src/Mod/Mesh/App/Core/SphereFit.h
View File

@@ -30,7 +30,7 @@
// -------------------------------------------------------------------------------
namespace MeshCoreFit {
typedef Eigen::Matrix<double,4,4,Eigen::RowMajor> Matrix4x4;
using Matrix4x4 = Eigen::Matrix<double,4,4,Eigen::RowMajor>;
/**
* Best-fit sphere for a given set of points.

4
src/Mod/Mesh/App/Core/TopoAlgorithm.cpp
View File

@@ -287,8 +287,8 @@ float MeshTopoAlgorithm::SwapEdgeBenefit(FacetIndex f, int e) const
vertices[v1], vertices[v4]);
}
typedef std::pair<FacetIndex,int> FaceEdge; // (face, edge) pair
typedef std::pair<float, FaceEdge> FaceEdgePriority;
using FaceEdge = std::pair<FacetIndex,int>; // (face, edge) pair
using FaceEdgePriority = std::pair<float, FaceEdge>;
void MeshTopoAlgorithm::OptimizeTopology()
{

2
src/Mod/Mesh/App/Core/TopoAlgorithm.h
View File

@@ -321,7 +321,7 @@ private:
};
// cache
typedef std::map<Base::Vector3f,PointIndex,Vertex_Less> tCache;
using tCache = std::map<Base::Vector3f,PointIndex,Vertex_Less>;
tCache* _cache;
};

8
src/Mod/Mesh/App/Core/Utilities.h
View File

@@ -31,8 +31,8 @@ namespace Base {
// Specialization for Wm4::Vector3d
template <>
struct vec_traits<Wm4::Vector3d> {
typedef Wm4::Vector3d vec_type;
typedef double float_type;
using vec_type = Wm4::Vector3d;
using float_type = double;
explicit vec_traits(const vec_type& v) : v(v){}
inline std::tuple<float_type,float_type,float_type> get() const {
return std::make_tuple(v.X(), v.Y(), v.Z());
@@ -43,8 +43,8 @@ private:
// Specialization for Wm4::Vector3f
template <>
struct vec_traits<Wm4::Vector3f> {
typedef Wm4::Vector3f vec_type;
typedef float float_type;
using vec_type = Wm4::Vector3f;
using float_type = float;
explicit vec_traits(const vec_type& v) : v(v){}
inline std::tuple<float_type,float_type,float_type> get() const {
return std::make_tuple(v.X(), v.Y(), v.Z());

4
src/Mod/Mesh/App/Mesh.h
View File

@@ -91,7 +91,7 @@ public:
using TFacePair = std::pair<FacetIndex, FacetIndex>;
using TFacePairs = std::vector<TFacePair>;
// typedef needed for cross-section
// type def needed for cross-section
using TPlane = std::pair<Base::Vector3f, Base::Vector3f>;
using TPolylines = std::list<std::vector<Base::Vector3f>>;
using TRay = std::pair<Base::Vector3d, Base::Vector3d>;
@@ -406,7 +406,7 @@ public:
const_facet_iterator facets_end() const
{ return const_facet_iterator(this, countFacets()); }
typedef std::vector<Segment>::const_iterator const_segment_iterator;
using const_segment_iterator = std::vector<Segment>::const_iterator;
const_segment_iterator segments_begin() const
{ return _segments.begin(); }
const_segment_iterator segments_end() const

4
src/Mod/Mesh/App/MeshFeature.h
View File

@@ -85,8 +85,8 @@ public:
PyObject* getPyObject() override;
};
typedef App::FeatureCustomT<Feature> FeatureCustom;
typedef App::FeaturePythonT<Feature> FeaturePython;
using FeatureCustom = App::FeatureCustomT<Feature>;
using FeaturePython = App::FeaturePythonT<Feature>;
} //namespace Mesh

4
src/Mod/Mesh/Gui/MeshEditor.h
View File

@@ -138,8 +138,8 @@ private Q_SLOTS:
void closeBridge();
private:
typedef std::vector<Mesh::PointIndex> TBoundary;
typedef boost::signals2::connection Connection;
using TBoundary = std::vector<Mesh::PointIndex>;
using Connection = boost::signals2::connection;
static void fileHoleCallback(void * ud, SoEventCallback * n);
void createPolygons();

2
src/Mod/Mesh/Gui/SegmentationBestFit.h
View File

@@ -49,7 +49,7 @@ public:
virtual std::vector<float> getParameter(Points) const = 0;
};
typedef std::list<std::pair<QString, float> > ParameterList;
using ParameterList = std::list<std::pair<QString, float> >;
class ParametersDialog : public QDialog
{
Q_OBJECT

8
src/Mod/Mesh/Gui/SoFCIndexedFaceSet.h
View File

@@ -35,9 +35,9 @@
class SoGLCoordinateElement;
class SoTextureCoordinateBundle;
typedef unsigned int GLuint;
typedef int GLint;
typedef float GLfloat;
using GLuint = unsigned int;
using GLint = int;
using GLfloat = float;
namespace MeshGui {
@@ -93,7 +93,7 @@ private:
* @author Werner Mayer
*/
class MeshGuiExport SoFCIndexedFaceSet : public SoIndexedFaceSet {
typedef SoIndexedFaceSet inherited;
using inherited = SoIndexedFaceSet;
SO_NODE_HEADER(SoFCIndexedFaceSet);

32
src/Mod/Mesh/Gui/SoFCMeshFaceSet.h
View File

@@ -43,9 +43,9 @@ class Feature;
namespace MeshGui {
class MeshGuiExport SoSFMeshFacetArray : public SoSField {
typedef SoSField inherited;
using inherited = SoSField;
SO_SFIELD_HEADER(SoSFMeshFacetArray, MeshCore::MeshFacetArray*, MeshCore::MeshFacetArray*);
SO_SFIELD_HEADER(SoSFMeshFacetArray, MeshCore::MeshFacetArray*, MeshCore::MeshFacetArray*)
public:
static void initClass(void);
@@ -62,7 +62,7 @@ protected:
// -------------------------------------------------------
class MeshGuiExport SoFCMeshFacetElement : public SoReplacedElement {
typedef SoReplacedElement inherited;
using inherited = SoReplacedElement;
SO_ELEMENT_HEADER(SoFCMeshFacetElement);
@@ -83,7 +83,7 @@ protected:
// -------------------------------------------------------
class MeshGuiExport SoFCMeshFacet : public SoNode {
typedef SoSField inherited;
using inherited = SoSField;
SO_NODE_HEADER(SoFCMeshFacet);
@@ -119,7 +119,7 @@ protected:
* @author Werner Mayer
*/
class MeshGuiExport SoFCMeshFaceSet : public SoShape {
typedef SoShape inherited;
using inherited = SoShape;
SO_NODE_HEADER(SoFCMeshFaceSet);
@@ -141,19 +141,19 @@ protected:
const SoPrimitiveVertex * v3,
SoPickedPoint * pp);
private:
enum Binding {
OVERALL = 0,
PER_FACE_INDEXED,
PER_VERTEX_INDEXED,
NONE = OVERALL
};
private:
enum Binding {
OVERALL = 0,
PER_FACE_INDEXED,
PER_VERTEX_INDEXED,
NONE = OVERALL
};
private:
// Force using the reference count mechanism.
virtual ~SoFCMeshFaceSet() {};
virtual ~SoFCMeshFaceSet() {}
virtual void notify(SoNotList * list);
Binding findMaterialBinding(SoState * const state) const;
Binding findMaterialBinding(SoState * const state) const;
// Draw faces
void drawFaces(const MeshCore::MeshPointArray *, const MeshCore::MeshFacetArray*, SoMaterialBundle* mb, Binding bind,
SbBool needNormals, SbBool ccw) const;
@@ -170,7 +170,7 @@ private:
// ------------------------------------------------------------
class MeshGuiExport SoFCMeshOpenEdgeSet : public SoShape {
typedef SoShape inherited;
using inherited = SoShape;
SO_NODE_HEADER(SoFCMeshOpenEdgeSet);
@@ -185,7 +185,7 @@ protected:
virtual void generatePrimitives(SoAction *action);
private:
// Force using the reference count mechanism.
virtual ~SoFCMeshOpenEdgeSet() {};
virtual ~SoFCMeshOpenEdgeSet() {}
void drawLines(const MeshCore::MeshPointArray *, const MeshCore::MeshFacetArray*) const ;
};

8
src/Mod/Mesh/Gui/SoFCMeshNode.h
View File

@@ -35,7 +35,7 @@ class MeshObject;
namespace MeshGui {
class MeshGuiExport SoFCMeshNode : public SoShape {
typedef SoShape inherited;
using inherited = SoShape;
SO_NODE_HEADER(SoFCMeshNode);
@@ -62,7 +62,7 @@ protected:
private:
// Force using the reference count mechanism.
virtual ~SoFCMeshNode() {};
virtual ~SoFCMeshNode() {}
virtual void notify(SoNotList * list);
// Draw faces
void drawFaces(SbBool needNormals) const;
@@ -80,7 +80,7 @@ private:
// ------------------------------------------------------------
class MeshGuiExport SoFCMeshOpenEdge : public SoShape {
typedef SoShape inherited;
using inherited = SoShape;
SO_NODE_HEADER(SoFCMeshOpenEdge);
@@ -96,7 +96,7 @@ protected:
virtual void generatePrimitives(SoAction *action);
private:
// Force using the reference count mechanism.
virtual ~SoFCMeshOpenEdge() {};
virtual ~SoFCMeshOpenEdge() {}
void drawLines() const ;
private:

26
src/Mod/Mesh/Gui/SoFCMeshObject.h
View File

@@ -34,16 +34,16 @@
#include <Mod/Mesh/App/Core/Elements.h>
#include <Mod/Mesh/App/Mesh.h>
typedef unsigned int GLuint;
typedef int GLint;
typedef float GLfloat;
using GLuint = unsigned int;
using GLint = int;
using GLfloat = float;
namespace MeshCore { class MeshFacetGrid; }
namespace MeshGui {
class MeshGuiExport SoSFMeshObject : public SoSField {
typedef SoSField inherited;
using inherited = SoSField;
SO_SFIELD_HEADER(SoSFMeshObject, Base::Reference<const Mesh::MeshObject>, Base::Reference<const Mesh::MeshObject>)
@@ -57,7 +57,7 @@ private:
// -------------------------------------------------------
class MeshGuiExport SoFCMeshObjectElement : public SoReplacedElement {
typedef SoReplacedElement inherited;
using inherited = SoReplacedElement;
SO_ELEMENT_HEADER(SoFCMeshObjectElement);
@@ -78,7 +78,7 @@ protected:
// -------------------------------------------------------
class MeshGuiExport SoFCMeshPickNode : public SoNode {
typedef SoNode inherited;
using inherited = SoNode;
SO_NODE_HEADER(SoFCMeshPickNode);
@@ -102,7 +102,7 @@ private:
// -------------------------------------------------------
class MeshGuiExport SoFCMeshGridNode : public SoNode {
typedef SoNode inherited;
using inherited = SoNode;
SO_NODE_HEADER(SoFCMeshGridNode);
@@ -122,7 +122,7 @@ protected:
// -------------------------------------------------------
class MeshGuiExport SoFCMeshObjectNode : public SoNode {
typedef SoNode inherited;
using inherited = SoNode;
SO_NODE_HEADER(SoFCMeshObjectNode);
@@ -164,7 +164,7 @@ protected:
* @author Werner Mayer
*/
class MeshGuiExport SoFCMeshObjectShape : public SoShape {
typedef SoShape inherited;
using inherited = SoShape;
SO_NODE_HEADER(SoFCMeshObjectShape);
@@ -225,7 +225,7 @@ private:
};
class MeshGuiExport SoFCMeshSegmentShape : public SoShape {
typedef SoShape inherited;
using inherited = SoShape;
SO_NODE_HEADER(SoFCMeshSegmentShape);
@@ -252,7 +252,7 @@ private:
private:
// Force using the reference count mechanism.
~SoFCMeshSegmentShape() override {};
~SoFCMeshSegmentShape() override {}
Binding findMaterialBinding(SoState * const state) const;
// Draw faces
void drawFaces(const Mesh::MeshObject *, SoMaterialBundle* mb, Binding bind,
@@ -261,7 +261,7 @@ private:
};
class MeshGuiExport SoFCMeshObjectBoundary : public SoShape {
typedef SoShape inherited;
using inherited = SoShape;
SO_NODE_HEADER(SoFCMeshObjectBoundary);
@@ -276,7 +276,7 @@ protected:
void generatePrimitives(SoAction *action) override;
private:
// Force using the reference count mechanism.
~SoFCMeshObjectBoundary() override {};
~SoFCMeshObjectBoundary() override {}
void drawLines(const Mesh::MeshObject *) const ;
};

8
src/Mod/Mesh/Gui/SoFCMeshVertex.h
View File

@@ -32,9 +32,9 @@
namespace MeshGui {
class MeshGuiExport SoSFMeshPointArray : public SoSField {
typedef SoSField inherited;
using inherited = SoSField;
SO_SFIELD_HEADER(SoSFMeshPointArray, MeshCore::MeshPointArray*, MeshCore::MeshPointArray*);
SO_SFIELD_HEADER(SoSFMeshPointArray, MeshCore::MeshPointArray*, MeshCore::MeshPointArray*)
public:
static void initClass(void);
@@ -51,7 +51,7 @@ protected:
// -------------------------------------------------------
class MeshGuiExport SoFCMeshVertexElement : public SoReplacedElement {
typedef SoReplacedElement inherited;
using inherited = SoReplacedElement;
SO_ELEMENT_HEADER(SoFCMeshVertexElement);
@@ -72,7 +72,7 @@ protected:
// -------------------------------------------------------
class MeshGuiExport SoFCMeshVertex : public SoNode {
typedef SoSField inherited;
using inherited = SoSField;
SO_NODE_HEADER(SoFCMeshVertex);

2
src/Mod/Mesh/Gui/SoPolygon.h
View File

@@ -37,7 +37,7 @@
namespace MeshGui {
class MeshGuiExport SoPolygon : public SoShape {
typedef SoShape inherited;
using inherited = SoShape;
SO_NODE_HEADER(SoPolygon);

2
src/Mod/Mesh/Gui/ViewProviderCurvature.h
View File

@@ -58,7 +58,7 @@ namespace MeshGui {
class MeshGuiExport ViewProviderMeshCurvature : public Gui::ViewProviderDocumentObject,
public App::DocumentObserver,
public Base::Observer<int> {
typedef Gui::ViewProviderDocumentObject inherited;
using inherited = Gui::ViewProviderDocumentObject;
PROPERTY_HEADER_WITH_OVERRIDE(MeshGui::ViewProviderMeshCurvature);

2
src/Mod/Mesh/Gui/ViewProviderPython.h
View File

@@ -29,7 +29,7 @@
namespace MeshGui {
typedef Gui::ViewProviderPythonFeatureT<ViewProviderMeshFaceSet> ViewProviderPython;
using ViewProviderPython = Gui::ViewProviderPythonFeatureT<ViewProviderMeshFaceSet>;
} // namespace MeshGui