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

Mod: redundant void 2

Browse Source
This commit is contained in:
berniev
2022-08-07 20:05:16 +10:00
committed by wwmayer
parent bfef3ed33a
commit f4ffd15864
805 changed files with 3787 additions and 3787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Mod/TechDraw/App/Geometry.h
View File

@@ -106,14 +106,14 @@ class TechDrawExport BaseGeom : public std::enable_shared_from_this<BaseGeom>
int ref3D; //obs?
TopoDS_Edge occEdge; //projected Edge
bool cosmetic;
int source(void) { return m_source; }
int source() { return m_source; }
void source(int s) { m_source = s; }
int sourceIndex(void) { return m_sourceIndex; }
int sourceIndex() { return m_sourceIndex; }
void sourceIndex(int si) { m_sourceIndex = si; }
std::string getCosmeticTag(void) { return cosmeticTag; }
std::string getCosmeticTag() { return cosmeticTag; }
void setCosmeticTag(std::string t) { cosmeticTag = t; }
virtual std::string toString(void) const;
virtual std::string toString() const;
virtual void Save(Base::Writer& w) const;
virtual void Restore(Base::XMLReader& r);
std::vector<Base::Vector3d> findEndPoints();
@@ -126,14 +126,14 @@ class TechDrawExport BaseGeom : public std::enable_shared_from_this<BaseGeom>
Base::Vector3d nearPoint(const BaseGeomPtr p);
static BaseGeomPtr baseFactory(TopoDS_Edge edge);
static bool validateEdge(TopoDS_Edge edge);
bool closed(void);
bool closed();
BaseGeomPtr copy();
std::string dump();
std::vector<Base::Vector3d> intersection(TechDraw::BaseGeomPtr geom2);
//Uniqueness
boost::uuids::uuid getTag() const;
virtual std::string getTagAsString(void) const;
virtual std::string getTagAsString() const;
private:
void intersectionLL(TechDraw::BaseGeomPtr geom1,
@@ -160,13 +160,13 @@ using BaseGeomPtrVector = std::vector<BaseGeomPtr>; //new style
class TechDrawExport Circle: public BaseGeom
{
public:
Circle(void);
Circle();
Circle(const TopoDS_Edge &e);
Circle(Base::Vector3d center, double radius);
virtual ~Circle() = default;
public:
virtual std::string toString(void) const override;
virtual std::string toString() const override;
virtual void Save(Base::Writer& w) const override;
virtual void Restore(Base::XMLReader& r) override;
@@ -217,11 +217,11 @@ class TechDrawExport AOC: public Circle
public:
AOC(const TopoDS_Edge &e);
AOC(Base::Vector3d c, double r, double s, double e);
AOC(void);
AOC();
~AOC() = default;
public:
virtual std::string toString(void) const override;
virtual std::string toString() const override;
virtual void Save(Base::Writer& w) const override;
virtual void Restore(Base::XMLReader& r) override;
@@ -273,8 +273,8 @@ class TechDrawExport BSpline: public BaseGeom
bool cw;
bool isArc;
bool isLine(void);
bool isCircle(void);
bool isLine();
bool isCircle();
TopoDS_Edge asCircle(bool& isArc);
void getCircleParms(bool& isCircle, double& radius, Base::Vector3d& center, bool& isArc);
bool intersectsArc(Base::Vector3d p1,Base::Vector3d p2);
@@ -288,11 +288,11 @@ class TechDrawExport Generic: public BaseGeom
Generic();
~Generic() = default;
virtual std::string toString(void) const override;
virtual std::string toString() const override;
virtual void Save(Base::Writer& w) const override;
virtual void Restore(Base::XMLReader& r) override;
Base::Vector3d asVector(void);
double slope(void);
Base::Vector3d asVector();
double slope();
Base::Vector3d apparentInter(GenericPtr g);
std::vector<Base::Vector3d> points;
};
@@ -306,7 +306,7 @@ class TechDrawExport Wire
Wire(const TopoDS_Wire &w);
~Wire();
TopoDS_Wire toOccWire(void) const;
TopoDS_Wire toOccWire() const;
void dump(std::string s);
BaseGeomPtrVector geoms;
};
@@ -317,7 +317,7 @@ class TechDrawExport Face
public:
Face() = default;
~Face();
TopoDS_Face toOccFace(void) const;
TopoDS_Face toOccFace() const;
std::vector<Wire *> wires;
};
using FacePtr = std::shared_ptr<Face>;
@@ -342,7 +342,7 @@ class TechDrawExport Vertex
bool isCenter;
TopoDS_Vertex occVertex;
bool isEqual(const Vertex& v, double tol);
Base::Vector3d point(void) const { return Base::Vector3d(pnt.x,pnt.y,0.0); }
Base::Vector3d point() const { return Base::Vector3d(pnt.x,pnt.y,0.0); }
void point(Base::Vector3d v){ pnt = Base::Vector3d(v.x, v.y); }
bool cosmetic;
int cosmeticLink; //deprec. use cosmeticTag
@@ -353,7 +353,7 @@ class TechDrawExport Vertex
double y() {return pnt.y;}
boost::uuids::uuid getTag() const;
virtual std::string getTagAsString(void) const;
virtual std::string getTagAsString() const;
protected:
//Uniqueness