Changeset ce7fdc for src/UIElements

Timestamp:

Oct 13, 2011, 1:03:40 PM (14 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

Files:

• CommandLineUI/CommandLineParser.cpp (modified) (1 diff)
• CommandLineUI/CommandLineParser.hpp (modified) (2 diffs)
• CommandLineUI/CommandLineStatusIndicator.cpp (modified) (3 diffs)
• CommandLineUI/CommandLineWindow.cpp (modified) (1 diff)
• CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistencyUnitTest.cpp (modified) (1 diff)
• CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistencyUnitTest.hpp (modified) (2 diffs)
• Menu/Menu.cpp (modified) (1 diff)
• Menu/Qt4/QtMenuPipe.cpp (modified) (1 diff)
• Menu/TextMenu/ActionMenuItem.cpp (modified) (1 diff)
• Menu/TextMenu/ActionMenuItem.hpp (modified) (1 diff)
• Menu/TextMenu/TxMenuLeaveAction.cpp (modified) (1 diff)
• Menu/TextMenu/TxMenuLeaveAction.hpp (modified) (1 diff)
• Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.cpp (modified) (2 diffs)
• Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.hpp (modified) (2 diffs)
• TextUI/TextStatusIndicator.cpp (modified) (3 diffs)
• TextUI/TextWindow.hpp (modified) (1 diff)
• Views/Qt4/Qt3D/GLWorldScene.cpp (modified) (1 diff)
• Views/Qt4/QtStatusBar.cpp (modified) (1 diff)
• Views/Qt4/QtStatusBar.hpp (modified) (3 diffs)

src/UIElements/CommandLineUI/CommandLineParser.cpp

@@ -39 +39 @@
 
 #include "CodePatterns/Singleton_impl.hpp"
+
+using namespace MoleCuilder;
 
 class element;

src/UIElements/CommandLineUI/CommandLineParser.hpp

@@ -24 +24 @@
 #include <map>
 
-class Action;
-class CommandLineParser_ActionRegistry_ConsistencyTest;
-class OptionTrait;
+namespace MoleCuilder {
+  class Action;
+  class OptionTrait;
+}
+class CommandLineParser_ActionRegistry_ConsistenyTest;
 
 /** This class is a wrapper for boost::program_options.
@@ -151 +153 @@
 
   // adds options to the parser
-  void AddOptionToParser(const OptionTrait * const currentOption, po::options_description* OptionList);
+  void AddOptionToParser(const MoleCuilder::OptionTrait * const currentOption, po::options_description* OptionList);
 
   // creates a map from short forms to action tokens needed to parse command line

src/UIElements/CommandLineUI/CommandLineStatusIndicator.cpp

@@ -26 +26 @@
 #include "Actions/Process.hpp"
 
-using namespace std;
+using namespace MoleCuilder;
 
 CommandLineStatusIndicator::CommandLineStatusIndicator() :
@@ -46 +46 @@
     if(proc->getMaxSteps()>0){
       if(!proc->doesStop()){
-        cout << "Busy (" << proc->getName() << ") ";
+        std::cout << "Busy (" << proc->getName() << ") ";
         // we can show a percentage done
-        cout << (int)proc->getDoneRatio() << "% done" << endl;
+        std::cout << (int)proc->getDoneRatio() << "% done" << std::endl;
       }
     }
@@ -54 +54 @@
       // we only show some kind of busy animation
       if(proc->doesStart()){
-        cout << "Busy (" << proc->getName() << ")";
+        std::cout << "Busy (" << proc->getName() << ")";
       }
       if(!proc->doesStop()){
-        cout << ".";
+        std::cout << ".";
       }
       else {
-        cout << endl;
+        std::cout << std::endl;
       }
     }

src/UIElements/CommandLineUI/CommandLineWindow.cpp

@@ -35 +35 @@
 #include <iostream>
 
-using namespace std;
+using namespace MoleCuilder;
 
 // TODO: see what code can be moved to a base class for Graphic and CommandLine Windows

src/UIElements/CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistencyUnitTest.cpp

@@ -30 +30 @@
 
 #include "CommandLineParser_ActionRegistry_ConsistencyUnitTest.hpp"
+
+using namespace MoleCuilder;
 
 #ifdef HAVE_TESTRUNNER

src/UIElements/CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistencyUnitTest.hpp

@@ -17 +17 @@
 #include <cppunit/extensions/HelperMacros.h>
 
+class CommandLineParser;
 
-class ActionRegistry;
-class CommandLineParser;
+namespace MoleCuilder {
+  class ActionRegistry;
+}
 
 /********************************************** Test classes **************************************/
@@ -35 +37 @@
 
 private:
-      ActionRegistry *AR;
+      MoleCuilder::ActionRegistry *AR;
       CommandLineParser *CLP;
 };

