Changeset 16f86d for molecuilder/src

Timestamp:

Jan 2, 2010, 3:53:39 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

538744

Parents:

f48622

Message:

Removed unecessary method stubs from oldmenu class

Location:

molecuilder/src

Files:

• menu.cpp (modified) (2 diffs)
• menu.hpp (modified) (1 diff)

molecuilder/src/menu.cpp

@@ -899 +899 @@
 
 
-void oldmenu::createNewMolecule(periodentafel *periode,MoleculeListClass *molecules) {
-  molecules->createNewMolecule(periode);
-};
-
-void oldmenu::loadFromXYZ(periodentafel *periode,MoleculeListClass *molecules){
-  molecules->loadFromXYZ(periode);
-}
-
-void oldmenu::changeName(MoleculeListClass *molecules){
-  molecules->changeName();
-}
-
-void oldmenu::setMoleculeFilename(MoleculeListClass *molecules) {
-  molecules->setMoleculeFilename();
-}
-
-void oldmenu::parseXYZIntoMolecule(MoleculeListClass *molecules){
- molecules->parseXYZIntoMolecule();
-};
-
-void oldmenu::eraseMolecule(MoleculeListClass *molecules){
-  molecules->eraseMolecule();
-};
-
 /** Submenu for merging molecules.
  * \param *periode periodentafel
@@ -1175 +1151 @@
   new ActionMenuItem('q',"quit",main_menu,quitAction);
 
+
+
   // build the EditMoleculesMenu
-  Action *createMoleculeAction = new MethodAction(boost::bind(&oldmenu::createNewMolecule,this,periode,molecules));
+  Action *createMoleculeAction = new MethodAction(boost::bind(&MoleculeListClass::createNewMolecule,molecules,periode));
   new ActionMenuItem('c',"create new molecule",edit_molecules_menu,createMoleculeAction);
 
-  Action *loadMoleculeAction = new MethodAction(boost::bind(&oldmenu::loadFromXYZ,this,periode,molecules));
+  Action *loadMoleculeAction = new MethodAction(boost::bind(&MoleculeListClass::loadFromXYZ,molecules,periode));
   new ActionMenuItem('l',"load molecule from xyz file",edit_molecules_menu,loadMoleculeAction);
 
-  Action *changeFilenameAction = new MethodAction(boost::bind(&oldmenu::changeName,this,molecules));
+  Action *changeFilenameAction = new MethodAction(boost::bind(&MoleculeListClass::changeName,molecules));
   new ActionMenuItem('n',"change molecule's name",edit_molecules_menu,changeFilenameAction);
 
-  Action *giveFilenameAction = new MethodAction(boost::bind(&oldmenu::setMoleculeFilename,this,molecules));
+  Action *giveFilenameAction = new MethodAction(boost::bind(&MoleculeListClass::setMoleculeFilename,molecules));
   new ActionMenuItem('N',"give molecules filename",edit_molecules_menu,giveFilenameAction);
 
-  Action *parseAtomsAction = new MethodAction(boost::bind(&oldmenu::parseXYZIntoMolecule,this,molecules));
+  Action *parseAtomsAction = new MethodAction(boost::bind(&MoleculeListClass::parseXYZIntoMolecule,molecules));
   new ActionMenuItem('p',"parse atoms in xyz file into molecule",edit_molecules_menu,parseAtomsAction);
 
-  Action *eraseMoleculeAction = new MethodAction(boost::bind(&oldmenu::eraseMolecule,this,molecules));
+  Action *eraseMoleculeAction = new MethodAction(boost::bind(&MoleculeListClass::eraseMolecule,molecules));
   new ActionMenuItem('r',"remove a molecule",edit_molecules_menu,eraseMoleculeAction);
 

molecuilder/src/menu.hpp

@@ -26 +26 @@
   void SaveConfig(char *, config *, periodentafel *, MoleculeListClass *);
 
-  // Methods extracted from EditMolecules. Probably to be moved to moleculeListClass
-  void createNewMolecule(periodentafel *periode,MoleculeListClass *molecules);
-  void loadFromXYZ(periodentafel *periode,MoleculeListClass *molecules);
-  void changeName(MoleculeListClass *molecules);
-  void setMoleculeFilename(MoleculeListClass *molecules);
-  void parseXYZIntoMolecule(MoleculeListClass *molecules);
-  void eraseMolecule(MoleculeListClass *molecules);
-
 protected:
   void AddAtoms(periodentafel *, molecule *);