Changeset 536ce2 for molecuilder/src/builder.cpp

Timestamp:

May 8, 2010, 8:14:04 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

e04838

Parents:

4d2636

Message:

...UIFactory::makeMainWindow() now has only a single parameter, namely menuPopulaters.

• as molecules and periodentafel can be accessed globally from singleton World, there is no need to pass these around anymore.
• typedef MenuMaker and populateEditMoleculesMenu() equally stripped.

File:

• molecuilder/src/builder.cpp (modified) (2 diffs)

molecuilder/src/builder.cpp

@@ -2514 +2514 @@
 /***************************************** Functions used to build all menus **********************/
 
-void populateEditMoleculesMenu(Menu* editMoleculesMenu,MoleculeListClass *molecules, config *configuration, periodentafel *periode){
+void populateEditMoleculesMenu(Menu* editMoleculesMenu){
+  MoleculeListClass *molecules = World::getInstance().getMolecules();
+  periodentafel *periode = World::getInstance().getPeriode();
+
   // build the EditMoleculesMenu
   Action *createMoleculeAction = new MethodAction("createMoleculeAction",boost::bind(&MoleculeListClass::createNewMolecule,molecules,periode));
@@ -2587 +2590 @@
       populaters.MakeEditMoleculesMenu = populateEditMoleculesMenu;
 
-      MainWindow *mainWindow = UIFactory::getInstance().makeMainWindow(populaters,World::getInstance().getMolecules(), configuration, World::getInstance().getPeriode(), ConfigFileName);
+      MainWindow *mainWindow = UIFactory::getInstance().makeMainWindow(populaters);
       mainWindow->display();
       delete mainWindow;