[Compbench-devel] CompBenchmarks++/Qt-4/Plan PlanDefineBatch.cpp, 1.7, 1.8 PlanDefineBatch.h, 1.7, 1.8

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

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

Modified Files:
	PlanDefineBatch.cpp PlanDefineBatch.h 
Log Message:
Changes implied by modification in underlaying API.

Index: PlanDefineBatch.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** PlanDefineBatch.cpp	21 May 2007 19:59:14 -0000	1.7
--- PlanDefineBatch.cpp	31 Jul 2007 17:28:22 -0000	1.8
***************
*** 49,53 ****
  
      addAction(QIcon(":/icons/remove.png"), tr("Remove compiler"),
! 	      this, SLOT(doOptionsRemove()));
    }
  }
--- 49,53 ----
  
      addAction(QIcon(":/icons/remove.png"), tr("Remove compiler"),
! 	      this, SLOT(doCompilerRemove()));
    }
  }
***************
*** 223,226 ****
--- 223,228 ----
    : QTreeWidget(parent)
  {
+   plan=new CBM::Plan;
+ 
    connect(this, SIGNAL(sigPlanBatchRegister(CBM::PlanBatch*)),
   	  this, SLOT(doPlanBatchRegister(CBM::PlanBatch*)),
***************
*** 343,357 ****
  void PlanDefineBatchList::doPlanBatchRegister(CBM::PlanBatch *_batch)
  {
-   CBM::Plan               *P = CBM::cbmSystem->Plan();
- 
    PlanDefineBatchListItem *R = new PlanDefineBatchListItem(_batch);
    addTopLevelItem(R);
  
!   P->addBatch(_batch);
  }
  
  void PlanDefineBatchList::doPlanBatchUnregister(CBM::PlanBatch *_batch)
  {
-   CBM::Plan               *P = CBM::cbmSystem->Plan();
    PlanDefineBatchListItem *I = Item(_batch);
    PlanDefineBatchListItem *R;
--- 345,356 ----
  void PlanDefineBatchList::doPlanBatchRegister(CBM::PlanBatch *_batch)
  {
    PlanDefineBatchListItem *R = new PlanDefineBatchListItem(_batch);
    addTopLevelItem(R);
  
!   plan->addBatch(_batch);
  }
  
  void PlanDefineBatchList::doPlanBatchUnregister(CBM::PlanBatch *_batch)
  {
    PlanDefineBatchListItem *I = Item(_batch);
    PlanDefineBatchListItem *R;
***************
*** 366,370 ****
  
    delete(invisibleRootItem()->takeChild(invisibleRootItem()->indexOfChild(I)));
!   P->removeBatch(_batch);
    delete(_batch);
  }
--- 365,369 ----
  
    delete(invisibleRootItem()->takeChild(invisibleRootItem()->indexOfChild(I)));
!   plan->removeBatch(_batch);
    delete(_batch);
  }
***************
*** 615,617 ****
--- 614,617 ----
  PlanDefineBatchList::~PlanDefineBatchList()
  {
+   delete(plan);
  }

Index: PlanDefineBatch.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** PlanDefineBatch.h	21 May 2007 19:59:14 -0000	1.7
--- PlanDefineBatch.h	31 Jul 2007 17:28:22 -0000	1.8
***************
*** 13,16 ****
--- 13,18 ----
  #include <Basic/PlanBatchHolder.h>
  
+ #include <Plan/Plan.h>
+ 
  namespace CQT {
  
***************
*** 76,79 ****
--- 78,82 ----
      Q_OBJECT
    private:
+     CBM::Plan *plan;
    protected:
      virtual PlanDefineBatchListItem *Item(CBM::PlanBatch *_batch);