Correct compilation under Win32 platform

diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip b/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip
index 1239326a37975a341295df8166f8eeebccf1073d..ca84e31fd6aae0a14f4057b673e5461136d9bfeb 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip
@@ -10,10 +10,6 @@
 
 %Import qtmod.sip
 
-%ExportedHeaderCode
-#include <SalomePyQt.h>
-%End
-
 class SALOME_Selection : QObject
 {
 %TypeHeaderCode

diff --git a/src/SalomeApp/SalomeApp_Study.cxx b/src/SalomeApp/SalomeApp_Study.cxx
index aeee814b63b4515a6ba051db89f3559a2dcd25bc..6c30d871cc5176141885948364d4f79549d29bf1 100644 (file)
--- a/src/SalomeApp/SalomeApp_Study.cxx
+++ b/src/SalomeApp/SalomeApp_Study.cxx
@@ -35,7 +35,6 @@
 #include <qapplication.h>
 #include <qdict.h>
 
-#include "utilities.h"
 #include <iostream>
 #include <string>
 #include <vector>
@@ -43,6 +42,8 @@
 #include <SUIT_Session.h>
 
 #include "SALOMEDS_Tool.hxx"
+#include "utilities.h"
+#include "OpUtil.hxx"
 
 #include "SALOMEDSClient_ClientFactory.hxx"
 #include "SALOMEDSClient_IParameters.hxx"
@@ -565,7 +566,7 @@ void SalomeApp_Study::SetListOfFiles ( const char* theModuleName,
 std::string SalomeApp_Study::GetTmpDir ( const char* theURL, const bool  isMultiFile )
 {
   std::string anURLDir = SALOMEDS_Tool::GetDirFromPath(theURL);
-  std::string aTmpDir = isMultiFile ? anURLDir : SALOMEDS_Tool::GetTmpDir();
+  std::string aTmpDir = isMultiFile ? anURLDir : OpUtil_Dir::GetTmpDirByEnv("SALOME_TMP_DIR");
   return aTmpDir;
 }
 

diff --git a/src/Session/SalomeApp_Engine_i.cxx b/src/Session/SalomeApp_Engine_i.cxx
index 813270515dd0f660de88055b41baefb33e0d44ba..e0c4986d299c24fc1a94b060c9f5559d1550d673 100644 (file)
--- a/src/Session/SalomeApp_Engine_i.cxx
+++ b/src/Session/SalomeApp_Engine_i.cxx
@@ -29,6 +29,7 @@
 #include "SalomeApp_Engine_i.hxx"
 
 #include "SALOMEDS_Tool.hxx"
+#include "OpUtil.hxx"
 
 #include "utilities.h"
 
@@ -113,7 +114,7 @@ CORBA::Boolean SalomeApp_Engine_i::Load (SALOMEDS::SComponent_ptr theComponent,
   const int studyId = theComponent->GetStudy()->StudyId();
 
   // Create a temporary directory for the component's data files
-  std::string aTmpDir = isMultiFile ? theURL : SALOMEDS_Tool::GetTmpDir();
+  std::string aTmpDir = isMultiFile ? theURL : OpUtil_Dir::GetTmpDirByEnv("SALOME_TMP_DIR");
 
   // Convert the byte stream theStream to a files and place them in the tmp directory.
   // The files and temporary directory must be deleted by the component loading procedure.