[CHANGE] - some clean ups

src/common/CMakeLists.txt

@@ -12,7 +12,10 @@ TARGET_LINK_LIBRARIES( OWcommon ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} )
 
 # Set the prefix and suffix of dynamically loadable modules to match
 # CMAKEs naming of them. The quotes are necessary so the shell doesn't mess
-# with these defines.
+# with these defines. Unfortunately, the Visual Studio has problems handling
+# the quotes on the command line. WSharedLib::getSystemPrefix and 
+# getSystemSuffix hard codes the right strings for VC.
+# Maybe you have to spend another 500 bucks to have your VC support quotes.
 IF( NOT CMAKE_GENERATOR MATCHES "Visual Studio" )
 	add_definitions( '-DW_LIB_PREFIX="${CMAKE_SHARED_LIBRARY_PREFIX}"' )
 	add_definitions( '-DW_LIB_SUFFIX="${CMAKE_SHARED_LIBRARY_SUFFIX}"' )

src/common/WSharedLib.cpp

@@ -269,7 +269,8 @@ void* WSharedLib::findVariable( const std::string& name ) const
 }
 
 #ifdef _MSC_VER
-// easier this way because VC has problems with quote in command line
+// easier this way because VC has problems with quote in command line. So we can not get this information by #define from CMake.
+// Maybe you have to spend another 500 bucks to have your VC support nearly trivial stuff.
 std::string WSharedLib::getSystemPrefix()
 {
     return "";
@@ -279,7 +280,6 @@ std::string WSharedLib::getSystemSuffix()
 {
     return ".dll";
 }
-
 #else
 std::string WSharedLib::getSystemPrefix()
 {

src/kernel/WModule.h

@@ -66,8 +66,8 @@ class WModuleOutputConnector;
  * \ingroup kernel
  */
 class EXPORT_KERNEL_DLL WModule: public WThreadedRunner,
-                             public WPrototyped,
-                             public boost::enable_shared_from_this< WModule >
+                                 public WPrototyped,
+                                 public boost::enable_shared_from_this< WModule >
 {
 friend class WModuleConnector;  // requires access to notify members
 friend class WModuleFactory;    // for proper creation of module instaces, the factory needs access to protected functions.
@@ -601,10 +601,9 @@ private:
 #ifdef _MSC_VER
 #define W_LOADABLE_MODULE( MODULECLASS ) \
 extern "C" __declspec(dllexport) void WLoadModule( boost::shared_ptr< WModule > &m ) { m = boost::shared_ptr< WModule >( new MODULECLASS ); }  // NOLINT
-// extern "C" __declspec(dllexport) boost::shared_ptr< WModule > WLoadModule() { return boost::shared_ptr< WModule >( new MODULECLASS ); }  // NOLINT
 #else
 #define W_LOADABLE_MODULE( MODULECLASS ) \
-extern "C" boost::shared_ptr< WModule > WLoadModule() { return boost::shared_ptr< WModule >( new MODULECLASS ); } // NOLINT
+extern "C"                       void WLoadModule( boost::shared_ptr< WModule > &m ) { m = boost::shared_ptr< WModule >( new MODULECLASS ); }  // NOLINT
 #endif
 
 /**

src/kernel/WModuleLoader.cpp

@@ -64,13 +64,11 @@ void WModuleLoader::load( WSharedAssociativeContainer< std::set< boost::shared_p
                 WSharedLib l( i->path() );
 
                 // get instantiation function
-//                typedef boost::shared_ptr< WModule > ( *createInstanceFunc )( void );
                 typedef void ( *createInstanceFunc )( boost::shared_ptr< WModule > & );
                 createInstanceFunc f;
                 l.fetchFunction< createInstanceFunc >( W_LOADABLE_MODULE_SYMBOL, f );
 
                 // get the first prototype
-//                boost::shared_ptr< WModule > m = f();
                 boost::shared_ptr< WModule > m;
                 f( m );
 

src/modules/fiberTransform/WMFiberTransform.cpp

@@ -30,9 +30,7 @@
 #include "fiberTransform.xpm"
 
 // This line is needed by the module loader to actually find your module.
-//#ifndef _MSC_VER // don't export it on visual studio because it doesn't compile there
 W_LOADABLE_MODULE( WMFiberTransform )
-//#endif
 
 WMFiberTransform::WMFiberTransform()
     : WModule(),

src/modules/fiberTransform/WMFiberTransform.h

@@ -31,8 +31,6 @@
 #include "../../kernel/WModuleInputData.h"
 #include "../../kernel/WModuleOutputData.h"
 
-
-
 /**
  * Transforms a fiber dataset
  * \ingroup modules