Skip to content

Commit

Permalink
[PD] remove unnecessary Unicode characters
Browse files Browse the repository at this point in the history
  • Loading branch information
donovaly committed Jan 6, 2022
1 parent 0c02395 commit 76c611a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions src/Mod/Part/App/GeometryDefaultExtension.cpp
Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions src/Mod/PartDesign/App/FeatureHole.cpp
Expand Up @@ -870,9 +870,9 @@ void Hole::updateHoleCutParams()
}
}

// handle legacy types but dont change user settings for
// handle legacy types but don't change user settings for
// user defined None, Counterbore and Countersink
// handle legacy types but dont 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);
Expand Down Expand Up @@ -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") {
Expand All @@ -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>();
}
Expand Down Expand Up @@ -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";
}
}
}
Expand Down

0 comments on commit 76c611a

Please sign in to comment.