Changeset cb85f24 for src/UIElements

Timestamp:

Nov 4, 2011, 3:20:41 PM (13 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

aee2da

Parents:

693a80

git-author:

Frederik Heber <heber@…> (09/26/11 13:11:33)

git-committer:

Frederik Heber <heber@…> (11/04/11 15:20:41)

Message:

Removed using namespace MoleCuilder from TxMenuLeaveAction.

• due to includes this re-appeared at some other places, too.

Location:

src/UIElements

Files:

• Menu/TextMenu/TextMenu.hpp (modified) (1 diff)
• Menu/TextMenu/TxMenuLeaveAction.hpp (modified) (3 diffs)
• TextUI/TextWindow.cpp (modified) (1 diff)
• TextUI/TextWindow.hpp (modified) (1 diff)

src/UIElements/Menu/TextMenu/TextMenu.hpp

@@ -145 +145 @@
     new SubMenuItem(getSuitableShortForm(description), description, MenuInstance, NewMenu->getMenuInstance());
     NewMenu->reserveShortcut('q',"leave"+token);
-    ActionTraits leaveTrait(
-        OptionTrait("leave"+token, &typeid(void), "leave menu "+token),
+    MoleCuilder::ActionTraits leaveTrait(
+        MoleCuilder::OptionTrait("leave"+token, &typeid(void), "leave menu "+token),
         token,
-        ActionRegistry::getInstance().getLastPosition(token)+2); // have a separator in between
+        MoleCuilder::ActionRegistry::getInstance().getLastPosition(token)+2); // have a separator in between
     new TxMenu::LeaveAction(NewMenu->getMenuInstance(), leaveTrait);
     NewMenu->init();

src/UIElements/Menu/TextMenu/TxMenuLeaveAction.hpp

@@ -19 +19 @@
 #include "Actions/ActionTraits.hpp"
 
-using namespace MoleCuilder;
-
 /** This specific action is used to leave a submenu and return to an upper one.
  * It differs from other Action's (and thus cannot be put into the usual
@@ -26 +24 @@
  * There, we call the doQuit() member function on performCall().
  */
-class TxMenu::LeaveAction : public Action {
+class TxMenu::LeaveAction : public MoleCuilder::Action 
+{
 public:
-  LeaveAction(TxMenu* const, const ActionTraits &_trait);
+  LeaveAction(TxMenu* const, const MoleCuilder::ActionTraits &_trait);
   virtual ~LeaveAction();
 
@@ -38 +37 @@
 private:
   virtual void getParametersfromValueStorage();
-  virtual Action::state_ptr performCall();
-  virtual Action::state_ptr performUndo(Action::state_ptr);
-  virtual Action::state_ptr performRedo(Action::state_ptr);
+  virtual MoleCuilder::Action::state_ptr performCall();
+  virtual MoleCuilder::Action::state_ptr performUndo(MoleCuilder::Action::state_ptr);
+  virtual MoleCuilder::Action::state_ptr performRedo(MoleCuilder::Action::state_ptr);
 
   TxMenu* const menu;

src/UIElements/TextUI/TextWindow.cpp

@@ -49 +49 @@
 #include <map>
 
+using namespace MoleCuilder;
+
 // TODO: see what code can be moved to a base class for Graphic and Text Windows
 TextWindow::TextWindow()

src/UIElements/TextUI/TextWindow.hpp

@@ -42 +42 @@
 
   // some actions only needed in textMenus
-  std::list<Action *> returnFromActions;
-  Action *quitAction;
+  std::list<MoleCuilder::Action *> returnFromActions;
+  MoleCuilder::Action *quitAction;
   // all views that are contained in the main Menu
   StringView *moleculeView;