Merge pull request #693 from dartsim/js/h_to_hpp

Use .hpp for headers
dartsim · Apr 26, 2016 · 7641f05 · 7641f05
2 parents 579cb2e + e0dab88
commit 7641f05
Show file tree

Hide file tree

Showing 571 changed files with 2,380 additions and 2,369 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -235,8 +235,8 @@ message(STATUS "[ Configured files ]")
 
 # Generate the dart config file
 # Ref: http://www.vtk.org/Wiki/CMake:How_To_Write_Platform_Checks
-set(DART_CONFIG_IN ${CMAKE_SOURCE_DIR}/dart/config.h.in)
-set(DART_CONFIG_OUT ${CMAKE_BINARY_DIR}/dart/config.h)
+set(DART_CONFIG_IN ${CMAKE_SOURCE_DIR}/dart/config.hpp.in)
+set(DART_CONFIG_OUT ${CMAKE_BINARY_DIR}/dart/config.hpp)
 message(STATUS ${DART_CONFIG_OUT})
 configure_file(${DART_CONFIG_IN} ${DART_CONFIG_OUT} @ONLY)
 install(FILES ${DART_CONFIG_OUT} DESTINATION include/dart)

diff --git a/dart/CMakeLists.txt b/dart/CMakeLists.txt
@@ -20,7 +20,7 @@ add_subdirectory(math)
 add_subdirectory(simulation)
 
 # Set header and source files
-get_filename_component(dart_h "dart.h" ABSOLUTE)
+get_filename_component(dart_h "dart.hpp" ABSOLUTE)
 set(dart_hdrs
   ${dart_h}
   ${dart_common_hdrs}
@@ -62,7 +62,7 @@ if(MSVC)
   )
 endif()
 
-install(FILES dart.h DESTINATION include/dart/ COMPONENT headers)
+install(FILES dart.hpp DESTINATION include/dart/ COMPONENT headers)
 install(TARGETS dart EXPORT DARTTargets DESTINATION lib)
 
 # Coverage test files

diff --git a/dart/collision/CMakeLists.txt b/dart/collision/CMakeLists.txt
@@ -1,8 +1,8 @@
 # Search all header and source files
+file(GLOB hdrs "*.hpp")
 file(GLOB srcs "*.cpp")
-file(GLOB hdrs "*.h")
+file(GLOB detail_hdrs "detail/*.hpp")
 file(GLOB detail_srcs "detail/*.cpp")
-file(GLOB detail_hdrs "detail/*.h")
 
 # Add subdirectories
 add_subdirectory(dart)
@@ -19,11 +19,11 @@ dart_get_filename_components(header_names "collision headers" ${hdrs})
 set(
   header_names
   ${header_names}
-  dart/dart.h
-  fcl/fcl.h
+  dart/dart.hpp
+  fcl/fcl.hpp
 )
 if(HAVE_BULLET_COLLISION)
-  set(header_names ${header_names} bullet/bullet.h)
+  set(header_names ${header_names} bullet/bullet.hpp)
 endif()
 dart_generate_include_header_list(
   collision_headers
@@ -32,13 +32,13 @@ dart_generate_include_header_list(
   ${header_names}
 )
 configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/collision.h.in
-  ${CMAKE_CURRENT_BINARY_DIR}/collision.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/collision.hpp.in
+  ${CMAKE_CURRENT_BINARY_DIR}/collision.hpp
 )
 
 # Install
 install(
-  FILES ${hdrs} ${CMAKE_CURRENT_BINARY_DIR}/collision.h
+  FILES ${hdrs} ${CMAKE_CURRENT_BINARY_DIR}/collision.hpp
   DESTINATION include/dart/collision
   COMPONENT headers
 )

diff --git a/dart/collision/CollisionDetector.cpp b/dart/collision/CollisionDetector.cpp
@@ -35,15 +35,15 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "dart/collision/CollisionDetector.h"
+#include "dart/collision/CollisionDetector.hpp"
 
 #include <algorithm>
 
