Merge from OCC_development_generic_2006

[modules/gui.git] / src / SUIT / SUIT_Operation.h

diff --git a/src/SUIT/SUIT_Operation.h b/src/SUIT/SUIT_Operation.h
index 6d44d9502a725417640b55d9f56c12fc154fa313..4f1b617b98575ddb0e62199f5a4b621974b86d76 100755 (executable)
--- 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 <qobject.h>
-
 #include "SUIT.h"
 
+#include <qobject.h>
+#include <qguardedptr.h>
+
 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<SUIT_Study> 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