[MERGE]

src/gui/qt4/networkEditor/WQtNetworkEditor.cpp

@@ -128,8 +128,13 @@ void WQtNetworkEditor::addModule( boost::shared_ptr< WModule > module )
 
     // set the object at a random start position
     time( &m_time );
+#ifndef _MSC_VER
     netItem->setPos( rand_r( ( unsigned int * ) &m_time ) % 200,
                      rand_r( ( unsigned int * ) &m_time ) % 200 );
+#else
+    netItem->setPos( ( rand() + m_time ) % 200,
+                     ( rand() + m_time ) % 200 );
+#endif
 
     m_scene->addItem( netItem );
 

src/gui/qt4/networkEditor/WQtNetworkInputPort.cpp

@@ -30,12 +30,12 @@
 
 #include "WQtNetworkInputPort.h"
 
-const float SIZE = 10.0;
+const float WSIZE = 10.0;
 
 WQtNetworkInputPort::WQtNetworkInputPort( boost::shared_ptr<WModuleInputConnector> connector )
     : WQtNetworkPort()
 {
-    setRect( 0.0, 0.0, SIZE, SIZE );
+    setRect( 0.0, 0.0, WSIZE, WSIZE );
     setBrush( Qt::gray );
     setPen( QPen( Qt::red, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin ) );
 

src/gui/qt4/networkEditor/WQtNetworkOutputPort.cpp

@@ -30,12 +30,12 @@
 
 #include "WQtNetworkOutputPort.h"
 
-const float SIZE = 10.0;
+const float WSIZE2 = 10.0;
 
 WQtNetworkOutputPort::WQtNetworkOutputPort( boost::shared_ptr<WModuleOutputConnector> connector )
     : WQtNetworkPort()
 {
-    setRect( 0.0, 0.0, SIZE, SIZE );
+    setRect( 0.0, 0.0, WSIZE2, WSIZE2 );
     setBrush( Qt::gray );
     setPen( QPen( Qt::red, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin ) );