ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-02-07 09:44:16 +05:00
Code Issues Packages Projects Releases Wiki Activity

Delete deprecated code

Browse Source
This commit is contained in:
mpa 2017-01-18 16:15:07 +03:00
parent 0f240cab6a
commit 8bea06f4fa
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/GEOM_I/GEOM_Gen_i.cc
View File

@ -589,8 +589,8 @@ SALOMEDS::TMPFile* GEOM_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent,
} }
// Create a list to store names of created files // Create a list to store names of created files
SALOMEDS::ListOfFileNames_var aSeq = new SALOMEDS::ListOfFileNames; SALOMEDS_Tool::ListOfFiles aSeq;
aSeq->length(1); aSeq.reserve(1);
// Prepare a file name to open // Prepare a file name to open
TCollection_AsciiString aNameWithExt(""); TCollection_AsciiString aNameWithExt("");
if (isMultiFile) if (isMultiFile)
@ -601,15 +601,15 @@ SALOMEDS::TMPFile* GEOM_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent,
#else #else
aNameWithExt += TCollection_AsciiString("_GEOM.sgd"); aNameWithExt += TCollection_AsciiString("_GEOM.sgd");
#endif #endif
aSeq[0] = CORBA::string_dup(aNameWithExt.ToCString()); aSeq.push_back(CORBA::string_dup(aNameWithExt.ToCString()));
// Build a full file name of temporary file // Build a full file name of temporary file
TCollection_AsciiString aFullName = TCollection_AsciiString((char*)aTmpDir.c_str()) + aNameWithExt; TCollection_AsciiString aFullName = TCollection_AsciiString((char*)aTmpDir.c_str()) + aNameWithExt;
// Save GEOM component in this file // Save GEOM component in this file
_impl->Save((char*) aFullName.ToCString()); _impl->Save((char*) aFullName.ToCString());
// Conver a file to the byte stream // Conver a file to the byte stream
aStreamFile = SALOMEDS_Tool::PutFilesToStream(aTmpDir.c_str(), aSeq.in(), isMultiFile); aStreamFile = SALOMEDS_Tool::PutFilesToStream(aTmpDir.c_str(), aSeq, isMultiFile);
// Remove the created file and tmp directory // Remove the created file and tmp directory
if (!isMultiFile) SALOMEDS_Tool::RemoveTemporaryFiles(aTmpDir.c_str(), aSeq.in(), true); if (!isMultiFile) SALOMEDS_Tool::RemoveTemporaryFiles(aTmpDir.c_str(), aSeq, true);
// Return the created byte stream // Return the created byte stream
return aStreamFile._retn(); return aStreamFile._retn();
@ -656,7 +656,7 @@ CORBA::Boolean GEOM_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent,
} }
// Conver the byte stream theStream to a file and place it in tmp directory // Conver the byte stream theStream to a file and place it in tmp directory
SALOMEDS::ListOfFileNames_var aSeq = SALOMEDS_Tool::ListOfFiles aSeq =
SALOMEDS_Tool::PutStreamToFiles(theStream, aTmpDir.c_str(), isMultiFile); SALOMEDS_Tool::PutStreamToFiles(theStream, aTmpDir.c_str(), isMultiFile);
// Prepare a file name to open // Prepare a file name to open
@ -666,7 +666,7 @@ CORBA::Boolean GEOM_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent,
#if OCC_VERSION_MAJOR > 6 #if OCC_VERSION_MAJOR > 6
// Get the file name. // Get the file name.
int i; int i;
int aLength = aSeq->length(); int aLength = aSeq.size();
const char *aGeomSgd = "_GEOM.sgd"; const char *aGeomSgd = "_GEOM.sgd";
const char *aGeomcbf = "_GEOM.cbf"; const char *aGeomcbf = "_GEOM.cbf";
@ -694,7 +694,7 @@ CORBA::Boolean GEOM_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent,
if (!_impl->Load((char*) aFullName.ToCString())) return false; if (!_impl->Load((char*) aFullName.ToCString())) return false;
// Remove the created file and tmp directory // Remove the created file and tmp directory
if (!isMultiFile) SALOMEDS_Tool::RemoveTemporaryFiles(aTmpDir.c_str(), aSeq.in(), true); if (!isMultiFile) SALOMEDS_Tool::RemoveTemporaryFiles(aTmpDir.c_str(), aSeq, true);
// creation of tree nodes for all data objects in the study // creation of tree nodes for all data objects in the study
// to support tree representation customization and drag-n-drop: // to support tree representation customization and drag-n-drop: