compbench-devel

[Frederic T. <xf...@us...>]

Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6940/Plan

Modified Files:
	PlanDefineBatch.cpp PlanDefineBatch.h 
Log Message:
Simplified message passing interface to Batch instances.

Index: PlanDefineBatch.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** PlanDefineBatch.cpp	13 Sep 2007 18:24:47 -0000	1.13
--- PlanDefineBatch.cpp	13 Sep 2007 18:48:30 -0000	1.14
***************
*** 76,85 ****
  
    CBM::PlanBatch *P = new CBM::PlanBatch(PlanHolderGet(), n);
!   App->planBatchRegister(P);
  }
  
  void PlanDefineBatchContextMenu::doBatchUnregister(void)
  {
!   App->planBatchUnregister(item->Batch());
  }
  
--- 76,85 ----
  
    CBM::PlanBatch *P = new CBM::PlanBatch(PlanHolderGet(), n);
!   PL->doPlanBatchRegister(P);
  }
  
  void PlanDefineBatchContextMenu::doBatchUnregister(void)
  {
!   PL->doPlanBatchUnregister(item->Batch());
  }
  
***************
*** 101,105 ****
    if (B)
      PL->doOptionSetRegister(B);
-     //    App->planOptionSetRegister(B);
  }
  
--- 101,104 ----
***************
*** 110,114 ****
  
    if (B)
!     App->planOptionSetUnregister(B, OS);
  }
  
--- 109,113 ----
  
    if (B)
!     PL->doOptionSetUnregister(B, OS);
  }
  
***************
*** 298,309 ****
  
    PL=this;
-   connect(this, SIGNAL(sigPlanBatchRegister(CBM::PlanBatch*)),
-  	  this, SLOT(doPlanBatchRegister(CBM::PlanBatch*)),
- 	  Qt::QueuedConnection);
  
-   connect(this, SIGNAL(sigPlanBatchUnregister(CBM::PlanBatch*)),
-  	  this, SLOT(doPlanBatchUnregister(CBM::PlanBatch*)),
- 	  Qt::QueuedConnection);
-   
    connect(this, SIGNAL(sigPlanBatchRenamed(CBM::PlanBatch*,
  					   QString)),
--- 297,301 ----
***************
*** 320,333 ****
  	  Qt::QueuedConnection);
  
-   connect(this, SIGNAL(sigOptionSetRegister(CBM::PlanBatch*)),
- 	  this, SLOT(doOptionSetRegister(CBM::PlanBatch*)),
- 	  Qt::QueuedConnection);
- 
-   connect(this, SIGNAL(sigOptionSetUnregister(CBM::PlanBatch*,
- 					      CBM::CompilerOptionSet*)),
- 	  this, SLOT(doOptionSetUnregister(CBM::PlanBatch*,
- 					   CBM::CompilerOptionSet*)),
- 	  Qt::QueuedConnection);
- 
    connect(this, SIGNAL(sigOptionSetRenamed(CBM::PlanBatch*,
  					   CBM::CompilerOptionSet*,
--- 312,315 ----
***************
*** 576,582 ****
    PlanDefineBatchListItem *R = B->Nearest(PIOptionSets);
  
    if (R) {
      R->takeChild(R->indexOfChild(B));
!     delete(R->OptionSet());
      delete(B);
    }
--- 558,566 ----
    PlanDefineBatchListItem *R = B->Nearest(PIOptionSets);
  
+   printf("unreg B=%x (R=%x)\n", B, R);
+ 
    if (R) {
      R->takeChild(R->indexOfChild(B));
!     _batch->remove(_options);
      delete(B);
    }
***************
*** 640,653 ****
  }
  
- void PlanDefineBatchList::planBatchRegister(CBM::PlanBatch *_batch)
- {
-   emit sigPlanBatchRegister(_batch);
- }
- 
- void PlanDefineBatchList::planBatchUnregister(CBM::PlanBatch *_batch)
- {
-   emit sigPlanBatchUnregister(_batch);
- }
- 
  void PlanDefineBatchList::planBatchRenamed(CBM::PlanBatch *_batch,
  					   QString _newname)
--- 624,627 ----
***************
*** 668,682 ****
  }
  
- void PlanDefineBatchList::optionSetRegister(CBM::PlanBatch *_batch)
- {
-   emit sigOptionSetRegister(_batch);
- }
- 
- void PlanDefineBatchList::optionSetUnregister(CBM::PlanBatch *_batch,
- 					      CBM::CompilerOptionSet *_options)
- {
-   emit sigOptionSetUnregister(_batch, _options);
- }
- 
  void PlanDefineBatchList::optionSetRenamed(CBM::PlanBatch *_batch,
  					   CBM::CompilerOptionSet *_options,
--- 642,645 ----

Index: PlanDefineBatch.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PlanDefineBatch.h	13 Sep 2007 18:24:47 -0000	1.11
--- PlanDefineBatch.h	13 Sep 2007 18:48:30 -0000	1.12
***************
*** 57,61 ****
    };
  
!   class PlanDefineBatchListItem : public QTreeWidgetItem,
                                    public CompilerHolder,
                                    public OptionSetHolder,
--- 57,61 ----
    };
  
