[MERGE]

.hgignore

@@ -8,4 +8,6 @@ syntax: regexp
 
 ^doc/developer/html
 ^doc/developer/man
-^build
\ No newline at end of file
+^build
+syntax: glob
+.project
\ No newline at end of file

src/dataHandler/CMakeLists.txt

@@ -6,7 +6,7 @@ FILE( GLOB DATAHANDLER_EXCEPTIONS_SRC "exceptions/*.cpp" )
 FILE( GLOB DATAHANDLER_LOADERS_SRC "io/WLoader*.cpp" )
 
 ADD_LIBRARY( dataHandler SHARED ${DATAHANDLER_SRC} ${DATAHANDLER_EXCEPTIONS_SRC} ${DATAHANDLER_LOADERS_SRC} )
-TARGET_LINK_LIBRARIES( dataHandler common math ${Boost_LIBRARIES} niftiio biosig)
+TARGET_LINK_LIBRARIES( dataHandler kernel common math ${Boost_LIBRARIES} niftiio biosig)
 
 # Unit tests
 IF( CXXTEST_FOUND )

src/dataHandler/WDataHandler.cpp

@@ -28,6 +28,7 @@
 #include "WSubject.h"
 #include "exceptions/WNoSuchDataSetException.h"
 #include "WLoaderManager.h"
+#include "../kernel/WKernel.h"
 
 WDataHandler::WDataHandler()
 {
@@ -60,6 +61,6 @@ void WDataHandler::loadDataSets( std::vector< std::string > fileNames )
     for ( size_t i = 0 ; i < fileNames.size() ; ++i)
     {
         // TODO( wiebel ): need to associate the dataset to its subject
-        lm.load( fileNames[i], ( boost::shared_ptr< WDataHandler > )this );
+        lm.load( fileNames[i], WKernel::getRunningKernel()->getDataHandler() );
     }
 }