[CHANGE #190] moved all .hpp files to .h files

src/common/CMakeLists.txt

@@ -12,6 +12,6 @@ IF( CXXTEST_FOUND )
   CXXTEST_ADD_TESTS_FROM_LIST( "${COMMON_SRC}"
                                "common"  # no libs for linking required
                                "WSegmentationFault.cpp"
-                               "WStringUtils.hpp" # since unit tests are already included via the .hpp file
+                               "WStringUtils.h" # since unit tests are already included via the .h file
                              )
 ENDIF( CXXTEST_FOUND )

src/common/WColor.cpp

@@ -27,7 +27,7 @@
 #include <vector>
 
 #include "WColor.h"
-#include "WStringUtils.hpp"
+#include "WStringUtils.h"
 
 WColor::WColor( float red, float green, float blue, float alpha )
     :   m_red( red ),

src/common/WStringUtils.cpp

@@ -28,7 +28,7 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include "WStringUtils.hpp"
+#include "WStringUtils.h"
 
 const std::string string_utils::WHITESPACE( "\r\n\t " );
 

src/common/WStringUtils.hpp → src/common/WStringUtils.h

@@ -22,8 +22,8 @@
 //
 //---------------------------------------------------------------------------
 
-#ifndef WSTRINGUTILS_HPP
-#define WSTRINGUTILS_HPP
+#ifndef WSTRINGUTILS_H
+#define WSTRINGUTILS_H
 
 #include <algorithm>
 #include <iostream>
@@ -161,4 +161,4 @@ namespace string_utils
     }
 }  // end of namespace
 
-#endif  // WSTRINGUTILS_HPP
+#endif  // WSTRINGUTILS_H

src/common/WThreadedRunner.h

@@ -28,7 +28,7 @@
 #include <boost/thread.hpp>
 #include <boost/thread/thread.hpp>
 
