Remove unused parameters and methods

diff --git a/src/Event/SALOME_Event.cxx b/src/Event/SALOME_Event.cxx
index 7de746341a653a8e9d2c182a1801291461e2ff77..dfebd7b02f751dbe9c8e6181150566b3d28a68b9 100644 (file)
--- a/src/Event/SALOME_Event.cxx
+++ b/src/Event/SALOME_Event.cxx
@@ -46,10 +46,9 @@ static int MYDEBUG = 0;
  *  Constructor
  */
 //===========================================================
-SALOME_Event::SALOME_Event( int salomeEventType, bool wait, bool autoRelease ): 
-  myType( salomeEventType ), 
-  myWait( wait ),
-  myAutoRelease( autoRelease )
+SALOME_Event::SALOME_Event(): 
+  myWait( true ),
+  myAutoRelease( false )
 {
   if(MYDEBUG) MESSAGE( "SALOME_Event::SALOME_Event(): this = "<<this<<", myWait = "<<myWait );
   if ( myWait ) {

diff --git a/src/Event/SALOME_Event.hxx b/src/Event/SALOME_Event.hxx
index 198d1d63caeec1b5d14ae6ff74e639ef2f1312e9..2467912d904ee9345081cc3f60262fe0c8eca2dd 100644 (file)
--- a/src/Event/SALOME_Event.hxx
+++ b/src/Event/SALOME_Event.hxx
@@ -85,12 +85,11 @@ class QSemaphore;
 class SALOME_Event
 {
 public:
-  SALOME_Event( int salomeEventType = -1, bool wait = true, bool autoRelease = false );
+  SALOME_Event();
   virtual ~SALOME_Event();
 
-  int getType() const { return myType; }
-
-  virtual bool Execute() { return false; }
+  // To do real work
+  virtual void Execute() = 0;
 
   void process();
   void processed();
@@ -98,7 +97,6 @@ public:
   void release();
 
 private:
-  int         myType;
   bool        myWait;
   bool        myAutoRelease;
   QSemaphore* mySemaphore;
@@ -119,9 +117,8 @@ public:
     myAction(theAction),
     myResult(theResult)
   {}
-  virtual bool Execute(){
+  virtual void Execute(){
     myResult = (myObject->*myAction)();
-    return true; 
   }
 private:
   TObject* myObject;
@@ -137,9 +134,8 @@ public:
     myObject(theObject),
     myAction(theAction)
   {}
-  virtual bool Execute(){
+  virtual void Execute(){
     (myObject->*myAction)();
-    return true; 
   }
 private:
   TObject* myObject;
@@ -163,9 +159,8 @@ public:
     myResult(theResult),
     myArg(theArg)
   {}
-  virtual bool Execute(){
+  virtual void Execute(){
     myResult = (myObject->*myAction)(myArg);
-    return true; 
   }
 private:
   TObject* myObject;
@@ -183,9 +178,8 @@ public:
     myAction(theAction),
     myArg(theArg)
   {}
-  virtual bool Execute(){
+  virtual void Execute(){
     (myObject->*myAction)(myArg);
-    return true; 
   }
 private:
   TObject* myObject;
@@ -213,9 +207,8 @@ public:
     myArg(theArg),
     myArg1(theArg1)
   {}
-  virtual bool Execute(){
+  virtual void Execute(){
     myResult = (myObject->*myAction)(myArg,myArg1);
-    return true; 
   }
 private:
   TObject* myObject;
@@ -236,9 +229,8 @@ public:
     myArg(theArg),
     myArg1(theArg1)
   {}
-  virtual bool Execute(){
+  virtual void Execute(){
     (myObject->*myAction)(myArg,myArg1);
-    return true; 
   }
 private:
   TObject* myObject;
@@ -263,4 +255,5 @@ inline void ProcessVoidEvent(SALOME_Event* theEvent){
   theEvent->release();
 }
 
+
 #endif

diff --git a/src/SALOMEGUI/QAD_Desktop.cxx b/src/SALOMEGUI/QAD_Desktop.cxx
index 892cc2e522c9c07a9a4ff4af94fd88a67953d26f..14b525a888e44a03b98c34831edf2182247723df 100644 (file)
--- a/src/SALOMEGUI/QAD_Desktop.cxx
+++ b/src/SALOMEGUI/QAD_Desktop.cxx
@@ -452,15 +452,9 @@ bool QAD_Desktop::eventFilter( QObject* o, QEvent* e )
   }
   else if ( e->type() == SALOME_EVENT ) { 
     SALOME_Event* aSE = (SALOME_Event*)((QCustomEvent*)e)->data();
-    MESSAGE( "QAD_Desktop::eventFilter - SALOME_Event handling - 1 : o = " << o << ", e = " << aSE);
-
     processEvent( aSE );
-    MESSAGE( "QAD_Desktop::eventFilter - SALOME_Event handling - 2" );
-
     // Signal the calling thread that the event has been processed
     aSE->processed();
-    MESSAGE( "QAD_Desktop::eventFilter - SALOME_Event handling - 3" );
-
     ((QCustomEvent*)e)->setData( 0 );
     delete aSE;
     return TRUE;
@@ -475,16 +469,7 @@ void QAD_Desktop::processEvent( SALOME_Event* theEvent )
 {
   if ( !theEvent )
     return;
-
-  if(theEvent->Execute())
-    return;
-
-  // san - temporary code - to be removed together with VISU_Event and test operations in VISU_I...
-  for ( ComponentMap::iterator it = myComponents.begin(); it != myComponents.end(); it++ ) {
-    if ( it.data()->CanProcessEvent( theEvent ) && it.data()->ProcessEvent( theEvent ) )
-      break;
-  }
-  // san - temporary code - to be removed together with VISU_Event and test operations in VISU_I...
+  theEvent->Execute();
 }
 
 /*!

diff --git a/src/SALOMEGUI/SALOMEGUI.cxx b/src/SALOMEGUI/SALOMEGUI.cxx
index e3843bd2515c4826616d081a64650f7864c3226f..d0abefe315cfd038b9649ec65b2ac56b4b07e2ca 100644 (file)
--- a/src/SALOMEGUI/SALOMEGUI.cxx
+++ b/src/SALOMEGUI/SALOMEGUI.cxx
@@ -58,26 +58,6 @@ bool SALOMEGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
   return true;
 }
 
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-bool SALOMEGUI::CanProcessEvent(SALOME_Event* se)
-{
-  return false;
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-bool SALOMEGUI::ProcessEvent(SALOME_Event* se)
-{
-  return false;
-}
-
 //=============================================================================
 /*!
  *

diff --git a/src/SALOMEGUI/SALOMEGUI.h b/src/SALOMEGUI/SALOMEGUI.h
index 0594487d424c48ecc8e8d85bfab6c3f6d49756f2..124ceee0b9fde549cf3fe32cd174ceea2c96e1c7 100644 (file)
--- a/src/SALOMEGUI/SALOMEGUI.h
+++ b/src/SALOMEGUI/SALOMEGUI.h
@@ -55,8 +55,6 @@ public:
   virtual ~SALOMEGUI();
 
   virtual bool OnGUIEvent        (int theCommandID, QAD_Desktop* parent);
-  virtual bool CanProcessEvent   (SALOME_Event* se);
-  virtual bool ProcessEvent      (SALOME_Event* se);
   virtual bool OnKeyPress        (QKeyEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame);
   virtual bool OnMousePress      (QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame);
   virtual bool OnMouseMove       (QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame);