Merging with BR_WPdev_For_5_0

diff --git a/src/DlgRef/DlgRef.h b/src/DlgRef/DlgRef.h
index b84bd55a3eec1a14c725691b671d0de43d5231ea..9ff6b68696f4f9b8f4fd5bc24e8918c03c570409 100644 (file)
--- a/src/DlgRef/DlgRef.h
+++ b/src/DlgRef/DlgRef.h
@@ -766,7 +766,7 @@ public:
 
 namespace DlgRef
 {
-  QString PrintDoubleValue( double, int = 16 );
+  DLGREF_EXPORT QString PrintDoubleValue( double, int = 16 );
 };
 
 #endif // GEOM_DLGREF_H

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
index ea8a1ccd49c32920a4a6d261450b829c6fcb10ab..d5bec4fd0ba2cc86f7af79001fd9b6cd8aef97b6 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
@@ -168,8 +168,6 @@ void GEOMToolsGUI::OnCheckGeometry()
 
 void GEOMToolsGUI::OnAutoColor()
 {
-  QList<SALOME_Prs> aListOfGroups;
-
   SALOME_ListIO selected;
   SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
   if( !app )

diff --git a/src/OBJECT/GEOM_OBJECT_defs.hxx b/src/OBJECT/GEOM_OBJECT_defs.hxx
index 3377ce908a68b4195c6b8c0c91b73d075a5d3e00..c9d5ede467b1715369d422525da36ed02891e237 100755 (executable)
--- a/src/OBJECT/GEOM_OBJECT_defs.hxx
+++ b/src/OBJECT/GEOM_OBJECT_defs.hxx
@@ -26,22 +26,14 @@
 #ifndef _GEOM_OBJECT_defs_HXX_
 #define _GEOM_OBJECT_defs_HXX_
 
-#ifdef WNT
- #if defined OBJECT_EXPORTS
-  #if defined WIN32
-   #define GEOM_OBJECT_EXPORT __declspec( dllexport )
-  #else
-   #define GEOM_OBJECT_EXPORT
-  #endif
- #else
-  #if defined WIN32
-   #define GEOM_OBJECT_EXPORT __declspec( dllimport )
-  #else
-   #define GEOM_OBJECT_EXPORT
-  #endif
- #endif
+#ifdef WIN32
+# if defined GEOM_OBJECT_EXPORTS
+#  define GEOM_OBJECT_EXPORT __declspec( dllexport )
+# else
+#  define GEOM_OBJECT_EXPORT __declspec( dllimport )
+# endif
 #else
- #define GEOM_OBJECT_EXPORT
+# define GEOM_OBJECT_EXPORT
 #endif
 
 #endif

diff --git a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
index 8435e9a3804bf5f7f0d26664e2beb6422df7d464..2dcecd1bd7de445e118fd5a3ec1d117df0ca411b 100644 (file)
--- a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
@@ -41,7 +41,7 @@
 #include <TopTools_IndexedMapOfShape.hxx>
 
 #include <GEOMImpl_Types.hxx>
-#include <ostream.h>
+#include <ostream>
 
 //=================================================================================
 // class    : PrimitiveGUI_BoxDlg()