Commit bf46bda6 authored by Alexander Wiebel's avatar Alexander Wiebel

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

parent 992e9df9
......@@ -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 )
......@@ -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 ),
......
......@@ -28,7 +28,7 @@
#include <boost/algorithm/string.hpp>
#include "WStringUtils.hpp"
#include "WStringUtils.h"
const std::string string_utils::WHITESPACE( "\r\n\t " );
......
......@@ -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
......@@ -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.
......
......@@ -30,7 +30,7 @@
#include <boost/thread.hpp>
#include <cxxtest/TestSuite.h>
#include "../WFlag.hpp"
#include "../WFlag.h"
#include "../WConditionOneShot.h"
/**
......
......@@ -30,7 +30,7 @@
#include <cxxtest/TestSuite.h>
#include "../WStringUtils.hpp"
#include "../WStringUtils.h"
namespace su = string_utils;
......
......@@ -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"
......
......@@ -25,7 +25,7 @@
#include <string>
#include "WDataTexture3D.h"
#include "WValueSet.hpp"
#include "WValueSet.h"
#include "WGrid.h"
#include "../common/WPrototyped.h"
......
......@@ -31,7 +31,7 @@
#include "WGrid.h"
#include "WGridRegular3D.h"
#include "WValueSet.hpp"
#include "WValueSet.h"
#include "WDataSet.h"
......
......@@ -27,7 +27,7 @@
#include "../math/WPosition.h"
#include "../math/WVector3D.h"
#include "../math/WMatrix.hpp"
#include "../math/WMatrix.h"
#include <osg/Vec3>
......
......@@ -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 )
......
......@@ -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.
......
......@@ -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
......@@ -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 )
......
......@@ -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 )
......
......@@ -35,7 +35,7 @@
#include "../WGrid.h"
#include "../WGridRegular3D.h"
#include "../WValueSetBase.h"
#include "../WValueSet.hpp"
#include "../WValueSet.h"
#include "../WDataHandlerEnums.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"
......
......@@ -25,7 +25,7 @@
#include <string>
#include "WReader.h"
#include "WIOTools.hpp"
#include "WIOTools.h"
#include "../exceptions/WDHNoSuchFile.h"
WReader::WReader( std::string fname )
......
......@@ -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 )
......
......@@ -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 )
......
......@@ -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"
......
......@@ -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 )
......
......@@ -27,7 +27,7 @@
#include <cxxtest/TestSuite.h>
#include "../WIOTools.hpp"
#include "../WIOTools.h"
/**
* Unit test helper functions in the wiotools namespace
......
......@@ -30,7 +30,7 @@
#include <cxxtest/TestSuite.h>
#include "../WDataSetSingle.h"
#include "../WValueSet.hpp"
#include "../WValueSet.h"
#include "../WGrid.h"
#include "../WDataHandlerEnums.h"
......
......@@ -29,7 +29,7 @@
#include <cxxtest/TestSuite.h>
#include "../WValueSet.hpp"
#include "../WValueSet.h"
#include "../WDataHandlerEnums.h"
/**
......
......@@ -23,7 +23,7 @@
//---------------------------------------------------------------------------
#include "../common/WConditionOneShot.h"
#include "../common/WFlag.hpp"
#include "../common/WFlag.h"
#include "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"
......
......@@ -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"
......
......@@ -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;
......
......@@ -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
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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;
......
......@@ -25,7 +25,7 @@
#ifndef WMATRIX_H
#define WMATRIX_H
#include "WValue.hpp"
#include "WValue.h"
namespace wmath
{
......
......@@ -29,7 +29,7 @@
#include <cmath>
#include <vector>
#include "../common/WStringUtils.hpp"
#include "../common/WStringUtils.h"
namespace wmath
{
......
......@@ -25,7 +25,7 @@
#ifndef WVECTOR3D_H
#define WVECTOR3D_H
#include "WValue.hpp"
#include "WValue.h"
namespace wmath
{
......
......@@ -27,7 +27,7 @@
#include <cxxtest/TestSuite.h>
#include "../WMatrix.hpp"
#include "../WMatrix.h"
using wmath::WMatrix;
/**
......
......@@ -29,7 +29,7 @@
#include <cxxtest/TestSuite.h>
#include "../WValue.hpp"
#include "../WValue.h"
using wmath::WValue;
......
......@@ -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;
......
......@@ -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
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
......@@ -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.
......
......@@ -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"
......
......@@ -31,7 +31,7 @@
#include "../../dataHandler/WDataSetFibers.h"
#include "../../kernel/WModule.h"
#include "../../kernel/WModuleInputData.hpp"
#include "../../kernel/WModuleInputData.h"
#include "../../math/WFiber.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"
......
......@@ -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;
......
......@@ -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"
......
......@@ -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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment