[PD] remove unnecessary Unicode characters
they cause problems: https://forum.freecadweb.org/viewtopic.php?p=559077#p559077
This commit is contained in:
@@ -88,11 +88,11 @@ std::unique_ptr<Part::GeometryExtension> GeometryDefaultExtension<T>::copy(void)
|
||||
// That would work perfectly with GCC 7.3.0. However, GCC 4.8.4 misserably fails:
|
||||
//
|
||||
// /home/travis/build/FreeCAD/FreeCAD/src/Mod/Part/App/GeometryDefaultExtension.cpp: In instantiation of
|
||||
// ‘std::unique_ptr<Part::GeometryExtension> Part::GeometryDefaultExtension<T>::copy() const [with T = long int]’:
|
||||
// 'std::unique_ptr<Part::GeometryExtension> Part::GeometryDefaultExtension<T>::copy() const [with T = long int]':
|
||||
// /home/travis/build/FreeCAD/FreeCAD/src/Mod/Part/App/GeometryDefaultExtension.cpp:164:16: required from here
|
||||
// /home/travis/build/FreeCAD/FreeCAD/src/Mod/Part/App/GeometryDefaultExtension.cpp:84:12: error: cannot bind //
|
||||
// ‘std::unique_ptr<Part::GeometryDefaultExtension<long int>, std::default_delete<Part::GeometryDefaultExtension<long int> > >’ lvalue
|
||||
// to ‘std::unique_ptr<Part::GeometryDefaultExtension<long int>, std::default_delete<Part::GeometryDefaultExtension<long int> > >&&’
|
||||
// 'std::unique_ptr<Part::GeometryDefaultExtension<long int>, std::default_delete<Part::GeometryDefaultExtension<long int> > >' lvalue
|
||||
// to 'std::unique_ptr<Part::GeometryDefaultExtension<long int>, std::default_delete<Part::GeometryDefaultExtension<long int> > >&&'
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
|
||||
@@ -870,9 +870,9 @@ void Hole::updateHoleCutParams()
|
||||
}
|
||||
}
|
||||
|
||||
// handle legacy types but don’t change user settings for
|
||||
// handle legacy types but don't change user settings for
|
||||
// user defined None, Counterbore and Countersink
|
||||
// handle legacy types but don’t change user settings for
|
||||
// handle legacy types but don't change user settings for
|
||||
// user defined None, Counterbore and Countersink
|
||||
else if (holeCutTypeStr == "Cheesehead (deprecated)") {
|
||||
HoleCutDiameter.setValue(diameterVal * 1.6);
|
||||
@@ -2200,7 +2200,7 @@ void from_json(const nlohmann::json &j, Hole::CutDimensionSet &t)
|
||||
else if (thread_type_string == "metricfine")
|
||||
t.thread_type = Hole::CutDimensionSet::MetricFine;
|
||||
else
|
||||
throw Base::IndexError(std::string(u8"Thread type ‘") + thread_type_string + u8"’ unsupported");
|
||||
throw Base::IndexError(std::string("Thread type '") + thread_type_string + "' unsupported");
|
||||
|
||||
std::string cut_type_string = j["cut_type"].get<std::string>();
|
||||
if (cut_type_string == "counterbore") {
|
||||
@@ -2213,7 +2213,7 @@ void from_json(const nlohmann::json &j, Hole::CutDimensionSet &t)
|
||||
t.angle = j["angle"].get<double>();
|
||||
}
|
||||
else
|
||||
throw Base::IndexError(std::string("Cut type ‘") + cut_type_string + "’ unsupported");
|
||||
throw Base::IndexError(std::string("Cut type '") + cut_type_string + "' unsupported");
|
||||
|
||||
t.name = j["name"].get<std::string>();
|
||||
}
|
||||
@@ -2241,7 +2241,7 @@ void Hole::readCutDefinitions()
|
||||
addCutType(screwtype);
|
||||
}
|
||||
catch(std::exception &e) {
|
||||
std::cerr << "Failed reading ‘" << f.filePath() << "’ with: "<< e.what() << "\n";
|
||||
std::cerr << "Failed reading '" << f.filePath() << "' with: "<< e.what() << "\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user