[TD]using namespace clean up

This commit is contained in:
wandererfan
2019-11-02 19:27:24 -04:00
committed by WandererFan
parent 4539bd90b7
commit e987560314
4 changed files with 25 additions and 28 deletions

View File

@@ -45,23 +45,23 @@
#include <TopoDS_Wire.hxx>
namespace TechDraw {
using namespace boost;
//using namespace boost;
typedef
adjacency_list
< vecS,
vecS,
undirectedS,
property<vertex_index_t, int>,
property<edge_index_t, int>
boost::adjacency_list
< boost::vecS,
boost::vecS,
boost::undirectedS,
boost::property<boost::vertex_index_t, int>,
boost::property<boost::edge_index_t, int>
>
graph;
typedef
graph_traits < graph >::vertex_descriptor
boost::graph_traits < graph >::vertex_descriptor
vertex_t;
typedef
graph_traits < graph >::edge_descriptor
boost::graph_traits < graph >::edge_descriptor
edge_t;
typedef
@@ -70,7 +70,7 @@ typedef
typedef
boost::iterator_property_map< planar_embedding_storage_t::iterator,
property_map<graph, vertex_index_t>::type
boost::property_map<graph, boost::vertex_index_t>::type
>
planar_embedding_t;
@@ -110,7 +110,7 @@ public:
class edgeVisitor : public planar_face_traversal_visitor
class edgeVisitor : public boost::planar_face_traversal_visitor
{
public:
template <typename Edge>

View File

@@ -442,7 +442,7 @@ void MDIViewPage::updateDrawing(bool force)
// get all the DrawViews for this page, including the second level ones
// if we ever have collections of collections, we'll need to revisit this
DrawPage* thisPage = m_vpPage->getDrawPage();
TechDraw::DrawPage* thisPage = m_vpPage->getDrawPage();
if(!thisPage->getNameInDocument())
return;
@@ -468,7 +468,7 @@ void MDIViewPage::updateDrawing(bool force)
if (obj == nullptr) {
m_view->removeQView(qv);
} else {
DrawPage* pp = qv->getViewObject()->findParentPage();
TechDraw::DrawPage* pp = qv->getViewObject()->findParentPage();
if (thisPage != pp) {
m_view->removeQView(qv);
}

View File

@@ -29,15 +29,12 @@
#include <QByteArray>
#include <QBrush>
#include <QPixmap>
//#include <QVector>
#include <Mod/TechDraw/App/HatchLine.h>
#include <Mod/TechDraw/App/Geometry.h>
#include "QGIPrimPath.h"
using namespace TechDraw;
namespace TechDrawGui
{
class QGCustomSvg;
@@ -101,14 +98,14 @@ public:
void setLineWeight(double w);
void clearLineSets(void);
void addLineSet(LineSet& ls);
void addLineSet(TechDraw::LineSet& ls);
void clearFillItems(void);
void lineSetToFillItems(LineSet& ls);
QGraphicsPathItem* geomToLine(TechDraw::BaseGeom* base,LineSet& ls);
// QGraphicsPathItem* geomToOffsetLine(TechDraw::BaseGeom* base, double offset, const LineSet& ls);
QGraphicsPathItem* geomToStubbyLine(TechDraw::BaseGeom* base, double offset, LineSet& ls);
QGraphicsPathItem* lineFromPoints(Base::Vector3d start, Base::Vector3d end, DashSpec ds);
void lineSetToFillItems(TechDraw::LineSet& ls);
QGraphicsPathItem* geomToLine(TechDraw::BaseGeom* base, TechDraw::LineSet& ls);
// QGraphicsPathItem* geomToOffsetLine(TechDraw::BaseGeom* base, double offset, const TechDraw::LineSet& ls);
QGraphicsPathItem* geomToStubbyLine(TechDraw::BaseGeom* base, double offset, TechDraw::LineSet& ls);
QGraphicsPathItem* lineFromPoints(Base::Vector3d start, Base::Vector3d end, TechDraw::DashSpec ds);
//bitmap texture fill parms method
QPixmap textureFromBitmap(std::string fileSpec);
@@ -122,7 +119,7 @@ protected:
std::vector<double> offsetDash(const std::vector<double> dv, const double offset);
QPainterPath dashedPPath(const std::vector<double> dv, const Base::Vector3d start, const Base::Vector3d end);
double dashRemain(const std::vector<double> dv, const double offset);
double calcOffset(TechDraw::BaseGeom* g,LineSet ls);
double calcOffset(TechDraw::BaseGeom* g,TechDraw::LineSet ls);
int projIndex; //index of face in Projection. -1 for SectionFace.
QGCustomRect *m_rect;
@@ -136,10 +133,10 @@ protected:
QGIFace::fillMode m_mode;
QPen setGeomPen(void);
std::vector<double> decodeDashSpec(DashSpec d);
std::vector<double> decodeDashSpec(TechDraw::DashSpec d);
std::vector<QGraphicsPathItem*> m_fillItems;
std::vector<LineSet> m_lineSets;
std::vector<DashSpec> m_dashSpecs;
std::vector<TechDraw::LineSet> m_lineSets;
std::vector<TechDraw::DashSpec> m_dashSpecs;
long int m_segCount;
long int m_maxSeg;
long int m_maxTile;

View File

@@ -124,7 +124,7 @@ void QGIViewSection::drawSectionFace()
newFace->setHatchColor(sectionVp->HatchColor.getValue());
newFace->setHatchScale(section->HatchScale.getValue());
newFace->setLineWeight(sectionVp->WeightPattern.getValue());
std::vector<LineSet> lineSets = section->getDrawableLines(i);
std::vector<TechDraw::LineSet> lineSets = section->getDrawableLines(i);
if (!lineSets.empty()) {
newFace->clearLineSets();
for (auto& ls: lineSets) {