Changeset d50264 for molecuilder/src/Views/StreamStringView.hpp

Timestamp:

Feb 26, 2010, 2:01:57 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

db6b872

Parents:

f467c6 (diff), dc5413 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'StructureRefactoring' into MenuRefactoring

Conflicts:

molecuilder/src/UIElements/TextDialog.cpp

File:

• molecuilder/src/Views/StreamStringView.hpp (modified) (2 diffs)

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