-#include "WFlag.hpp"
+#include "WFlag.h"
 
 /**
  * Base class for all classes needing to be executed in a separate thread.

src/common/test/WFlag_test.h

@@ -30,7 +30,7 @@
 #include <boost/thread.hpp>
 #include <cxxtest/TestSuite.h>
 
-#include "../WFlag.hpp"
+#include "../WFlag.h"
 #include "../WConditionOneShot.h"
 
 /** 

src/common/test/WStringUtils_test.h

@@ -30,7 +30,7 @@
 
 #include <cxxtest/TestSuite.h>
 
-#include "../WStringUtils.hpp"
+#include "../WStringUtils.h"
 
 namespace su = string_utils;
 

src/dataHandler/WDataHandler.h

@@ -29,7 +29,7 @@
 #include <vector>
 
 #include <boost/shared_ptr.hpp>
-#include "../gui/qt4/signalslib.hpp"
+#include "../gui/qt4/signalslib.h"
 #include <boost/enable_shared_from_this.hpp>
 
 #include "WDataSet.h"

src/dataHandler/WDataSetSingle.cpp

@@ -25,7 +25,7 @@
 #include <string>
 
 #include "WDataTexture3D.h"
-#include "WValueSet.hpp"
+#include "WValueSet.h"
 #include "WGrid.h"
 #include "../common/WPrototyped.h"
 

src/dataHandler/WDataSetSingle.h

@@ -31,7 +31,7 @@
 
 #include "WGrid.h"
 #include "WGridRegular3D.h"
-#include "WValueSet.hpp"
+#include "WValueSet.h"
 
 #include "WDataSet.h"
 

src/dataHandler/WGridRegular3D.h

@@ -27,7 +27,7 @@
 
 #include "../math/WPosition.h"
 #include "../math/WVector3D.h"
-#include "../math/WMatrix.hpp"
+#include "../math/WMatrix.h"
 
 #include <osg/Vec3>
 

src/dataHandler/WLoader.cpp

@@ -26,7 +26,7 @@
 
 #include "WLoader.h"
 #include "exceptions/WDHIOFailure.h"
-#include "io/WIOTools.hpp"
+#include "io/WIOTools.h"
 
 
 WLoader::WLoader( std::string fileName, boost::shared_ptr< WDataHandler > dataHandler ) throw( WDHIOFailure )

src/dataHandler/WValueSet.hpp → src/dataHandler/WValueSet.h

@@ -31,7 +31,7 @@
 
 #include "WValueSetBase.h"
 #include "WDataHandlerEnums.h"
-#include "../math/WValue.hpp"
+#include "../math/WValue.h"
 
 /**
  * Base Class for all value set types.

src/dataHandler/io/WIOTools.hpp → src/dataHandler/io/WIOTools.h

@@ -22,8 +22,8 @@
 //
 //---------------------------------------------------------------------------
 
-#ifndef WIOTOOLS_HPP
-#define WIOTOOLS_HPP
+#ifndef WIOTOOLS_H
+#define WIOTOOLS_H
 
 #include <stdint.h>
 
@@ -125,4 +125,4 @@ namespace wiotools
         return std::string( std::tmpnam( NULL ) );
     }
 }  // end of namespace
-#endif  // WIOTOOLS_HPP
+#endif  // WIOTOOLS_H

src/dataHandler/io/WLoaderEEGASCII.cpp

@@ -32,7 +32,7 @@
 #include "../WSubject.h"
 #include "../WEEG.h"
 #include "../../common/WException.h"
-#include "../../common/WStringUtils.hpp"
+#include "../../common/WStringUtils.h"
 
 WLoaderEEGASCII::WLoaderEEGASCII( std::string fileName, boost::shared_ptr< WDataHandler > dataHandler )
     : WLoader( fileName, dataHandler )

src/dataHandler/io/WLoaderFibers.cpp

@@ -31,13 +31,13 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/lexical_cast.hpp>
 
-#include "../../common/WStringUtils.hpp"
+#include "../../common/WStringUtils.h"
 #include "../../common/WLogger.h"
 #include "../../math/WPosition.h"
 #include "../WDataHandler.h"
 #include "../WDataSetFibers.h"
 #include "../WSubject.h"
-#include "WIOTools.hpp"
+#include "WIOTools.h"
 #include "WLoaderFibers.h"
 
 WLoaderFibers::WLoaderFibers( std::string fname, boost::shared_ptr< WDataHandler > dataHandler ) throw( WDHIOFailure )

src/dataHandler/io/WLoaderNIfTI.cpp

@@ -35,7 +35,7 @@
 #include "../WGrid.h"
 #include "../WGridRegular3D.h"
 #include "../WValueSetBase.h"
-#include "../WValueSet.hpp"
+#include "../WValueSet.h"
 #include "../WDataHandlerEnums.h"
 
 

src/dataHandler/io/WLoaderNIfTI.h

@@ -30,7 +30,7 @@
 #include <boost/shared_ptr.hpp>
 
 #include "../WLoader.h"
-#include "../../math/WMatrix.hpp"
+#include "../../math/WMatrix.h"
 
 #include "nifti/nifti1_io.h"
 

src/dataHandler/io/WReader.cpp

@@ -25,7 +25,7 @@
 #include <string>
 
 #include "WReader.h"
-#include "WIOTools.hpp"
+#include "WIOTools.h"
 #include "../exceptions/WDHNoSuchFile.h"
 
 WReader::WReader( std::string fname )

src/dataHandler/io/WReaderLookUpTableVTK.cpp

@@ -30,12 +30,12 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include "WIOTools.hpp"
+#include "WIOTools.h"
 #include "WReader.h"
 #include "WReaderLookUpTableVTK.h"
 #include "../exceptions/WDHException.h"
 #include "../exceptions/WDHIOFailure.h"
-#include "../../common/WStringUtils.hpp"
+#include "../../common/WStringUtils.h"
 
 WReaderLookUpTableVTK::WReaderLookUpTableVTK( std::string fname )
     : WReader( fname )

src/dataHandler/io/WWriter.cpp

@@ -25,7 +25,7 @@
 #include <string>
 
 #include "WWriter.h"
-#include "WIOTools.hpp"
+#include "WIOTools.h"
 #include "../exceptions/WDHIOFailure.h"
 
 WWriter::WWriter( std::string fname, bool overwrite )

src/dataHandler/io/WWriterFiberVTK.cpp

@@ -29,7 +29,7 @@
 #include <boost/shared_ptr.hpp>
 
 #include "WWriterFiberVTK.h"
-#include "WIOTools.hpp"
+#include "WIOTools.h"
 #include "../WDataSetFibers.h"
 #include "../exceptions/WDHIOFailure.h"
 

src/dataHandler/io/WWriterLookUpTableVTK.cpp

@@ -30,7 +30,7 @@
 #include <boost/shared_ptr.hpp>
 
 #include "WWriterLookUpTableVTK.h"
-#include "WIOTools.hpp"
+#include "WIOTools.h"
 #include "../exceptions/WDHIOFailure.h"
 
 WWriterLookUpTableVTK::WWriterLookUpTableVTK( std::string fname, bool overwrite )

src/dataHandler/io/test/WIOTools_test.h

@@ -27,7 +27,7 @@
 
 #include <cxxtest/TestSuite.h>
 
-#include "../WIOTools.hpp"
+#include "../WIOTools.h"
 
 /**
  * Unit test helper functions in the wiotools namespace

src/dataHandler/test/WDataSetSingle_test.h

@@ -30,7 +30,7 @@
 #include <cxxtest/TestSuite.h>
 
 #include "../WDataSetSingle.h"
-#include "../WValueSet.hpp"
+#include "../WValueSet.h"
 #include "../WGrid.h"
 #include "../WDataHandlerEnums.h"
 

src/dataHandler/test/WValueSet_test.h

@@ -29,7 +29,7 @@
 
 #include <cxxtest/TestSuite.h>
 
-#include "../WValueSet.hpp"
+#include "../WValueSet.h"
 #include "../WDataHandlerEnums.h"
 
 /**

src/gui/WGUI.cpp

@@ -23,7 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "../common/WConditionOneShot.h"
-#include "../common/WFlag.hpp"
+#include "../common/WFlag.h"
 
 #include "WGUI.h"
 

src/gui/WGUI.h

@@ -32,7 +32,7 @@
 #include "boost/signals2/signal.hpp"
 
 #include "../common/WThreadedRunner.h"
-#include "../common/WFlag.hpp"
+#include "../common/WFlag.h"
 #include "../kernel/WModule.h"
 
 

src/gui/qt4/WQtGLWidget.cpp

@@ -30,7 +30,7 @@
 #include "WQtGLWidget.h"
 
 #include "../../graphicsEngine/WGEViewer.h"
-#include "../../common/WFlag.hpp"
+#include "../../common/WFlag.h"
 #include "../../common/WConditionOneShot.h"
 #include "../../kernel/WKernel.h"
 

src/gui/qt4/WQtGLWidget.h

@@ -34,7 +34,7 @@
 #include "boost/signals2/signal.hpp"
 
 #include "../../graphicsEngine/WGECamera.h"
-#include "../../common/WFlag.hpp"
+#include "../../common/WFlag.h"
 
 class WGEViewer;
 class WColor;

src/gui/qt4/signalslib.hpp → src/gui/qt4/signalslib.h

@@ -23,8 +23,8 @@
 //---------------------------------------------------------------------------
 
 
-#ifndef SIGNALSLIB_HPP_INCLUDED
-#define SIGNALSLIB_HPP_INCLUDED
+#ifndef SIGNALSLIB_H
+#define SIGNALSLIB_H
 
 #if defined(signals) && defined(QOBJECTDEFS_H) && \
   !defined( QT_MOC_CPP )
@@ -46,4 +46,4 @@ namespace signalslib = signals;
 #  define signals protected
 #endif
 
-#endif
+#endif  // SIGNALSLIB_H

src/kernel/CMakeLists.txt

@@ -18,8 +18,8 @@ IF( CXXTEST_FOUND )
                                "WModule.cpp"
                                "WModuleInputConnector.cpp"
                                "WModuleOutputConnector.cpp"
-                               "WModuleInputData.hpp"
-                               "WModuleOutputData.hpp"
+                               "WModuleInputData.h"
+                               "WModuleOutputData.h"
                                "WModuleInputData.cpp"
                                "WModuleOutputData.cpp"
                                "WModuleContainer.cpp"

src/kernel/WKernel.cpp

@@ -38,7 +38,7 @@
 #include "../common/WException.h"
 #include "../common/WCondition.h"
 #include "../common/WConditionOneShot.h"
-#include "../common/WFlag.hpp"
+#include "../common/WFlag.h"
 
 #include "../graphicsEngine/WGraphicsEngine.h"
 

src/kernel/WKernel.h

@@ -36,7 +36,7 @@
 #include "WModuleContainer.h"
 #include "../common/WLogger.h"
 #include "../common/WThreadedRunner.h"
-#include "../common/WFlag.hpp"
+#include "../common/WFlag.h"
 #include "../graphicsEngine/WGraphicsEngine.h"
 #include "../dataHandler/WDataHandler.h"
 #include "../gui/WGUI.h"

src/kernel/WModule.h

@@ -39,9 +39,9 @@
 
 #include "../dataHandler/WDataSet.h"
 #include "../dataHandler/WDataSetSingle.h"
-#include "../dataHandler/WValueSet.hpp"
+#include "../dataHandler/WValueSet.h"
 
-#include "../common/WFlag.hpp"
+#include "../common/WFlag.h"
 #include "../common/WLogger.h"
 #include "../common/WProperties.h"
 #include "../common/WThreadedRunner.h"

src/kernel/WModuleInputData.hpp → src/kernel/WModuleInputData.h

@@ -33,7 +33,7 @@
 
 // this is necessary since we have some kind of cyclic includes
 template < typename T > class WModuleOutputData;
-#include "WModuleOutputData.hpp"
+#include "WModuleOutputData.h"
 #include "exceptions/WModuleConnectorUnconnected.h"
 #include "../common/WTransferable.h"
 #include "../common/WPrototyped.h"

src/kernel/WModuleOutputData.hpp → src/kernel/WModuleOutputData.h

@@ -33,7 +33,7 @@
 
 // this is necessary since we have some kind of cyclic includes
 template < typename T > class WModuleInputData;
-#include "WModuleInputData.hpp"
+#include "WModuleInputData.h"
 #include "../common/WPrototyped.h"
 
 #include "WModuleOutputConnector.h"

src/kernel/test/WModuleConnector_test.h

@@ -33,8 +33,8 @@
 #include <cxxtest/TestSuite.h>
 
 #include "../WModuleConnector.h"
-#include "../WModuleInputData.hpp"
-#include "../WModuleOutputData.hpp"
+#include "../WModuleInputData.h"
+#include "../WModuleOutputData.h"
 #include "../WModuleInputConnector.h"
 #include "../WModuleOutputConnector.h"
 #include "../WModule.h"

src/math/WLine.h

@@ -29,7 +29,7 @@
 #include <vector>
 
 #include "WPosition.h"
-#include "../common/WStringUtils.hpp"
+#include "../common/WStringUtils.h"
 
 // we need this to find the WLineTest class which is not inside wmath namespace
 class WLineTest;

src/math/WMatrix.hpp → src/math/WMatrix.h

@@ -25,7 +25,7 @@
 #ifndef WMATRIX_H
 #define WMATRIX_H
 
-#include "WValue.hpp"
+#include "WValue.h"
 
 namespace wmath
 {

src/math/WValue.hpp → src/math/WValue.h

@@ -29,7 +29,7 @@
 #include <cmath>
 #include <vector>
 
-#include "../common/WStringUtils.hpp"
+#include "../common/WStringUtils.h"
 
 namespace wmath
 {

src/math/WVector3D.h

@@ -25,7 +25,7 @@
 #ifndef WVECTOR3D_H
 #define WVECTOR3D_H
 
-#include "WValue.hpp"
+#include "WValue.h"
 
 namespace wmath
 {

src/math/test/WMatrix_test.h

@@ -27,7 +27,7 @@
 
 #include <cxxtest/TestSuite.h>
 
-#include "../WMatrix.hpp"
+#include "../WMatrix.h"
 
 using wmath::WMatrix;
 /**

src/math/test/WValue_test.h

@@ -29,7 +29,7 @@
 
 #include <cxxtest/TestSuite.h>
 
-#include "../WValue.hpp"
+#include "../WValue.h"
 
 using wmath::WValue;
 

src/modules/coordinateSystem/WCoordConverter.h

@@ -26,7 +26,7 @@
 #define WCOORDCONVERTER_H
 
 #include "../../math/WVector3D.h"
-#include "../../math/WMatrix.hpp"
+#include "../../math/WMatrix.h"
 
 using wmath::WMatrix;
 using wmath::WVector3D;

src/modules/coordinateSystem/WMCoordinateSystem.h

@@ -35,7 +35,7 @@
 #include "../../dataHandler/WDataSet.h"
 #include "../../kernel/WModule.h"
 #include "../../kernel/WModuleConnector.h"
-#include "../../kernel/WModuleInputData.hpp"
+#include "../../kernel/WModuleInputData.h"
 
 /**
  * class that implements the various coordinate systems as overlays within the 3D view

src/modules/coordinateSystem/WTalairachConverter.h

@@ -26,7 +26,7 @@
 #define WTALAIRACHCONVERTER_H
 
 #include "../../math/WVector3D.h"
-#include "../../math/WMatrix.hpp"
+#include "../../math/WMatrix.h"
 
 /**
  * class to provide conversions between world or voxel space coordinates und talairach coordinates

src/modules/data/WMData.cpp

@@ -33,7 +33,7 @@
 #include "../../dataHandler/io/WLoaderBiosig.h"
 #include "../../dataHandler/io/WLoaderEEGASCII.h"
 #include "../../dataHandler/io/WLoaderFibers.h"
-#include "../../dataHandler/io/WIOTools.hpp"
+#include "../../dataHandler/io/WIOTools.h"
 
 #include "../../dataHandler/WDataTexture3D.h"
 #include "WMData.h"

src/modules/data/WMData.h

@@ -33,7 +33,7 @@
 #include "../../kernel/WKernel.h"
 #include "../../kernel/WModule.h"
 #include "../../kernel/WModuleConnector.h"
-#include "../../kernel/WModuleOutputData.hpp"
+#include "../../kernel/WModuleOutputData.h"
 
 #include "../../dataHandler/WDataSet.h"
 #include "../../dataHandler/WDataSetSingle.h"

src/modules/distanceMap/WMDistanceMap.h

@@ -28,7 +28,7 @@
 #include <string>
 
 #include "../../kernel/WModule.h"
-#include "../../kernel/WModuleInputData.hpp"
+#include "../../kernel/WModuleInputData.h"
 
 /**
  * Computes a distance map from an anatomy dataset and renders it as isosurface.

src/modules/fiberClustering/WMFiberClustering.cpp

@@ -38,8 +38,8 @@
 #include "../../common/WColor.h"
 #include "../../common/WLogger.h"
 #include "../../common/WStatusReport.h"
-#include "../../common/WStringUtils.hpp"
-#include "../../dataHandler/io/WIOTools.hpp"
+#include "../../common/WStringUtils.h"
+#include "../../dataHandler/io/WIOTools.h"
 #include "../../dataHandler/io/WReaderLookUpTableVTK.h"
 #include "../../dataHandler/io/WWriterLookUpTableVTK.h"
 #include "../../dataHandler/WDataHandler.h"

src/modules/fiberDisplay/WMFiberDisplay.h

@@ -31,7 +31,7 @@
 
 #include "../../dataHandler/WDataSetFibers.h"
 #include "../../kernel/WModule.h"
-#include "../../kernel/WModuleInputData.hpp"
+#include "../../kernel/WModuleInputData.h"
 #include "../../math/WFiber.h"
 
 /**

src/modules/marchingCubes/WMMarchingCubes.h

@@ -34,7 +34,7 @@
 #include <osg/Uniform>
 
 #include "../../kernel/WModule.h"
-#include "../../kernel/WModuleInputData.hpp"
+#include "../../kernel/WModuleInputData.h"
 #include "../../dataHandler/WGridRegular3D.h"
 #include "WTriangleMesh.h"
 

src/modules/marchingCubes/test/WMMarchingCubes_test.h

@@ -33,7 +33,7 @@
 #include "../WMMarchingCubes.h"
 #include "../../../common/WLogger.h"
 #include "../../../math/WPosition.h"
-#include "../../../dataHandler/io/WIOTools.hpp"
+#include "../../../dataHandler/io/WIOTools.h"
 
 static WLogger logger;
 static bool loggerInitialized = false;

src/modules/navSlices/WMNavSlices.cpp

@@ -33,18 +33,16 @@
 #include <osg/Geode>
 #include <osg/Geometry>
 
-#include "boost/smart_ptr.hpp"
-
 #include "WMNavSlices.h"
 #include "../../kernel/WKernel.h"
 #include "../../kernel/WModule.h"
 #include "../../kernel/WModuleConnector.h"
-#include "../../kernel/WModuleInputData.hpp"
+#include "../../kernel/WModuleInputData.h"
 
 #include "../../dataHandler/WDataSet.h"
 #include "../../dataHandler/WDataSetSingle.h"
 #include "../../dataHandler/WSubject.h"
-#include "../../dataHandler/WValueSet.hpp"
+#include "../../dataHandler/WValueSet.h"
 #include "../../dataHandler/WGridRegular3D.h"
 #include "../../dataHandler/WDataTexture3D.h"
 

src/modules/navSlices/WMNavSlices.h

@@ -34,7 +34,7 @@
 #include "../../dataHandler/WDataSet.h"
 #include "../../kernel/WModule.h"
 #include "../../kernel/WModuleConnector.h"
-#include "../../kernel/WModuleInputData.hpp"
+#include "../../kernel/WModuleInputData.h"
 #include "../../graphicsEngine/WShader.h"