Changeset 98a2987 for molecuilder/src/Views

Timestamp:

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

Author:

Tillmann Crueger <crueger@…>

Children:

e65cc0

Parents:

33bc66

Message:

Added -Wall flag and fixed several small hickups

Location:

molecuilder/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)

molecuilder/src/Views/MethodStringView.cpp

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

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

molecuilder/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();
 }

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

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