add <string> and other small fixes to make

Lars' std::string patch compile with STLport.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7864 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index e5cb4ad2730e71d0dbdd67276e2f36deb9dfbb35..894061399f8ef9b0555bd4cf73682eb04210ac14 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,27 @@
+<<<<<<< ChangeLog
+2003-10-07  Martin Vermeer <martin.vermeer@hut.fi>
+
+       * CutAndPaste.h:
+       * DepTable.h:
+       * FloatList.h:
+       * LaTeXFeatures.h:
+       * ParagraphParameters.h:
+       * TextCache.h:
+       * Thesaurus.h:
+       * bufferlist.h:
+       * exporter.h:
+       * importer.h:
+       * lastfiles.h:
+       * lyxfind.h:
+       * lyxfont.h:
+       * lyxlex.h:
+       * lyxtextclasslist.h:
+       * messages.h:
+       * paragraph.h:
+       * paragraph_pimpl.C:
+       * textcursor.h: add <string> and other small fixes to make Lars'
+       std::string patch compile with STLport.
+
 2003-10-06  Angus Leeming  <leeming@lyx.org>
 
        * LColor.h: Add missing #include <string>.

diff --git a/src/CutAndPaste.h b/src/CutAndPaste.h
index 25cb10c13651f1bc628a0f17c5e9101d4a3245e7..7d2e4a1a853928f9083d73ea65097a33e83bcefb 100644 (file)
--- a/src/CutAndPaste.h
+++ b/src/CutAndPaste.h
@@ -17,6 +17,7 @@
 #include "ParagraphList_fwd.h"
 #include "support/types.h"
 
+#include <string>
 #include <vector>
 
 class Buffer;

diff --git a/src/DepTable.h b/src/DepTable.h
index 6148f67736507a140c768734bf38d61d91a45ba8..f74e8cbec03bfb8464e45c34887ffedf81e7b813 100644 (file)
--- a/src/DepTable.h
+++ b/src/DepTable.h
@@ -14,6 +14,7 @@
 #define DEP_TABLE_H
 
 #include <map>