-#include "dart/common/Console.h"
-#include "dart/collision/CollisionObject.h"
-#include "dart/collision/CollisionGroup.h"
-#include "dart/dynamics/BodyNode.h"
-#include "dart/dynamics/Skeleton.h"
+#include "dart/common/Console.hpp"
+#include "dart/collision/CollisionObject.hpp"
+#include "dart/collision/CollisionGroup.hpp"
+#include "dart/dynamics/BodyNode.hpp"
+#include "dart/dynamics/Skeleton.hpp"
 
 namespace dart {
 namespace collision {

diff --git a/dart/collision/CollisionDetector.h → dart/collision/CollisionDetector.hpp b/dart/collision/CollisionDetector.h → dart/collision/CollisionDetector.hpp
@@ -35,19 +35,19 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef DART_COLLISION_COLLISIONDETECTOR_H_
-#define DART_COLLISION_COLLISIONDETECTOR_H_
+#ifndef DART_COLLISION_COLLISIONDETECTOR_HPP_
+#define DART_COLLISION_COLLISIONDETECTOR_HPP_
 
 #include <vector>
 #include <map>
 
 #include <Eigen/Dense>
 
-#include "dart/collision/Contact.h"
-#include "dart/collision/Option.h"
-#include "dart/collision/Result.h"
-#include "dart/collision/SmartPointer.h"
-#include "dart/dynamics/SmartPointer.h"
+#include "dart/collision/Contact.hpp"
+#include "dart/collision/Option.hpp"
+#include "dart/collision/Result.hpp"
+#include "dart/collision/SmartPointer.hpp"
+#include "dart/dynamics/SmartPointer.hpp"
 
 namespace dart {
 namespace collision {
@@ -225,6 +225,6 @@ class CollisionDetector::ManagerForSharableCollisionObjects final :
 }  // namespace collision
 }  // namespace dart
 
-#include "dart/collision/detail/CollisionDetector.h"
+#include "dart/collision/detail/CollisionDetector.hpp"
 
-#endif  // DART_COLLISION_COLLISIONDETECTOR_H_
+#endif  // DART_COLLISION_COLLISIONDETECTOR_HPP_
diff --git a/dart/collision/CollisionFilter.cpp b/dart/collision/CollisionFilter.cpp
@@ -34,10 +34,10 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "dart/collision/CollisionFilter.h"
+#include "dart/collision/CollisionFilter.hpp"
 
-#include "dart/dynamics/BodyNode.h"
-#include "dart/collision/CollisionObject.h"
+#include "dart/dynamics/BodyNode.hpp"
+#include "dart/collision/CollisionObject.hpp"
 
 namespace dart {
 namespace collision {

diff --git a/dart/collision/CollisionFilter.h → dart/collision/CollisionFilter.hpp b/dart/collision/CollisionFilter.h → dart/collision/CollisionFilter.hpp
@@ -34,8 +34,8 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef DART_COLLISION_COLLISIONFILTER_H_
-#define DART_COLLISION_COLLISIONFILTER_H_
+#ifndef DART_COLLISION_COLLISIONFILTER_HPP_
+#define DART_COLLISION_COLLISIONFILTER_HPP_
 
 namespace dart {
 
@@ -65,4 +65,4 @@ struct BodyNodeCollisionFilter : CollisionFilter
 }  // namespace collision
 }  // namespace dart
 
-#endif  // DART_COLLISION_COLLISIONFILTER_H_
+#endif  // DART_COLLISION_COLLISIONFILTER_HPP_
diff --git a/dart/collision/CollisionGroup.cpp b/dart/collision/CollisionGroup.cpp
@@ -34,14 +34,14 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "dart/collision/CollisionGroup.h"
+#include "dart/collision/CollisionGroup.hpp"
 
 #include <cassert>
 
-#include "dart/collision/CollisionObject.h"
-#include "dart/collision/CollisionDetector.h"
-#include "dart/dynamics/BodyNode.h"
-#include "dart/dynamics/Skeleton.h"
+#include "dart/collision/CollisionObject.hpp"
+#include "dart/collision/CollisionDetector.hpp"
+#include "dart/dynamics/BodyNode.hpp"
+#include "dart/dynamics/Skeleton.hpp"
 
 namespace dart {
 namespace collision {

diff --git a/dart/collision/CollisionGroup.h → dart/collision/CollisionGroup.hpp b/dart/collision/CollisionGroup.h → dart/collision/CollisionGroup.hpp
@@ -34,15 +34,15 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef DART_COLLISION_COLLISIONGROUP_H_
-#define DART_COLLISION_COLLISIONGROUP_H_
+#ifndef DART_COLLISION_COLLISIONGROUP_HPP_
+#define DART_COLLISION_COLLISIONGROUP_HPP_
 
 #include <map>
 #include <vector>
-#include "dart/collision/SmartPointer.h"
-#include "dart/collision/Option.h"
-#include "dart/collision/Result.h"
-#include "dart/dynamics/SmartPointer.h"
+#include "dart/collision/SmartPointer.hpp"
+#include "dart/collision/Option.hpp"
+#include "dart/collision/Result.hpp"
+#include "dart/dynamics/SmartPointer.hpp"
 
 namespace dart {
 namespace collision {
@@ -236,6 +236,6 @@ class CollisionGroup
 }  // namespace collision
 }  // namespace dart
 
-#include "dart/collision/detail/CollisionGroup.h"
+#include "dart/collision/detail/CollisionGroup.hpp"
 
-#endif  // DART_COLLISION_COLLISIONGROUP_H_
+#endif  // DART_COLLISION_COLLISIONGROUP_HPP_
diff --git a/dart/collision/CollisionObject.cpp b/dart/collision/CollisionObject.cpp
@@ -34,10 +34,10 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "dart/collision/CollisionObject.h"
+#include "dart/collision/CollisionObject.hpp"
 
-#include "dart/collision/CollisionDetector.h"
-#include "dart/dynamics/ShapeFrame.h"
+#include "dart/collision/CollisionDetector.hpp"
+#include "dart/dynamics/ShapeFrame.hpp"
 
 namespace dart {
 namespace collision {

diff --git a/dart/collision/CollisionObject.h → dart/collision/CollisionObject.hpp b/dart/collision/CollisionObject.h → dart/collision/CollisionObject.hpp
@@ -34,13 +34,13 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef DART_COLLISION_COLLISIONOBJECT_H_
-#define DART_COLLISION_COLLISIONOBJECT_H_
+#ifndef DART_COLLISION_COLLISIONOBJECT_HPP_
+#define DART_COLLISION_COLLISIONOBJECT_HPP_
 
 #include <Eigen/Dense>
 
-#include "dart/collision/SmartPointer.h"
-#include "dart/dynamics/SmartPointer.h"
+#include "dart/collision/SmartPointer.hpp"
+#include "dart/dynamics/SmartPointer.hpp"
 
 namespace dart {
 namespace collision {
@@ -93,4 +93,4 @@ class CollisionObject
 }  // namespace collision
 }  // namespace dart
 
-#endif  // DART_COLLISION_COLLISIONOBJECT_H_
+#endif  // DART_COLLISION_COLLISIONOBJECT_HPP_
diff --git a/dart/collision/Contact.cpp b/dart/collision/Contact.cpp
@@ -35,7 +35,7 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "dart/collision/Contact.h"
+#include "dart/collision/Contact.hpp"
 
 namespace dart {
 namespace collision {

diff --git a/dart/collision/Contact.h → dart/collision/Contact.hpp b/dart/collision/Contact.h → dart/collision/Contact.hpp
@@ -34,12 +34,12 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef DART_COLLISION_CONTACT_H_
-#define DART_COLLISION_CONTACT_H_
+#ifndef DART_COLLISION_CONTACT_HPP_
+#define DART_COLLISION_CONTACT_HPP_
 
 #include <Eigen/Dense>
-#include "dart/collision/SmartPointer.h"
-#include "dart/dynamics/SmartPointer.h"
+#include "dart/collision/SmartPointer.hpp"
+#include "dart/dynamics/SmartPointer.hpp"
 
 namespace dart {
 namespace collision {
@@ -87,4 +87,4 @@ struct Contact
 }  // namespace collision
 }  // namespace dart
 
-#endif  // DART_COLLISION_CONTACT_H_
+#endif  // DART_COLLISION_CONTACT_HPP_
diff --git a/dart/collision/Option.cpp b/dart/collision/Option.cpp
@@ -34,7 +34,7 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "dart/collision/Option.h"
+#include "dart/collision/Option.hpp"
 
 namespace dart {
 namespace collision {

diff --git a/dart/collision/Option.h → dart/collision/Option.hpp b/dart/collision/Option.h → dart/collision/Option.hpp
@@ -34,8 +34,8 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef DART_COLLISION_OPTION_H_
-#define DART_COLLISION_OPTION_H_
+#ifndef DART_COLLISION_OPTION_HPP_
+#define DART_COLLISION_OPTION_HPP_
 
 #include <cstddef>
 #include <memory>
@@ -72,4 +72,4 @@ struct CollisionOption
 }  // namespace collision
 }  // namespace dart
 
-#endif  // DART_COLLISION_OPTION_H_
+#endif  // DART_COLLISION_OPTION_HPP_
diff --git a/dart/collision/Result.cpp b/dart/collision/Result.cpp
@@ -34,12 +34,12 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "dart/collision/Result.h"
-#include "dart/collision/CollisionObject.h"
+#include "dart/collision/Result.hpp"
+#include "dart/collision/CollisionObject.hpp"
 
-#include "dart/dynamics/ShapeFrame.h"
-#include "dart/dynamics/ShapeNode.h"
-#include "dart/dynamics/BodyNode.h"
+#include "dart/dynamics/ShapeFrame.hpp"
+#include "dart/dynamics/ShapeNode.hpp"
+#include "dart/dynamics/BodyNode.hpp"
 
 namespace dart {
 namespace collision {

diff --git a/dart/collision/Result.h → dart/collision/Result.hpp b/dart/collision/Result.h → dart/collision/Result.hpp
@@ -34,12 +34,12 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef DART_COLLISION_RESULT_H_
-#define DART_COLLISION_RESULT_H_
+#ifndef DART_COLLISION_RESULT_HPP_
+#define DART_COLLISION_RESULT_HPP_
 
 #include <vector>
 #include <unordered_set>
-#include "dart/collision/Contact.h"
+#include "dart/collision/Contact.hpp"
 
 namespace dart {
 
@@ -112,4 +112,4 @@ class CollisionResult
 }  // namespace collision
 }  // namespace dart
 
-#endif  // DART_COLLISION_RESULT_H_
+#endif  // DART_COLLISION_RESULT_HPP_
diff --git a/dart/collision/SmartPointer.h → dart/collision/SmartPointer.hpp b/dart/collision/SmartPointer.h → dart/collision/SmartPointer.hpp
@@ -34,11 +34,11 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef DART_COLLISION_SMARTPOINTER_H_
-#define DART_COLLISION_SMARTPOINTER_H_
+#ifndef DART_COLLISION_SMARTPOINTER_HPP_
+#define DART_COLLISION_SMARTPOINTER_HPP_
 
-#include "dart/config.h"
-#include "dart/common/SmartPointer.h"
+#include "dart/config.hpp"
+#include "dart/common/SmartPointer.hpp"
 
 namespace dart {
 namespace collision {
@@ -57,4 +57,4 @@ DART_COMMON_MAKE_SHARED_WEAK(CollisionGroup)
 }  // namespace collision
 }  // namespace dart
 
-#endif  // DART_COLLISION_SMARTPOINTER_H_
+#endif  // DART_COLLISION_SMARTPOINTER_HPP_