From: stv Date: Wed, 25 Jan 2006 11:44:22 +0000 (+0000) Subject: QGuardedPtr used for field myStudy. This prevet using of the deleted study object. X-Git-Tag: SPDev_start~10 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FOCC_ENK_config_imp;p=modules%2Fgui.git QGuardedPtr used for field myStudy. This prevet using of the deleted study object. --- diff --git a/src/SUIT/SUIT_Operation.h b/src/SUIT/SUIT_Operation.h index 6d44d9502..4f1b617b9 100755 --- a/src/SUIT/SUIT_Operation.h +++ b/src/SUIT/SUIT_Operation.h @@ -31,10 +31,11 @@ #ifndef SUIT_OPERATION_H #define SUIT_OPERATION_H -#include - #include "SUIT.h" +#include +#include + class SUIT_Study; class SUIT_Application; @@ -54,6 +55,10 @@ class SUIT_Application; * - virtual void resumeOperation(); * - virtual void suspendOperation(); */ +#ifdef WIN32 +#pragma warning( disable:4251 ) +#endif + class SUIT_EXPORT SUIT_Operation : public QObject { Q_OBJECT @@ -152,14 +157,21 @@ protected: void start( SUIT_Operation*, const bool = false ); +private: + typedef QGuardedPtr StudyPtr; + private: SUIT_Application* myApp; //!< application for this operation int myFlags; //!< operation flags - SUIT_Study* myStudy; //!< study for this operation + StudyPtr myStudy; //!< study for this operation OperationState myState; //!< Operation state ExecStatus myExecStatus; //!< Execution status friend class SUIT_Study; }; +#ifdef WIN32 +#pragma warning( default:4251 ) +#endif + #endif