X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Application.h;h=0a1f6731448059d059a2f24731e99670945f6cc6;hb=9ef491f540879952217af7e01c7b092af0ccb7e4;hp=6ec3c8df938bf137bf8346f71fdc1d8d770166ec;hpb=15d511a49a2b8f1fa39496c7abf79ea285d23ce5;p=modules%2Fshaper.git

diff --git a/src/Model/Model_Application.h b/src/Model/Model_Application.h
index 6ec3c8df9..0a1f67314 100644
--- a/src/Model/Model_Application.h
+++ b/src/Model/Model_Application.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2020  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -12,10 +12,9 @@
 //
 // You should have received a copy of the GNU Lesser General Public
 // License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #ifndef Model_Application_H_
@@ -46,7 +45,7 @@ public:
   DEFINE_STANDARD_RTTIEXT(Model_Application, TDocStd_Application)
 
   //! Retuns the application: one per process
-  MODEL_EXPORT static Handle_Model_Application getApplication();
+  MODEL_EXPORT static Handle(Model_Application) getApplication();
   //! Returns the document by the identifier
   //! \returns false of document is not yet created/not loaded
   MODEL_EXPORT std::shared_ptr<Model_Document> document(const int theDocID);
@@ -67,19 +66,16 @@ public:
   //! \param theDocName name of the document file
   //! \param theDocID the identifier of the loaded document (to be created)
   //! \returns true if load is ok
-  MODEL_EXPORT bool loadDocument(const std::string theDocName, const int theDocID);
+  MODEL_EXPORT bool loadDocument(const std::wstring theDocName, const int theDocID);
 
   //! Set path for the loaded by demand documents
   void setLoadPath(std::string thePath);
   //! Returns the path for the loaded by demand documents
   const std::string& loadPath() const;
   //! Defines that specified document must be loaded by demand
-  void setLoadByDemand(std::string theID, const int theDocID);
+  void setLoadByDemand(std::wstring theID, const int theDocID);
   //! Returns true if specified document must be loaded by demand
-  bool isLoadByDemand(std::string theID, const int theDocIndex);
-  //! Closes and removes the documents that are not loaded by demand and
-  //! not in the given list
-  void removeUselessDocuments(std::list<std::shared_ptr<ModelAPI_Document> > theUsedDocs);
+  bool isLoadByDemand(std::wstring theID, const int theDocIndex);
 
   //! produces new unique identifier of the document
   int generateDocumentId();
@@ -102,7 +98,7 @@ public:
   /// Path for the loaded by demand documents
   std::string myPath;
   /// Path for the loaded by demand documents (and the persistent ID as the value)
-  std::map<std::string, int> myLoadedByDemand;
+  std::map<std::wstring, int> myLoadedByDemand;
 };
 
 #endif