[Compbench-devel] CompBenchmarks++/Qt-4/Plan PlanDefineBatch.cpp, 1.17, 1.18

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

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

Modified Files:
	PlanDefineBatch.cpp 
Log Message:
Fixes on OptionSet and option handling.

Index: PlanDefineBatch.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** PlanDefineBatch.cpp	13 Sep 2007 19:13:31 -0000	1.17
--- PlanDefineBatch.cpp	16 Sep 2007 18:52:54 -0000	1.18
***************
*** 443,447 ****
    case PIOptions:
      App->planOptionsRenamed(I->Nearest(PIPlanBatch)->Batch(),
! 			    I->Nearest(PIOptionSet)->OptionSet(),
  			    I->OptionsGroup(),
  			    I->text(0));
--- 443,447 ----
    case PIOptions:
      App->planOptionsRenamed(I->Nearest(PIPlanBatch)->Batch(),
! 			    I->Parent(PIOptionSet)->OptionSet(),
  			    I->OptionsGroup(),
  			    I->text(0));
***************
*** 582,586 ****
  
    if (I) {
-     printf("Rename should be OK\n");
      _options->setId(_newname.toStdString());
    }
--- 582,585 ----
***************
*** 755,770 ****
        } else
  	if (event->mimeData()->text()=="option") {
  	  PlanDefineBatchListItem *PlanItem = I->Parent(PIPlanBatch);
  	  event->setDropAction(Qt::MoveAction);
  	  CBM::CompilerOption     *O = App->PlanCompilerOptionSelected();
  	  
! 	  PlanDefineBatchListItem *P = I->Nearest(PIOptions);
  	  if (P) {
! 	  P->setExpanded(true);
! 	  /* if (P->Options()->add(O)) {
! 	     PlanDefineBatchListItem *OI = new PlanDefineBatchListItem(O);
! 	     P->addChild(OI);
! 	  */
! 	  printf("there!\n");
  	  }
  	}
--- 754,772 ----
        } else
  	if (event->mimeData()->text()=="option") {
+ 	  printf("yeah\n");
  	  PlanDefineBatchListItem *PlanItem = I->Parent(PIPlanBatch);
  	  event->setDropAction(Qt::MoveAction);
  	  CBM::CompilerOption     *O = App->PlanCompilerOptionSelected();
  	  
! 	  PlanDefineBatchListItem *P = I->Parent(PIOptions);
! 	  printf("P=%x\n", P);
  	  if (P) {
! 	    P->setExpanded(true);
! 	    if (P->OptionsGroup()->add(I->Parent(PIPlanBatch)->Batch(),
! 				       O->Option())) {
! 	      PlanDefineBatchListItem *OI = new PlanDefineBatchListItem(O);
! 	      P->addChild(OI);
! 	      printf("there!\n");
! 	    }
  	  }
  	}