First stable version after merging with V3_2_2

[modules/kernel.git] / src / TOOLSDS / SALOMEDS_Tool.hxx

diff --git a/src/TOOLSDS/SALOMEDS_Tool.hxx b/src/TOOLSDS/SALOMEDS_Tool.hxx
index c36de54e7d4fcfd362ac94cb4f0d1e5078bcf772..0c57ace2e93ba183939dda374aaa6b6c6368a7e0 100644 (file)
--- a/src/TOOLSDS/SALOMEDS_Tool.hxx
+++ b/src/TOOLSDS/SALOMEDS_Tool.hxx
@@ -15,7 +15,7 @@
 // License along with this library; if not, write to the Free Software 
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  File      : SALOMEDS_Tool.hxx
 //  Created   : Mon Oct 21 16:24:50 2002
@@ -23,8 +23,6 @@
 
 //  Project   : SALOME
 //  Module    : SALOMEDS
-//  Copyright : Open CASCADE
-
 
 #ifndef __SALOMEDS_Tool_H__
 #define __SALOMEDS_Tool_H__
@@ -38,14 +36,25 @@
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
 #ifdef WNT
-#include <SALOME_WNT.hxx>
+ #if defined TOOLSDS_EXPORTS
+  #if defined WIN32
+   #define TOOLSDS_EXPORT __declspec( dllexport )
+  #else
+   #define TOOLSDS_EXPORT
+  #endif
+ #else
+  #if defined WIN32
+   #define TOOLSDS_EXPORT __declspec( dllimport )
+  #else
+   #define TOOLSDS_EXPORT
+  #endif
+ #endif
 #else
-#define SALOME_WNT_EXPORT
+ #define TOOLSDS_EXPORT
 #endif
 
-class SALOME_WNT_EXPORT SALOMEDS_Tool                                
+class TOOLSDS_EXPORT SALOMEDS_Tool                                
 {
-
 public:
  
   // Returns the unique temporary directory, that is defined in SALOME_TMP_DIR if this variable is set
@@ -64,6 +73,10 @@ public:
                                             const SALOMEDS::ListOfFileNames& theFiles,
                                             const int theNamesOnly = 0);
 
+  // Converts files listed in <theFiles> which will be named as pointed in the <theFileNames> into a byte sequence TMPFile
+  static SALOMEDS::TMPFile* PutFilesToStream(const SALOMEDS::ListOfFileNames& theFiles,
+                                            const SALOMEDS::ListOfFileNames& theFileNames);
+
   // Converts a byte sequence <theStream> to files and places them in <theToDirectory>
   static SALOMEDS::ListOfFileNames_var PutStreamToFiles(const SALOMEDS::TMPFile& theStream,
                                                        const std::string& theToDirectory,