STYLE: Change Cxx extenstion to Cpp.

Applications/ctkDICOM/CMakeLists.txt

@@ -6,7 +6,7 @@ PROJECT(ctkDICOM)
   
 # Source files
 SET(KIT_SRCS
-  ctkDICOM.cxx
+  ctkDICOM.cpp
   )
 
 # Headers that should run through moc

Applications/ctkDICOM/Testing/CMakeLists.txt

@@ -1 +1 @@
-ADD_SUBDIRECTORY(Cxx)
+ADD_SUBDIRECTORY(Cpp)

Applications/ctkDICOM/Testing/Cxx/CMakeLists.txt

@@ -1,19 +1,19 @@
 SET(KIT ${PROJECT_NAME})
 
-CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx
+CREATE_TEST_SOURCELIST(Tests ${KIT}CppTests.cpp
   )
 
 SET (TestsToRun ${Tests})
-REMOVE (TestsToRun ${KIT}CxxTests.cxx)
+REMOVE (TestsToRun ${KIT}CppTests.cpp)
 
 SET(LIBRARY_NAME ${PROJECT_NAME})
 
-ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
-TARGET_LINK_LIBRARIES(${KIT}CxxTests ${LIBRARY_NAME})
+ADD_EXECUTABLE(${KIT}CppTests ${Tests})
+TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME})
 
-SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CxxTests)
+SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CppTests)
 IF(WIN32)
-  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CxxTests)
+  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
 ENDIF(WIN32)
 
 MACRO( SIMPLE_TEST  TESTNAME )

Applications/ctkDICOMIndexer/CMakeLists.txt

@@ -6,7 +6,7 @@ PROJECT(ctkDICOMIndexer)
   
 # Source files
 SET(KIT_SRCS
-  ctkDICOMIndexer.cxx
+  ctkDICOMIndexer.cpp
   )
 
 # Headers that should run through moc

Applications/ctkDICOMIndexer/Testing/CMakeLists.txt

@@ -1 +1 @@
-ADD_SUBDIRECTORY(Cxx)
+ADD_SUBDIRECTORY(Cpp)

Libs/Visualization/XIP/Testing/Cxx/CMakeLists.txt

@@ -1,19 +1,19 @@
 SET(KIT ${PROJECT_NAME})
 
-CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx
+CREATE_TEST_SOURCELIST(Tests ${KIT}CppTests.cpp
   )
 
 SET (TestsToRun ${Tests})
-REMOVE (TestsToRun ${KIT}CxxTests.cxx)
+REMOVE (TestsToRun ${KIT}CppTests.cpp)
 
 SET(LIBRARY_NAME ${PROJECT_NAME})
 
-ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
-TARGET_LINK_LIBRARIES(${KIT}CxxTests ${LIBRARY_NAME})
+ADD_EXECUTABLE(${KIT}CppTests ${Tests})
+TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME})
 
-SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CxxTests)
+SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CppTests)
 IF(WIN32)
-  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CxxTests)
+  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
 ENDIF(WIN32)
 
 MACRO( SIMPLE_TEST  TESTNAME )

CMake/ctkDashboardDriverScript.cmake

@@ -126,7 +126,7 @@ WITH_COVERAGE:BOOL=TRUE
     include("${CTEST_BINARY_DIRECTORY}/CTestConfigSubProject.cmake")
     
     set(test_kits 
-      CxxTests
+      CppTests
       #PythonTests
       )
     

Libs/Core/CMakeLists.txt

@@ -39,11 +39,11 @@ SET(KIT_include_directories
   
 # Source files
 SET(KIT_SRCS
-  ctkDependencyGraph.cxx
+  ctkDependencyGraph.cpp
   ctkDependencyGraph.h
-  ctkModelTester.cxx
+  ctkModelTester.cpp
   ctkModelTester.h
-  ctkUtils.cxx
+  ctkUtils.cpp
   ctkUtils.h
   )
 

Libs/Core/Testing/CMakeLists.txt

@@ -1 +1 @@
-ADD_SUBDIRECTORY(Cxx)
+ADD_SUBDIRECTORY(Cpp)

Libs/Core/Testing/Cxx/CMakeLists.txt

@@ -1,23 +1,23 @@
 SET(KIT ${PROJECT_NAME})
 
-CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx
-  ctkModelTesterTest1.cxx
-  ctkUtilsTest1.cxx
-  ctkDependencyGraphTest1.cxx
+CREATE_TEST_SOURCELIST(Tests ${KIT}CppTests.cpp
+  ctkModelTesterTest1.cpp
+  ctkUtilsTest1.cpp
+  ctkDependencyGraphTest1.cpp
   #EXTRA_INCLUDE TestingMacros.h
   )
 
 SET (TestsToRun ${Tests})
-REMOVE (TestsToRun ${KIT}CxxTests.cxx)
+REMOVE (TestsToRun ${KIT}CppTests.cpp)
 
 SET(LIBRARY_NAME ${PROJECT_NAME})
 
-ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
-TARGET_LINK_LIBRARIES(${KIT}CxxTests ${LIBRARY_NAME} ${CTK_BASE_LIBRARIES})
+ADD_EXECUTABLE(${KIT}CppTests ${Tests})
+TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME} ${CTK_BASE_LIBRARIES})
 
-SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CxxTests)
+SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CppTests)
 IF(WIN32)
-  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CxxTests)
+  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
 ENDIF(WIN32)
 
 MACRO( SIMPLE_TEST  TESTNAME )

Libs/DICOM/Core/CMakeLists.txt

@@ -22,11 +22,11 @@ SET(KIT_include_directories
   
 # Source files
 SET(KIT_SRCS
-  ctkDICOM.cxx
+  ctkDICOM.cpp
   ctkDICOM.h
-  ctkDICOMIndexer.cxx
+  ctkDICOMIndexer.cpp
   ctkDICOMIndexer.h
-  ctkDICOMModel.cxx
+  ctkDICOMModel.cpp
   ctkDICOMModel.h
   )
 

Libs/DICOM/Core/Testing/CMakeLists.txt

@@ -1 +1 @@
-ADD_SUBDIRECTORY(Cxx)
+ADD_SUBDIRECTORY(Cpp)

Libs/DICOM/Core/Testing/Cxx/CMakeLists.txt

@@ -1,21 +1,21 @@
 SET(KIT ${PROJECT_NAME})
 
-CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx
-  ctkDICOMModelTest1.cxx
-  ctkDICOMTest1.cxx
+CREATE_TEST_SOURCELIST(Tests ${KIT}CppTests.cpp
+  ctkDICOMModelTest1.cpp
+  ctkDICOMTest1.cpp
   )
 
 SET (TestsToRun ${Tests})
-REMOVE (TestsToRun ${KIT}CxxTests.cxx)
+REMOVE (TestsToRun ${KIT}CppTests.cpp)
 
 SET(LIBRARY_NAME ${PROJECT_NAME})
 
-ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
-TARGET_LINK_LIBRARIES(${KIT}CxxTests ${LIBRARY_NAME})
+ADD_EXECUTABLE(${KIT}CppTests ${Tests})
+TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME})
 
-SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CxxTests)
+SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CppTests)
 IF(WIN32)
-  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CxxTests)
+  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
 ENDIF(WIN32)
 
 MACRO( SIMPLE_TEST  TESTNAME )

Libs/DICOM/Widgets/CMakeLists.txt

@@ -12,17 +12,17 @@ SET(KIT_include_directories
   
 # Source files
 SET(KIT_SRCS
-  ctkDICOMListenerWidget.cxx
+  ctkDICOMListenerWidget.cpp
   ctkDICOMListenerWidget.h
-  ctkDICOMLocationWidget.cxx
+  ctkDICOMLocationWidget.cpp
   ctkDICOMLocationWidget.h
-  ctkDICOMQueryRetrieveWidget.cxx
+  ctkDICOMQueryRetrieveWidget.cpp
   ctkDICOMQueryRetrieveWidget.h
-  ctkDICOMServerNodeWidget.cxx
+  ctkDICOMServerNodeWidget.cpp
   ctkDICOMServerNodeWidget.h
-  ctkDICOMQueryWidget.cxx
+  ctkDICOMQueryWidget.cpp
   ctkDICOMQueryWidget.h
-  ctkDICOMCommandWidget.cxx
+  ctkDICOMCommandWidget.cpp
   ctkDICOMCommandWidget.h
   )
 

Libs/DICOM/Widgets/Testing/CMakeLists.txt

@@ -1 +1 @@
-ADD_SUBDIRECTORY(Cxx)
+ADD_SUBDIRECTORY(Cpp)

Applications/ctkDICOMIndexer/Testing/Cxx/CMakeLists.txt

@@ -1,19 +1,19 @@
 SET(KIT ${PROJECT_NAME})
 
-CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx
+CREATE_TEST_SOURCELIST(Tests ${KIT}CppTests.cpp
   )
 
 SET (TestsToRun ${Tests})
-REMOVE (TestsToRun ${KIT}CxxTests.cxx)
+REMOVE (TestsToRun ${KIT}CppTests.cpp)
 
 SET(LIBRARY_NAME ${PROJECT_NAME})
 
-ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
-TARGET_LINK_LIBRARIES(${KIT}CxxTests ${LIBRARY_NAME})
+ADD_EXECUTABLE(${KIT}CppTests ${Tests})
+TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME})
 
-SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CxxTests)
+SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CppTests)
 IF(WIN32)
