Remove unused macros USE_INCLUDED_STRING and STD_STRING_IS_GOOD

[lyx.git] / src / support / convert.h

diff --git a/src/support/convert.h b/src/support/convert.h
index eb51d77c838b842ef46712126e466ba0dc7b0bb2..2fed4eafdf14d23cae28dae6f08fef09183d6eb2 100644 (file)
--- a/src/support/convert.h
+++ b/src/support/convert.h
@@ -16,7 +16,7 @@
 #ifndef CONVERT_H
 #define CONVERT_H
 
-#include "support/docstring.h"
+#include "support/strfwd.h"
 
 namespace lyx {
 
@@ -30,15 +30,15 @@ template<> std::string convert<std::string>(short unsigned int sui);
 template<> std::string convert<std::string>(int i);
 template<> docstring convert<docstring>(int i);
 template<> std::string convert<std::string>(unsigned int ui);
-template<> docstring convert<lyx::docstring>(unsigned int ui);
+template<> docstring convert<docstring>(unsigned int ui);
 template<> std::string convert<std::string>(unsigned long ul);
-template<> docstring convert<lyx::docstring>(unsigned long ul);
+template<> docstring convert<docstring>(unsigned long ul);
 template<> std::string convert<std::string>(long l);
-template<> docstring convert<lyx::docstring>(long l);
+template<> docstring convert<docstring>(long l);
 template<> std::string convert<std::string>(float f);
 template<> std::string convert<std::string>(double d);
 template<> int convert<int>(std::string const s);
-template<> int convert<int>(lyx::docstring const s);
+template<> int convert<int>(docstring const s);
 template<> unsigned int convert<unsigned int>(std::string const s);
 template<> unsigned long convert<unsigned long>(std::string const s);
 template<> double convert<double>(std::string const s);