! class PlanDefineBatchListItem : public QTreeWidgetItem,
                                    public CompilerHolder,
                                    public OptionSetHolder,
***************
*** 107,112 ****
  
    signals:
-     void sigPlanBatchRegister(CBM::PlanBatch *_batch);
-     void sigPlanBatchUnregister(CBM::PlanBatch *_batch);
      void sigPlanBatchRenamed(CBM::PlanBatch *_batch,
  			     QString _newname);
--- 107,110 ----
***************
*** 117,123 ****
  			   CBM::Compiler *_compiler);
  
-     void sigOptionSetRegister(CBM::PlanBatch *_batch);
-     void sigOptionSetUnregister(CBM::PlanBatch *_batch,
- 				CBM::CompilerOptionSet *_options);
      void sigOptionSetRenamed(CBM::PlanBatch *_batch,
  			     CBM::CompilerOptionSet *_options,
--- 115,118 ----
***************
*** 139,144 ****
      virtual void itemEdited(QTreeWidgetItem *item, int);
  
-     virtual void doPlanBatchRegister(CBM::PlanBatch *_batch);
-     virtual void doPlanBatchUnregister(CBM::PlanBatch *_batch);
      virtual void doPlanBatchRenamed(CBM::PlanBatch *_batch,
  				    QString _newname);
--- 134,137 ----
***************
*** 149,154 ****
  
      // !!!
-     virtual void doOptionSetUnregister(CBM::PlanBatch *_batch,
- 				       CBM::CompilerOptionSet *_options);
      virtual void doOptionSetRenamed(CBM::PlanBatch *_batch,
  				    CBM::CompilerOptionSet *_options,
--- 142,145 ----
***************
*** 170,179 ****
  
    public slots:
      virtual void doOptionSetRegister(CBM::PlanBatch *_batch);
    public:
      PlanDefineBatchList(QWidget *parent = 0);
  
-     virtual void planBatchRegister(CBM::PlanBatch *_batch);
-     virtual void planBatchUnregister(CBM::PlanBatch *_batch);
      virtual void planBatchRenamed(CBM::PlanBatch *_batch,
  				  QString _newname);
--- 161,175 ----
  
    public slots:
+     virtual void doPlanBatchRegister(CBM::PlanBatch *_batch);
+     virtual void doPlanBatchUnregister(CBM::PlanBatch *_batch);
+ 
      virtual void doOptionSetRegister(CBM::PlanBatch *_batch);
+     virtual void doOptionSetUnregister(CBM::PlanBatch *_batch,
+ 				       CBM::CompilerOptionSet *_options);
+ 
+ 
    public:
      PlanDefineBatchList(QWidget *parent = 0);
  
      virtual void planBatchRenamed(CBM::PlanBatch *_batch,
  				  QString _newname);
***************
*** 184,190 ****
  				CBM::Compiler *_compiler);
  
-     virtual void optionSetRegister(CBM::PlanBatch *_batch);
-     virtual void optionSetUnregister(CBM::PlanBatch *_batch,
- 				     CBM::CompilerOptionSet *_options);
      virtual void optionSetRenamed(CBM::PlanBatch *_batch,
  				  CBM::CompilerOptionSet *_options,
--- 180,183 ----