Merge pull request #756 from j-rivero/master

Fix spelling errors detected by Debian QA checker
dartsim · Aug 4, 2016 · 38a068c · 38a068c
2 parents 7b886b7 + aecc9d8
commit 38a068c
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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)
 

diff --git a/dart/gui/GlutWindow.cpp b/dart/gui/GlutWindow.cpp
@@ -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);
 }
 

diff --git a/dart/math/Helpers.hpp b/dart/math/Helpers.hpp
@@ -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);
 }

diff --git a/dart/utils/CompositeResourceRetriever.cpp b/dart/utils/CompositeResourceRetriever.cpp
@@ -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;
   }
 

diff --git a/dart/utils/VskParser.cpp b/dart/utils/VskParser.cpp
@@ -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;
       }
 
@@ -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;
   }
 }

diff --git a/tutorials/tutorialCollisions-Finished.cpp b/tutorials/tutorialCollisions-Finished.cpp
@@ -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;
 }

diff --git a/tutorials/tutorialCollisions.cpp b/tutorials/tutorialCollisions.cpp
@@ -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;
 }