Remove strfwd.h.

Will break cygwin due to trivstring header.

https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg223056.html

diff --git a/development/cmake/configCompiler.h.msvc b/development/cmake/configCompiler.h.msvc
index bec1a4113caa69de150cb8205052d45d10346566..771286af9f9710adde04417b2af1c8881c965986 100644 (file)
--- a/development/cmake/configCompiler.h.msvc
+++ b/development/cmake/configCompiler.h.msvc
@@ -168,9 +168,4 @@
 #define HAVE_MODE_T
 #endif
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1600)
-#include "support/strfwd.h" // always first, to prevent compiler's interpretation/instantiations of some typedef
-#endif
-
-
 #endif

diff --git a/src/Box.h b/src/Box.h
index 9522ad0a79d1121913b9b6434447b9ab270b6386..e0aa633b4350854d1a799f665b9d547e18621f6a 100644 (file)
--- a/src/Box.h
+++ b/src/Box.h
@@ -12,7 +12,7 @@
 #ifndef BOX_H
 #define BOX_H
 
-#include "support/strfwd.h"
+#include <ostream>
 
 
 namespace lyx {

diff --git a/src/Buffer.h b/src/Buffer.h
index d4e8db8748e221589a1f5a8fe089087aae1a944d..fa240a4cbfa3e0a51cfc66927050d9d9a2f4ad96 100644 (file)
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -16,13 +16,12 @@
 #include "OutputEnums.h"
 
 #include "support/unique_ptr.h"
-#include "support/strfwd.h"
+#include "support/docstring.h"
 #include "support/types.h"
 
 #include <map>
 #include <list>
 #include <set>
-#include <string>
 #include <vector>
 
 

diff --git a/src/BufferEncodings.h b/src/BufferEncodings.h
index d5a9081f0977d1d7152e10e9f5148ce67f221093..917a8371a1282805829154c79c0ca742fef08c27 100644 (file)
--- a/src/BufferEncodings.h
+++ b/src/BufferEncodings.h
@@ -16,8 +16,6 @@
 
 #include "Encoding.h"
 
-#include "support/strfwd.h"
-
 namespace lyx {
 
 class Buffer;

diff --git a/src/BufferList.h b/src/BufferList.h
index ff5156657b95e84331a5882bf19991b09d1ff100..1384467c73f4751e86bd86db548269ff159ed32d 100644 (file)
--- a/src/BufferList.h
+++ b/src/BufferList.h
@@ -12,8 +12,7 @@
 #ifndef BUFFER_LIST_H
 #define BUFFER_LIST_H
 
-#include "support/strfwd.h"
-
+#include <string>
 #include <vector>
 
 

diff --git a/src/BufferView.h b/src/BufferView.h
index 0f673e38e6f458875b19c8b49bbb07f5e6929a15..deeeb7061b32a1f6c5784729749642cd74e8f965 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -20,7 +20,6 @@
 #include "TexRow.h"
 #include "update_flags.h"
 
-#include "support/strfwd.h"
 #include "support/types.h"
 
 namespace lyx {

diff --git a/src/Changes.h b/src/Changes.h
index d53887556d5a32ffb9fc352ed8f7d3c03e3a32f3..1bad1b2bc0cf9e0435f36cad9c36236c8247baad 100644 (file)
--- a/src/Changes.h
+++ b/src/Changes.h
@@ -15,7 +15,6 @@
 #ifndef CHANGES_H
 #define CHANGES_H
 
-#include "support/strfwd.h"
 #include "support/types.h"
 #include "support/lyxtime.h"
 

diff --git a/src/Citation.h b/src/Citation.h
index 747599d5f85f21a5d890ab05ad17ac05af37c8d5..4be8c3f09af39bc9125cc478c59b59028a617e88 100644 (file)
--- a/src/Citation.h
+++ b/src/Citation.h
@@ -13,7 +13,6 @@
 #define CITATION_H
 
 #include "support/docstring.h"
-#include <string>
 #include <vector>
 
 namespace lyx {

diff --git a/src/CmdDef.h b/src/CmdDef.h
index 946730e64e44ffee41b8325c9395fde303369469..e250015bee4914281a57c24cfed80bd97f3cb959 100644 (file)
--- a/src/CmdDef.h
+++ b/src/CmdDef.h
@@ -12,10 +12,9 @@
 #ifndef CMDDEF_H
 #define CMDDEF_H
 
-#include "support/strfwd.h"
-
 #include <map>
 #include <set>
+#include <string>
 
 namespace lyx {
 

diff --git a/src/Color.h b/src/Color.h
index d67c4989a71e87b9719878ab054a023fd0b94b29..e85efbfbaeb9cbc52c3c98e66c8f8ccc433950fc 100644 (file)
--- a/src/Color.h
+++ b/src/Color.h
@@ -21,7 +21,7 @@
 
 #include "ColorCode.h"
 
-#include "support/strfwd.h"
+#include <string>
 
 namespace lyx {
 

diff --git a/src/ColorSet.h b/src/ColorSet.h
index c1de480f4f0b66dd8a2f0cba2572627a110b0e04..88684079bab346d6e9b913cedb042a940d3dc761 100644 (file)
--- a/src/ColorSet.h
+++ b/src/ColorSet.h
@@ -19,10 +19,10 @@
 #ifndef COLORSET_H
 #define COLORSET_H
 
+#include "support/docstring.h"
 #include "Color.h"
 
 #include <map>
-#include <string>
 
 namespace lyx {
 

diff --git a/src/Converter.h b/src/Converter.h
index 720990013aa8b8250f2e450c945a4a47dad43295..c1abe62feeff5e3725cc1efec98392f7c8fa129b 100644 (file)
--- a/src/Converter.h
+++ b/src/Converter.h
@@ -13,12 +13,11 @@
 #define CONVERTER_H
 
 #include "Graph.h"
-#include "support/trivstring.h"
+#include "support/docstring.h"
 
 #include <memory>
 #include <vector>
 #include <set>
-#include <string>
 
 
 namespace lyx {

diff --git a/src/ConverterCache.h b/src/ConverterCache.h
index 72afe293e5ae515a287d6952534a15bde6762396..46176c70bfc091227b07e307985ed1a3efd1795b 100644 (file)
--- a/src/ConverterCache.h
+++ b/src/ConverterCache.h
@@ -21,7 +21,7 @@
 #ifndef CONVERTERCACHE_H
 #define CONVERTERCACHE_H
 
-#include "support/strfwd.h"
+#include <string>
 
 
 namespace lyx {

diff --git a/src/CursorSlice.h b/src/CursorSlice.h
index eb865de9482013ec8f742b9689d946fb2b525965..6eb6ff5aba96bd1a6ad7b67947a3800238cffb3a 100644 (file)
--- a/src/CursorSlice.h
+++ b/src/CursorSlice.h
@@ -18,7 +18,6 @@
 #define CURSORSLICE_H
 
 #include "support/types.h"
-#include "support/strfwd.h"
 #include "insets/Inset.h"
 
 

diff --git a/src/CutAndPaste.h b/src/CutAndPaste.h
index 0692afe5964a8fc04c3790e9863d0ea4ae6d569d..edea773321d858b52f3258bf6fe7374043bcfc05 100644 (file)
--- a/src/CutAndPaste.h
+++ b/src/CutAndPaste.h
@@ -17,7 +17,6 @@
 #include "Author.h"
 #include "DocumentClassPtr.h"
 
-#include "support/strfwd.h"
 #include "support/types.h"
 
 #include "frontends/Clipboard.h"

diff --git a/src/ErrorList.h b/src/ErrorList.h
index 29cb03cfe6ace8d311290a8140c756855c36721a..267c2f82d02a955b5a84f63a4cf419b7de3f7e89 100644 (file)
--- a/src/ErrorList.h
+++ b/src/ErrorList.h
@@ -14,8 +14,6 @@
 
 #include "TexRow.h"
 
-#include "support/strfwd.h"
-
 #include <vector>
 
 

diff --git a/src/Floating.h b/src/Floating.h
index ab57c4dd94b174d891a10b281c601997fd15235b..6fabe729ce5316fca8773fec51a8631542421533 100644 (file)
--- a/src/Floating.h
+++ b/src/Floating.h
@@ -12,10 +12,7 @@
 #ifndef FLOATING_H
 #define FLOATING_H
 
-#include "support/strfwd.h"
-
-#include <string>
-
+#include "support/docstring.h"
 
 namespace lyx {
 

diff --git a/src/Font.h b/src/Font.h
index b59f015eca7d9318deb5ec513f6755681c45e453..61e2a535b041e8f9ea25f7783f1adff6f015a4da 100644 (file)
--- a/src/Font.h
+++ b/src/Font.h
@@ -17,8 +17,6 @@
 
 #include "FontInfo.h"
 
-#include "support/strfwd.h"
-
 
 namespace lyx {
 

diff --git a/src/FontInfo.cpp b/src/FontInfo.cpp
index b6f45f88b5b49d6bf6bc2cafca0265e9ba0eb1ab..86e995e6d3d1d27449bd8965458f7f2d02587d61 100644 (file)
--- a/src/FontInfo.cpp
+++ b/src/FontInfo.cpp
@@ -27,7 +27,6 @@
 #include "support/lstrings.h"
 
 #include <algorithm>
-#include <ostream>
 #include <sstream>
 
 using namespace std;

diff --git a/src/FontInfo.h b/src/FontInfo.h
index bd0f125a7a594eb3285b2392b258fdfbc5fe05b3..008504653e6733b64131aa01fe4039d6274379b1 100644 (file)
--- a/src/FontInfo.h
+++ b/src/FontInfo.h
@@ -20,7 +20,7 @@
 #include "FontEnums.h"
 
 #include "support/Changer.h"
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 
 namespace lyx {

diff --git a/src/Format.h b/src/Format.h
index d1d6d74183cf8c78b8fb26c4fdaadc298308d3b0..9895b0193b446c4db24c5830dff134e3873d42f9 100644 (file)
--- a/src/Format.h
+++ b/src/Format.h
@@ -12,11 +12,9 @@
 #ifndef FORMAT_H
 #define FORMAT_H
 
-#include "support/strfwd.h"
-#include "support/trivstring.h"
+#include "support/docstring.h"
 
 #include <vector>
-#include <string>
 
 namespace lyx {
 

diff --git a/src/KeyMap.h b/src/KeyMap.h
index ac9de6298bf8f99db9f315246bedc7a344c1879e..964483522468c8c2188e72de88952211fe6ed942 100644 (file)
--- a/src/KeyMap.h
+++ b/src/KeyMap.h
@@ -17,8 +17,6 @@
 #include "FuncRequest.h"
 #include "KeySequence.h"
 
-#include "support/strfwd.h"
-
 #include <memory>
 #include <vector>
 

diff --git a/src/LaTeX.h b/src/LaTeX.h
index 502834348b94f67ade297bb7dd9d264be0ec1b1e..185b9ebdd9a94339940de8dcda90829bf4ff5f5a 100644 (file)
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -16,7 +16,6 @@
 
 #include "OutputParams.h"
 
-#include "support/strfwd.h"
 #include "support/FileName.h"
 #include "support/signals.h"
 

diff --git a/src/Layout.h b/src/Layout.h
index c8f08439f577b022943adbc370e985ead887af03..421ab239fde5da80427f2facc934b1d7b435f513 100644 (file)
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -22,7 +22,6 @@
 
 #include <map>
 #include <set>
-#include <string>
 
 namespace lyx {
 

diff --git a/src/LayoutFile.h b/src/LayoutFile.h
index 87548187edc9ba626af9ea70fb9a95d9b7a01f7d..ad7effdab6b34d72592b3562b835ae33f562d67c 100644 (file)
--- a/src/LayoutFile.h
+++ b/src/LayoutFile.h
@@ -15,8 +15,6 @@
 
 #include "TextClass.h"
 
-#include "support/strfwd.h"
-
 #include <string>
 #include <vector>
 

diff --git a/src/LyX.h b/src/LyX.h
index c35464e210e6626f9d5f6e10f6ed879514b78935..b7c71ce6600264632308e15233c9ac935e0de9f3 100644 (file)
--- a/src/LyX.h
+++ b/src/LyX.h
@@ -14,8 +14,7 @@
 #ifndef LYX_H
 #define LYX_H
 
-#include "support/strfwd.h"
-
+#include <string>
 #include <vector>
 
 namespace lyx {

diff --git a/src/LyXRC.h b/src/LyXRC.h
index a8b4b04452b42c18f84c2840f57cb89ca71fb9db..8c34712d9043a8d6f4e86c2e1a1edd8f27cf49e6 100644 (file)
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -22,7 +22,6 @@
 #include "update_flags.h"
 
 #include "support/Length.h"
-#include "support/strfwd.h"
 #include "support/userinfo.h"
 
 #include <map>

diff --git a/src/LyXVC.h b/src/LyXVC.h
index fd223570172ee0338967ab3e88d7cb9e2f2e1e01..48e544808fa6cb1d03c057f30dcfe61bca0abba0 100644 (file)
--- a/src/LyXVC.h
+++ b/src/LyXVC.h
@@ -15,8 +15,6 @@
 #include "support/docstring.h"
 #include "support/unique_ptr.h"
 
-#include <string>
-
 
 namespace lyx {
 

diff --git a/src/MetricsInfo.h b/src/MetricsInfo.h
index 6f1d404822f2fca5d268a9fa7c388d3422e17d3f..48d313ba71f533a54f2fa8984656e97d62e374a7 100644 (file)
--- a/src/MetricsInfo.h
+++ b/src/MetricsInfo.h
@@ -17,7 +17,6 @@
 #include "ColorCode.h"
 #include "FontInfo.h"
 
-#include "support/strfwd.h"
 #include "support/Changer.h"
 
 #include "insets/Inset.h"

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index c3d057eba8d17d882acded2da52382e600454b18..6a7c80144a6b0495a49cab5da017556b37c1c140 100644 (file)
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -26,7 +26,6 @@
 #include "support/lstrings.h"
 
 #include <sstream>
-#include <string>
 #include <algorithm>
 
 using namespace std;

diff --git a/src/Paragraph.h b/src/Paragraph.h
index 0de720e2d820514e64016ff95473ba313d3f092d..467054499c04ac213c532e6d3f83c8bbdf5db668 100644 (file)
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -19,7 +19,6 @@
 #include "LayoutEnums.h"
 #include "SpellChecker.h"
 
-#include "support/strfwd.h"
 #include "support/types.h"
 
 #include "insets/InsetCode.h"

diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h
index 6f5b4f1b3f0b8f114370f9bcc5a189decca89f98..540ea95679530fc28d7a3636cd8f597d9a72ce4f 100644 (file)
--- a/src/ParagraphParameters.h
+++ b/src/ParagraphParameters.h
@@ -18,7 +18,6 @@
 #include "Spacing.h"
 
 #include "support/types.h"
-#include "support/strfwd.h"
 #include "support/Length.h"
 
 

diff --git a/src/PersonalWordList.h b/src/PersonalWordList.h
index 0194bbcbe69e0eb206903c06b0b3d61b932d1731..9abb3fd14641f68b0dd7ecbfbbb4de7fc8bcb5af 100644 (file)
--- a/src/PersonalWordList.h
+++ b/src/PersonalWordList.h
@@ -12,7 +12,6 @@
 #ifndef PERSONAL_WORD_LIST_H
 #define PERSONAL_WORD_LIST_H
 
-#include "support/strfwd.h"
 #include "support/docstring_list.h"
 #include "support/FileName.h"
 

diff --git a/src/Spacing.h b/src/Spacing.h
index 7311f792b5a3b5ae7ec98e90430db607a30ac52c..d394b28b2bcc11936201b4c0a864acffb8414fd7 100644 (file)
--- a/src/Spacing.h
+++ b/src/Spacing.h
@@ -12,8 +12,6 @@
 #ifndef SPACING_H
 #define SPACING_H
 
-#include "support/strfwd.h"
-
 #include <string>
 
 namespace lyx {

diff --git a/src/SpellChecker.h b/src/SpellChecker.h
index 58e5de6bd2acc66fefb723abcfd510da27d1cfb9..fe8cb9dfc0f5c7b6737943ce00c91a6803822f17 100644 (file)
--- a/src/SpellChecker.h
+++ b/src/SpellChecker.h
@@ -13,7 +13,7 @@
 #ifndef SPELL_BASE_H
 #define SPELL_BASE_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 #include <vector>
 
 

diff --git a/src/Statistics.h b/src/Statistics.h
index 195af0382cf7a6d6e06338edcc76357cdbaa529d..4ccd276752c037881a87004b497503f5dea33c9f 100644 (file)
--- a/src/Statistics.h
+++ b/src/Statistics.h
@@ -12,7 +12,7 @@
 #ifndef STATISTICS_H
 #define STATISTICS_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 #include "support/types.h"
 
 namespace lyx {

diff --git a/src/TextClass.h b/src/TextClass.h
index 7626dc329da4c52d3de647452e93c3da89d274f4..ef5ed7789e3ea1b0940cc3c9c1c107123b2ca423 100644 (file)
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -26,7 +26,6 @@
 #include <list>
 #include <map>
 #include <set>
-#include <string>
 #include <vector>
 
 #ifdef ERROR

diff --git a/src/Thesaurus.h b/src/Thesaurus.h
index 9c13b044cb9ecf30980b0bbdb9b3073d0a046eb9..b85c81621cbc1b6b03f45319229d551af3ca0f84 100644 (file)
--- a/src/Thesaurus.h
+++ b/src/Thesaurus.h
@@ -13,7 +13,7 @@
 #ifndef THESAURUS_H
 #define THESAURUS_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 #include <map>
 #include <vector>

diff --git a/src/TocBackend.h b/src/TocBackend.h
index 68eb825c6d5888120885fecafeef62462bdd3902..eefe7873c69c11bef0238e924d9758319e4e9580 100644 (file)
--- a/src/TocBackend.h
+++ b/src/TocBackend.h
@@ -21,7 +21,6 @@
 #include "Toc.h"
 #include "TocBuilder.h"
 
-#include "support/strfwd.h"
 #include "support/unique_ptr.h"
 
 

diff --git a/src/TocBuilder.h b/src/TocBuilder.h
index eca655ca16dcfbe9e68f5bfac8d971dbfb142450..af9c41cb24e77aa24612a05d207cb10e23863060 100644 (file)
--- a/src/TocBuilder.h
+++ b/src/TocBuilder.h
@@ -14,7 +14,7 @@
 
 #include "Toc.h"
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 #include <stack>
 

diff --git a/src/frontends/Application.h b/src/frontends/Application.h
index 4d2d249b23caff405be6f7553ee387dfc5b9808d..f52b124e2cabeabfb357deb9a1d2f43e629d872e 100644 (file)
--- a/src/frontends/Application.h
+++ b/src/frontends/Application.h
@@ -15,7 +15,7 @@
 #include "FuncCode.h"
 #include "update_flags.h"
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 #include <functional>
 

diff --git a/src/frontends/Clipboard.h b/src/frontends/Clipboard.h
index 5e16a26bbf8d31179d9b2a4d4a2224961ea80181..13066eb279ffe9e076783fa1e7be23f8fe82158b 100644 (file)
--- a/src/frontends/Clipboard.h
+++ b/src/frontends/Clipboard.h
@@ -14,8 +14,6 @@
 #ifndef BASE_CLIPBOARD_H
 #define BASE_CLIPBOARD_H
 
-#include "support/strfwd.h"
-
 namespace lyx {
 
 class Cursor;

diff --git a/src/frontends/Delegates.h b/src/frontends/Delegates.h
index c50df6b33f3b842de7fcedf7067dc13041bede78..715505edc6d61e7d7e7bd1a5b2346d952ba7629d 100644 (file)
--- a/src/frontends/Delegates.h
+++ b/src/frontends/Delegates.h
@@ -12,7 +12,7 @@
 #ifndef DELEGATES_H
 #define DELEGATES_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 namespace lyx {
 

diff --git a/src/frontends/FontLoader.h b/src/frontends/FontLoader.h
index e876e7820030b3d3bf1b5ac04bf9ceb1c5f50615..c59885b77eea148a910a343b8d7a292a064a73ee 100644 (file)
--- a/src/frontends/FontLoader.h
+++ b/src/frontends/FontLoader.h
@@ -12,7 +12,7 @@
 #ifndef FONTLOADER_H
 #define FONTLOADER_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 namespace lyx {
 

diff --git a/src/frontends/FontMetrics.h b/src/frontends/FontMetrics.h
index c9a1d86cda4112a58a52a27e1ef24b504884f2b5..28e3dec4dd5ddd3a5aa1b671f11a8166edfe90f3 100644 (file)
--- a/src/frontends/FontMetrics.h
+++ b/src/frontends/FontMetrics.h
@@ -16,7 +16,7 @@
 
 
 #include "support/mute_warning.h"
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 #include <vector>
 

diff --git a/src/frontends/Painter.h b/src/frontends/Painter.h
index 60953341aff45af69de064acf75a9f705392cc09..d408ca68b2d3039cf2785005a19accfed654f76e 100644 (file)
--- a/src/frontends/Painter.h
+++ b/src/frontends/Painter.h
@@ -13,7 +13,7 @@
 #ifndef PAINTER_H
 #define PAINTER_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 #include "support/types.h"
 
 namespace lyx {

diff --git a/src/frontends/Selection.h b/src/frontends/Selection.h
index 931cb4470efcb051949795a4f85cec0122e7e14f..1aba5bfdd2c280991eb988359d9b4e756939c9de 100644 (file)
--- a/src/frontends/Selection.h
+++ b/src/frontends/Selection.h
@@ -14,7 +14,7 @@
 #ifndef SELECTION_H
 #define SELECTION_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 namespace lyx {
 namespace frontend {

diff --git a/src/frontends/alert.h b/src/frontends/alert.h
index a4556ca2d4899a6f86b0e2f0e92e4733e8704570..dd1318614f651dedf75934816d46c1f265d77638 100644 (file)
--- a/src/frontends/alert.h
+++ b/src/frontends/alert.h
@@ -12,7 +12,7 @@
 #ifndef LYX_ALERT_H
 #define LYX_ALERT_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 
 namespace lyx {

diff --git a/src/frontends/qt/CategorizedCombo.h b/src/frontends/qt/CategorizedCombo.h
index 51bdb4ff0789aab6a555aef47198fb4b89064212..f2a19a69c20cf89b545fe6a9c8637f5f9cc443ab 100644 (file)
--- a/src/frontends/qt/CategorizedCombo.h
+++ b/src/frontends/qt/CategorizedCombo.h
@@ -17,8 +17,6 @@
 #ifndef LYX_CATEGORIZEDCOMBO_H
 #define LYX_CATEGORIZEDCOMBO_H
 
-#include "support/strfwd.h"
-
 #include <QComboBox>
 
 

diff --git a/src/frontends/qt/Dialog.h b/src/frontends/qt/Dialog.h
index 928513c3fe04c3c4190c0b686889d111b2e13bd2..b778f18755d95d28d80924ae58d1e7544cbbaf46 100644 (file)
--- a/src/frontends/qt/Dialog.h
+++ b/src/frontends/qt/Dialog.h
@@ -16,8 +16,6 @@
 
 #include "insets/InsetCode.h"
 
-#include "support/strfwd.h"
-
 #include <QString>
 
 class QSettings;

diff --git a/src/frontends/qt/FindAndReplace.h b/src/frontends/qt/FindAndReplace.h
index 07c03eab0f78158602d6b4924d9abcd2f1c3014e..cb4691a07b81c26441b44bd76339b54d0ef849cf 100644 (file)
--- a/src/frontends/qt/FindAndReplace.h
+++ b/src/frontends/qt/FindAndReplace.h
@@ -18,7 +18,6 @@
 #include "ui_FindAndReplaceUi.h"
 #include "support/docstring.h"
 
-#include <string>
 
 namespace lyx {
 

diff --git a/src/frontends/qt/GuiCitation.cpp b/src/frontends/qt/GuiCitation.cpp
index 1800543d4a58b5fed96b72c91b83fe055e75ed05..8c3be320ad2c9d360971790607d6f9c11a7b947d 100644 (file)
--- a/src/frontends/qt/GuiCitation.cpp
+++ b/src/frontends/qt/GuiCitation.cpp
@@ -49,7 +49,6 @@
 
 #include <algorithm>
 #include <regex>
-#include <string>
 #include <vector>
 
 using namespace std;

diff --git a/src/frontends/qt/GuiDelimiter.cpp b/src/frontends/qt/GuiDelimiter.cpp
index 3d064288f53f420bb03d9a7c9eeba0370fec3dfa..3cb70449f61c473c7c13bd045369922f5def227e 100644 (file)
--- a/src/frontends/qt/GuiDelimiter.cpp
+++ b/src/frontends/qt/GuiDelimiter.cpp
@@ -34,7 +34,6 @@
 #include <QScrollBar>
 
 #include <map>
-#include <string>
 
 using namespace std;
 

diff --git a/src/frontends/qt/GuiDelimiter.h b/src/frontends/qt/GuiDelimiter.h
index e0450a296d2b98fc36057633e00aac6aee3ba9d4..f36ecd10ee4245b3f947020612ae3b088afc5427 100644 (file)
--- a/src/frontends/qt/GuiDelimiter.h
+++ b/src/frontends/qt/GuiDelimiter.h
@@ -12,6 +12,8 @@
 #ifndef GUIDELIMITERDIALOG_H
 #define GUIDELIMITERDIALOG_H
 
+#include "support/docstring.h"
+
 #include "GuiDialog.h"
 
 #include "ui_DelimiterUi.h"

diff --git a/src/frontends/qt/GuiSymbols.h b/src/frontends/qt/GuiSymbols.h
index 260ce53a74d2d6e1d52585b872f479324a06b354..775969012b69bec36792b4a801b11da05b505e37 100644 (file)
--- a/src/frontends/qt/GuiSymbols.h
+++ b/src/frontends/qt/GuiSymbols.h
@@ -12,11 +12,12 @@
 #ifndef GUISYMBOLSDIALOG_H
 #define GUISYMBOLSDIALOG_H
 
+#include "support/docstring.h"
+
 #include "DialogView.h"
 #include "ui_SymbolsUi.h"
 
 #include <map>
-#include <string>
 #include <vector>
 
 namespace lyx {

diff --git a/src/frontends/qt/GuiToolbar.h b/src/frontends/qt/GuiToolbar.h
index 23ee9610d14b39deeee9e251080fdc3eeecc68c3..1b780b6bbbf941e14cf960ea3ff1f15393bbd80b 100644 (file)
--- a/src/frontends/qt/GuiToolbar.h
+++ b/src/frontends/qt/GuiToolbar.h
@@ -20,8 +20,6 @@
 #include <QToolBar>
 #include <QToolButton>
 
-#include "support/strfwd.h"
-
 class QSettings;
 
 namespace lyx {

diff --git a/src/frontends/qt/GuiView.h b/src/frontends/qt/GuiView.h
index b7726e02305bd78c3bace4a3fb5a02bc012c9a47..7ff366c3b42172b406420fcb45d609b7c580adda 100644 (file)
--- a/src/frontends/qt/GuiView.h
+++ b/src/frontends/qt/GuiView.h
@@ -17,8 +17,6 @@
 
 #include "frontends/Delegates.h"
 
-#include "support/strfwd.h"
-
 #include <QMainWindow>
 #include <QLabel>
 #include <QMenu>

diff --git a/src/frontends/qt/InsetParamsDialog.h b/src/frontends/qt/InsetParamsDialog.h
index 2683a4da83fb8f3794766805bda540cc0d049b1d..cab2c5edf98cae5d54b054e07e5f49f600421030 100644 (file)
--- a/src/frontends/qt/InsetParamsDialog.h
+++ b/src/frontends/qt/InsetParamsDialog.h
@@ -12,6 +12,8 @@
 #ifndef INSET_PARAMS_DIALOG_H
 #define INSET_PARAMS_DIALOG_H
 
+#include "support/docstring.h"
+
 #include "DialogView.h"
 #include "ui_InsetParamsUi.h"
 

diff --git a/src/frontends/qt/InsetParamsWidget.h b/src/frontends/qt/InsetParamsWidget.h
index 0811ca5e49d9b35edd22db69851c96300f2b506b..8a0fb98fd502ad4a67cdc77fd2bdd4f20bf57a27 100644 (file)
--- a/src/frontends/qt/InsetParamsWidget.h
+++ b/src/frontends/qt/InsetParamsWidget.h
@@ -16,7 +16,7 @@
 
 #include "FuncCode.h"
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 #include <QWidget>
 

diff --git a/src/frontends/qt/LayoutBox.h b/src/frontends/qt/LayoutBox.h
index bbccb74ae8bfb1b6c2840a043ce879ef6ec962fe..90dde03449e136f0333bede189cf07c797357315 100644 (file)
--- a/src/frontends/qt/LayoutBox.h
+++ b/src/frontends/qt/LayoutBox.h
@@ -16,7 +16,7 @@
 #ifndef LYX_LAYOUT_BOX_H
 #define LYX_LAYOUT_BOX_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 #include <QComboBox>
 

diff --git a/src/graphics/GraphicsTypes.h b/src/graphics/GraphicsTypes.h
index 90d390cae1c01192a3b32b41887eaeaacab6530f..a0625a4a429afcb96adf2050a30bc72e0b33c45a 100644 (file)
--- a/src/graphics/GraphicsTypes.h
+++ b/src/graphics/GraphicsTypes.h
@@ -15,9 +15,6 @@
 #ifndef GRAPHICSTYPES_H
 #define GRAPHICSTYPES_H
 
-#include "support/strfwd.h"
-
-
 namespace lyx {
 namespace graphics {
 

diff --git a/src/graphics/PreviewImage.h b/src/graphics/PreviewImage.h
index 6d26748092a85c3398ed61fd97ebdbc33942c5b5..c36c607a116c94a71ab58c5c3c447d34a7058313 100644 (file)
--- a/src/graphics/PreviewImage.h
+++ b/src/graphics/PreviewImage.h
@@ -12,7 +12,7 @@
 #ifndef PREVIEWIMAGE_H
 #define PREVIEWIMAGE_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 namespace lyx {
 

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index 336843d41af6b9a6119893cbe1a12542017e432b..19ca818073e350c4b0a8fb358c56bf5012cd2f09 100644 (file)
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -24,7 +24,6 @@
 #include "RowFlags.h"
 
 #include "support/docstring.h"
-#include "support/strfwd.h"
 #include "support/types.h"
 
 #include <climits>

diff --git a/src/insets/InsetCommandParams.h b/src/insets/InsetCommandParams.h
index 2faaf3f545799b6a7d1c9283f5272c4152cd50d8..bfb8b04cf6a540c5d37797a2d156d94267bc6ab6 100644 (file)
--- a/src/insets/InsetCommandParams.h
+++ b/src/insets/InsetCommandParams.h
@@ -18,7 +18,6 @@
 
 #include "support/docstring.h"
 
-#include <string>
 #include <vector>
 #include <map>
 

diff --git a/src/insets/InsetLayout.h b/src/insets/InsetLayout.h
index 21f5095d1a8aa6e5eaaf0c9a1fd4f3c0a1fdd3a8..eb1bb1df86cf41c77968ffe3ce5bea77410f0ef4 100644 (file)
--- a/src/insets/InsetLayout.h
+++ b/src/insets/InsetLayout.h
@@ -20,7 +20,6 @@
 #include "support/docstring.h"
 
 #include <set>
-#include <string>
 
 namespace lyx {
 

diff --git a/src/lyxfind.h b/src/lyxfind.h
index b700e0ce1a5065013f8bc1cdf1d2c4d43a72fab2..84d2400e2b53168fd4034371be4ba6066ffb9453 100644 (file)
--- a/src/lyxfind.h
+++ b/src/lyxfind.h
@@ -16,8 +16,6 @@
 #ifndef LYXFIND_H
 #define LYXFIND_H
 
-#include "support/strfwd.h"
-
 // FIXME
 #include "support/docstring.h"
 

diff --git a/src/mathed/InsetMathDecoration.cpp b/src/mathed/InsetMathDecoration.cpp
index 960b6b78ab282af767ca4ef711e5323a84cb280f..92140368c30407143e94ef7576e5fa7fb5079736 100644 (file)
--- a/src/mathed/InsetMathDecoration.cpp
+++ b/src/mathed/InsetMathDecoration.cpp
@@ -30,7 +30,6 @@
 #include "support/lstrings.h"
 
 #include <algorithm>
-#include <ostream>
 
 using namespace lyx::support;
 

diff --git a/src/mathed/InsetMathMatrix.h b/src/mathed/InsetMathMatrix.h
index 6aa44c1d5ca30060ae3a7c402e8beb57928a8d94..3b752c22b9d4b116d754fbf027ead4c0a02452b6 100644 (file)
--- a/src/mathed/InsetMathMatrix.h
+++ b/src/mathed/InsetMathMatrix.h
@@ -13,7 +13,6 @@
 #define MATH_MATRIXINSET_H
 
 #include "InsetMathGrid.h"
-#include "support/strfwd.h"
 
 
 namespace lyx {

diff --git a/src/mathed/MathAutoCorrect.h b/src/mathed/MathAutoCorrect.h
index a782d678eedcb8c0a4667149db6251a1511e6853..3a4a25a811ba24a90c3de8ad65514f96cab2679f 100644 (file)
--- a/src/mathed/MathAutoCorrect.h
+++ b/src/mathed/MathAutoCorrect.h
@@ -12,7 +12,7 @@
 #ifndef MATHAUTOCORRECT_H
 #define MATHAUTOCORRECT_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 namespace lyx {
 

diff --git a/src/mathed/MathClass.cpp b/src/mathed/MathClass.cpp
index 1d352cd746943de83949ab7336dc9dc126c25001..f2d015ada588f47bf887f29087cc0b7ad1e9ebd6 100644 (file)
--- a/src/mathed/MathClass.cpp
+++ b/src/mathed/MathClass.cpp
@@ -20,8 +20,6 @@
 #include "support/docstring.h"
 #include "support/lassert.h"
 
-#include <ostream>
-
 using namespace std;
 
 namespace lyx {

diff --git a/src/mathed/MathClass.h b/src/mathed/MathClass.h
index af4f884cca5df2824700a7cac78313bf2aff9a9b..f78ea2bae320f313d14ff4851036389a7cb2c974 100644 (file)
--- a/src/mathed/MathClass.h
+++ b/src/mathed/MathClass.h
@@ -12,7 +12,7 @@
 #ifndef MATH_CLASS_H
 #define MATH_CLASS_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 namespace lyx {
 

diff --git a/src/mathed/MathData.h b/src/mathed/MathData.h
index 6ff477f592e58d18d4e749b2bcc2a2e4571a3c4c..dc04a9bb4c233b8e85f5a6d8ee86ae5277b45173 100644 (file)
--- a/src/mathed/MathData.h
+++ b/src/mathed/MathData.h
@@ -21,8 +21,6 @@
 #include "Dimension.h"
 #include "OutputEnums.h"
 
-#include "support/strfwd.h"
-
 #include <cstddef>
 #include <vector>
 

diff --git a/src/mathed/MathExtern.h b/src/mathed/MathExtern.h
index 2544ebf811f4b8305eec12b1caadf8f06d3d0a3c..a1a9020ac9cc135c9a757bd24427b696a57218b3 100644 (file)
--- a/src/mathed/MathExtern.h
+++ b/src/mathed/MathExtern.h
@@ -12,7 +12,7 @@
 #ifndef MATH_EXTERN_H
 #define MATH_EXTERN_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 namespace lyx {
 

diff --git a/src/mathed/MathFactory.h b/src/mathed/MathFactory.h
index b6fdb5044a34aea6e3b2073194d76ca22b74f254..d653c54fb3d19324f95d5d7dc95a1c585027fbab 100644 (file)
--- a/src/mathed/MathFactory.h
+++ b/src/mathed/MathFactory.h
@@ -14,8 +14,6 @@
 
 #include "MathParser.h"
 
-#include "support/strfwd.h"
-
 #include <map>
 
 namespace lyx {

diff --git a/src/mathed/MathStream.cpp b/src/mathed/MathStream.cpp
index a9d6e0498ed1d34555fb929068bec8b07e13fa29..6c0bb31940eec488068ce3134b5cbec46c169bd9 100644 (file)
--- a/src/mathed/MathStream.cpp
+++ b/src/mathed/MathStream.cpp
@@ -25,7 +25,6 @@
 
 #include <algorithm>
 #include <cstring>
-#include <ostream>
 #include <FontInfo.h>
 
 using namespace std;

diff --git a/src/mathed/MathStream.h b/src/mathed/MathStream.h
index c49384cddaad7ffd2178624e568400bac79a97d4..bd0e90c3f59fe6d0caf8683fea2adbc281adb181 100644 (file)
--- a/src/mathed/MathStream.h
+++ b/src/mathed/MathStream.h
@@ -19,7 +19,6 @@
 #include "texstream.h"
 
 #include "support/Changer.h"
-#include "support/strfwd.h"
 
 
 namespace lyx {

diff --git a/src/mathed/MathSupport.h b/src/mathed/MathSupport.h
index 1f83ffb6f26537957249467ab5a3212163b473b6..d3766c693e89e53baa52eb6b39fcb9fe93b6903a 100644 (file)
--- a/src/mathed/MathSupport.h
+++ b/src/mathed/MathSupport.h
@@ -14,7 +14,7 @@
 #define MATH_SUPPORT_H
 
 #include "MathParser_flags.h"
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 namespace lyx {
 

diff --git a/src/output_docbook.h b/src/output_docbook.h
index 1fd8d5e8964fa37674549325e0ea83ac0df26fab..aaf17559f27c884522615ebb213f22c3bb4d5a7d 100644 (file)
--- a/src/output_docbook.h
+++ b/src/output_docbook.h
@@ -28,7 +28,6 @@
 #include "ParagraphList.h"
 
 #include "support/docstream.h"
-#include "support/strfwd.h"
 #include "xml.h"
 
 namespace lyx {

diff --git a/src/output_plaintext.h b/src/output_plaintext.h
index 8b2e4f9d1c04f68d99b9f21a22b0029813d8ef57..63519cf338d1163b8b340f02fb07abe05e195609 100644 (file)
--- a/src/output_plaintext.h
+++ b/src/output_plaintext.h
@@ -12,7 +12,7 @@
 #ifndef OUTPUT_PLAINTEXT_H
 #define OUTPUT_PLAINTEXT_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 #include "support/types.h"
 
 #include <climits>

diff --git a/src/output_xhtml.h b/src/output_xhtml.h
index 3877fb0c7b1c37b602998d5c8a3dbb9b84559524..930798b7775a3a488e2e626348c01cfe210861eb 100644 (file)
--- a/src/output_xhtml.h
+++ b/src/output_xhtml.h
@@ -14,7 +14,6 @@
 
 #include "LayoutEnums.h"
 
-#include "support/strfwd.h"
 #include "xml.h"
 
 

diff --git a/src/support/ConsoleApplication.h b/src/support/ConsoleApplication.h
index 2b8ed2b80b3fb4eb9bb574347c73d915bb0deb28..4c025cdb8f5ba77dab795a47b66a45d2ac37b2cc 100644 (file)
--- a/src/support/ConsoleApplication.h
+++ b/src/support/ConsoleApplication.h
@@ -11,7 +11,7 @@
 #ifndef CONSOLEAPPLICATION_H
 #define CONSOLEAPPLICATION_H
 
-#include "support/strfwd.h"
+#include <string>
 
 namespace lyx {
 

diff --git a/src/support/FileName.h b/src/support/FileName.h
index 35f182e42882b3dc5970db29817c4b6a63bd8246..4611ee8b6fa674704973ce55c86a5be60095346c 100644 (file)
--- a/src/support/FileName.h
+++ b/src/support/FileName.h
@@ -13,7 +13,6 @@
 #define FILENAME_H
 
 #include "support/os.h"
-#include "support/strfwd.h"
 
 #include <ctime>
 #include <set>

diff --git a/src/support/ForkedCalls.h b/src/support/ForkedCalls.h
index e64e53c6df0239e805fab7afedd0beca9cc25e2a..734f193b877d110ced75d79198a459f196747753 100644 (file)
--- a/src/support/ForkedCalls.h
+++ b/src/support/ForkedCalls.h
@@ -15,7 +15,7 @@
 #define FORKEDCALLS_H
 
 #include "support/signals.h"
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>

diff --git a/src/support/Length.h b/src/support/Length.h
index cb612b6135c8b9b7027eb0aa915756e07449a9a8..0a4e1adb1cbbdddcf2bf5316635389b124e4e6e9 100644 (file)
--- a/src/support/Length.h
+++ b/src/support/Length.h
@@ -15,7 +15,7 @@
 #ifndef LENGTH_H
 #define LENGTH_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 
 namespace lyx {

diff --git a/src/support/Lexer.h b/src/support/Lexer.h
index 96ac205abadae322889d1f68c73defdd043cf17c..9ca6e1e6f70b37c3e69a28970d59b860b5159121 100644 (file)
--- a/src/support/Lexer.h
+++ b/src/support/Lexer.h
@@ -17,8 +17,7 @@
 #ifndef LEXER_H
 #define LEXER_H
 
-#include "support/strfwd.h"
-#include <string>
+#include "support/docstring.h"
 
 namespace lyx {
 

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index efcefb673671fc530a7ebef3670579c548c0006c..2122cc4a42595d1264043833e9d33edb1af6165f 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -106,7 +106,6 @@ liblyxsupport_a_SOURCES = \
        signals.h \
        socktools.cpp \
        socktools.h \
-       strfwd.h \
        Systemcall.cpp \
        Systemcall.h \
        SystemcallPrivate.h \

diff --git a/src/support/Messages.h b/src/support/Messages.h
index 9f33d45e6fd610662da8d73cd534fc0d40c7dc7d..e4670e4f6f133a4a806a1f62a29c2296f80dce8e 100644 (file)
--- a/src/support/Messages.h
+++ b/src/support/Messages.h
@@ -14,7 +14,6 @@
 #include "support/docstring.h"
 
 #include <map>
-#include <string>
 
 namespace lyx {
 

diff --git a/src/support/ProgressInterface.h b/src/support/ProgressInterface.h
index 4a9a1edb68ac8c7e60a8a9f962d35a8f857a7591..2f411abcfe58ed91401f5646e1db8bd207473827 100644 (file)
--- a/src/support/ProgressInterface.h
+++ b/src/support/ProgressInterface.h
@@ -12,7 +12,7 @@
 #ifndef LYX_SUPPORT_PROGRESSINTERFACE_H
 #define LYX_SUPPORT_PROGRESSINTERFACE_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 class QString;
 

diff --git a/src/support/Systemcall.h b/src/support/Systemcall.h
index 537a701afab09c333f5839862df263fc4534029d..d73a9280972951d5012e42a4f6bb83b99ae6c3bb 100644 (file)
--- a/src/support/Systemcall.h
+++ b/src/support/Systemcall.h
@@ -15,8 +15,6 @@
 #ifndef SYSTEMCALL_H
 #define SYSTEMCALL_H
 
-#include "strfwd.h"
-
 namespace lyx {
 namespace support {
 

diff --git a/src/support/convert.cpp b/src/support/convert.cpp
index 46de4b455cd954d5c4d1475f405a948af92176b3..d172469bc8bc59d9676cffd8e14912bcfe8ae40a 100644 (file)
--- a/src/support/convert.cpp
+++ b/src/support/convert.cpp
@@ -14,7 +14,6 @@
 #include "support/convert.h"
 #include "support/docstring.h"
 
-#include <string>
 #include <sstream>
 //needed for Mac OSX 10.5.2 Leopard
 #include <cstdlib>

diff --git a/src/support/convert.h b/src/support/convert.h
index ac0fd2903ad4cf922dc41c0324b80b257387cff1..e49f5bd8802d2cb515507e9341365437ace93793 100644 (file)
--- a/src/support/convert.h
+++ b/src/support/convert.h
@@ -16,7 +16,7 @@
 #ifndef CONVERT_H
 #define CONVERT_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 namespace lyx {
 

diff --git a/src/support/counter_reps.h b/src/support/counter_reps.h
index 59305dc427c8fd12b45ff522273ff6a2758ff1dc..bafec250f91946d85be54d8035bce05cf9f8d4c6 100644 (file)
--- a/src/support/counter_reps.h
+++ b/src/support/counter_reps.h
@@ -17,7 +17,7 @@
 #ifndef COUNTER_REPS_H
 #define COUNTER_REPS_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 namespace lyx {
 

diff --git a/src/support/debug.h b/src/support/debug.h
index f823ee156e761b07de3474d79792db279e6598ee..6ab59b553899cbb9eacdf487edc39ffc3f8f0927 100644 (file)
--- a/src/support/debug.h
+++ b/src/support/debug.h
@@ -15,7 +15,7 @@
 #ifndef LYXDEBUG_H
 #define LYXDEBUG_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 // Forward definitions do not work with libc++
 // but ios_base has already been defined in strfwd

diff --git a/src/support/docstring.h b/src/support/docstring.h
index 2c2901bf9d7dcde75e90eeeb2429d4b2c6043408..2a760eacee365ad46ef3a008cf96e8bea5c4bc52 100644 (file)
--- a/src/support/docstring.h
+++ b/src/support/docstring.h
@@ -13,12 +13,71 @@
 #ifndef LYX_DOCSTRING_H
 #define LYX_DOCSTRING_H
 
-#include "support/strfwd.h"
+#ifdef USE_WCHAR_T
+
+// Prefer this if possible because GNU libstdc++ has usable
+// std::ctype<wchar_t> locale facets but not
+// std::ctype<boost::uint32_t>. gcc older than 3.4 is also missing
+// usable std::char_traits<boost::uint32_t>.
+namespace lyx { typedef wchar_t char_type; }
+
+#else
+
+#include <cstdint>
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1600)
+namespace lyx { typedef uint32_t char_type; }
+#include "support/numpunct_lyx_char_type.h" // implementation for our char_type needed
+#else
+namespace lyx { typedef std::uint32_t char_type; }
+#endif
+
+#endif
 
 #include <string>
 
 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, std::char_traits<char_type>,
+       std::allocator<char_type> > docstring;
+
+/// Base class for UCS4 input streams
+typedef std::basic_istream<char_type, std::char_traits<char_type> > idocstream;
+
+/// Base class for UCS4 output streams
+typedef std::basic_ostream<char_type, std::char_traits<char_type> > odocstream;
+
+/// UCS4 output stringstream
+typedef std::basic_ostringstream<char_type, std::char_traits<char_type>, std::allocator<char_type> > odocstringstream;
+
+#if ! defined(USE_WCHAR_T)
+extern odocstream & operator<<(odocstream &, char);
+#endif
+
+// defined in lstrings.cpp
+docstring const & empty_docstring();
+std::string const & empty_string();
+// defined in docstring.cpp
+bool operator==(docstring const &, char const *);
+
+#ifdef STD_STRING_USES_COW
+template<typename Char> class trivial_string;
+typedef trivial_string<char> trivstring;
+typedef trivial_string<char_type> trivdocstring;
+#else
+typedef std::string trivstring;
+typedef docstring trivdocstring;
+#endif
+
+} // namespace lyx
+
+namespace lyx {
+
 /// Creates a docstring from a C string of ASCII characters
 docstring const from_ascii(char const *);
 

diff --git a/src/support/filetools.h b/src/support/filetools.h
index ceb1da62be8954dc0085ad0c1b5ce14ebd5132e8..14aea9c21697af4f6e0b3e04c4b717e5b05c119a 100644 (file)
--- a/src/support/filetools.h
+++ b/src/support/filetools.h
@@ -15,7 +15,6 @@
 #include "support/docstring.h"
 
 #include <utility>
-#include <string>
 #include <set>
 
 namespace lyx {

diff --git a/src/support/gettext.h b/src/support/gettext.h
index 317feec82ec6ba5a78bb84a2ac172341baf3de37..19ba3bf0fa65ab11ab0880ce6bd5a19db2460908 100644 (file)
--- a/src/support/gettext.h
+++ b/src/support/gettext.h
@@ -13,7 +13,7 @@
 #ifndef GETTEXT_H
 #define GETTEXT_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 
 namespace lyx {

diff --git a/src/support/lassert.h b/src/support/lassert.h
index 58f299f7af02edf19f701a1350191febd5a2eade..2d53a3b52fb639e06e40a74998e9376a982cc6c4 100644 (file)
--- a/src/support/lassert.h
+++ b/src/support/lassert.h
@@ -15,7 +15,7 @@
 
 #ifdef __cplusplus
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 namespace lyx {
 

diff --git a/src/support/lyxtime.h b/src/support/lyxtime.h
index 05cbc508411be0e8cec72cf05ff75b29bb874c78..366ee221a1fc4151d648bfc7c48da1ff447558b3 100644 (file)
--- a/src/support/lyxtime.h
+++ b/src/support/lyxtime.h
@@ -14,9 +14,8 @@
 #define LYXTIME_H
 
 #include <time.h>
-#include <string>
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 
 namespace lyx {

diff --git a/src/support/os.h b/src/support/os.h
index 20b4e96346c1dcc8b884f7e5e0da6152b6c81044..1b664e444492792d93509ed9af05d827e6fd883e 100644 (file)
--- a/src/support/os.h
+++ b/src/support/os.h
@@ -14,7 +14,7 @@
 #ifndef OS_H
 #define OS_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 #include <cstddef>
 
 

diff --git a/src/support/qstring_helpers.h b/src/support/qstring_helpers.h
index 905343e77d568d164055dcc0c609bc6127a48dbf..bb608b2334a764ceec2499bdf1c2e6df58f51848 100644 (file)
--- a/src/support/qstring_helpers.h
+++ b/src/support/qstring_helpers.h
@@ -12,7 +12,7 @@
 #ifndef QSTRING_HELPERS_H
 #define QSTRING_HELPERS_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 
 class QString;
 

diff --git a/src/support/strfwd.h b/src/support/strfwd.h
deleted file mode 100644 (file)
index eef3a83..0000000
--- a/src/support/strfwd.h
+++ /dev/null
@@ -1,114 +0,0 @@
-// -*- C++ -*-
-
-// Heavily inspired by /usr/include/c++/4.1/bits
-//
-// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-#ifndef STRFWD_H
-#define STRFWD_H
-
-#ifdef USE_WCHAR_T
-
-// Prefer this if possible because GNU libstdc++ has usable
-// std::ctype<wchar_t> locale facets but not
-// std::ctype<boost::uint32_t>. gcc older than 3.4 is also missing
-// usable std::char_traits<boost::uint32_t>.
-namespace lyx { typedef wchar_t char_type; }
-
-#else
-
-#include <cstdint>
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1600)
-namespace lyx { typedef uint32_t char_type; }
-#include "support/numpunct_lyx_char_type.h" // implementation for our char_type needed
-#else
-namespace lyx { typedef std::uint32_t char_type; }
-#endif
-
-#endif
-
-// Forward definitions do not work with libc++
-// For gcc5 with the new std::string ABI forward declarations would work in
-// principle, but I am not sure whether we want non-standard
-// "namespace __cxx11" in our sources.
-#if defined(USE_LLVM_LIBCPP) || defined(USE_GLIBCXX_CXX11_ABI)
-#include <string>
-#else
-
-namespace std {
-
-template<typename Alloc> class allocator;
-
-template<typename Char> struct char_traits;
-template<> struct char_traits<char>;
-#ifdef USE_WCHAR_T
-template<> struct char_traits<wchar_t>;
-#endif
-
-template<typename Char, typename Traits, typename Alloc> class basic_string;
-typedef basic_string<char, char_traits<char>, allocator<char> > string;
-
-template<class Char, class Traits> class basic_istream;
-template<class Char, class Traits> class basic_ostream;
-template<class Char, class Traits, class Allocator> class basic_ostringstream;
-
-typedef basic_istream<char, char_traits<char> > istream;
-typedef basic_ostream<char, char_traits<char> > ostream;
-typedef basic_ostringstream<char, char_traits<char>, allocator<char> > ostringstream;
-
-} // namespace std
-
-#endif
-
-
-
-
-
-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, std::char_traits<char_type>,
-       std::allocator<char_type> > docstring;
-
-/// Base class for UCS4 input streams
-typedef std::basic_istream<char_type, std::char_traits<char_type> > idocstream;
-
-/// Base class for UCS4 output streams
-typedef std::basic_ostream<char_type, std::char_traits<char_type> > odocstream;
-
-/// UCS4 output stringstream
-typedef std::basic_ostringstream<char_type, std::char_traits<char_type>, std::allocator<char_type> > odocstringstream;
-
-#if ! defined(USE_WCHAR_T)
-extern odocstream & operator<<(odocstream &, char);
-#endif
-
-// defined in lstrings.cpp
-docstring const & empty_docstring();
-std::string const & empty_string();
-// defined in docstring.cpp
-bool operator==(docstring const &, char const *);
-
-#ifdef STD_STRING_USES_COW
-template<typename Char> class trivial_string;
-typedef trivial_string<char> trivstring;
-typedef trivial_string<char_type> trivdocstring;
-#else
-typedef std::string trivstring;
-typedef docstring trivdocstring;
-#endif
-
-} // namespace lyx
-
-#endif

diff --git a/src/support/textutils.h b/src/support/textutils.h
index 64498fab7078bc3feb1dcd5f3dae21edd9c7ac09..1409b0a2fbcae59331b8044366895cf6f9d57b8c 100644 (file)
--- a/src/support/textutils.h
+++ b/src/support/textutils.h
@@ -15,9 +15,6 @@
 #ifndef TEXTUTILS_H
 #define TEXTUTILS_H
 
-#include "support/strfwd.h"
-
-
 namespace lyx {
 
 /// return true if the char is a line separator

diff --git a/src/support/trivstring.cpp b/src/support/trivstring.cpp
index d2325cbbabf37a4025e4e858f4b39a158a6efb4f..c5102526a8e1c967300807567b20543a3337eef1 100644 (file)
--- a/src/support/trivstring.cpp
+++ b/src/support/trivstring.cpp
@@ -15,7 +15,6 @@
 
 #ifdef STD_STRING_USES_COW
 #include <algorithm>
-#include <ostream>
 #include <stdexcept>
 
 using namespace std;

diff --git a/src/support/trivstring.h b/src/support/trivstring.h
index 6b935eee02eb325ad6cbe200de1334ba29b91cf5..3b47f6dc85683ab05a20c060f4d7d6dc9df6d2f6 100644 (file)
--- a/src/support/trivstring.h
+++ b/src/support/trivstring.h
@@ -12,8 +12,6 @@
 #ifndef LYX_TRIVSTRING_H
 #define LYX_TRIVSTRING_H
 
-#include "support/strfwd.h"
-
 #ifdef STD_STRING_USES_COW
 #include <cstdlib>
 

diff --git a/src/support/unicode.h b/src/support/unicode.h
index 74c37bdf4a9528d2d0e71d95293c43047a1f0df4..46cea696cc2ae5bf40cd7ed5265b29794490b519 100644 (file)
--- a/src/support/unicode.h
+++ b/src/support/unicode.h
@@ -14,11 +14,10 @@
 #ifndef LYX_SUPPORT_UNICODE_H
 #define LYX_SUPPORT_UNICODE_H
 
-#include "support/strfwd.h"
+#include "support/docstring.h"
 #include "support/unique_ptr.h"
 
 #include <cstddef>
-#include <string>
 #include <vector>
 
 

diff --git a/src/support/userinfo.h b/src/support/userinfo.h
index 096e8ff47bc3a2847273a79b3712ad37b57ae6fe..deee3ed80961302ef82e7d550f9c4208397676b5 100644 (file)
--- a/src/support/userinfo.h
+++ b/src/support/userinfo.h
@@ -12,7 +12,7 @@
 #ifndef USERINFO_H
 #define USERINFO_H
 
-#include "support/strfwd.h"
+#include <string>
 
 
 namespace lyx {