+#include <string>
 
 ///
 class DepTable {

diff --git a/src/FloatList.h b/src/FloatList.h
index 212050f4e15105a48b0c2277b6fdda28d2ef2d0b..c8a9df46e2fa4d756a2fe79bee633de3d8e98788 100644 (file)
--- a/src/FloatList.h
+++ b/src/FloatList.h
@@ -13,6 +13,7 @@
 #define FLOATLIST_H
 
 #include <map>
+#include <string>
 
 
 class Floating;

diff --git a/src/LaTeXFeatures.h b/src/LaTeXFeatures.h
index daa6231c2b3f966a6558dbfdc0e38f92efc30c38..c179896daaa94f584d73a7e25d1aeb3c63230cdf 100644 (file)
--- a/src/LaTeXFeatures.h
+++ b/src/LaTeXFeatures.h
@@ -17,6 +17,7 @@
 #include <set>
 #include <list>
 #include <map>
+#include <string>
 
 class Buffer;
 class BufferParams;

diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h
index 60aaeba7aabc2fc321439c875c447250efe30b45..7c1726267a6d40fb7a749a5c880a76f5c51da128 100644 (file)
--- a/src/ParagraphParameters.h
+++ b/src/ParagraphParameters.h
@@ -20,6 +20,7 @@
 #include "support/types.h"
 
 #include <iosfwd>
+#include <string>
 
 class BufferView;
 class LyXLength;

diff --git a/src/TextCache.h b/src/TextCache.h
index d8ae4ce383267033b6a9442f59fd05729acaccdb..50c60852520addaef9f6893e3a834f75b19fd949 100644 (file)
--- a/src/TextCache.h
+++ b/src/TextCache.h
@@ -14,6 +14,7 @@
 
 #include <iosfwd>
 #include <map>
+#include <string>
 
 class Buffer;
 class LyXText;

diff --git a/src/Thesaurus.h b/src/Thesaurus.h
index a673e04765a1f6792932768a066f4945e18b7fb9..c3ea6904e9434fbe4c077e44ee5288203482f5f5 100644 (file)
--- a/src/Thesaurus.h
+++ b/src/Thesaurus.h
@@ -14,6 +14,7 @@
 
 #include <vector>
 #include <map>
+#include <string>
 
 #ifdef HAVE_LIBAIKSAURUS
 #include AIKSAURUS_H_LOCATION

diff --git a/src/bufferlist.h b/src/bufferlist.h
index 84f9a8047ed5e30b52ff3d00ad056c97c4ddeeb4..19dfd51d3ceeb22be66ec91c92e79d09f68995bd 100644 (file)
--- a/src/bufferlist.h
+++ b/src/bufferlist.h
@@ -14,6 +14,7 @@
 
 #include <boost/utility.hpp>
 
+#include <string>
 #include <vector>
 
 class Buffer;

diff --git a/src/exporter.h b/src/exporter.h
index 985b213dd00219f1e37c3ed5c442ed98681d4122..826ce82addbed93bbc99ccca5073a310ed37a58a 100644 (file)
--- a/src/exporter.h
+++ b/src/exporter.h
@@ -13,6 +13,7 @@
 #ifndef EXPORTER_H
 #define EXPORTER_H
 
+#include <string>
 #include <vector>
 
 

diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog
index 2d38f585d488c8c52cde433997305c1782debdbd..963ae548174cf18838d842e98327f2cd68071db3 100644 (file)
--- a/src/frontends/ChangeLog
+++ b/src/frontends/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-07  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * lyx_gui.h: add <string> and other small fixes to make Lars'
+       std::string patch compile with STLport.
+
 2003-09-21  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
        * LyXView.C (updateToolbar): adjust

diff --git a/src/frontends/controllers/BCView.h b/src/frontends/controllers/BCView.h
index e456245a08ca1f450889ba40329ba0c89e219b19..a0f0faae30c39f38248405fbe78acea5cb1eb7e1 100644 (file)
--- a/src/frontends/controllers/BCView.h
+++ b/src/frontends/controllers/BCView.h
@@ -16,6 +16,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <list>
+#include <string>
 
 
 class ButtonController;

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 97d2e00b7510d645e1d19bcc3d4633e3639e7cde..59d86fefad0630b3fe381b197fc267ded01850f0 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,12 @@
+2003-10-07  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * BCView.h:
+       * ControlCommandBuffer.h:
+       * biblio.h:
+       * frnt_lang.h:
+       * tex_helpers.h: add <string> and other small fixes to make Lars'
+       std::string patch compile with STLport.
+
 2003-10-01  Angus Leeming  <leeming@lyx.org>
 
        * ControlExternal.[Ch]: changes due to the introduction of

diff --git a/src/frontends/controllers/ControlCommandBuffer.h b/src/frontends/controllers/ControlCommandBuffer.h
index 983b7e40a78da706815d277b612f5d25c2418cb2..124cc668a09e2d293cb6ecb1c7d047811ee2d434 100644 (file)
--- a/src/frontends/controllers/ControlCommandBuffer.h
+++ b/src/frontends/controllers/ControlCommandBuffer.h
@@ -14,6 +14,7 @@
 #ifndef CONTROLCOMMANDBUFFER_H
 #define CONTROLCOMMANDBUFFER_H
 
+#include <string>
 #include <vector>
 
 

diff --git a/src/frontends/controllers/biblio.h b/src/frontends/controllers/biblio.h
index adc9610cf900f2be552420c9982d158182bc5fb7..0c37e8dce9d41c4a5f09293d2e3cad60af56e8bd 100644 (file)
--- a/src/frontends/controllers/biblio.h
+++ b/src/frontends/controllers/biblio.h
@@ -13,6 +13,7 @@
 #define BIBLIOHELPERS_H
 
 #include <map>
+#include <string>
 #include <vector>
 
 /** Functions of use to citation and bibtex GUI controllers and views */

diff --git a/src/frontends/controllers/frnt_lang.h b/src/frontends/controllers/frnt_lang.h
index 6aaa38a0bb1411cb6182e47ba2eff49402c75ce7..6d2c3e53b71e37ad524025acebc1b17b7411b353 100644 (file)
--- a/src/frontends/controllers/frnt_lang.h
+++ b/src/frontends/controllers/frnt_lang.h
@@ -12,6 +12,7 @@
 #ifndef FRNT_LANG_H
 #define FRNT_LANG_H
 
+#include <string>
 #include <utility>
 #include <vector>
 

diff --git a/src/frontends/controllers/tex_helpers.h b/src/frontends/controllers/tex_helpers.h
index 5300f90ebc0c7214b7608c0a96167e4ff0ef9418..d604135d87b18f2d805b4f5693fe31bdecaca73a 100644 (file)
--- a/src/frontends/controllers/tex_helpers.h
+++ b/src/frontends/controllers/tex_helpers.h
@@ -12,6 +12,7 @@
 #ifndef TEX_HELPERS_H
 #define TEX_HELPERS_H
 
+#include <string>
 #include <vector>
 
 

diff --git a/src/frontends/lyx_gui.h b/src/frontends/lyx_gui.h
index 296f830340358a5d6176cdd9814d610ab55b35fd..f8be6a290d0143d01b11bab62de938e6b2a5ca09 100644 (file)
--- a/src/frontends/lyx_gui.h
+++ b/src/frontends/lyx_gui.h
@@ -15,6 +15,7 @@
 
 #include "FuncStatus.h"
 
+#include <string>
 #include <vector>
 
 class Dialogs;

diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog
index d4bf1089b68d44054e2fc24975282ccfe788bfa3..09d90f7b12eab7d97065c4863fbf96c4aefa06d2 100644 (file)
--- a/src/graphics/ChangeLog
+++ b/src/graphics/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-07  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * GraphicsCache.h: 
+       * PreviewImage.h: add <string> and other small fixes to make
+       Lars' std::string patch compile with STLport.
+
 2003-09-29  Angus Leeming  <leeming@lyx.org>
 
        * GraphicsParams.[Ch] (asString): removed. Replaced with

diff --git a/src/graphics/GraphicsCache.h b/src/graphics/GraphicsCache.h
index dbd3d6286d2a909545881ae7cdc2b5e830670136..9d20e9abc327f5ce032385d627e8de21f36d247f 100644 (file)
--- a/src/graphics/GraphicsCache.h
+++ b/src/graphics/GraphicsCache.h
@@ -25,6 +25,7 @@
 #include <boost/shared_ptr.hpp>
 
 #include <vector>
+#include <string>
 
 
 namespace lyx {

diff --git a/src/graphics/PreviewImage.h b/src/graphics/PreviewImage.h
index 07dd3b71f4c5618acc866bd0b4d32b925cb7ebcb..3e4bdcd47194d8fa697ebb0b4ad32638c2c5bc0b 100644 (file)
--- a/src/graphics/PreviewImage.h
+++ b/src/graphics/PreviewImage.h
@@ -13,6 +13,7 @@
 #define PREVIEWIMAGE_H
 
 #include <boost/scoped_ptr.hpp>
+#include <string>
 
 class InsetOld;
 

diff --git a/src/importer.h b/src/importer.h
index 012a9c65666265045fa88133c480964aeb3a5644..7d62799cabd20e6034281f3c9069b3bdd7d1f55c 100644 (file)
--- a/src/importer.h
+++ b/src/importer.h
@@ -14,6 +14,7 @@
 #ifndef IMPORTER_H
 #define IMPORTER_H
 
+#include <string>
 #include <vector>
 
 

diff --git a/src/lastfiles.h b/src/lastfiles.h
index d663e14c0c90fbe6eef01f9fc4cda5f3424963ee..e053af70591fec723bb3157bf20fbbdcf7afced7 100644 (file)
--- a/src/lastfiles.h
+++ b/src/lastfiles.h
@@ -15,6 +15,7 @@
 #include <boost/utility.hpp>
 
 #include <deque>
+#include <string>
 
 
 /** The latest documents loaded.

diff --git a/src/lyxfind.h b/src/lyxfind.h
index 93b167efec7666c454c4dcb4775e84a5e2e315f1..488804763862df2f9aa79b13c48ffae121079ae2 100644 (file)
--- a/src/lyxfind.h
+++ b/src/lyxfind.h
@@ -16,6 +16,8 @@
 
 #include "support/types.h"
 
+#include <string>
+
 class BufferView;
 class LyXText;
 

diff --git a/src/lyxfont.h b/src/lyxfont.h
index 65f7aeda8183c08d96e1435d1ff5bb1f3142b427..3df9cbe2dbd7be98e6f854c84ff1613bba31bea8 100644 (file)
--- a/src/lyxfont.h
+++ b/src/lyxfont.h
@@ -16,6 +16,7 @@
 #define LYXFONT_H
 
 #include <iosfwd>
+#include <string>
 
 class LColor_color;
 class LyXLex;

diff --git a/src/lyxlex.h b/src/lyxlex.h
index 4c5ea7d6941b264c5513bd5a8d9188dd19c75636..98172c6d6c80cfa4dd3a5e2dc7ff5cf9d7d13b2d 100644 (file)
--- a/src/lyxlex.h
+++ b/src/lyxlex.h
@@ -20,6 +20,7 @@
 #include <boost/utility.hpp>
 
 #include <iosfwd>
+#include <string>
 
 
 ///

diff --git a/src/lyxtextclasslist.h b/src/lyxtextclasslist.h
index 38d336b2fc207a7cbd51694f470192bb000cc99a..15603182343662065d12608287289d9bd5bc793c 100644 (file)
--- a/src/lyxtextclasslist.h
+++ b/src/lyxtextclasslist.h
@@ -16,6 +16,7 @@
 
 #include <boost/utility.hpp>
 
+#include <string>
 #include <vector>
 
 class LyXTextClass;

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index 8b32c25deef8b570958eebf12897df9a6330c164..acb14647407796f93529609438c44267166a3ea5 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,9 @@
+
+2003-10-07  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * math_macrotable.h: add <string> and other small fixes to make
+       Lars' std::string patch compile with STLport.
+
 2003-10-06  Martin Vermeer  <martin.vermeer@hut.fi>
 
        * math_cursor.C:

diff --git a/src/mathed/math_macrotable.h b/src/mathed/math_macrotable.h
index ede1928551618cd5de57ab87407d78a8dade09fb..b1433964c91dc2748acf82b5fd84d26b4dec3948 100644 (file)
--- a/src/mathed/math_macrotable.h
+++ b/src/mathed/math_macrotable.h
@@ -15,6 +15,7 @@
 #include "math_atom.h"
 
 #include <map>
+#include <string>
 
 
 class MathMacroTable {

diff --git a/src/messages.h b/src/messages.h
index 50bc36ca119c14bed7c56979e4c52c58f5e5ab3e..c4b2fa25ec225e381c1aa232799945383d7054a5 100644 (file)
--- a/src/messages.h
+++ b/src/messages.h
@@ -12,6 +12,7 @@
 #define MESSAGES_H
 
 #include <boost/scoped_ptr.hpp>
+#include <string>
 
 ///
 class Messages {

diff --git a/src/paragraph.h b/src/paragraph.h
index fd03c1c62010f8538cda6fe075d4c4268e8df0d8..fa9a3afdf1d4feb8234f333d7842a661d3cd91cb 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -23,6 +23,7 @@
 
 #include "support/types.h"
 
+#include <string>
 
 class Buffer;
 class BufferParams;

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index 8cec598fd3e144875658b910d7cd13ef6a88f8eb..700c2420ddd2851fa8742e52aaff1871bfba006a 100644 (file)
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -31,6 +31,7 @@ using lyx::pos_type;
 
 using std::endl;
 using std::upper_bound;
+using std::lower_bound;
 using std::string;
 using std::ostream;
 

diff --git a/src/textcursor.h b/src/textcursor.h
index 1f0dadbaf1ed606cf244ddbb505065a15631be19..5622c065efef86d34df87d3b7d04f8c56cbfc41e 100644 (file)
--- a/src/textcursor.h
+++ b/src/textcursor.h
@@ -17,6 +17,8 @@
 
 #include "lyxcursor.h"
 
+#include <string>
+
 class Buffer;
 
 // Do not even think of forward declaring LyXText/BufferView etc here!