From c3e8ff80d9d378563809c9b25108228eb2b5c2df Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 5 Sep 2008 06:26:56 +0000 Subject: [PATCH] Remove obsolete files --- .../unix/config_files/ac_cc_warnings.m4 | 119 --------------- salome_adm/unix/config_files/check_Salome.m4 | 78 ---------- salome_adm/unix/config_files/check_java.m4 | 111 -------------- src/Communication/Receiver.cxx | 45 ------ src/Communication/libSALOME_Comm.i | 136 ------------------ src/ModuleCatalog/SALOME_TestModuleCatalog.py | 82 ----------- src/SALOMEDS/Makefile.am | 4 - src/SALOMEDS/README_attributes | 46 ------ src/SALOMEDS/SALOMEDS_AttLong_i.cxx | 102 ------------- src/SALOMEDS/SALOMEDS_AttLong_i.hxx | 53 ------- src/SALOMEDS/SALOMEDS_AttReal_i.cxx | 103 ------------- src/SALOMEDS/SALOMEDS_AttReal_i.hxx | 53 ------- .../SALOMEDS_BasicAttributeFactory.cxx | 54 ------- .../SALOMEDS_BasicAttributeFactory.hxx | 48 ------- src/SALOMEDS/SALOMEDS_BasicAttribute_i.cxx | 41 ------ src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx | 55 ------- src/Utils/SalomeString.hxx | 63 -------- src/Utils/Utils_SignalsHandler.h | 50 ------- 18 files changed, 1243 deletions(-) delete mode 100644 salome_adm/unix/config_files/ac_cc_warnings.m4 delete mode 100644 salome_adm/unix/config_files/check_Salome.m4 delete mode 100644 salome_adm/unix/config_files/check_java.m4 delete mode 100644 src/Communication/Receiver.cxx delete mode 100644 src/Communication/libSALOME_Comm.i delete mode 100644 src/ModuleCatalog/SALOME_TestModuleCatalog.py delete mode 100644 src/SALOMEDS/README_attributes delete mode 100644 src/SALOMEDS/SALOMEDS_AttLong_i.cxx delete mode 100644 src/SALOMEDS/SALOMEDS_AttLong_i.hxx delete mode 100644 src/SALOMEDS/SALOMEDS_AttReal_i.cxx delete mode 100644 src/SALOMEDS/SALOMEDS_AttReal_i.hxx delete mode 100644 src/SALOMEDS/SALOMEDS_BasicAttributeFactory.cxx delete mode 100644 src/SALOMEDS/SALOMEDS_BasicAttributeFactory.hxx delete mode 100644 src/SALOMEDS/SALOMEDS_BasicAttribute_i.cxx delete mode 100644 src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx delete mode 100644 src/Utils/SalomeString.hxx delete mode 100644 src/Utils/Utils_SignalsHandler.h diff --git a/salome_adm/unix/config_files/ac_cc_warnings.m4 b/salome_adm/unix/config_files/ac_cc_warnings.m4 deleted file mode 100644 index 9f3aa1a7f..000000000 --- a/salome_adm/unix/config_files/ac_cc_warnings.m4 +++ /dev/null @@ -1,119 +0,0 @@ -dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -dnl -dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -dnl -dnl -dnl -dnl Synopsis : AC_CC_WARNINGS([ANSI]) -dnl -dnl Version : 1.1 (2000/12/31) -dnl -dnl Author : Ville Laurikari -dnl -dnl Description : -dnl -dnl Enables a reasonable set of warnings for the C compiler. -dnl Optionally, if the first argument is nonempty, turns on -dnl flags which enforce and/or enable proper ANSI C if such -dnl flags are known to the compiler used. -dnl -dnl Currently this macro knows about GCC, Solaris C compiler, -dnl Digital Unix C compiler, C for AIX Compiler, HP-UX C -dnl compiler, and IRIX C compiler. - -AC_DEFUN([AC_CC_WARNINGS], [ - ansi=$1 - if test -z "$ansi"; then - msg="for C compiler warning flags" - else - msg="for C compiler warning and ANSI conformance flags" - fi - AC_CACHE_CHECK($msg, ac_cv_prog_cc_warnings, [ - if test -n "$CC"; then - cat > conftest.c <&1 | grep "Xc.*strict ANSI C" > /dev/null 2>&1 && - $CC -c -v -Xc conftest.c > /dev/null 2>&1 && - test -f conftest.o; then - if test -z "$ansi"; then - ac_cv_prog_cc_warnings="-v" - else - ac_cv_prog_cc_warnings="-v -Xc" - fi - - dnl HP-UX C compiler - elif $CC > /dev/null 2>&1 && - $CC -c -Aa +w1 conftest.c > /dev/null 2>&1 && - test -f conftest.o; then - if test -z "$ansi"; then - ac_cv_prog_cc_warnings="+w1" - else - ac_cv_prog_cc_warnings="+w1 -Aa" - fi - - dnl Digital Unix C compiler - elif ! $CC > /dev/null 2>&1 && - $CC -c -verbose -w0 -warnprotos -std1 conftest.c > /dev/null 2>&1 && - test -f conftest.o; then - if test -z "$ansi"; then - ac_cv_prog_cc_warnings="-verbose -w0 -warnprotos" - else - ac_cv_prog_cc_warnings="-verbose -w0 -warnprotos -std1" - fi - - dnl C for AIX Compiler - elif $CC > /dev/null 2>&1 | grep AIX > /dev/null 2>&1 && - $CC -c -qlanglvl=ansi -qinfo=all conftest.c > /dev/null 2>&1 && - test -f conftest.o; then - if test -z "$ansi"; then - ac_cv_prog_cc_warnings="-qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" - else - ac_cv_prog_cc_warnings="-qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd -qlanglvl=ansi" - fi - - dnl IRIX C compiler - elif $CC -fullwarn -ansi -ansiE > /dev/null 2>&1 && - test -f conftest.o; then - if test -z "$ansi"; then - ac_cv_prog_cc_warnings="-fullwarn" - else - ac_cv_prog_cc_warnings="-fullwarn -ansi -ansiE" - fi - - fi - rm -f conftest.* - fi - if test -n "$ac_cv_prog_cc_warnings"; then - CFLAGS="$CFLAGS $ac_cv_prog_cc_warnings" - CXXFLAGS="$CXXFLAGS $ac_cv_prog_cc_warnings" - else - ac_cv_prog_cc_warnings="unknown" - fi - ]) -]) diff --git a/salome_adm/unix/config_files/check_Salome.m4 b/salome_adm/unix/config_files/check_Salome.m4 deleted file mode 100644 index ff12fd6c3..000000000 --- a/salome_adm/unix/config_files/check_Salome.m4 +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# 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. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# 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 -# -# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -# -#------------------------------------------------------------ -# Check availability of Salome binary distribution -# -# Author : Marc Tajchman (CEA, 2002) -#------------------------------------------------------------ - -AC_DEFUN([CHECK_SALOME],[ - -AC_CHECKING(for Salome) - -Salome_ok=no - -AC_ARG_WITH(salome, - --with-salome=DIR root directory path of SALOME installation, - SALOME_DIR="$withval",SALOME_DIR="") - -if test "x$SALOME_DIR" == "x" ; then - -# no --with-salome-dir option used - - if test "x$SALOME_ROOT_DIR" != "x" ; then - - # SALOME_ROOT_DIR environment variable defined - SALOME_DIR=$SALOME_ROOT_DIR - - else - - # search Salome binaries in PATH variable - AC_PATH_PROG(TEMP, libMEDMEM_Swig.py) - if test "x$TEMP" != "x" ; then - SALOME_BIN_DIR=`dirname $TEMP` - SALOME_DIR=`dirname $SALOME_BIN_DIR` - fi - - fi -# -fi - -if test -f ${SALOME_DIR}/bin/libMEDMEM_Swig.py ; then - Salome_ok=yes - AC_MSG_RESULT(Using Salome distribution in ${SALOME_DIR}) - - if test "x$SALOME_ROOT_DIR" == "x" ; then - SALOME_ROOT_DIR=${SALOME_DIR} - fi - if test "x$SALOME_SITE_DIR" == "x" ; then - SALOME_SITE_DIR=${SALOME_ROOT_DIR} - fi - AC_SUBST(SALOME_ROOT_DIR) - AC_SUBST(SALOME_SITE_DIR) - -else - AC_MSG_WARN("Cannot find compiled Salome distribution") -fi - -AC_MSG_RESULT(for Salome: $Salome_ok) - -])dnl - diff --git a/salome_adm/unix/config_files/check_java.m4 b/salome_adm/unix/config_files/check_java.m4 deleted file mode 100644 index c03e9f7ff..000000000 --- a/salome_adm/unix/config_files/check_java.m4 +++ /dev/null @@ -1,111 +0,0 @@ -dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -dnl -dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -dnl -dnl -dnl -AC_DEFUN([CHECK_JAVA],[ -dnl AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl -dnl AC_REQUIRE([AC_PROG_CPP])dnl - -AC_CHECKING(for JAVA) - -JAVA_INCLUDES="" -JAVA_LIBS="" -JAVA_LDPATH="" - -java_ok=no - -if test -z $JAVAHOME -then - AC_MSG_WARN(define JAVAHOME variable to use Java) -else - java_ok=yes -fi - -if test "x$java_ok" = "xyes" -then - AC_EXEEXT - AC_CHECK_PROG(JAVA, java$EXEEXT,found) - if test "x$JAVA" = "x" - then - java_ok=no - fi - - AC_CHECK_PROG(JAVAC, javac$EXEEXT,found) - if test "x$JAVAC" = "x" - then - java_ok=no - fi -fi - -if test "x$java_ok" = "xyes" -then - version=`$JAVA -version 2>&1 | grep "java version"` - case "$version" in - *1.1.*) - AC_MSG_RESULT(using jdk1.1 version - jdk1.4 required) - java_ok=no;; - *1.2*) - AC_MSG_RESULT(using jdk1.2 version - jdk1.4 required) - java_ok=no;; - *1.3*) - AC_MSG_RESULT(using jdk1.3 version - jdk1.4 required) - java_ok=no;; - *1.4*) - AC_MSG_RESULT(using jdk1.4 version) ;; - esac -fi - -if test "x$java_ok" = "xyes" -then -dnl java headers - LOCAL_INCLUDES=" -I${JAVAHOME}/include -I${JAVAHOME}/include/linux" - CPPFLAGS_old="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $LOCAL_INCLUDES" - AC_CHECK_HEADER(jni.h,java_ok=yes ,java_ok=no) - - CPPFLAGS="$CPPFLAGS_old" -fi - -if test "x$java_ok" = "xyes" -then -dnl libjava library - LOCAL_LIBS="-L${JAVAHOME}/jre/lib/i386 -ljava -L${JAVAHOME}/jre/lib/i386/client -ljvm -lverify" - LIBS_old="$LIBS" - LIBS="$LIBS $LOCAL_LIBS" - - AC_CHECK_LIB(jvm,JNI_CreateJavaVM,java_ok=yes,java_ok=no) - - LIBS="$LIBS_old" -fi - -if test "x$java_ok" = "xyes" -then - JAVA_INCLUDES="$LOCAL_INCLUDES" - JAVA_LIBS="$LOCAL_LIBS" -fi - -AC_SUBST(JAVA_INCLUDES) -AC_SUBST(JAVA_LIBS) -AC_SUBST(JAVA_LDPATH) - -AC_MSG_RESULT(for java: $java_ok) - -])dnl -dnl diff --git a/src/Communication/Receiver.cxx b/src/Communication/Receiver.cxx deleted file mode 100644 index 48ddf6556..000000000 --- a/src/Communication/Receiver.cxx +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// 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. -// -// This library is distributed in the hope that it will be useful -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// 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 -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -#include "Receiver.hxx" -#include -using namespace std; - -/*! - return a deep copy of the array contained in the servant. - */ -void *Receiver::getLocalValue(long &size,SALOME_Sender_i* servant) -{ - const void *src=servant->getData(size); - long lgr=size*servant->getSizeOf(); - void *ret=new char[lgr]; - memcpy(ret,src,lgr); - return ret; - //return (void *)servant->getData(size); -} - -void *Receiver::getValue(long &size,SALOME::Sender_ptr sender) -{ - SALOME_Sender_i* data=SALOME_Sender_i::find(sender); - if(data) - return getLocalValue(size,data); - else - return getDistValue(size); -} - diff --git a/src/Communication/libSALOME_Comm.i b/src/Communication/libSALOME_Comm.i deleted file mode 100644 index 9a507209c..000000000 --- a/src/Communication/libSALOME_Comm.i +++ /dev/null @@ -1,136 +0,0 @@ -// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// 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. -// -// This library is distributed in the hope that it will be useful -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// 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 -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -%{ - #include "ReceiverFactory.hxx" - #include "SALOME_Comm_i.hxx" -%} - -%typemap(python,in) SALOME::SenderDouble_ptr -{ - PyObject* pdict = PyDict_New(); - PyDict_SetItemString(pdict, "__builtins__", PyEval_GetBuiltins()); - PyRun_String("import CORBA", Py_single_input, pdict, pdict); - - PyRun_String("o = CORBA.ORB_init([''], CORBA.ORB_ID);", Py_single_input, - pdict, pdict); - - PyObject* orb = PyDict_GetItemString(pdict, "o"); - - // Ask omniORBpy to transform SUPPORT (python Corba) ptr to IOR string - - PyObject* iorSupport = PyObject_CallMethod(orb, "object_to_string", "O", $input); - - if (iorSupport == Py_None) - return NULL; - char * s = PyString_AsString(PyObject_Str(iorSupport)); - - // Ask omniORB to convert IOR string to SALOME::SenderDouble_ptr - - int argc = 0; - char *xargv = ""; - char **argv = &xargv; - CORBA::ORB_var ORB = CORBA::ORB_init(argc, argv); - CORBA::Object_var O = ORB->string_to_object(s); - SALOME::SenderDouble_ptr t = SALOME::SenderDouble::_narrow(O); - $1 = t; -} - -%typemap(python,in) SALOME::SenderInt_ptr -{ - PyObject* pdict = PyDict_New(); - PyDict_SetItemString(pdict, "__builtins__", PyEval_GetBuiltins()); - PyRun_String("import CORBA", Py_single_input, pdict, pdict); - - PyRun_String("o = CORBA.ORB_init([''], CORBA.ORB_ID);", Py_single_input, - pdict, pdict); - - PyObject* orb = PyDict_GetItemString(pdict, "o"); - - // Ask omniORBpy to transform SUPPORT (python Corba) ptr to IOR string - - PyObject* iorSupport = PyObject_CallMethod(orb, "object_to_string", "O", $input); - - if (iorSupport == Py_None) - return NULL; - char * s = PyString_AsString(PyObject_Str(iorSupport)); - - // Ask omniORB to convert IOR string to SALOME::SenderInt_ptr - - int argc = 0; - char *xargv = ""; - char **argv = &xargv; - CORBA::ORB_var ORB = CORBA::ORB_init(argc, argv); - CORBA::Object_var O = ORB->string_to_object(s); - SALOME::SenderInt_ptr t = SALOME::SenderInt::_narrow(O); - $1 = t; -} - -PyObject * getValueForSenderDouble(SALOME::SenderDouble_ptr senderDouble); - -%{ -PyObject * getValueForSenderDouble(SALOME::SenderDouble_ptr senderDouble) -{ - PyObject *py_list; - long size; - double *ret=ReceiverFactory::getValue(senderDouble,size); - py_list = PyList_New(size); - for (int i=0; i < size; i++) - { - int err = PyList_SetItem(py_list, i, Py_BuildValue("d", (double) ret[i])); - if(err) - { - char * message = "Error in SUPPORT::getTypes"; - PyErr_SetString(PyExc_RuntimeError, message); - return NULL; - } - } - PyObject * result = Py_BuildValue("O", py_list); - delete [] ret; - Py_DECREF(py_list); - return result; -} -%} - - -PyObject * getValueForSenderInt(SALOME::SenderInt_ptr senderInt); - -%{ -PyObject * getValueForSenderInt(SALOME::SenderInt_ptr senderInt) -{ - PyObject *py_list; - long size; - int *ret=ReceiverFactory::getValue(senderInt,size); - py_list = PyList_New(size); - for (int i=0; i < size; i++) - { - int err = PyList_SetItem(py_list, i, Py_BuildValue("i", (int) ret[i])); - if(err) - { - char * message = "Error in SUPPORT::getTypes"; - PyErr_SetString(PyExc_RuntimeError, message); - return NULL; - } - } - PyObject * result = Py_BuildValue("O", py_list); - delete [] ret; - Py_DECREF(py_list); - return result; -} -%} diff --git a/src/ModuleCatalog/SALOME_TestModuleCatalog.py b/src/ModuleCatalog/SALOME_TestModuleCatalog.py deleted file mode 100644 index 9f9245b0b..000000000 --- a/src/ModuleCatalog/SALOME_TestModuleCatalog.py +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG -# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT -# 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. -# -# This library is distributed in the hope that it will be useful -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# 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 -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -import batchmode_salome -import SALOME_ModuleCatalog - -print -print "======================================================================" -print " XML Catalog file generation from idl file" -print "======================================================================" - -import os -os.system('runIDLparser -Wbcatalog=x \ - ${KERNEL_ROOT_DIR}/idl/salome/SALOME_TestModuleCatalog.idl') - -print "======================================================================" -print " Get Catalog " -print "======================================================================" -obj = batchmode_salome.naming_service.Resolve('Kernel/ModulCatalog') -catalog = obj._narrow(SALOME_ModuleCatalog.ModuleCatalog) -catalog.GetComponentList() - -print -print "======================================================================" -print " Import xml file " -print "======================================================================" -catalog.ImportXmlCatalogFile("x.xml") - -name = "AddComponent" -print -print "======================================================================" -print " Dump component <", name, "> " -print "======================================================================" -C = catalog.GetComponent(name) - -print "name : ", C._get_componentname() -print "username : ", C._get_componentusername() -print "type : ", C._get_component_type() -print "constraint : ", C._get_constraint() -print "icon : ", C._get_component_icone() - -for iL in C.GetInterfaceList(): - I = C.GetInterface(iL) - print "interface : ", I.interfacename - for S in I.interfaceservicelist: - print " service : ", S.ServiceName - print " ", len(S.ServiceinParameter), "in params : " - for iP in S.ServiceinParameter: - print ' ' + iP.Parametername + '(' + iP.Parametertype + ')' - pass - print " ", len(S.ServiceoutParameter), "out params : " - for iP in S.ServiceoutParameter: - print ' ' + iP.Parametername + '(' + iP.Parametertype + ')' - pass - print " ", len(S.ServiceinDataStreamParameter), "in datastream params : " - for iP in S.ServiceinDataStreamParameter: - print ' ' + iP.Parametername + '(' + str(iP.Parametertype) + ', ' + \ - str(iP.Parameterdependency) + ')' - pass - print " ", len(S.ServiceoutDataStreamParameter), "out datastream params : " - for iP in S.ServiceoutDataStreamParameter: - print ' ' + iP.Parametername + '(' + str(iP.Parametertype) + ', ' + \ - str(iP.Parameterdependency) + ')' - pass - pass - pass - diff --git a/src/SALOMEDS/Makefile.am b/src/SALOMEDS/Makefile.am index 37686d204..d8a55d88f 100644 --- a/src/SALOMEDS/Makefile.am +++ b/src/SALOMEDS/Makefile.am @@ -180,8 +180,6 @@ libSalomeDS_la_SOURCES = \ SALOMEDS_AttributeParameter.cxx \ SALOMEDS_AttributeString.cxx \ SALOMEDS_IParameters.cxx \ - SALOMEDS_AttLong_i.hxx \ - SALOMEDS_AttReal_i.hxx \ SALOMEDS_AttributeComment.hxx \ SALOMEDS_AttributeComment_i.hxx \ SALOMEDS_AttributeDrawable.hxx \ @@ -239,8 +237,6 @@ libSalomeDS_la_SOURCES = \ SALOMEDS_AttributeTreeNode_i.hxx \ SALOMEDS_AttributeUserID.hxx \ SALOMEDS_AttributeUserID_i.hxx \ - SALOMEDS_BasicAttributeFactory.hxx \ - SALOMEDS_BasicAttribute_i.hxx \ SALOMEDS_Callback_i.hxx \ SALOMEDS_ChildIterator.hxx \ SALOMEDS_ChildIterator_i.hxx \ diff --git a/src/SALOMEDS/README_attributes b/src/SALOMEDS/README_attributes deleted file mode 100644 index b0c4ff789..000000000 --- a/src/SALOMEDS/README_attributes +++ /dev/null @@ -1,46 +0,0 @@ - -$Header$ - -How to add a new attribute (without WOK): ------------------------------------------ - -This works only for simple types (ex: string) - -example: add attribute FileType (string) - -# new files (copied from files specific to ExternalFileDef attribute = string): - -? src/SALOMEDS/Handle_SALOMEDS_FileType.hxx <--- Handle_SALOMEDS_ExternalFileDef.hxx -? src/SALOMEDS/SALOMEDS_AttributeFileType_i.cxx <--- SALOMEDS_AttributeExternalFileDef_i.cxx -? src/SALOMEDS/SALOMEDS_AttributeFileType_i.hxx <--- SALOMEDS_AttributeExternalFileDef_i.hxx -? src/SALOMEDS/SALOMEDS_FileType.cdl <--- SALOMEDS_ExternalFileDef.cdl -? src/SALOMEDS/SALOMEDS_FileType.cxx <--- SALOMEDS_ExternalFileDef.cxx -? src/SALOMEDS/SALOMEDS_FileType.hxx <--- SALOMEDS_ExternalFileDef.hxx -? src/SALOMEDS/SALOMEDS_FileType.ixx <--- SALOMEDS_ExternalFileDef.ixx -? src/SALOMEDS/SALOMEDS_FileType.jxx <--- SALOMEDS_ExternalFileDef.jxx - -# files modified: - -M idl/SALOMEDS_Attributes.idl -M src/SALOMEDS/Makefile.in -M src/SALOMEDS/SALOMEDS_SObject_i.cxx -M src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx - -# detailled modifications: - -- in new files, -change ExternalFileDef in FileType everywhere -- in SALOMEDS_FileType.cxx, -Standard_GUID (Global Universal IDentifier) must be changed. -To obtain a new GUID, it is possible to use guidgen.exe on windows (with visual C++). - -- in src/SALOMEDS/Makefile.in, -add under LIB_SRC = \ - SALOMEDS_FileType.cxx \ - SALOMEDS_AttributeExternalFileDef_i.cxx \ - -- in src/SALOMEDS/SALOMEDS_SObject_i.cxx, -- in src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx, -- in idl/SALOMEDS_Attributes.idl, -find portions of code containing ExternalFileDef, duplicate and replace - diff --git a/src/SALOMEDS/SALOMEDS_AttLong_i.cxx b/src/SALOMEDS/SALOMEDS_AttLong_i.cxx deleted file mode 100644 index b126fe493..000000000 --- a/src/SALOMEDS/SALOMEDS_AttLong_i.cxx +++ /dev/null @@ -1,102 +0,0 @@ -// SALOME SALOMEDS : data structure of SALOME and sources of Salome data server -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// 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. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// 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 -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -// -// -// File : SALOMEDS_AttLong_i.cxx -// Author : Estelle Deville -// Module : SALOME -// $Header$ - -#include "SALOMEDS_AttLong_i.hxx" -#include "utilities.h" -#include -#include -using namespace std; - -//============================================================================ -/*! Function : Set - * Purpose : Affect a value to the basic attribute - */ -//============================================================================ -void SALOMEDS_AttLong_i::Set(CORBA::Long i) -{ - CheckLocked(); - SALOMEDSImpl_AttributeInteger::Set (_Lab,i); -} - -//============================================================================ -/*! Function : Get - * Purpose : Get basic attribute's value - */ -//============================================================================ -CORBA::Long SALOMEDS_AttLong_i::Get() -{ - SALOMEDSImpl_AttributeInteger* Att = NULL; - CORBA::Long x; - if ((Att=(SALOMEDSImpl_AttributeInteger*)_Lab.FindAttribute(SALOMEDSImpl_AttributeInteger::GetID()))) - x = Att->Get (); - return x; -} - -//============================================================================ -/*! Function : Save - * Purpose : - */ -//============================================================================ -char* SALOMEDS_AttLong_i::Save() -{ - BEGIN_OF("SALOMEDS_AttLong_i::Save"); - CORBA::Long x = this->Get(); - char* out= new char[12]; - sprintf(out,"%ld",x); - return out; -} - -//============================================================================ -/*! Function : Load - * Purpose : - */ -//============================================================================ -void SALOMEDS_AttLong_i::Load() -{ - BEGIN_OF("SALOMEDS_AttLong_i::Load"); -} - -//============================================================================ -/*! Function : GetPtr - * Purpose : return sobject associated to the basic attribute (if exist) - */ -//============================================================================ -CORBA::Boolean SALOMEDS_AttLong_i::GetPtr(SALOMEDS::SObject_ptr anObject) -{ - return (_Lab.IsAttribute(SALOMEDSImpl_AttributeInteger::GetID())); -} - -//============================================================================ -/*! Function : GetType - * Purpose : - */ -//============================================================================ -char* SALOMEDS_AttLong_i::GetType() -{ - return CORBA::string_dup(_type); -} diff --git a/src/SALOMEDS/SALOMEDS_AttLong_i.hxx b/src/SALOMEDS/SALOMEDS_AttLong_i.hxx deleted file mode 100644 index adb6acb0c..000000000 --- a/src/SALOMEDS/SALOMEDS_AttLong_i.hxx +++ /dev/null @@ -1,53 +0,0 @@ -// SALOME SALOMEDS : data structure of SALOME and sources of Salome data server -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// 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. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// 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 -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -// -// -// File : SALOMEDS_AttLong_i.hxx -// Author : Estelle Deville -// Module : SALOME -// $Header$ - -#ifndef __SALOMEDS_ATTLONG_I_H__ -#define __SALOMEDS_ATTLONG_I_H__ - -// IDL headers -#include -#include CORBA_SERVER_HEADER(SALOMEDS_AttLong) -#include "SALOMEDS_BasicAttribute_i.hxx" - -class SALOMEDS_AttLong_i: public POA_SALOMEDS::AttLong, - public SALOMEDS_BasicAttribute_i { -protected: - char * _type; - -public: - - SALOMEDS_AttLong_i() { _type = "AttLong";}; - ~SALOMEDS_AttLong_i() {}; - void Set(CORBA::Long i); - CORBA::Long Get(); - virtual char* Save(); - virtual void Load(); - CORBA::Boolean GetPtr(SALOMEDS::SObject_ptr so); - virtual char* GetType(); -}; -#endif diff --git a/src/SALOMEDS/SALOMEDS_AttReal_i.cxx b/src/SALOMEDS/SALOMEDS_AttReal_i.cxx deleted file mode 100644 index 30740a810..000000000 --- a/src/SALOMEDS/SALOMEDS_AttReal_i.cxx +++ /dev/null @@ -1,103 +0,0 @@ -// SALOME SALOMEDS : data structure of SALOME and sources of Salome data server -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// 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. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// 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 -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -// -// -// File : SALOMEDS_AttReal_i.cxx -// Author : Estelle Deville -// Module : SALOME -// $Header$ - -#include "SALOMEDS_AttReal_i.hxx" -#include "utilities.h" -#include -#include -#include -using namespace std; - -//============================================================================ -/*! Function : Set - * Purpose : Affect a value to the basic attribute - */ -//============================================================================ -void SALOMEDS_AttReal_i::Set(CORBA::Double r) -{ - CheckLocked(); - SALOMEDSImpl_AttributeReal::Set (_Lab,r); -} - -//============================================================================ -/*! Function : Get - * Purpose : Get basic attribute's value - */ -//============================================================================ -CORBA::Double SALOMEDS_AttReal_i::Get() -{ - SALOMEDSImpl_AttributeReal* Att; - CORBA::Double x; - if ((Att=(SALOMEDSImpl_AttributeReal*)_Lab.FindAttribute(TDataStd_Real::GetID()))) - x = Att->Get (); - return x; -} - -//============================================================================ -/*! Function : Save - * Purpose : - */ -//============================================================================ -char* SALOMEDS_AttReal_i::Save() -{ - BEGIN_OF("SALOMEDS_AttReal_i::Save"); - CORBA::Double x = this->Get(); - char* out= new char[12]; - sprintf(out,"%g",x); - return out; -} - -//============================================================================ -/*! Function : Load - * Purpose : - */ -//============================================================================ -void SALOMEDS_AttReal_i::Load() -{ - BEGIN_OF("SALOMEDS_AttReal_i::Load"); -} - -//============================================================================ -/*! Function : GetPtr - * Purpose : return sobject associated to the basic attribute (if exist) - */ -//============================================================================ -CORBA::Boolean SALOMEDS_AttReal_i::GetPtr(SALOMEDS::SObject_ptr anObject) -{ - return _Lab.IsAttribute(SALOMEDSImpl_AttributeReal::GetID()); -} - -//============================================================================ -/*! Function : GetType - * Purpose : - */ -//============================================================================ -char* SALOMEDS_AttReal_i::GetType() -{ - return CORBA::string_dup(_type); -} diff --git a/src/SALOMEDS/SALOMEDS_AttReal_i.hxx b/src/SALOMEDS/SALOMEDS_AttReal_i.hxx deleted file mode 100644 index 65fda690a..000000000 --- a/src/SALOMEDS/SALOMEDS_AttReal_i.hxx +++ /dev/null @@ -1,53 +0,0 @@ -// SALOME SALOMEDS : data structure of SALOME and sources of Salome data server -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// 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. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// 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 -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -// -// -// File : SALOMEDS_AttReal_i.hxx -// Author : Estelle Deville -// Module : SALOME -// $Header$ - -#ifndef __SALOMEDS_ATTREAL_I_H__ -#define __SALOMEDS_ATTREAL_I_H__ - -// IDL headers -#include -#include CORBA_SERVER_HEADER(SALOMEDS_AttReal) -#include "SALOMEDS_BasicAttribute_i.hxx" - -class SALOMEDS_AttReal_i: public POA_SALOMEDS::AttReal, - public SALOMEDS_BasicAttribute_i { -protected: - char * _type; - -public: - - SALOMEDS_AttReal_i() { _type = "AttReal";}; - ~SALOMEDS_AttReal_i() {}; - void Set(CORBA::Double r); - CORBA::Double Get(); - virtual char* Save(); - virtual void Load(); - CORBA::Boolean GetPtr(SALOMEDS::SObject_ptr so); - virtual char* GetType(); -}; -#endif diff --git a/src/SALOMEDS/SALOMEDS_BasicAttributeFactory.cxx b/src/SALOMEDS/SALOMEDS_BasicAttributeFactory.cxx deleted file mode 100644 index e5f27882a..000000000 --- a/src/SALOMEDS/SALOMEDS_BasicAttributeFactory.cxx +++ /dev/null @@ -1,54 +0,0 @@ -// SALOME SALOMEDS : data structure of SALOME and sources of Salome data server -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// 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. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// 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 -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -// -// -// File : SALOMEDS_BasicAttributeFactory.cxx -// Author : Estelle Deville, CEA -// Module : SALOME -// $Header$ - -#include "SALOMEDS_BasicAttributeFactory.hxx" -#include "utilities.h" -using namespace std; - -//============================================================================ -/*! Function : Create - * Purpose : create new basic attributes - */ -//============================================================================ -SALOMEDS_BasicAttribute_i* BasicAttributeFactory::Create(const char* type) - throw (SALOME_Exception) -{ - try { - if (!strcmp(type,"AttReal")) - { - SALOMEDS_AttReal_i *A = new SALOMEDS_AttReal_i(); - return A; - } - else if(!strcmp(type,"AttLong")) - { - SALOMEDS_AttLong_i *A = new SALOMEDS_AttLong_i(); - return A; - } - else throw(SALOME_Exception(LOCALIZED("bad attribute type name"))); - } catch (...) {throw(SALOME_Exception(LOCALIZED("Unexpected exception was caught")));} -} diff --git a/src/SALOMEDS/SALOMEDS_BasicAttributeFactory.hxx b/src/SALOMEDS/SALOMEDS_BasicAttributeFactory.hxx deleted file mode 100644 index 8ad0c9c9e..000000000 --- a/src/SALOMEDS/SALOMEDS_BasicAttributeFactory.hxx +++ /dev/null @@ -1,48 +0,0 @@ -// SALOME SALOMEDS : data structure of SALOME and sources of Salome data server -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// 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. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// 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 -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -// -// -// File : SALOMEDS_BasicAttributeFactory.hxx -// Author : Estelle Deville, CEA -// Module : SALOME -// $Header$ - -#ifndef _BASIC_ATTRIBUTEFACTORY_HXX_ -#define _BASIC_ATTRIBUTEFACTORY_HXX_ -#include "SALOMEDS_BasicAttribute_i.hxx" -// Add new Attribute type here -#include "SALOMEDS_AttReal_i.hxx" -#include "SALOMEDS_AttLong_i.hxx" - -#include "Utils_SALOME_Exception.hxx" - -class BasicAttributeFactory -{ -public: - BasicAttributeFactory() {}; - virtual ~BasicAttributeFactory() {}; - - SALOMEDS_BasicAttribute_i* Create(const char* type) - throw (SALOME_Exception); -}; - -#endif diff --git a/src/SALOMEDS/SALOMEDS_BasicAttribute_i.cxx b/src/SALOMEDS/SALOMEDS_BasicAttribute_i.cxx deleted file mode 100644 index 74dd4e85d..000000000 --- a/src/SALOMEDS/SALOMEDS_BasicAttribute_i.cxx +++ /dev/null @@ -1,41 +0,0 @@ -// SALOME SALOMEDS : data structure of SALOME and sources of Salome data server -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// 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. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// 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 -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -// -// -// File : SALOMEDS_BasicAttribute_i.cxx -// Author : Estelle Deville, CEA -// Module : SALOME -// $Header$ - -#include "SALOMEDS_BasicAttribute_i.hxx" -using namespace std; - -//============================================================================ -/*! Function : SetLabel - * Purpose : - */ -//============================================================================ -void SALOMEDS_BasicAttribute_i::SetLabel(const DF_Label& Lab) -{ - _Lab = Lab; -} - diff --git a/src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx b/src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx deleted file mode 100644 index b8902a902..000000000 --- a/src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx +++ /dev/null @@ -1,55 +0,0 @@ -// SALOME SALOMEDS : data structure of SALOME and sources of Salome data server -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// 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. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// 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 -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -// -// -// File : SALOMEDS_BasicAttribute_i.hxx -// Author : Estelle Deville, CEA -// Module : SALOME -// $Header$ - -#ifndef _BASIC_ATTRIBUTE_I_HXX_ -#define _BASIC_ATTRIBUTE_I_HXX_ - -// IDL headers -#include -#include CORBA_SERVER_HEADER(SALOMEDS) -#include - -class SALOMEDS_BasicAttribute_i: public POA_SALOMEDS::BasicAttribute, - public PortableServer::ServantBase { -protected: - DF_Label _Lab; - -public: - SALOMEDS_BasicAttribute_i() {}; - - ~SALOMEDS_BasicAttribute_i() {}; - - virtual char * Save() =0; - virtual void Load () =0; - CORBA::Boolean GetPtr(SALOMEDS::SObject so); - void SetLabel(const DF_Label& Lab); - virtual char* GetType() = 0; - -}; - -#endif diff --git a/src/Utils/SalomeString.hxx b/src/Utils/SalomeString.hxx deleted file mode 100644 index eaee786cd..000000000 --- a/src/Utils/SalomeString.hxx +++ /dev/null @@ -1,63 +0,0 @@ -// SALOME Utils : general SALOME's definitions and tools -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// 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. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// 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 -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -// -// -// File : SalomeString.hxx -// Module : SALOME - -# ifndef SALOME_STRING -# define SALOME_STRING - -#include "SALOME_Utils.hxx" - -# include -# include - -class UTILS_EXPORT SALOME_STRING : public string -{ -private : - ostringstream _s ; -public : - operator const char*() const - { - return _s.str().c_str() ; - } - SALOME_STRING() : _s() - { - } - template SALOME_STRING( const T &valeur ) : _s() - { - _s << valeur ; - } - template SALOME_STRING &operator<<( const T &valeur ) - { - _s << valeur ; - return *this ; - } -} ; - -// Exemple d'utilisation avec les exceptions SALOME -// SALOME_STRING msgErr; -// msgErr << "ESSAI::ESSAI() : This Object cannot be instanciated by now ! Try "<< 11 << "times just to see what happens "; -// throw SALOME_EXCEPTION (LOCALIZED(msgErr)) ; - -# endif diff --git a/src/Utils/Utils_SignalsHandler.h b/src/Utils/Utils_SignalsHandler.h deleted file mode 100644 index a76ce46d8..000000000 --- a/src/Utils/Utils_SignalsHandler.h +++ /dev/null @@ -1,50 +0,0 @@ -// KERNEL Utils : common utils for KERNEL -// Copyright (C) 2003 CEA -// -// 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. -// - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// 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 -// -// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org - -#ifndef _UTILS_SIGNALSHANDLER_H_ -#define _UTILS_SIGNALSHANDLER_H_ - -#include "SALOME_Utils.hxx" - -#include -typedef void (*TSigHandler)(int); - - -class UTILS_EXPORT Utils_SignalsHandler{ - public: - Utils_SignalsHandler(); - ~Utils_SignalsHandler(); - - TSigHandler GetSigHandler(int theSigId); - TSigHandler SetSigHandler(int theSigId, TSigHandler theSigHandler); - typedef std::map TSigHandlerCont; - - private: - TSigHandlerCont mySigHandlerCont; -}; - - -class UTILS_EXPORT Utils_CASSignalsHandler: private Utils_SignalsHandler{ - public: - Utils_CASSignalsHandler(); -}; - - -#endif -- 2.39.2