Changeset 536ce2 for molecuilder/src/UIElements/TextWindow.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/UIElements/TextWindow.cpp (modified) (3 diffs)

molecuilder/src/UIElements/TextWindow.cpp

@@ -27 +27 @@
 #include "molecule.hpp"
 #include "periodentafel.hpp"
+#include "World.hpp"
 
 #include "Legacy/oldmenu.hpp"
@@ -48 +49 @@
 
 // TODO: see what code can be moved to a base class for Graphic and Text Windows
-TextWindow::TextWindow(menuPopulaters populaters,MoleculeListClass *molecules, config *configuration, periodentafel *periode, char *ConfigFileName)
+TextWindow::TextWindow(menuPopulaters populaters)
 {
+  MoleculeListClass *molecules = World::getInstance().getMolecules();
+  config *configuration = NULL;
+  periodentafel *periode = World::getInstance().getPeriode();
+  char *ConfigFileName = NULL;
   old_menu = new oldmenu;
 
@@ -101 +106 @@
   // call all functions used to build the submenus
 
-  populaters.MakeEditMoleculesMenu(editMoleculesMenu,molecules,configuration,periode);
+  populaters.MakeEditMoleculesMenu(editMoleculesMenu);
 
   Action *returnFromEditMoleculeAction = new TextMenu::LeaveAction(editMoleculesMenu);