Update of /cvsroot/compbench/CompBenchmarks++/Qt-4
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6940
Modified Files:
main.cpp main.h
Log Message:
Simplified message passing interface to Batch instances.
Index: main.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** main.cpp 13 Sep 2007 18:25:32 -0000 1.14
--- main.cpp 13 Sep 2007 18:48:30 -0000 1.15
***************
*** 205,216 ****
Qt::QueuedConnection);
- 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)),
--- 205,208 ----
***************
*** 225,238 ****
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*,
--- 217,220 ----
***************
*** 358,371 ****
}
- void Application::doPlanBatchRegister(CBM::PlanBatch *_batch)
- {
- planManager->Define()->Batch()->planBatchRegister(_batch);
- }
-
- void Application::doPlanBatchUnregister(CBM::PlanBatch *_batch)
- {
- planManager->Define()->Batch()->planBatchUnregister(_batch);
- }
-
void Application::doPlanBatchRenamed(CBM::PlanBatch *_batch,
QString _newname)
--- 340,343 ----
***************
*** 382,396 ****
}
- 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,
--- 354,357 ----
***************
*** 514,527 ****
}
- void Application::planBatchRegister(CBM::PlanBatch *_batch)
- {
- emit sigPlanBatchRegister(_batch);
- }
-
- void Application::planBatchUnregister(CBM::PlanBatch *_batch)
- {
- emit sigPlanBatchUnregister(_batch);
- }
-
void Application::planBatchRenamed(CBM::PlanBatch *_batch,
QString _newname)
--- 475,478 ----
***************
*** 537,551 ****
}
- 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,
--- 488,491 ----
Index: main.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** main.h 13 Sep 2007 18:25:32 -0000 1.9
--- main.h 13 Sep 2007 18:48:30 -0000 1.10
***************
*** 94,99 ****
void sigCompilerUnregister(CBM::Compiler *_compiler);
- void sigPlanBatchRegister(CBM::PlanBatch *_batch);
- void sigPlanBatchUnregister(CBM::PlanBatch *_batch);
void sigPlanBatchRenamed(CBM::PlanBatch *_batch,
QString _newname);
--- 94,97 ----
***************
*** 101,107 ****
CBM::Compiler *_compiler);
- void sigPlanOptionSetRegister(CBM::PlanBatch *_batch);
- void sigPlanOptionSetUnregister(CBM::PlanBatch *_batch,
- CBM::CompilerOptionSet *_options);
void sigPlanOptionSetRenamed(CBM::PlanBatch *_batch,
CBM::CompilerOptionSet *_options,
--- 99,102 ----
***************
*** 133,138 ****
void doCompilerRegisterManual(void);
- virtual void doPlanBatchRegister(CBM::PlanBatch *_batch);
- virtual void doPlanBatchUnregister(CBM::PlanBatch *_batch);
virtual void doPlanBatchRenamed(CBM::PlanBatch *_batch,
QString _newname);
--- 128,131 ----
***************
*** 141,147 ****
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,
--- 134,137 ----
***************
*** 176,181 ****
virtual void optionInfo(CBM::CompilerOption *_option);
- virtual void planBatchRegister(CBM::PlanBatch *_batch);
- virtual void planBatchUnregister(CBM::PlanBatch *_batch);
virtual void planBatchRenamed(CBM::PlanBatch *_batch,
QString _newname);
--- 166,169 ----
***************
*** 183,189 ****
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,
--- 171,174 ----
|
