Update of /cvsroot/compbench/CompBenchmarks++/Qt-4
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13095
Modified Files:
main.cpp main.h
Log Message:
Simplified message passing interface to option groups.
Index: main.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** main.cpp 13 Sep 2007 18:48:30 -0000 1.15
--- main.cpp 13 Sep 2007 19:00:42 -0000 1.16
***************
*** 211,220 ****
Qt::QueuedConnection);
- connect(this, SIGNAL(sigPlanBatchCompilerRemove(CBM::PlanBatch*,
- CBM::Compiler*)),
- this, SLOT(doPlanBatchCompilerRemove(CBM::PlanBatch*,
- CBM::Compiler*)),
- Qt::QueuedConnection);
-
connect(this, SIGNAL(sigPlanOptionSetRenamed(CBM::PlanBatch*,
CBM::CompilerOptionSet*,
--- 211,214 ----
***************
*** 226,241 ****
- 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*,
--- 220,223 ----
***************
*** 347,357 ****
}
- void Application::doPlanBatchCompilerRemove(CBM::PlanBatch *_batch,
- CBM::Compiler *_compiler)
- {
- planManager->Define()->Batch()->compilerRemove(_batch,
- _compiler);
- }
-
void Application::doPlanOptionSetRenamed(CBM::PlanBatch *_batch,
CBM::CompilerOptionSet *_options,
--- 329,332 ----
***************
*** 363,379 ****
}
- 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,
--- 338,341 ----
***************
*** 481,491 ****
}
- void Application::planCompilerRemove(CBM::PlanBatch *_batch,
- CBM::Compiler *_compiler)
- {
- emit sigPlanBatchCompilerRemove(_batch,
- _compiler);
- }
-
void Application::planOptionSetRenamed(CBM::PlanBatch *_batch,
CBM::CompilerOptionSet *_options,
--- 443,446 ----
***************
*** 495,511 ****
}
- 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,
--- 450,453 ----
Index: main.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** main.h 13 Sep 2007 18:48:30 -0000 1.10
--- main.h 13 Sep 2007 19:00:42 -0000 1.11
***************
*** 96,101 ****
void sigPlanBatchRenamed(CBM::PlanBatch *_batch,
QString _newname);
- void sigPlanBatchCompilerRemove(CBM::PlanBatch *_batch,
- CBM::Compiler *_compiler);
void sigPlanOptionSetRenamed(CBM::PlanBatch *_batch,
--- 96,99 ----
***************
*** 103,111 ****
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,
--- 101,104 ----
***************
*** 131,148 ****
QString _newname);
- virtual void doPlanBatchCompilerRemove(CBM::PlanBatch *_batch,
- CBM::Compiler *_compiler);
-
virtual void doPlanOptionSetRenamed(CBM::PlanBatch *_batch,
CBM::CompilerOptionSet *_options,
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,
--- 124,131 ----
***************
*** 168,173 ****
virtual void planBatchRenamed(CBM::PlanBatch *_batch,
QString _newname);
- virtual void planCompilerRemove(CBM::PlanBatch *_batch,
- CBM::Compiler *_compiler);
virtual void planOptionSetRenamed(CBM::PlanBatch *_batch,
--- 151,154 ----
***************
*** 175,183 ****
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,
--- 156,159 ----
|
