Changeset 63fb7a for src/UIElements/Views/Qt4/MoleculeList

Timestamp:

Jul 24, 2015, 4:44:34 PM (9 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:

1259df

Parents:

795c0f

git-author:

Frederik Heber <heber@…> (06/01/15 08:48:35)

git-committer:

Frederik Heber <heber@…> (07/24/15 16:44:34)

Message:

Replaced getMolecule() by const access version where possible.

• so far this is done done via const_casting the World.

Location:

src/UIElements/Views/Qt4/MoleculeList

Files:

• QtMoleculeItem.cpp (modified) (3 diffs)
• QtMoleculeList.cpp (modified) (2 diffs)
• SpecificItems/QtMoleculeItem_atomcount.hpp (modified) (1 diff)
• SpecificItems/QtMoleculeItem_formula.hpp (modified) (1 diff)
• SpecificItems/QtMoleculeItem_name.hpp (modified) (1 diff)

src/UIElements/Views/Qt4/MoleculeList/QtMoleculeItem.cpp

@@ -71 +71 @@
 void QtMoleculeItem::signOnToMolecule()
 {
-  const molecule *mol = World::getInstance().getMolecule(MoleculeById(molid));
+  const molecule * const mol = const_cast<const World &>(World::getInstance()).
+      getMolecule(MoleculeById(molid));
   if (mol != NULL) {
     if (!IsSignedOn)
@@ -83 +84 @@
 void QtMoleculeItem::signOffFromMolecule()
 {
-  const molecule *mol = World::getInstance().getMolecule(MoleculeById(molid));
+  const molecule * const mol = const_cast<const World &>(World::getInstance()).
+      getMolecule(MoleculeById(molid));
   if (mol != NULL) {
     if (IsSignedOn)
@@ -140 +142 @@
 const molecule * const QtMoleculeItem::getMolecule() const
 {
-  const molecule * mol = World::getInstance().getMolecule(MoleculeById(molid));
+  const molecule * const mol = const_cast<const World &>(World::getInstance()).getMolecule(MoleculeById(molid));
   ASSERT (mol != NULL,
       "QtMoleculeItem::getMolecule() - mol with "+toString(molid)+" is gone.");

src/UIElements/Views/Qt4/MoleculeList/QtMoleculeList.cpp

@@ -578 +578 @@
             QtMoleculeItemFactory::NAME));
     const moleculeId_t molid = ItemToMoleculeId(_item);
-    const molecule *mol = World::getInstance().getMolecule(MoleculeById(molid));
+    const molecule *mol = const_cast<const World &>(World::getInstance()).
+        getMolecule(MoleculeById(molid));
     if (std::binary_search(
             toBeRemovedItems_copy.begin(), toBeRemovedItems_copy.end(),
@@ -624 +625 @@
 //    LOG(1, "Adding molecule " << (*moliter)->getName());
     // check that World knows the molecule still
-    const molecule * const mol =
-        World::getInstance().getMolecule(MoleculeById((*moliter)->getId()));
+    const molecule * const mol = const_cast<const World &>(World::getInstance()).
+        getMolecule(MoleculeById((*moliter)->getId()));
     if ((mol != NULL) && (mol == *moliter)) {
       addMolecule(mol);

src/UIElements/Views/Qt4/MoleculeList/SpecificItems/QtMoleculeItem_atomcount.hpp

@@ -44 +44 @@
   void internal_updateState()
   {
-    const molecule * mol = World::getInstance().getMolecule(MoleculeById(molid));
+    const molecule * mol = const_cast<const World &>(World::getInstance()).
+        getMolecule(MoleculeById(molid));
     if (mol != NULL)
       setText(QString::number(mol->getAtomCount()));

src/UIElements/Views/Qt4/MoleculeList/SpecificItems/QtMoleculeItem_formula.hpp

@@ -47 +47 @@
   void internal_updateState()
   {
-    const molecule * mol = World::getInstance().getMolecule(MoleculeById(molid));
+    const molecule * mol = const_cast<const World &>(World::getInstance()).
+        getMolecule(MoleculeById(molid));
     if (mol != NULL)
       setText(QString(mol->getFormula().toString().c_str()));

src/UIElements/Views/Qt4/MoleculeList/SpecificItems/QtMoleculeItem_name.hpp

@@ -44 +44 @@
   void internal_updateState()
   {
-    const molecule * mol = World::getInstance().getMolecule(MoleculeById(molid));
+    const molecule * mol = const_cast<const World &>(World::getInstance()).
+        getMolecule(MoleculeById(molid));
     if (mol != NULL)
       setText(QString(mol->getName().c_str()));