Remove unneeded typedef

docstring is already defined in strfwd.h (which is included from docstring.h).
There are only two possible cases:
Either the typedef in docstring.h defines an identical type (then it is not
needed), or it defines a different type (then it generates a compilation error)
=> it is not needed.

diff --git a/src/support/docstring.h b/src/support/docstring.h
index 5eea0111a3a6f06bd450344d28e99fc7ccdd2dec..096bc00322fdd27d66f0c82775b563c8ea770b88 100644 (file)
--- a/src/support/docstring.h
+++ b/src/support/docstring.h
@@ -19,13 +19,6 @@
 
 namespace lyx {
 
-/**
- * String type for storing the main text in UCS4 encoding.
- * Use std::string only in cases 7-bit ASCII is to be manipulated
- * within the variable.
- */
-typedef std::basic_string<char_type> docstring;
-
 /// Creates a docstring from a C string of ASCII characters
 docstring const from_ascii(char const *);
 

diff --git a/src/support/strfwd.h b/src/support/strfwd.h
index e40ec1c4b8b0beeddbced9f404507918972e45b0..10411cda229f86cd7b3270693a50f082783a2abb 100644 (file)
--- a/src/support/strfwd.h
+++ b/src/support/strfwd.h
@@ -68,7 +68,11 @@ typedef basic_ostringstream<char, char_traits<char>, allocator<char> > ostringst
 
 namespace lyx {
 
-/// String type for storing the main text in UCS4 encoding
+/**
+ * String type for storing the main text in UCS4 encoding.
+ * Use std::string only in cases 7-bit ASCII is to be manipulated
+ * within the variable.
+ */
 typedef std::basic_string<char_type, std::char_traits<char_type>,
        std::allocator<char_type> > docstring;