[Compbench-devel] CompBenchmarks++/Qt-4 main.cpp, 1.13, 1.14 main.h, 1.8, 1.9

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

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

Modified Files:
	main.cpp main.h 
Log Message:
Option group messages handling.

Index: main.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** main.cpp	12 Sep 2007 18:59:21 -0000	1.13
--- main.cpp	13 Sep 2007 18:25:32 -0000	1.14
***************
*** 133,136 ****
--- 133,137 ----
    console=new StatusConsole(sa);
    planCompilerSelected=0;
+   planCompilerOptionSelected=0;
    App=this;
  
***************
*** 200,203 ****
--- 201,208 ----
  	  Qt::QueuedConnection);
  
+   connect(this, SIGNAL(sigPlanCompilerOptionSelected(CBM::CompilerOption*)),
+ 	  this, SLOT(doPlanCompilerOptionSelected(CBM::CompilerOption*)),
+ 	  Qt::QueuedConnection);
+ 
    connect(this, SIGNAL(sigPlanBatchRegister(CBM::PlanBatch*)),
  	  this, SLOT(doPlanBatchRegister(CBM::PlanBatch*)),
***************
*** 237,240 ****
--- 242,268 ----
  					    QString)),
  	  Qt::QueuedConnection);
+ 
+ 
+   connect(this, SIGNAL(sigPlanOptionsRegister(CBM::PlanBatch*,CBM::CompilerOptionSet*)),
+ 	  this, SLOT(doPlanOptionsRegister(CBM::PlanBatch*,CBM::CompilerOptionSet*)),
+ 	  Qt::QueuedConnection);
+ 
+   connect(this, SIGNAL(sigPlanOptionsUnregister(CBM::PlanBatch*,
+ 						CBM::CompilerOptionSet*,
+ 						CBM::CompilerOptions*)),
+ 	  this, SLOT(doPlanOptionsUnregister(CBM::PlanBatch*,
+ 					     CBM::CompilerOptionSet*,
+ 					     CBM::CompilerOptions*)),
+ 	  Qt::QueuedConnection);
+ 
+   connect(this, SIGNAL(sigPlanOptionsRenamed(CBM::PlanBatch*,
+ 					     CBM::CompilerOptionSet*,
+ 					     CBM::CompilerOptions*,
+ 					     QString)),
+ 	  this, SLOT(doPlanOptionsRenamed(CBM::PlanBatch*,
+ 					  CBM::CompilerOptionSet*,
+ 					  CBM::CompilerOptions*,
+ 					  QString)),
+ 	  Qt::QueuedConnection);
  }
  
***************
*** 374,377 ****
--- 402,429 ----
  }
  
+ void Application::doPlanOptionsRegister(CBM::PlanBatch *_batch,
+ 					CBM::CompilerOptionSet *_set)
+ {
+   planManager->Define()->Batch()->optionsRegister(_batch, _set);
+ }
+ 
+ void Application::doPlanOptionsUnregister(CBM::PlanBatch *_batch,
+ 					  CBM::CompilerOptionSet *_set,
+ 					  CBM::CompilerOptions *_options)
+ {
+   planManager->Define()->Batch()->optionsUnregister(_batch, _set, _options);
+ }
+ 
+ void Application::doPlanOptionsRenamed(CBM::PlanBatch *_batch,
+ 				       CBM::CompilerOptionSet *_set,
+ 				       CBM::CompilerOptions *_options,
+ 				       QString _newname)
+ {
+   planManager->Define()->Batch()->optionsRenamed(_batch,
+ 						 _set,
+ 						 _options,
+ 						 _newname);
+ }
+ 
  
  void Application::doPlanCompilerSelected(CBM::Compiler *_compiler)
***************
*** 380,383 ****
--- 432,440 ----
  }
  
+ void Application::doPlanCompilerOptionSelected(CBM::CompilerOption *_option)
+ {
+   planCompilerOptionSelected=_option;
+ }
+ 
  void Application::doCompilerUnregister(CBM::Compiler *_compiler)
  {
***************
*** 452,455 ****
--- 509,517 ----
  }
  
+ void Application::planOptionSelect(CBM::CompilerOption *_option)
+ {
+   emit sigPlanCompilerOptionSelected(_option);
+ }
+ 
  void Application::planBatchRegister(CBM::PlanBatch *_batch)
  {
***************
*** 493,496 ****
--- 555,579 ----
  }
  
