From 49af9db6237f3d7c64c41cb3a4fac81be51e602a Mon Sep 17 00:00:00 2001
From: Georg Baum <baum@lyx.org>
Date: Wed, 3 Dec 2014 21:08:13 +0100
Subject: [PATCH] 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.
---
 src/support/docstring.h | 7 -------
 src/support/strfwd.h    | 6 +++++-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/support/docstring.h b/src/support/docstring.h
index 5eea0111a3..096bc00322 100644
--- 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 e40ec1c4b8..10411cda22 100644
--- 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;
 
-- 
2.39.2