Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13095/Plan
Modified Files:
PlanDefineBatch.cpp PlanDefineBatch.h
Log Message:
Simplified message passing interface to option groups.
Index: PlanDefineBatch.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** PlanDefineBatch.cpp 13 Sep 2007 18:48:30 -0000 1.14
--- PlanDefineBatch.cpp 13 Sep 2007 19:00:42 -0000 1.15
***************
*** 92,96 ****
{
CBM::Compiler *C = item->Compiler();
! App->planCompilerRemove(item->Parent(PIPlanBatch)->Batch(), C);
}
--- 92,96 ----
{
CBM::Compiler *C = item->Compiler();
! PL->doCompilerRemove(item->Parent(PIPlanBatch)->Batch(), C);
}
***************
*** 121,125 ****
if ((B) && (OS))
! App->planOptionsRegister(B,OS->OptionSet());
}
--- 121,125 ----
if ((B) && (OS))
! PL->doOptionsRegister(B,OS->OptionSet());
}
***************
*** 131,135 ****
if ((B) && (OS) && (O))
! App->planOptionsUnregister(B, OS, O);
}
--- 131,135 ----
if ((B) && (OS) && (O))
! PL->doOptionsUnregister(B, OS, O);
}
***************
*** 308,315 ****
Qt::QueuedConnection);
- connect(this, SIGNAL(sigCompilerRemove(CBM::PlanBatch*, CBM::Compiler*)),
- this, SLOT(doCompilerRemove(CBM::PlanBatch*, CBM::Compiler*)),
- Qt::QueuedConnection);
-
connect(this, SIGNAL(sigOptionSetRenamed(CBM::PlanBatch*,
CBM::CompilerOptionSet*,
--- 308,311 ----
***************
*** 321,341 ****
-
-
-
- connect(this, SIGNAL(sigOptionsRegister(CBM::PlanBatch*,
- CBM::CompilerOptionSet*)),
- this, SLOT(doOptionsRegister(CBM::PlanBatch*,
- CBM::CompilerOptionSet*)),
- Qt::QueuedConnection);
-
- connect(this, SIGNAL(sigOptionsUnregister(CBM::PlanBatch*,
- CBM::CompilerOptionSet*,
- CBM::CompilerOptions*)),
- this, SLOT(doOptionsUnregister(CBM::PlanBatch*,
- CBM::CompilerOptionSet*,
- CBM::CompilerOptions*)),
- Qt::QueuedConnection);
-
connect(this, SIGNAL(sigOptionsRenamed(CBM::PlanBatch*,
CBM::CompilerOptionSet*,
--- 317,320 ----
***************
*** 570,577 ****
CBM::CompilerOptionSet *_set)
{
- printf("R In\n");
PlanDefineBatchListItem *R = Item(_batch, _set);
- printf("R=%x\n", R);
if (R) {
std::string n = "option group ";
--- 549,554 ----
***************
*** 636,645 ****
}
- void PlanDefineBatchList::compilerRemove(CBM::PlanBatch *_batch,
- CBM::Compiler *_compiler)
- {
- emit sigCompilerRemove(_batch, _compiler);
- }
-
void PlanDefineBatchList::optionSetRenamed(CBM::PlanBatch *_batch,
CBM::CompilerOptionSet *_options,
--- 613,616 ----
***************
*** 650,666 ****
}
- void PlanDefineBatchList::optionsRegister(CBM::PlanBatch *_batch,
- CBM::CompilerOptionSet *_set)
- {
- emit sigOptionsRegister(_batch, _set);
- }
-
- void PlanDefineBatchList::optionsUnregister(CBM::PlanBatch *_batch,
- CBM::CompilerOptionSet *_set,
- CBM::CompilerOptions *_options)
- {
- emit sigOptionsUnregister(_batch, _set, _options);
- }
-
void PlanDefineBatchList::optionsRenamed(CBM::PlanBatch *_batch,
CBM::CompilerOptionSet *_set,
--- 621,624 ----
Index: PlanDefineBatch.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** PlanDefineBatch.h 13 Sep 2007 18:48:30 -0000 1.12
--- PlanDefineBatch.h 13 Sep 2007 19:00:42 -0000 1.13
***************
*** 112,127 ****
void sigCompilerUnregister(CBM::Compiler *_compiler);
- void sigCompilerRemove(CBM::PlanBatch *_batch,
- CBM::Compiler *_compiler);
-
void sigOptionSetRenamed(CBM::PlanBatch *_batch,
CBM::CompilerOptionSet *_options,
QString _newname);
- void sigOptionsRegister(CBM::PlanBatch *_batch,
- CBM::CompilerOptionSet *_set);
- void sigOptionsUnregister(CBM::PlanBatch *_batch,
- CBM::CompilerOptionSet *_set,
- CBM::CompilerOptions *_options);
void sigOptionsRenamed(CBM::PlanBatch *_batch,
CBM::CompilerOptionSet *_set,
--- 112,119 ----
***************
*** 138,143 ****
virtual void doCompilerUnregister(CBM::Compiler *_compiler);
- virtual void doCompilerRemove(CBM::PlanBatch *_batch,
- CBM::Compiler *_compiler);
// !!!
--- 130,133 ----
***************
*** 147,157 ****
- virtual void doOptionsRegister(CBM::PlanBatch *_batch,
- CBM::CompilerOptionSet *_set);
-
- virtual void doOptionsUnregister(CBM::PlanBatch *_batch,
- CBM::CompilerOptionSet *_set,
- CBM::CompilerOptions *_options);
-
virtual void doOptionsRenamed(CBM::PlanBatch *_batch,
CBM::CompilerOptionSet *_set,
--- 137,140 ----
***************
*** 168,171 ****
--- 151,166 ----
CBM::CompilerOptionSet *_options);
+ virtual void doOptionsRegister(CBM::PlanBatch *_batch,
+ CBM::CompilerOptionSet *_set);
+
+ virtual void doOptionsUnregister(CBM::PlanBatch *_batch,
+ CBM::CompilerOptionSet *_set,
+ CBM::CompilerOptions *_options);
+
+
+
+ virtual void doCompilerRemove(CBM::PlanBatch *_batch,
+ CBM::Compiler *_compiler);
+
public:
***************
*** 177,192 ****
virtual void compilerUnregister(CBM::Compiler *_compiler);
- virtual void compilerRemove(CBM::PlanBatch *_batch,
- CBM::Compiler *_compiler);
-
virtual void optionSetRenamed(CBM::PlanBatch *_batch,
CBM::CompilerOptionSet *_options,
QString _newname);
- virtual void optionsRegister(CBM::PlanBatch *_batch,
- CBM::CompilerOptionSet *_set);
- virtual void optionsUnregister(CBM::PlanBatch *_batch,
- CBM::CompilerOptionSet *_set,
- CBM::CompilerOptions *_options);
virtual void optionsRenamed(CBM::PlanBatch *_batch,
CBM::CompilerOptionSet *_set,
--- 172,179 ----
|
