Fix mixed line endings
This commit is contained in:
@@ -84,7 +84,7 @@ bool ExternalGeometryExtension::getFlagsFromName(std::string str, ExternalGeomet
|
||||
auto pos = std::find_if( ExternalGeometryExtension::flag2str.begin(),
|
||||
ExternalGeometryExtension::flag2str.end(),
|
||||
[str](const char * val) {
|
||||
return strcmp(val,str.c_str())==0;
|
||||
return strcmp(val,str.c_str())==0;
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
@@ -115,7 +115,7 @@ PyObject* ExternalGeometryFacadePy::setFlag(PyObject *args)
|
||||
auto pos = std::find_if(ExternalGeometryExtension::flag2str.begin(),
|
||||
ExternalGeometryExtension::flag2str.end(),
|
||||
[flag](const char * val) {
|
||||
return strcmp(val,flag)==0;
|
||||
return strcmp(val,flag)==0;
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
@@ -114,7 +114,7 @@ bool SketchGeometryExtension::getInternalTypeFromName(std::string str, InternalT
|
||||
auto pos = std::find_if( SketchGeometryExtension::internaltype2str.begin(),
|
||||
SketchGeometryExtension::internaltype2str.end(),
|
||||
[str](const char * val) {
|
||||
return strcmp(val,str.c_str())==0;
|
||||
return strcmp(val,str.c_str())==0;
|
||||
}
|
||||
);
|
||||
|
||||
@@ -133,7 +133,7 @@ bool SketchGeometryExtension::getGeometryModeFromName(std::string str, GeometryM
|
||||
auto pos = std::find_if( SketchGeometryExtension::geometrymode2str.begin(),
|
||||
SketchGeometryExtension::geometrymode2str.end(),
|
||||
[str](const char * val) {
|
||||
return strcmp(val,str.c_str())==0;
|
||||
return strcmp(val,str.c_str())==0;
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
@@ -1807,7 +1807,7 @@ int SketchObject::fillet(int GeoId1, int GeoId2,
|
||||
int filletId;
|
||||
std::unique_ptr<Part::GeomArcOfCircle> arc(
|
||||
Part::createFilletGeometry(lineSeg1, lineSeg2, filletCenter, radius));
|
||||
if (!arc)
|
||||
if (!arc)
|
||||
return -1;
|
||||
|
||||
// calculate intersection and distances before we invalidate lineSeg1 and lineSeg2
|
||||
|
||||
@@ -181,7 +181,7 @@ void CmdSketcherNewSketch::activated(int iMsg)
|
||||
qApp->translate("Sketcher_NewSketch", "Sketch attachment"),
|
||||
qApp->translate("Sketcher_NewSketch", "Select the method to attach this sketch to selected object"),
|
||||
items, iSugg, false, &ok, Qt::MSWindowsFixedSizeDialogHint);
|
||||
if (!ok)
|
||||
if (!ok)
|
||||
return;
|
||||
int index = items.indexOf(text);
|
||||
if (index == 0){
|
||||
|
||||
@@ -598,7 +598,7 @@ int DrawSketchHandler::seekAutoConstraint(std::vector<AutoConstraint> &suggested
|
||||
suggestedConstraints.push_back(constr);
|
||||
|
||||
// Do not seek for tangent if we are actually building a primitive
|
||||
if (type == AutoConstraint::VERTEX_NO_TANGENCY)
|
||||
if (type == AutoConstraint::VERTEX_NO_TANGENCY)
|
||||
return suggestedConstraints.size();
|
||||
|
||||
// Find if there are tangent constraints (currently arcs and circles)
|
||||
|
||||
@@ -224,7 +224,7 @@ CONTEXT_MEMBER_DEF("Sketcher_SelectVerticalAxis",doSelectVAxis)
|
||||
void ElementView::deleteSelectedItems()
|
||||
{
|
||||
App::Document* doc = App::GetApplication().getActiveDocument();
|
||||
if (!doc)
|
||||
if (!doc)
|
||||
return;
|
||||
|
||||
doc->openTransaction("Delete element");
|
||||
@@ -615,7 +615,7 @@ void TaskSketcherElements::on_listWidgetElements_itemSelectionChanged(void)
|
||||
void TaskSketcherElements::on_listWidgetElements_itemEntered(QListWidgetItem *item)
|
||||
{
|
||||
ElementItem *it = dynamic_cast<ElementItem*>(item);
|
||||
if (!it)
|
||||
if (!it)
|
||||
return;
|
||||
|
||||
Gui::Selection().rmvPreselect();
|
||||
@@ -1164,11 +1164,11 @@ TaskSketcherElements::MultIcon::MultIcon(const char* name)
|
||||
|
||||
QIcon TaskSketcherElements::MultIcon::getIcon(bool construction, bool external) const
|
||||
{
|
||||
if (construction && external)
|
||||
if (construction && external)
|
||||
return QIcon();
|
||||
if (construction)
|
||||
if (construction)
|
||||
return Construction;
|
||||
if (external)
|
||||
if (external)
|
||||
return External;
|
||||
return Normal;
|
||||
}
|
||||
|
||||
@@ -523,7 +523,7 @@ void ViewProviderSketch::getProjectingLine(const SbVec2s& pnt, const Gui::View3D
|
||||
}
|
||||
|
||||
SoCamera* pCam = viewer->getSoRenderManager()->getCamera();
|
||||
if (!pCam)
|
||||
if (!pCam)
|
||||
return;
|
||||
SbViewVolume vol = pCam->getViewVolume();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user