[Compbench-devel] CompBenchmarks++/Qt-4 main.cpp, 1.6, 1.7 main.h, 1.5, 1.6

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

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

Modified Files:
	main.cpp main.h 
Log Message:
OptionSet can be handled.

Index: main.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** main.cpp	21 May 2007 17:16:40 -0000	1.6
--- main.cpp	21 May 2007 19:42:45 -0000	1.7
***************
*** 184,187 ****
--- 184,204 ----
  	  Qt::QueuedConnection);
  
+   connect(this, SIGNAL(sigPlanOptionSetRegister(CBM::PlanBatch*)),
+ 	  this, SLOT(doPlanOptionSetRegister(CBM::PlanBatch*)),
+ 	  Qt::QueuedConnection);
+ 
+   connect(this, SIGNAL(sigPlanOptionSetUnregister(CBM::PlanBatch*,
+ 						  CBM::CompilerOptionSet*)),
+ 	  this, SLOT(doPlanOptionSetUnregister(CBM::PlanBatch*,
+ 					       CBM::CompilerOptionSet*)),
+ 	  Qt::QueuedConnection);
+ 
+   connect(this, SIGNAL(sigPlanOptionSetRenamed(CBM::PlanBatch*,
+ 					       CBM::CompilerOptionSet*,
+ 					       QString)),
+ 	  this, SLOT(doPlanOptionSetRenamed(CBM::PlanBatch*,
+ 					    CBM::CompilerOptionSet*,
+ 					    QString)),
+ 	  Qt::QueuedConnection);
  }
  
***************
*** 273,276 ****
--- 290,313 ----
  }
  
+ void Application::doPlanOptionSetRegister(CBM::PlanBatch *_batch)
+ {
+   planManager->Define()->Batch()->optionSetRegister(_batch);
+ }
+ 
+ void Application::doPlanOptionSetUnregister(CBM::PlanBatch *_batch,
+ 					    CBM::CompilerOptionSet *_options)
+ {
+   planManager->Define()->Batch()->optionSetUnregister(_batch, _options);
+ }
+ 
+ void Application::doPlanOptionSetRenamed(CBM::PlanBatch *_batch,
+ 					 CBM::CompilerOptionSet *_options,
+ 					 QString _newname)
+ {
+   planManager->Define()->Batch()->optionSetRenamed(_batch,
+ 						   _options,
+ 						   _newname);
+ }
+ 
  
  void Application::doPlanCompilerSelected(CBM::Compiler *_compiler)
***************
*** 373,376 ****
--- 410,431 ----
  }
  
+ void Application::planOptionSetRegister(CBM::PlanBatch *_batch)
+ {
+   emit sigPlanOptionSetRegister(_batch);
+ }
+ 
+ void Application::planOptionSetUnregister(CBM::PlanBatch *_batch,
+ 					  CBM::CompilerOptionSet *_options)
+ {
+   emit sigPlanOptionSetUnregister(_batch, _options);
+ }
+ 
+ void Application::planOptionSetRenamed(CBM::PlanBatch *_batch,
+ 				       CBM::CompilerOptionSet *_options,
+ 				       QString _newname)
+ {
+   emit sigPlanOptionSetRenamed(_batch, _options, _newname);
+ }
+ 
  CBM::Compiler *Application::PlanCompilerSelected(void)
  {

Index: main.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** main.h	21 May 2007 17:16:40 -0000	1.5
--- main.h	21 May 2007 19:42:45 -0000	1.6
***************
*** 83,86 ****
--- 83,93 ----
  				    CBM::Compiler *_compiler);
  
+     void sigPlanOptionSetRegister(CBM::PlanBatch *_batch);
+     void sigPlanOptionSetUnregister(CBM::PlanBatch *_batch,
+ 				    CBM::CompilerOptionSet *_options);
+     void sigPlanOptionSetRenamed(CBM::PlanBatch *_batch,
+ 				 CBM::CompilerOptionSet *_options,
+ 				 QString _newname);
+ 
      void sigPlanCompilerSelected(CBM::Compiler *_compiler);
  
***************
*** 104,107 ****
--- 111,121 ----
  					   CBM::Compiler *_compiler);
  
+     virtual void doPlanOptionSetRegister(CBM::PlanBatch *_batch);
+     virtual void doPlanOptionSetUnregister(CBM::PlanBatch *_batch,
+ 					   CBM::CompilerOptionSet *_options);
+     virtual void doPlanOptionSetRenamed(CBM::PlanBatch *_batch,
+ 					CBM::CompilerOptionSet *_options,
+ 					QString _newname);
+ 
      void doPlanCompilerSelected(CBM::Compiler *_compiler);
  
***************
*** 123,126 ****
--- 137,147 ----
  				    CBM::Compiler *_compiler);
  
+     virtual void planOptionSetRegister(CBM::PlanBatch *_batch);
+     virtual void planOptionSetUnregister(CBM::PlanBatch *_batch,
+ 					 CBM::CompilerOptionSet *_options);
+     virtual void planOptionSetRenamed(CBM::PlanBatch *_batch,
+ 				      CBM::CompilerOptionSet *_options,
+ 				      QString _newname);
+ 
      virtual void planCompilerSelect(CBM::Compiler *_compiler);