ENV: Windows porting

diff --git a/src/GLViewer/GLViewer_Tools.cxx b/src/GLViewer/GLViewer_Tools.cxx
index dcf259da88f7e9f26072db43c3024f1a30182137..5af5cd9bb1ff7ccf35c1f440a99f449a20d10af6 100644 (file)
--- a/src/GLViewer/GLViewer_Tools.cxx
+++ b/src/GLViewer/GLViewer_Tools.cxx
@@ -7,7 +7,9 @@
 
 #include <GL/gl.h>
 
-#include <iostream.h>
+#include <iostream>
+
+using namespace std;
 
 /****************************************************************************
 **  Class:   GLViewer_LineList 

diff --git a/src/Plot2d/Plot2d_ViewFrame.cxx b/src/Plot2d/Plot2d_ViewFrame.cxx
index 912dea7eb8ce79bf808a2326b9b2604377ec3b3f..10937b0292f4b8380fe476bf9e0e7d9f7967aa14 100755 (executable)
--- a/src/Plot2d/Plot2d_ViewFrame.cxx
+++ b/src/Plot2d/Plot2d_ViewFrame.cxx
@@ -25,7 +25,7 @@
 
 #include <qwt_math.h>
 #include <qwt_plot_canvas.h>
-#include <iostream.h>
+#include <iostream>
 #include <stdlib.h>
 
 //#include "utilities.h"

diff --git a/src/PyInterp/PyInterp_base.cxx b/src/PyInterp/PyInterp_base.cxx
index 50e2b4ba92507c35574b46857f0956aceddd4ae2..525f8771954d346688a7a7d2dadb600c49fdb2cd 100644 (file)
--- a/src/PyInterp/PyInterp_base.cxx
+++ b/src/PyInterp/PyInterp_base.cxx
@@ -205,7 +205,11 @@ int compile_command(const char *command,PyObject *context)
     return 1;
   }else{
     // Complete and correct text. We evaluate it.
+#ifndef WNT
     PyObjWrapper r(PyEval_EvalCode(v,context,context));
+#else
+    PyObjWrapper r(PyEval_EvalCode((PyCodeObject *)&v,context,context));
+#endif
     if(!r){
       // Execution error. We return -1
       PyErr_Print();

diff --git a/src/PyInterp/PyInterp_base.h b/src/PyInterp/PyInterp_base.h
index ff39c5a33ece4f255ef3c48b011e4fbe6cc337fc..63a11f82f8c3cbede3a64adc702eb1c19cf86717 100644 (file)
--- a/src/PyInterp/PyInterp_base.h
+++ b/src/PyInterp/PyInterp_base.h
@@ -24,7 +24,9 @@
 
 #include <Python.h>   // must be before qt includes ...
 
+#ifndef WNT
 extern "C" PyObject * PyEval_EvalCode(PyObject *co, PyObject *g, PyObject *l);
+#endif
 
 #define TOP_HISTORY_PY "--- top of history ---"
 #define BEGIN_HISTORY_PY "--- begin of history ---"

diff --git a/src/Qtx/QtxActionMgr.cxx b/src/Qtx/QtxActionMgr.cxx
index 93e8bbadf00ec73a0efe3d48e9ad3240b42ea579..4c8a6aab130c0a4558539b49510465bf9d9dd5ad 100644 (file)
--- a/src/Qtx/QtxActionMgr.cxx
+++ b/src/Qtx/QtxActionMgr.cxx
@@ -381,7 +381,7 @@ void QtxActionMgr::XMLReader::read( const QDomNode& parent_node,
   for( int i=0, n=children.count(); i<n; i++ )
   {
     QDomNode node = children.item( i );
-    QString n = node.nodeName();
+    //QString n = node.nodeName();
     if( node.isElement() /*&& node.hasAttributes()*/ &&
         ( items.contains( node.nodeName() ) || node.nodeName()==option( "separator" ) ) )
     {

diff --git a/src/STD/STD_Application.cxx b/src/STD/STD_Application.cxx
index dd478f44e032e7e68376e7e98fa1c89608f6f1f0..947b8f746962d4730ecc87d554beb23a439103a5 100755 (executable)
--- a/src/STD/STD_Application.cxx
+++ b/src/STD/STD_Application.cxx
@@ -24,7 +24,7 @@
 #include <qfiledialog.h>
 #include <qapplication.h>
 
-#include <iostream.h>
+#include <iostream>
 
 /*!Create and return new instance of STD_Application*/
 extern "C" STD_EXPORT SUIT_Application* createApplication()

diff --git a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.h b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.h
index 9d474ac67fe1d2ecb15fe586a1be9fc3a72ffb6c..5da0d5cc629c4b108c5397ec540ea7e345b16ee7 100755 (executable)
--- a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.h
+++ b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.h
@@ -31,6 +31,8 @@
 
 #include <qdialog.h>
 
+#include <Standard_Macro.hxx>
+
 class QLineEdit;
 class QPushButton;
 
@@ -38,7 +40,7 @@ class QPushButton;
 // class    : ToolsGUI_CatalogGeneratorDlg
 // purpose  :
 //=================================================================================
-class ToolsGUI_CatalogGeneratorDlg : public QDialog
+class Standard_EXPORT ToolsGUI_CatalogGeneratorDlg : public QDialog
 { 
     Q_OBJECT
 

diff --git a/src/TOOLSGUI/ToolsGUI_HelpWindow.cxx b/src/TOOLSGUI/ToolsGUI_HelpWindow.cxx
index e45d7fcc8a3323d9667e3fa3a13960748c096744..bd1ed427ae2e9d1a6854e594784c3f36ea51f7b6 100755 (executable)
--- a/src/TOOLSGUI/ToolsGUI_HelpWindow.cxx
+++ b/src/TOOLSGUI/ToolsGUI_HelpWindow.cxx
@@ -26,7 +26,6 @@
 //  Module : SALOME
 //  $Header$
 
-using namespace std;
 # include "ToolsGUI_HelpWindow.h"
 # include "utilities.h"
 
@@ -35,6 +34,8 @@ using namespace std;
 # include <qtextstream.h> 
 # include <qfile.h> 
 
+using namespace std;
+
 ToolsGUI_HelpWindow::ToolsGUI_HelpWindow(QWidget* parent, const char* name ) 
      : QMainWindow( parent, name, WType_TopLevel | WDestructiveClose )
 {

diff --git a/src/TOOLSGUI/ToolsGUI_IntervalWindow.h b/src/TOOLSGUI/ToolsGUI_IntervalWindow.h
index 876c0846953e98759c1dfac630a38eeaf6236d85..40c1f1af150fdafe7ab60e2ba5cdfcecdd31feb8 100755 (executable)
--- a/src/TOOLSGUI/ToolsGUI_IntervalWindow.h
+++ b/src/TOOLSGUI/ToolsGUI_IntervalWindow.h
@@ -16,7 +16,9 @@
 # include <qpushbutton.h>
 # include <qspinbox.h>
 
+#ifndef WNT
 using namespace std;
+#endif
 
 class ToolsGUI_IntervalWindow : public QDialog
 {

diff --git a/src/TOOLSGUI/ToolsGUI_RegWidget.h b/src/TOOLSGUI/ToolsGUI_RegWidget.h
index 2fa72b754b762eb34f34188a648740778b148f1b..b2ff850876ad34a25794e6c066f028d77566b41b 100755 (executable)
--- a/src/TOOLSGUI/ToolsGUI_RegWidget.h
+++ b/src/TOOLSGUI/ToolsGUI_RegWidget.h
@@ -45,10 +45,12 @@ class QTextView;
 class QPushButton;
 #endif
 
+#include <Standard_Macro.hxx>
+
 class ToolsGUI_HelpWindow;
 class ToolsGUI_IntervalWindow;
 
-class ToolsGUI_InfoWindow : public QMainWindow {
+class Standard_EXPORT  ToolsGUI_InfoWindow : public QMainWindow {
 public:
   ToolsGUI_InfoWindow( QWidget* parent = 0, const char* name = 0);
 
@@ -62,7 +64,7 @@ private:
   QTextView* myTextView;
 };
 
-class ToolsGUI_RegWidget : public QMainWindow
+class Standard_EXPORT  ToolsGUI_RegWidget : public QMainWindow
 {
   
   Q_OBJECT