-  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CxxTests)
+  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
 ENDIF(WIN32)
 
 MACRO( SIMPLE_TEST  TESTNAME )

Libs/Visualization/XIP/CMakeLists.txt

@@ -22,7 +22,7 @@ SET(KIT_include_directories
   
 # Source files
 SET(KIT_SRCS
-  ctkXIPAdaptor.cxx
+  ctkXIPAdaptor.cpp
   ctkXIPAdaptor.h
   )
 

Libs/Visualization/XIP/Testing/CMakeLists.txt

@@ -1 +1 @@
-ADD_SUBDIRECTORY(Cxx)
+ADD_SUBDIRECTORY(Cpp)

Libs/DICOM/Widgets/Testing/Cxx/CMakeLists.txt

@@ -1,19 +1,19 @@
 SET(KIT ${PROJECT_NAME})
 
-CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx
+CREATE_TEST_SOURCELIST(Tests ${KIT}CppTests.cpp
   )
 
 SET (TestsToRun ${Tests})
-REMOVE (TestsToRun ${KIT}CxxTests.cxx)
+REMOVE (TestsToRun ${KIT}CppTests.cpp)
 
 SET(LIBRARY_NAME ${PROJECT_NAME})
 
-ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
-TARGET_LINK_LIBRARIES(${KIT}CxxTests ${LIBRARY_NAME})
+ADD_EXECUTABLE(${KIT}CppTests ${Tests})
+TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME})
 
-SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CxxTests)
+SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CppTests)
 IF(WIN32)
-  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CxxTests)
+  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
 ENDIF(WIN32)
 
 MACRO( SIMPLE_TEST  TESTNAME )

Libs/Widgets/CMakeLists.txt

@@ -12,7 +12,7 @@ SET(KIT_include_directories
   
 # Source files
 SET(KIT_SRCS
-  ctkSettings.cxx
+  ctkSettings.cpp
   ctkSettings.h
   )
 

Libs/Widgets/Testing/CMakeLists.txt

@@ -1 +1 @@
-ADD_SUBDIRECTORY(Cxx)
+ADD_SUBDIRECTORY(Cpp)

Libs/Widgets/Testing/Cpp/CMakeLists.txt

@@ -0,0 +1,27 @@
+SET(KIT ${PROJECT_NAME})
+
+CREATE_TEST_SOURCELIST(Tests ${KIT}CppTests.cxx
+  )
+
+SET (TestsToRun ${Tests})
+REMOVE (TestsToRun ${KIT}CppTests.cxx)
+
+SET(LIBRARY_NAME ${PROJECT_NAME})
+
+ADD_EXECUTABLE(${KIT}CppTests ${Tests})
+TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME})
+
+SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CppTests)
+IF(WIN32)
+  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
+ENDIF(WIN32)
+
+MACRO( SIMPLE_TEST  TESTNAME )
+  ADD_TEST( ${TESTNAME} ${KIT_TESTS} ${TESTNAME} )
+  SET_PROPERTY(TEST ${TESTNAME} PROPERTY LABELS ${PROJECT_NAME})
+ENDMACRO( SIMPLE_TEST  )
+
+#
+# Add Tests
+#
+

Libs/Widgets/Testing/Cxx/CMakeLists.txt

@@ -1,27 +0,0 @@
-SET(KIT ${PROJECT_NAME})
-
-CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx
-  )
-
-SET (TestsToRun ${Tests})
-REMOVE (TestsToRun ${KIT}CxxTests.cxx)
-
-SET(LIBRARY_NAME ${PROJECT_NAME})
-
-ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
-TARGET_LINK_LIBRARIES(${KIT}CxxTests ${LIBRARY_NAME})
-
-SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CxxTests)
-IF(WIN32)
-  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CxxTests)
-ENDIF(WIN32)
-
-MACRO( SIMPLE_TEST  TESTNAME )
-  ADD_TEST( ${TESTNAME} ${KIT_TESTS} ${TESTNAME} )
-  SET_PROPERTY(TEST ${TESTNAME} PROPERTY LABELS ${PROJECT_NAME})
-ENDMACRO( SIMPLE_TEST  )
-
-#
-# Add Tests
-#
-

Utilities/DGraph/CMakeLists.txt

@@ -30,10 +30,10 @@ CONFIGURE_FILE(
 
 # Add excutable
 ADD_EXECUTABLE(${PROJECT_NAME}
-  DGraph.cxx
+  DGraph.cpp
   ${CTK_SOURCE_DIR}/Libs/Core/ctkDependencyGraph.h
-  ${CTK_SOURCE_DIR}/Libs/Core/ctkDependencyGraph.cxx)
+  ${CTK_SOURCE_DIR}/Libs/Core/ctkDependencyGraph.cpp)
   
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${QT_LIBRARIES} )
 
-  
+