+ void Application::planOptionsRegister(CBM::PlanBatch *_batch,
+ 				      CBM::CompilerOptionSet *_set)
+ {
+   emit sigPlanOptionsRegister(_batch, _set);
+ }
+ 
+ void Application::planOptionsUnregister(CBM::PlanBatch *_batch,
+ 					CBM::CompilerOptionSet *_set,
+ 					CBM::CompilerOptions *_options)
+ {
+   emit sigPlanOptionsUnregister(_batch, _set, _options);
+ }
+ 
+ void Application::planOptionsRenamed(CBM::PlanBatch *_batch,
+ 				     CBM::CompilerOptionSet *_set,
+ 				     CBM::CompilerOptions *_options,
+ 				     QString _newname)
+ {
+   emit sigPlanOptionsRenamed(_batch, _set, _options, _newname);
+ }
+ 
  CBM::Compiler *Application::PlanCompilerSelected(void)
  {
***************
*** 498,501 ****
--- 581,589 ----
  }
  
+ CBM::CompilerOption *Application::PlanCompilerOptionSelected(void)
+ {
+   return(planCompilerOptionSelected);
+ }
+ 
  Application::~Application()
  {

Index: main.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** main.h	11 Sep 2007 20:18:53 -0000	1.8
--- main.h	13 Sep 2007 18:25:32 -0000	1.9
***************
*** 63,66 ****
--- 63,67 ----
  
      CBM::Compiler   *planCompilerSelected;
+     CBM::CompilerOption   *planCompilerOptionSelected;
  
      QTabWidget      *mainTab;
***************
*** 107,111 ****
--- 108,123 ----
  				 QString _newname);
  
+     void sigPlanOptionsRegister(CBM::PlanBatch *_batch,
+ 				CBM::CompilerOptionSet *_set);
+     void sigPlanOptionsUnregister(CBM::PlanBatch *_batch,
+ 				  CBM::CompilerOptionSet *_set,
+ 				  CBM::CompilerOptions *_options);
+     void sigPlanOptionsRenamed(CBM::PlanBatch *_batch,
+ 			       CBM::CompilerOptionSet *_set,
+ 			       CBM::CompilerOptions *_options,
+ 			       QString _newname);
+ 
      void sigPlanCompilerSelected(CBM::Compiler *_compiler);
+     void sigPlanCompilerOptionSelected(CBM::CompilerOption *_option);
  
    public slots:
***************
*** 136,140 ****
--- 148,165 ----
  					QString _newname);
  
+     virtual void doPlanOptionsRegister(CBM::PlanBatch *_batch,
+ 				       CBM::CompilerOptionSet *_set);
+ 				       
+     virtual void doPlanOptionsUnregister(CBM::PlanBatch *_batch,
+ 					 CBM::CompilerOptionSet *_set,
+ 					 CBM::CompilerOptions *_options);
+ 
+     virtual void doPlanOptionsRenamed(CBM::PlanBatch *_batch,
+ 				      CBM::CompilerOptionSet *_set,
+ 				      CBM::CompilerOptions *_options,
+ 				      QString _newname);
+ 
      void doPlanCompilerSelected(CBM::Compiler *_compiler);
+     void doPlanCompilerOptionSelected(CBM::CompilerOption *_option);
  
    public:
***************
*** 165,171 ****
--- 190,209 ----
  				      QString _newname);
  
+     virtual void planOptionsRegister(CBM::PlanBatch *_batch,
+ 				     CBM::CompilerOptionSet *_set);
+     virtual void planOptionsUnregister(CBM::PlanBatch *_batch,
+ 				       CBM::CompilerOptionSet *_set,
+ 				       CBM::CompilerOptions *_options);
+     virtual void planOptionsRenamed(CBM::PlanBatch *_batch,
+ 				    CBM::CompilerOptionSet *_set,
+ 				    CBM::CompilerOptions *_options,
+ 				    QString _newname);
+ 
+ 
      virtual void planCompilerSelect(CBM::Compiler *_compiler);
+     virtual void planOptionSelect(CBM::CompilerOption *_option);
  
      virtual CBM::Compiler *PlanCompilerSelected(void);
+     virtual CBM::CompilerOption *PlanCompilerOptionSelected(void);
  
      virtual ~Application();