Commit 90bd3466 authored by ledig's avatar ledig
Browse files

[FIX] Compilable with Visual Studio

parent bea466ce
......@@ -94,7 +94,7 @@ void WProperties2::endIteration()
m_iterationLock.unlock();
}
const WProperties2::PropertyIterator WProperties2::getPropertyIteratorEnd() const
const WProperties2::PropertyIterator WProperties2::getPropertyIteratorEnd()
{
return m_properties.end();
}
......
......@@ -101,7 +101,7 @@ public:
*
* \return the list of properties.
*/
const PropertyIterator getPropertyIteratorEnd() const;
const PropertyIterator getPropertyIteratorEnd();
/**
* Create and add a new property of the template type. For more details see appropriate constructor ow WPropertyVariable.
......
......@@ -108,6 +108,8 @@ protected:
boost::thread* m_Thread;
#else
OpenThreads::Thread *m_Thread;
bool m_firstRun;
#endif
/**
......
......@@ -31,8 +31,9 @@
#include <boost/shared_ptr.hpp>
#include <boost/signals2/signal.hpp>
#include "../common/WThreadedRunner.h"
#include "../common/WFlag.h"
//#include "../common/WThreadedRunner.h"
//#include "../common/WFlag.h"
#include "../kernel/WModule.h"
#include "../graphicsEngine/WGECamera.h"
#include "WCustomWidget.h"
......
......@@ -39,7 +39,8 @@
WQtGLWidget::WQtGLWidget( std::string nameOfViewer, QWidget* parent, WGECamera::ProjectionMode projectionMode )
: QGLWidget( parent ),
: QWidget( parent ),
// : QGLWidget( parent ),
m_nameOfViewer( nameOfViewer ),
m_recommendedSize(),
m_isInitialized( new WConditionOneShot(), false ),
......
......@@ -44,7 +44,8 @@ class WColor;
* engine.
* \ingroup gui
*/
class WQtGLWidget: public QGLWidget
class WQtGLWidget: public QWidget
//class WQtGLWidget: public QGLWidget
{
public:
/**
......
......@@ -40,8 +40,8 @@
#include "../common/WPreferences.h"
#include "../common/WStringUtils.h"
#include "WBatchLoader.h"
#include "WModule.h"
#include "WBatchLoader.h"
#include "WModuleFactory.h"
#include "../graphicsEngine/WGraphicsEngine.h"
......
......@@ -172,7 +172,7 @@ const std::set<boost::shared_ptr< WModuleOutputConnector > >& WModule::getOutput
return m_outputConnectors;
}
boost::shared_ptr< WModuleInputConnector > WModule::getInputConnector( std::string name ) const
boost::shared_ptr< WModuleInputConnector > WModule::getInputConnector( std::string name )
{
// simply search
for( std::set<boost::shared_ptr< WModuleInputConnector > >::iterator listIter = m_inputConnectors.begin();
......@@ -188,7 +188,7 @@ boost::shared_ptr< WModuleInputConnector > WModule::getInputConnector( std::stri
throw WModuleConnectorNotFound( "The connector \"" + name + "\" does not exist in the module \"" + getName() + "\"." );
}
boost::shared_ptr< WModuleOutputConnector > WModule::getOutputConnector( std::string name ) const
boost::shared_ptr< WModuleOutputConnector > WModule::getOutputConnector( std::string name )
{
// simply search
for( std::set<boost::shared_ptr< WModuleOutputConnector > >::iterator listIter = m_outputConnectors.begin();
......
......@@ -96,7 +96,7 @@ public:
* \return the connector.
* \throw WModuleConnectorNotFound thrown whenever the module does not provide the specified connector.
*/
boost::shared_ptr< WModuleInputConnector > getInputConnector( std::string name ) const;
boost::shared_ptr< WModuleInputConnector > getInputConnector( std::string name );
/**
* Gives back output connectors.
......@@ -113,7 +113,7 @@ public:
* \return the connector.
* \throw WModuleConnectorNotFound thrown whenever the module does not provide the specified connector.
*/
boost::shared_ptr< WModuleOutputConnector > getOutputConnector( std::string name ) const;
boost::shared_ptr< WModuleOutputConnector > getOutputConnector( std::string name );
/**
* Return a pointer to the properties object of the module
......
......@@ -22,6 +22,8 @@
//
//---------------------------------------------------------------------------
#include <stdint.h>
#include <iostream>
#include <fstream>
#include <string>
......
......@@ -22,6 +22,8 @@
//
//---------------------------------------------------------------------------
#include <stdint.h>
#include <iostream>
#include <fstream>
#include <string>
......@@ -209,7 +211,7 @@ void WMWriteNIfTI::writeToFile( std::string fileName )
if( nifti_set_filenames( outField, fileName.c_str(), 0, 1 ) )
{
throw WException( "NIfTI filename Problem" );
throw WException( std::string( "NIfTI filename Problem" ) );
}
nifti_image_write( outField );
......
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