]> SALOME platform Git repositories - modules/kernel.git/commitdiff
Salome HOME
KillKey also OK for RdExt.
authorAnthony Geay <anthony.geay@edf.fr>
Fri, 14 Aug 2015 16:01:08 +0000 (18:01 +0200)
committerAnthony Geay <anthony.geay@edf.fr>
Fri, 14 Aug 2015 16:01:08 +0000 (18:01 +0200)
src/SALOMESDS/SALOMESDS_PickelizedPyObjRdWrServer.cxx
src/SALOMESDS/SALOMESDS_PickelizedPyObjRdWrServer.hxx
src/SALOMESDS/SALOMESDS_PickelizedPyObjServer.cxx
src/SALOMESDS/SALOMESDS_PickelizedPyObjServer.hxx

index 38c51e54ad20ad0e1739fa0f57a455d025a0efc3..a4aba64f267363d697953e61e2a951acf9ceaa58 100644 (file)
@@ -115,13 +115,6 @@ void PickelizedPyObjRdWrServer::addKeyValueHard(PyObject *key, PyObject *value)
     throw Exception("PickelizedPyObjRdWrServer::addKeyValueHard : error when trying to add key,value to dict !");
 }
 
-void PickelizedPyObjRdWrServer::removeKeyInVarErrorIfNotAlreadyExisting(PyObject *key)
-{
-  checkKeyPresent(key);
-  if(PyDict_DelItem(_self,key)!=0)
-    throw Exception("PickelizedPyObjRdWrServer::removeKeyInVarErrorIfNotAlreadyExisting : error during deletion of key in dict !");
-}
-
 std::string PickelizedPyObjRdWrServer::getAccessStr() const
 {
   return std::string(ACCESS_REPR);
index 0a3a3e0934d8a96853de6e97a84c032b9d766bf0..09e94e1ea510a84d05b25bb3d3847e9373b6d43d 100644 (file)
@@ -42,7 +42,6 @@ namespace SALOMESDS
   public:
     std::string getAccessStr() const;
     void addKeyValueHard(PyObject *key, PyObject *value);
-    void removeKeyInVarErrorIfNotAlreadyExisting(PyObject *key);
   public:
     static const char ACCESS_REPR[];
   };
index 587bc55fa5482487580373e5c6b9a90523750924..c43fff87b62c3388ce8ca4c92a789b76932927d9 100644 (file)
@@ -270,3 +270,10 @@ void PickelizedPyObjServerModifiable::addKeyValueErrorIfAlreadyExisting(PyObject
   if(!isOK)
     throw Exception("PickelizedPyObjServerModifiable::addKeyValueErrorIfAlreadyExisting : error when trying to add key,value to dict !");
 }
+
+void PickelizedPyObjServerModifiable::removeKeyInVarErrorIfNotAlreadyExisting(PyObject *key)
+{
+  checkKeyPresent(key);
+  if(PyDict_DelItem(_self,key)!=0)
+    throw Exception("PickelizedPyObjServerModifiable::removeKeyInVarErrorIfNotAlreadyExisting : error during deletion of key in dict !");
+}
index 03458877574a1863914396b2eff43ca4ba704543..d3ed0bd0d8cbbb75b8390d7ca00d0dd95a2a1407 100644 (file)
@@ -76,7 +76,9 @@ namespace SALOMESDS
   public:
     PickelizedPyObjServerModifiable(DataScopeServerBase *father, const std::string& varName, const SALOME::ByteVec& value);
     PickelizedPyObjServerModifiable(DataScopeServerBase *father, const std::string& varName, PyObject *obj);
+  public:
     void addKeyValueErrorIfAlreadyExisting(PyObject *key, PyObject *value);
+    void removeKeyInVarErrorIfNotAlreadyExisting(PyObject *key);
   };
 }