From: apo Date: Tue, 7 Mar 2006 09:29:17 +0000 (+0000) Subject: Restore more precise signal detection as in SALOME V2.2.7, connected to Bug PAL11170 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=160938772b34c8a2e02de0d0c7b666e34670cc78;p=modules%2Fgui.git Restore more precise signal detection as in SALOME V2.2.7, connected to Bug PAL11170 --- diff --git a/src/SalomeApp/SalomeApp_ExceptionHandler.cxx b/src/SalomeApp/SalomeApp_ExceptionHandler.cxx index 63a70256d..16b5004ce 100644 --- a/src/SalomeApp/SalomeApp_ExceptionHandler.cxx +++ b/src/SalomeApp/SalomeApp_ExceptionHandler.cxx @@ -17,7 +17,7 @@ // See http://www.salome-platform.org/ // #include "SalomeApp_ExceptionHandler.h" -#include "CASCatch_CatchSignals.hxx" +#include "CASCatch.hxx" #include @@ -36,9 +36,6 @@ SalomeApp_ExceptionHandler::SalomeApp_ExceptionHandler( const bool floatSignal ) /*!Try to call SUIT_ExceptionHandler::internalHandle(o, e), catch if failure.*/ bool SalomeApp_ExceptionHandler::handleSignals( QObject* o, QEvent* e ) { - - CASCatch_CatchSignals aCatchSignals; - CASCatch_TRY { SUIT_ExceptionHandler::internalHandle( o, e ); } diff --git a/src/Session/Makefile.in b/src/Session/Makefile.in index 89d4fab0e..22837fbc8 100755 --- a/src/Session/Makefile.in +++ b/src/Session/Makefile.in @@ -60,7 +60,7 @@ BIN_CLIENT_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Component.idl SALOM CPPFLAGS += $(QT_MT_INCLUDES) $(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(BOOST_CPPFLAGS) -I$(KERNEL_ROOT_DIR)/include/salome -I$(OCC_INCLUDES) CXXFLAGS += $(OCC_CXXFLAGS) $(BOOST_CPPFLAGS) -LDFLAGS += $(QT_MT_LIBS) -L$(KERNEL_ROOT_DIR)/lib/salome -lSalomeNS -lsuit -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace -lwith_loggerTraceCollector -lEvent -lCASCatch -lSalomeCatalog -lSalomeDSClient $(CAS_KERNEL) +LDFLAGS += $(QT_MT_LIBS) -L$(KERNEL_ROOT_DIR)/lib/salome -lSalomeNS -lsuit -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace -lwith_loggerTraceCollector -lEvent -lSalomeCatalog -lSalomeDSClient $(CAS_KERNEL) LDFLAGSFORBIN= $(LDFLAGS) $(OMNIORB_LIBS) $(HDF5_LIBS) -lqtx -lSalomeContainer -lSalomeResourcesManager -lTOOLSDS -lSalomeHDFPersist -lSalomeDSImpl -lSalomeGenericObj -lRegistry -lSalomeNotification -lSALOMEBasics