Merge 'master' branch into 'V9_dev' branch

[modules/kernel.git] / src / SALOMEDS / SALOMEDS_StudyBuilder.hxx

diff --git a/src/SALOMEDS/SALOMEDS_StudyBuilder.hxx b/src/SALOMEDS/SALOMEDS_StudyBuilder.hxx
index 273d55d85e6acf7a08ce1639c77773198f8d7bbe..a57ab0a516cffeb46f60e8c5b6b9a4964279f7fb 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_StudyBuilder.hxx
+++ b/src/SALOMEDS/SALOMEDS_StudyBuilder.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -55,7 +55,6 @@ public:
   virtual void RemoveComponent(const _PTR(SComponent)& theSCO);
   virtual _PTR(SObject) NewObject(const _PTR(SObject)& theFatherObject);
   virtual _PTR(SObject) NewObjectToTag(const _PTR(SObject)& theFatherObject, int theTag);
-  virtual void AddDirectory(const std::string& thePath);
   virtual void LoadWith(const _PTR(SComponent)& theSCO, const std::string& theIOR);
   virtual void Load(const _PTR(SObject)& theSCO);
   virtual void RemoveObject(const _PTR(SObject)& theSO);