I start a new thread because I feel enough ashamed of the other one :)
Ok, this is what I've got. Should in theory be ok for both qt and xforms.
(to be applied against current cvs)
Please continue to correct me or point errors if they show up, I surely
deserve it.
Thanks, Alfredo
Colorful remark: mi laptop begun to overheat after compiling lyx too many
times. Now once in a while it throws some assembler errors, that go away if
I leave it alone for a few minutes.
? save
Index: converter.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/converter.C,v
retrieving revision 1.65
diff -u -r1.65 converter.C
--- converter.C 2003/02/28 09:49:44 1.65
+++ converter.C 2003/02/28 16:07:15
@@ -29,10 +29,12 @@
#include "support/lyxfunctional.h"
#include "support/path.h"
#include "support/systemcall.h"
+#include "support/lstrings.h"
#include "BoostFormat.h"
#include <cctype>
+#include "LString.h"
#ifndef CXX_GLOBAL_CSTD
using std::isdigit;
Index: converter.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/converter.h,v
retrieving revision 1.25
diff -u -r1.25 converter.h
--- converter.h 2003/02/28 09:49:44 1.25
+++ converter.h 2003/02/28 16:07:16
@@ -13,9 +13,12 @@
* Full author contact details are available in file CREDITS
*/
+#include <config.h>
+
#include "graph.h"
#include <vector>
+#include "LString.h"
class Format;
class Formats;
Index: format.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/format.C,v
retrieving revision 1.1
diff -u -r1.1 format.C
--- format.C 2003/02/28 09:49:44 1.1
+++ format.C 2003/02/28 16:07:17
@@ -8,12 +8,14 @@
* Full author contact details are available in file CREDITS
*/
+
+#include <config.h>
+
#include "format.h"
#include "lyxrc.h"
#include "debug.h"
#include "lyx_cb.h" // for ShowMessage() ... to be removed?
#include "gettext.h"
-#include "LString.h"
#include "frontends/Alert.h" //to be removed?
@@ -21,6 +23,17 @@
#include "support/path.h"
#include "support/systemcall.h"
#include "support/lyxfunctional.h"
+
+#include "BoostFormat.h"
+
+#include <iostream>
+
+#include <algorithm>
+
+using std::cout;
+using std::endl;
+using std::find_if;
+
namespace {
Index: format.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/format.h,v
retrieving revision 1.1
diff -u -r1.1 format.h
--- format.h 2003/02/28 09:49:44 1.1
+++ format.h 2003/02/28 16:07:18
@@ -15,11 +15,8 @@
* Full author contact details are available in file CREDITS
*/
-
-
#include "buffer.h"
#include "LString.h"
-#include "support/lstrings.h"
#include <vector>
Index: graph.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/graph.C,v
retrieving revision 1.1
diff -u -r1.1 graph.C
--- graph.C 2003/02/28 09:49:44 1.1
+++ graph.C 2003/02/28 16:07:18
@@ -7,6 +7,7 @@
*
* Full author contact details are available in file CREDITS
*/
+#include <config.h>
#include "graph.h"
#include "format.h"
@@ -14,8 +15,12 @@
#include <queue>
#include <vector>
+#include <algorithm>
+
using std::queue;
+using std::fill;
using std::vector;
+using std::reverse;
Index: graph.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/graph.h,v
retrieving revision 1.1
diff -u -r1.1 graph.h
--- graph.h 2003/02/28 09:49:44 1.1
+++ graph.h 2003/02/28 16:07:18
@@ -13,8 +13,9 @@
* Full author contact details are available in file CREDITS
*/
-#include "LString.h"
+#include <config.h>
+#include "LString.h"
#include <queue>
#include <vector>
Index: lyxrc.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/lyxrc.C,v
retrieving revision 1.143
diff -u -r1.143 lyxrc.C
--- lyxrc.C 2003/02/28 09:49:46 1.143
+++ lyxrc.C 2003/02/28 16:07:24
@@ -23,6 +23,7 @@
#include "support/filetools.h"
#include "support/LAssert.h"
#include "support/userinfo.h"
+#include "support/lstrings.h"
#include "converter.h"
#include "format.h"
#include "gettext.h"
Index: frontends/qt2/QLImage.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/qt2/QLImage.C,v
retrieving revision 1.17
diff -u -r1.17 QLImage.C
--- frontends/qt2/QLImage.C 2003/02/28 09:49:46 1.17
+++ frontends/qt2/QLImage.C 2003/02/28 16:07:26
@@ -24,6 +24,9 @@
#include <qwmatrix.h>
#include <qpainter.h>
+#include "LString.h"
+#include "support/lstrings.h"
+
#include <boost/tuple/tuple.hpp>
using std::find_if;
Index: frontends/xforms/FormPreferences.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/FormPreferences.C,v
retrieving revision 1.154
diff -u -r1.154 FormPreferences.C
--- frontends/xforms/FormPreferences.C 2003/02/28 09:49:47 1.154
+++ frontends/xforms/FormPreferences.C 2003/02/28 16:07:35
@@ -40,6 +40,7 @@
#include "support/lyxmanip.h"
#include "support/filetools.h"
#include "support/LAssert.h"
+#include "support/lstrings.h"
#include "graphics/GraphicsCache.h"
#include "graphics/GraphicsTypes.h"
@@ -47,6 +48,7 @@
#include <boost/bind.hpp>
#include FORMS_H_LOCATION
+#include "LString.h"
#include <utility>
#include <iomanip>
#include <X11/Xlib.h>
Index: frontends/xforms/FormSendto.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/FormSendto.C,v
retrieving revision 1.19
diff -u -r1.19 FormSendto.C
--- frontends/xforms/FormSendto.C 2003/02/28 09:49:48 1.19
+++ frontends/xforms/FormSendto.C 2003/02/28 16:07:35
@@ -19,6 +19,9 @@
#include "xforms_helpers.h"
#include "format.h"
#include "gettext.h"
+#include "LString.h"
+#include "support/lstrings.h"
+
#include FORMS_H_LOCATION
using std::vector;
Index: frontends/xforms/xformsImage.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/xformsImage.C,v
retrieving revision 1.21
diff -u -r1.21 xformsImage.C
--- frontends/xforms/xformsImage.C 2003/02/28 09:49:48 1.21
+++ frontends/xforms/xformsImage.C 2003/02/28 16:07:36
@@ -16,6 +16,7 @@
#include "Color.h"
#include "format.h"
#include "debug.h"
+#include "support/lstrings.h"
#include "support/LAssert.h"
#include "support/lyxfunctional.h" // compare_memfun
@@ -29,6 +30,7 @@
# endif
#endif
+#include "LString.h"
#include <boost/tuple/tuple.hpp>
using std::find_if;
Index: graphics/GraphicsConverter.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/graphics/GraphicsConverter.C,v
retrieving revision 1.28
diff -u -r1.28 GraphicsConverter.C
--- graphics/GraphicsConverter.C 2003/02/28 09:49:48 1.28
+++ graphics/GraphicsConverter.C 2003/02/28 16:07:37
@@ -20,6 +20,7 @@
#include "support/forkedcall.h"
#include "support/forkedcallqueue.h"
#include "support/lyxlib.h"
+#include "support/lstrings.h"
#include <boost/bind.hpp>
#include <boost/signals/trackable.hpp>
@@ -28,6 +29,8 @@
#include "support/LOstream.h"
#include <fstream>
#include <sys/types.h> // needed for pid_t
+
+#include "LString.h"
using std::endl;
using std::ostream;
Index: insets/insetgraphics.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/insets/insetgraphics.C,v
retrieving revision 1.153
diff -u -r1.153 insetgraphics.C
--- insets/insetgraphics.C 2003/02/28 09:49:49 1.153
+++ insets/insetgraphics.C 2003/02/28 16:07:39
@@ -92,6 +92,8 @@
#include <boost/signals/trackable.hpp>
#include "BoostFormat.h"
+#include "LString.h"
+
#include <algorithm> // For the std::max
extern string system_tempdir;
