Changeset 24a5e0 for src/Views

Timestamp:

Feb 26, 2010, 12:40:52 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

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:

1f2217

Parents:

7042f45

Message:

Added -Wall flag and fixed several small hickups

Location:

src/Views

Files:

• MethodStringView.cpp (modified) (1 diff)
• MethodStringView.hpp (modified) (1 diff)
• StreamStringView.cpp (modified) (1 diff)
• StreamStringView.hpp (modified) (2 diffs)
• StringView.hpp (modified) (2 diffs)

src/Views/MethodStringView.cpp

@@ -7 +7 @@
 
 #include "MethodStringView.hpp"
+
+using namespace std;
 
 MethodStringView::MethodStringView(boost::function<string()> _displayMethod) :

src/Views/MethodStringView.hpp

@@ -19 +19 @@
 {
 public:
-  MethodStringView(boost::function<string()>);
+  MethodStringView(boost::function<std::string()>);
   virtual ~MethodStringView();
 
-  virtual const string toString();
+  virtual const std::string toString();
 
 private:
-  boost::function<string()> displayMethod;
+  boost::function<std::string()> displayMethod;
 };
 

src/Views/StreamStringView.cpp

@@ -7 +7 @@
 
 #include <sstream>
+#include <iostream>
 
 #include "StreamStringView.hpp"
 
-StreamStringView::StreamStringView(boost::function<void(ofstream *)> _displayMethod) :
+using namespace std;
+
+StreamStringView::StreamStringView(boost::function<void(ostream *)> _displayMethod) :
 StringView(),
 displayMethod(_displayMethod)
-{
-  // TODO Auto-generated constructor stub
-
-}
+{}
 
 StreamStringView::~StreamStringView()
-{
-  // TODO Auto-generated destructor stub
-}
+{}
 
 const string StreamStringView::toString() {
   stringstream s;
-  displayMethod((ofstream *)&s);
+  displayMethod(dynamic_cast<ostream *>(&s));
   return s.str();
 }

src/Views/StreamStringView.hpp

@@ -10 +10 @@
 
 #include <boost/function.hpp>
+#include <iostream>
 
 #include "Views/StringView.hpp"
@@ -24 +25 @@
 {
 public:
-  StreamStringView(boost::function<void(ofstream *)>);
+  StreamStringView(boost::function<void(std::ostream *)>);
   virtual ~StreamStringView();
 
-  virtual const string toString();
+  virtual const std::string toString();
 
 private:
-  boost::function<void(ofstream *)> displayMethod;
+  boost::function<void(std::ostream *)> displayMethod;
 };
 

src/Views/StringView.hpp

@@ -12 +12 @@
 #include "Views/View.hpp"
 
-using namespace std;
-
 /**
  * View to show something as a string
@@ -26 +24 @@
   virtual ~StringView();
 
-  virtual const string toString()=0;
+  virtual const std::string toString()=0;
 };