Changeset ce7fdc for src/UIElements/Views/Qt4

Timestamp:

Oct 13, 2011, 1:03: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:

61ff05, db67ea

Parents:

e0f8c8

git-author:

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

git-committer:

Frederik Heber <heber@…> (10/13/11 13:03:40)

Message:

HUGE: All Action-related codes resides now in namespace MoleCuilder.

• removed all namespace std in Actions..., replaced by MoleCuilder.

Location:

src/UIElements/Views/Qt4

Files:

• Qt3D/GLWorldScene.cpp (modified) (1 diff)
• QtStatusBar.cpp (modified) (1 diff)
• QtStatusBar.hpp (modified) (3 diffs)

src/UIElements/Views/Qt4/Qt3D/GLWorldScene.cpp

@@ -39 +39 @@
 #include "World.hpp"
 
+using namespace MoleCuilder;
 
 GLWorldScene::GLWorldScene(QObject *parent)

src/UIElements/Views/Qt4/QtStatusBar.cpp

@@ -33 +33 @@
 #define PLURAL_S(v) (((v)==1)?"":"s")
 
+using namespace MoleCuilder;
 
 QtStatusBar::QtStatusBar(QWidget *_parent) :

src/UIElements/Views/Qt4/QtStatusBar.hpp

@@ -24 +24 @@
 class QLabel;
 class QProgressBar;
-class Process;
 class QBoxLayout;
+
+namespace MoleCuilder {
+  class Process;
+}
 
 class QtStatusBar : public QStatusBar, public Observer
@@ -48 +51 @@
 private:
   void redrawStatus();
-  void redrawProcess(Process *proc);
+  void redrawProcess(MoleCuilder::Process *proc);
 
   int atomCount;
@@ -55 +58 @@
   QLabel *statusLabel;
   QWidget *parent;
-  std::map<Process*,progressIndicator*> progressBars;
-  Process* activeProcess;
+  std::map<MoleCuilder::Process*,progressIndicator*> progressBars;
+  MoleCuilder::Process* activeProcess;
 };