Changeset b22179 for src

Timestamp:

Nov 4, 2011, 3:20:40 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:

807d91

Parents:

d44d7b

git-author:

Frederik Heber <heber@…> (09/21/11 18:42:29)

git-committer:

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

Message:

FIX: Removed OptionTrait's copy constructor as there are no pointers in it.

• With ActionTraits we need it, with OptionTrait we don't.

Location:

src/Actions

Files:

• ActionTraits.cpp (modified) (2 diffs)
• OptionTrait.cpp (modified) (1 diff)
• OptionTrait.hpp (modified) (1 diff)

src/Actions/ActionTraits.cpp

@@ -50 +50 @@
  */
 ActionTraits::ActionTraits(const ActionTraits &_Traits) :
-  OptionTrait(_Traits.getName(),
-      _Traits.getType(),
-      _Traits.getDescription(),
-      _Traits.hasDefaultValue() ? _Traits.getDefaultValue() : "",
-      _Traits.hasShortForm() ? _Traits.getShortForm() : ""
-  ),
+  OptionTrait(_Traits),
   MenuTitle(_Traits.MenuTitle),
   MenuPosition(_Traits.MenuPosition)
@@ -63 +58 @@
         std::pair< std::string, OptionTrait *> (
             iter->first,
-            new OptionTrait(iter->second->getName(),iter->second->getType(),iter->second->getDescription(), iter->second->getDefaultValue(), iter->second->getShortForm())
+            new OptionTrait(*iter->second)
         )
     );

src/Actions/OptionTrait.cpp

@@ -48 +48 @@
   //std::cout << "OptionTrait::OptionTrait() with " << getName() << ", type " << getTypeName() << " and description " << getDescription() << std::endl;
 }
-
-/** Copy constructor for class OptionTrait.
- * note that OptionTrait automatically registers with OptionRegistry.
- * \param &_option reference of option to copy
- * \param *_instance type to be stored in this OptionTrait.
- */
-OptionTrait::OptionTrait(const OptionTrait &_option) :
-    Token(_option.getName()),
-    InternalType(_option.getType()),
-    Description(_option.getDescription()),
-    DefaultValue(_option.getDefaultValue()),
-    ShortForm(_option.getShortForm())
-{}
 
 /** Destructor for class OptionTrait.

src/Actions/OptionTrait.hpp

@@ -26 +26 @@
 public:
   OptionTrait(const std::string &_token, std::type_info const * const _type, const std::string _description, const std::string _defaultvalue = std::string(), const std::string _shortform = std::string());
-  OptionTrait(const OptionTrait &_option);
   ~OptionTrait();