Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix spelling errors detected by Debian QA checker #756

Merged
merged 4 commits into from
Aug 4, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Misc improvements and bug fixes

* Added `virtual Shape::getType()` and deprecated `ShapeType Shpae::getShapeType()`: [#724](https://github.com/dartsim/dart/pull/724)
* Fixed typo: grount --> ground: [#755](https://github.com/dartsim/dart/pull/755)
* Fixed typo: [#756](https://github.com/dartsim/dart/pull/756), [#755](https://github.com/dartsim/dart/pull/755)

### DART 6.0.1 (2016-XX-XX)

Expand Down
2 changes: 1 addition & 1 deletion dart/gui/GlutWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ inline GlutWindow* GlutWindow::current() {
return mWindows.at(i);
}
}
std::cout << "An unknown error occured!" << std::endl;
std::cout << "An unknown error occurred!" << std::endl;
exit(0);
}

Expand Down
4 changes: 2 additions & 2 deletions dart/math/Helpers.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -340,12 +340,12 @@ inline Eigen::Vector3d Red()
return Eigen::Vector3d(0.9, 0.1, 0.1);
}

inline Eigen::Vector3d Fuschia()
inline Eigen::Vector3d Fuchsia()
{
return Eigen::Vector3d(1.0, 0.0, 0.5);
}

inline Eigen::Vector4d Fuschia(double alpha)
inline Eigen::Vector4d Fuchsia(double alpha)
{
return Eigen::Vector4d(1.0, 0.0, 0.5, alpha);
}
Expand Down
4 changes: 2 additions & 2 deletions dart/utils/CompositeResourceRetriever.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ bool CompositeResourceRetriever::addSchemaRetriever(
{
if(!_resourceRetriever)
{
dterr << "[CompositeResourceRetriever::addSchemaRetriever] Recieved nullptr"
" ResourceRetriever; skipping this entry.\n";
dterr << "[CompositeResourceRetriever::addSchemaRetriever] Receieved"
" nullptr ResourceRetriever; skipping this entry.\n";
return false;
}

Expand Down
4 changes: 2 additions & 2 deletions dart/utils/VskParser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ bool readSegment(const tinyxml2::XMLElement* segment,

if (!res)
{
dtwarn << "[ParserVsk::readSegment] Faild to parse joint type.\n";
dtwarn << "[ParserVsk::readSegment] Failed to parse joint type.\n";
return false;
}

Expand Down Expand Up @@ -571,7 +571,7 @@ bool readJoint(const std::string& jointType,
}
else
{
dtwarn << "[ParserVsk::readSegment] Faild to parse joint type.\n";
dtwarn << "[ParserVsk::readSegment] Failed to parse joint type.\n";
return false;
}
}
Expand Down
2 changes: 1 addition & 1 deletion tutorials/tutorialCollisions-Finished.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ SkeletonPtr createSoftBody()
inertia.setMoment(box->computeInertia(inertia.getMass()));
bn->setInertia(inertia);

setAllColors(soft, dart::Color::Fuschia());
setAllColors(soft, dart::Color::Fuchsia());

return soft;
}
Expand Down
2 changes: 1 addition & 1 deletion tutorials/tutorialCollisions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ SkeletonPtr createSoftBody()
// Add a rigid collision geometry and inertia
// Lesson 2f

setAllColors(soft, dart::Color::Fuschia());
setAllColors(soft, dart::Color::Fuchsia());

return soft;
}
Expand Down