X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFloatList.h;h=b410ade851240e902eb042bea526ca5558059e77;hb=52eb91c94fb70d58dceef430659c8781de2eccda;hp=2b6082d24016ad28bc2815f26933137cfea84b67;hpb=236ea81bc5c0ce7101c9460d1ee97b8f3c9be9df;p=lyx.git

diff --git a/src/FloatList.h b/src/FloatList.h
index 2b6082d240..b410ade851 100644
--- a/src/FloatList.h
+++ b/src/FloatList.h
@@ -12,17 +12,20 @@
 #ifndef FLOATLIST_H
 #define FLOATLIST_H
 
+#include "Floating.h"
+
 #include <map>
+#include <string>
+
 
-#include "support/std_string.h"
+namespace lyx {
 
-class Floating;
 
 ///
 class FloatList {
 public:
 	///
-	typedef std::map<string, Floating> List;
+	typedef std::map<std::string, Floating> List;
 	///
 	typedef List::const_iterator const_iterator;
 	///
@@ -34,18 +37,21 @@ public:
 	///
 	void newFloat(Floating const & fl);
 	///
-	string const defaultPlacement(string const & t) const;
+	std::string const defaultPlacement(std::string const & t) const;
 	///
-	bool typeExist(string const & t) const;
+	bool typeExist(std::string const & t) const;
 	///
-	Floating const & getType(string const & t) const;
+	Floating const & getType(std::string const & t) const;
 	///
-	void erase(string const & t);
+	void erase(std::string const & t);
 	///
-	const_iterator operator[](string const & t) const;
+	const_iterator operator[](std::string const & t) const;
 private:
 	///
 	List list;
 };
 
+
+} // namespace lyx
+
 #endif