src/UIElements/Menu/Menu.cpp

@@ -26 +26 @@
 #include "Actions/ActionTraits.hpp"
 #include "Menu/Menu.hpp"
+
+using namespace MoleCuilder;
 
 /** Constructor of class Menu.

src/UIElements/Menu/Qt4/QtMenuPipe.cpp

@@ -27 +27 @@
 #include "Actions/Action.hpp"
 
+using namespace MoleCuilder;
+
 QtMenuPipe::QtMenuPipe(const std::string &_ActionName, QAction *_action) :
     ActionName(_ActionName), theAction(_action)

src/UIElements/Menu/TextMenu/ActionMenuItem.cpp

@@ -26 +26 @@
 #include "Actions/ActionRegistry.hpp"
 
-using namespace std;
+using namespace MoleCuilder;
 
 ActionMenuItem::ActionMenuItem(char _trigger, const std::string &_description,TxMenu* const _menu,const std::string &_ActionName)

src/UIElements/Menu/TextMenu/ActionMenuItem.hpp

@@ -18 +18 @@
 #include "Menu/TextMenu/MenuItem.hpp"
 
-class Action;
+namespace MoleCuilder {
+  class Action;
+}
 class TxMenu;
 

src/UIElements/Menu/TextMenu/TxMenuLeaveAction.cpp

@@ -24 +24 @@
 #include "Menu/TextMenu/TxMenuLeaveAction.hpp"
 #include "CodePatterns/Assert.hpp"
+
+using namespace MoleCuilder;
 
 /** Constructor for class TxMenu::LeaveAction.

src/UIElements/Menu/TextMenu/TxMenuLeaveAction.hpp

@@ -18 +18 @@
 #include "Actions/Action.hpp"
 #include "Actions/ActionTraits.hpp"
+
+using namespace MoleCuilder;
 
 /** This specific action is used to leave a submenu and return to an upper one.

src/UIElements/Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.cpp

@@ -18 +18 @@
 #endif
 
-using namespace std;
 
 #include <cppunit/CompilerOutputter.h>
@@ -29 +28 @@
 
 #include "MenuDescription_ActionRegistry_ConsistencyUnitTest.hpp"
+
+using namespace MoleCuilder;
 
 #ifdef HAVE_TESTRUNNER

src/UIElements/Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.hpp

@@ -19 +19 @@
 #include "UIElements/Menu/MenuDescription.hpp"
 
-class ActionRegistry;
+namespace MoleCuilder {
+  class ActionRegistry;
+}
 
 /********************************************** Test classes **************************************/
@@ -36 +38 @@
 private:
       MenuDescription md;
-      ActionRegistry *AR;
+      MoleCuilder::ActionRegistry *AR;
 };
 

src/UIElements/TextUI/TextStatusIndicator.cpp

@@ -26 +26 @@
 #include "Actions/Process.hpp"
 
-using namespace std;
+using namespace MoleCuilder;
 
 TextStatusIndicator::TextStatusIndicator() :
@@ -46 +46 @@
     if(proc->getMaxSteps()>0){
       if(!proc->doesStop()){
-        cout << "Busy (" << proc->getName() << ") ";
+        std::cout << "Busy (" << proc->getName() << ") ";
         // we can show a percentage done
-        cout << (int)proc->getDoneRatio() << "% done" << endl;
+        std::cout << (int)proc->getDoneRatio() << "% done" << std::endl;
       }
     }
@@ -54 +54 @@
       // we only show some kind of busy animation
       if(proc->doesStart()){
-        cout << "Busy (" << proc->getName() << ")";
+        std::cout << "Busy (" << proc->getName() << ")";
       }
       if(!proc->doesStop()){
-        cout << ".";
+        std::cout << ".";
       }
       else {
-        cout << endl;
+        std::cout << std::endl;
       }
     }

src/UIElements/TextUI/TextWindow.hpp

@@ -22 +22 @@
 #include "Menu/TextMenu/TextMenu.hpp"
 
-class Action;
+namespace MoleCuilder {
+  class Action;
+}
 class StringView;
 class TextStatusIndicator;

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;
 };