small changes

prepare for the STRINGCONV patch


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

po/POTFILES.in

@@ -1,20 +1,16 @@
-src/BufferView.C
-src/BufferView_pimpl.C
-src/Chktex.C
-src/CutAndPaste.C
-src/LColor.C
-src/LaTeX.C
-src/LyXAction.C
-src/MenuBackend.C
 src/buffer.C
 src/bufferlist.C
+src/BufferView.C
 src/bufferview_funcs.C
+src/BufferView_pimpl.C
+src/Chktex.C
 src/converter.C
+src/CutAndPaste.C
 src/debug.C
 src/exporter.C
-src/ext_l10n.h
+src/frontends/controllers/biblio.C
-src/frontends/LyXView.C
 src/frontends/controllers/ButtonController.h
+src/frontends/controllers/character.C
 src/frontends/controllers/ControlAboutlyx.C
 src/frontends/controllers/ControlBibtex.C
 src/frontends/controllers/ControlCharacter.C
@@ -29,13 +25,13 @@ src/frontends/controllers/ControlSearch.C
 src/frontends/controllers/ControlSpellchecker.C
 src/frontends/controllers/ControlThesaurus.C
 src/frontends/controllers/ControlVCLog.C
-src/frontends/controllers/biblio.C
-src/frontends/controllers/character.C
 src/frontends/controllers/frnt_lang.C
 src/frontends/controllers/helper_funcs.C
 src/frontends/gnome/GLog.C
+src/frontends/LyXView.C
 src/frontends/qt2/Alert_pimpl.C
 src/frontends/qt2/FileDialog.C
+src/frontends/qt2/lengthcombo.C
 src/frontends/qt2/QAbout.C
 src/frontends/qt2/QBibitem.C
 src/frontends/qt2/QBibtex.C
@@ -47,8 +43,8 @@ src/frontends/qt2/QCommandBuffer.C
 src/frontends/qt2/QDelimiterDialog.C
 src/frontends/qt2/QDocument.C
 src/frontends/qt2/QDocumentDialog.C
-src/frontends/qt2/QERT.C
 src/frontends/qt2/QError.C
+src/frontends/qt2/QERT.C
 src/frontends/qt2/QExternal.C
 src/frontends/qt2/QExternalDialog.C
 src/frontends/qt2/QFloat.C
@@ -65,6 +61,7 @@ src/frontends/qt2/QPrint.C
 src/frontends/qt2/QPrintDialog.C
 src/frontends/qt2/QRef.C
 src/frontends/qt2/QSearch.C
+src/frontends/qt2/QSendto.C
 src/frontends/qt2/QShowFile.C
 src/frontends/qt2/QSpellchecker.C
 src/frontends/qt2/QTabularCreate.C
@@ -74,9 +71,9 @@ src/frontends/qt2/QToc.C
 src/frontends/qt2/QURL.C
 src/frontends/qt2/QVCLog.C
 src/frontends/qt2/QWrap.C
-src/frontends/qt2/lengthcombo.C
 src/frontends/xforms/Alert_pimpl.C
 src/frontends/xforms/ColorHandler.C
+src/frontends/xforms/combox.C
 src/frontends/xforms/FeedbackController.C
 src/frontends/xforms/FileDialog.C
 src/frontends/xforms/FormAboutlyx.C
@@ -85,8 +82,8 @@ src/frontends/xforms/FormBibtex.C
 src/frontends/xforms/FormCharacter.C
 src/frontends/xforms/FormCitation.C
 src/frontends/xforms/FormDocument.C
-src/frontends/xforms/FormERT.C
 src/frontends/xforms/FormError.C
+src/frontends/xforms/FormERT.C
 src/frontends/xforms/FormExternal.C
 src/frontends/xforms/FormFiledialog.C
 src/frontends/xforms/FormFloat.C
@@ -119,15 +116,14 @@ src/frontends/xforms/FormToc.C
 src/frontends/xforms/FormUrl.C
 src/frontends/xforms/FormVCLog.C
 src/frontends/xforms/FormWrap.C
-src/frontends/xforms/Menubar_pimpl.C
-src/frontends/xforms/XMiniBuffer.C
-src/frontends/xforms/combox.C
 src/frontends/xforms/input_validators.C
+src/frontends/xforms/Menubar_pimpl.C
 src/frontends/xforms/xforms_helpers.C
+src/frontends/xforms/XMiniBuffer.C
 src/gettext.h
 src/importer.C
-src/insets/inset.C
 src/insets/insetbib.C
+src/insets/inset.C
 src/insets/insetcaption.C
 src/insets/inseterror.C
 src/insets/insetert.C
@@ -154,24 +150,27 @@ src/insets/inseturl.C
 src/insets/insetwrap.C
 src/kbsequence.C
 src/language.C
+src/LaTeX.C
+src/LColor.C
+src/LyXAction.C
 src/lyx_cb.C
-src/lyx_main.C
 src/lyxfind.C
 src/lyxfont.C
 src/lyxfunc.C
+src/lyx_main.C
 src/lyxrc.C
 src/lyxtextclasslist.C
 src/lyxvc.C
 src/mathed/formulabase.C
 src/mathed/formulamacro.C
-src/mathed/math_cursor.C
 src/mathed/math_hullinset.C
 src/mathed/math_parboxinset.C
 src/mathed/ref_inset.C
+src/MenuBackend.C
 src/paragraph.C
 src/support/filetools.C
 src/tabular.C
-src/text.C
 src/text2.C
 src/text3.C
+src/text.C
 src/ext_l10n.h

src/ChangeLog

@@ -1,3 +1,20 @@
+2002-11-04  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* vc-backend.C (scanMaster): change from submatch[...] to
+	submatch.str(...)
+
+	* funcrequest.C: include config.h
+
+	* factory.C: include config.h
+
+	* chset.C (loadFile): change from submatch[...] to submatch.str(...)
+
+	* box.C: include config.h
+
+	* LaTeX.C (scanAuxFile): change from submatch[...] to
+	submatch.str(...)
+	(deplog): ditto
+
 2002-10-25  Angus Leeming  <leeming@lyx.org>
 
 	* BufferView_pimpl.C (cursorToggle): remove reapSpellchecker hack.
@@ -12,7 +29,7 @@
 2002-10-30  John Levon  <levon@movementarian.org>
 
 	* text3.C: make start appendix undoable
- 
+
 2002-10-24  Dekel Tsur  <dekelts@tau.ac.il>
 
 	* lyxlength.C (inPixels): Fix returned value.
@@ -28,26 +45,26 @@
 2002-10-21  John Levon  <levon@movementarian.org>
 
 	* BufferView.C: menuUndo ->undo, redo
- 
+
 	* BufferView.h: document, remove dead, make some methods private
- 
+
 	* paragraph_funcs.h:
-	* paragraph_funcs.C: 
+	* paragraph_funcs.C:
 	* CutAndPaste.C: s/pasteParagraph/mergeParagraph
- 
+
 	* buffer.h:
 	* buffer.C:
 	* sgml.h:
 	* sgml.C: move sgml open/close tag into sgml.C
- 
+
 	* bufferview_funcs.h: unused prototype
- 
+
 	* lyxfunc.h:
 	* lyxfunc.C: remove unused
- 
+
 	* lyxtext.h:
 	* text.C: remove unused
- 
+
 2002-10-21  John Levon  <levon@movementarian.org>
 
 	* BufferView.h:
@@ -55,7 +72,7 @@
 	* BufferView_pimpl.h:
 	* BufferView_pimpl.C: fix mouse wheel handling based on
 	  patch from Darren Freeman
- 
+
 2002-10-09  Dekel Tsur  <dekelts@tau.ac.il>
 
 	* lyx_main.C (queryUserLyXDir): Fix automatic reconfiguration.
@@ -68,7 +85,7 @@
 2002-10-16  John Levon  <levon@movementarian.org>
 
 	* buffer.C: remove \\protected_separator parsing done by lyx2lyx now
- 
+
 2002-10-16  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
 	* converter.C (view): add support for $$i (file name) and $$p
@@ -129,25 +146,25 @@
 2002-09-16  John Levon  <levon@movementarian.org>
 
 	* lyxfunc.C: check tabular for cut/copy too
- 
+
 2002-09-12  John Levon  <levon@movementarian.org>
 
 	* LyXAction.C: tidy
 
 	* factory.h:
 	* factory.C: add header
- 
+
 	* paragraph_funcs.h:
 	* paragraph_funcs.C: cleanup
- 
+
 2002-09-11  John Levon  <levon@movementarian.org>
 
 	* PrinterParams.h: odd/even default to true
- 
+
 2002-09-12  Rob Lahaye  <lahaye@snu.ac.kr>
 
 	* PrinterParams.h: update printer parameters for new xforms dialog
- 
+
 2002-09-11  Angus Leeming  <leeming@lyx.org>
 
 	* lyxserver.C (read_ready): re-write to make it more transparent

src/LaTeX.C

@@ -434,7 +434,7 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info)
 		token = rtrim(token, "\r");
 		smatch sub;
 		if (regex_match(token, sub, reg1)) {
-			string data = sub[1];
+			string data = sub.str(1);
 			while (!data.empty()) {
 				string citation;
 				data = split(data, citation, ',');
@@ -443,7 +443,7 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info)
 				aux_info.citations.insert(citation);
 			}
 		} else if (regex_match(token, sub, reg2)) {
-			string data = sub[1];
+			string data = sub.str(1);
 			// data is now all the bib files separated by ','
 			// get them one by one and pass them to the helper
 			while (!data.empty()) {
@@ -455,7 +455,7 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info)
 				aux_info.databases.insert(database);
 			}
 		} else if (regex_match(token, sub, reg3)) {
-			string style = sub[1];
+			string style = sub.str(1);
 			// token is now the style file
 			// pass it to the helper
 			style = ChangeExtension(style, "bst");
@@ -463,7 +463,7 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info)
 					     << style << "'" << endl;
 			aux_info.styles.insert(style);
 		} else if (regex_match(token, sub, reg4)) {
-			string file2 = sub[1];
+			string file2 = sub.str(1);
 			scanAuxFile(file2, aux_info);
 		}
 	}
@@ -685,15 +685,15 @@ void LaTeX::deplog(DepTable & head)
 
 		smatch sub;
 		if (regex_match(token, sub, reg1)) {
-			foundfile = sub[1];
+			foundfile = sub.str(1);
 		} else if (regex_match(token, sub, reg2)) {
-			foundfile = sub[1];
+			foundfile = sub.str(1);
 		} else if (regex_match(token, sub, reg3)) {
-			foundfile = sub[1];
+			foundfile = sub.str(1);
 		} else if (regex_match(token, sub, reg4)) {
-			foundfile = sub[1];
+			foundfile = sub.str(1);
 		} else if (regex_match(token, sub, reg5)) {
-			foundfile = sub[1];
+			foundfile = sub.str(1);
 		} else {
 			continue;
 		}

src/box.C

@@ -8,16 +8,20 @@
 
 // Code moved out of line and out of box.h by Angus (7 Jan 2002)
 
+#include <config.h>
+
 #include "box.h"
 
 #include "support/LOstream.h"
 
 using std::ostream;
 
+
 Box::Box(int x1_, int x2_, int y1_, int y2_) :
 	x1(x1_), x2(x2_), y1(y1_), y2(y2_)
 {}
 
+
 bool Box::contained(int x, int y)
 {
 	return (x1 < x && x2 > x &&
@@ -28,5 +32,6 @@ bool Box::contained(int x, int y)
 ostream & operator<<(ostream & o, Box const & b)
 {
 	return o << "x1,y1: " << b.x1 << "," << b.y1
-		<< " x2,y2: " << b.x2 << "," << b.y2 << std::endl;
+		 << " x2,y2: " << b.x2 << "," << b.y2
+		 << std::endl;
 }

src/chset.C

@@ -22,6 +22,7 @@ using boost::regex;
 using boost::regex_match;
 using boost::smatch;
 
+
 bool CharacterSet::loadFile(string const & fname)
 {
 	map_.clear();
@@ -51,8 +52,8 @@ bool CharacterSet::loadFile(string const & fname)
 	while (getline(ifs, line)) {
 		smatch sub;
 		if (regex_match(line, sub, reg)) {
-			int const n = lyx::atoi(sub[1]);
+			int const n = lyx::atoi(sub.str(1));
-			string const str = sub[2];
+			string const str = sub.str(2);
 			if (lyxerr.debugging(Debug::KBMAP))
 				lyxerr << "Chardef: " << n
 				       << " to [" << str << "]" << endl;

src/factory.C

@@ -8,6 +8,8 @@
  * Full author contact details are available in file CREDITS
  */
 
+#include <config.h>
+
 #include "funcrequest.h"
 #include "bufferparams.h"
 #include "buffer.h"
@@ -123,7 +125,7 @@ Inset * createInset(FuncRequest const & cmd)
 			}
 			return 0;
 
-		case LFUN_INDEX_PRINT: 
+		case LFUN_INDEX_PRINT:
 			return new InsetPrintIndex(InsetCommandParams("printindex"));
 
 		case LFUN_TOC_INSERT:
@@ -153,5 +155,3 @@ Inset * createInset(FuncRequest const & cmd)
 	}
 	return 0;
 }
-
-

src/frontends/ChangeLog

@@ -1,3 +1,7 @@
+2002-11-04  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* lyx_gui.h: reindent a bit, change signeture on lyx_gui::start.
+
 2002-10-24  Rob Lahaye  <lahaye@snu.ac.kr>
 
 	* PrinterParams.h (to): default value changed to 0 (from 1).

src/frontends/controllers/ChangeLog

@@ -1,8 +1,12 @@
+2002-11-04  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* ControlMath.C: include config.h
+
 2002-10-31  John Levon  <levon@movementarian.org>
 
 	* ControlGraphics.h:
 	* ControlGraphics.C: bb units from Herbert
- 
+
 2002-10-29  Rob Lahaye  <lahaye@snu.ac.kr>
 
 	* ControlParagraph.[Ch] (alignDefault): new method, returning the
@@ -11,7 +15,7 @@
 2002-10-25  John Levon  <levon@movementarian.org>
 
 	* ControlPrint.C: using endl
- 
+
 2002-10-24  Rob Lahaye  <lahaye@snu.ac.kr>
 
 	* ControlPrint.[Ch]: move code here from Liason.[Ch].

src/frontends/controllers/ControlMath.C

@@ -9,6 +9,8 @@
  * Full author contact details are available in file CREDITS
  */
 
+#include <config.h>
+
 #include "ControlMath.h"
 
 char const * function_names[] = {

src/frontends/lyx_gui.h

@@ -4,16 +4,16 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author John Levon 
+ * \author John Levon
  *
  * Full author contact details are available in file CREDITS
  */
 
 #ifndef LYX_GUI_H
 #define LYX_GUI_H
- 
+
 #include "LColor.h"
-#include "LString.h" 
+#include "LString.h"
 #include <vector>
 
 class Dialogs;
@@ -23,55 +23,56 @@ class LyXComm;
 /// GUI interaction
 namespace lyx_gui {
 
-	/// parse command line and do basic initialisation
+/// parse command line and do basic initialisation
-	void parse_init(int & argc, char * argv[]);
+void parse_init(int & argc, char * argv[]);
 
-	/**
+/**
-	 * set up GUI parameters. At this point lyxrc may
+ * set up GUI parameters. At this point lyxrc may
-	 * be used.
+ * be used.
-	 */
+ */
-	void parse_lyxrc();
+void parse_lyxrc();
 
-	/**
+/**
-	 * Start the main event loop, after executing the given
+ * Start the main event loop, after executing the given
-	 * batch commands, and loading the given documents
+ * batch commands, and loading the given documents
-	 */
+ */
-	void start(string const & batch, std::vector<std::string> files);
+void start(string const & batch, std::vector<std::string> const & files);
 
-	/**
+/**
-	 * quit running LyX
+ * quit running LyX
-	 */
+ */
-	void exit();
+void exit();
- 
-	/** Eg, passing LColor::black returns "000000",
-	 *      passing LColor::white returns "ffffff".
-	 */
-	string const hexname(LColor::color col);
 
-	/**
+/** Eg, passing LColor::black returns "000000",
-	 * update an altered GUI color
+ *      passing LColor::white returns "ffffff".
-	 */
+ */
-	void update_color(LColor::color col);
+string const hexname(LColor::color col);
 
-	/**
+/**
-	 * update the font cache
+ * update an altered GUI color
-	 */
+ */
-	void update_fonts();
+void update_color(LColor::color col);
 
-	/**
+/**
-	 * is the given font available ?
+ * update the font cache
-	 */
+ */
-	bool font_available(LyXFont const & font);
+void update_fonts();
 
-	/**
+/**
-	 * add a callback for I/O read notification
+ * is the given font available ?
-	 */
+ */
-	void set_read_callback(int fd, LyXComm * comm);
+bool font_available(LyXFont const & font);
 
-	/**
+/**
-	 * remove a I/O read callback
+ * add a callback for I/O read notification
-	 */
+ */
-	void remove_read_callback(int fd);
+void set_read_callback(int fd, LyXComm * comm);
-}
+
+/**
+ * remove a I/O read callback
+ */
+void remove_read_callback(int fd);
+
+} // namespace lyx_gui
 
 #endif // LYX_GUI_H

src/frontends/qt2/ChangeLog

@@ -1,14 +1,21 @@
+2002-11-04  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* qttableview.C: include config.h
+
+	* lyx_gui.C: move includes around a bit
+	(start): adjust signature
+
 2002-10-31  John Levon  <levon@movementarian.org>
 
 	* QExternal.C: fix crash, valid check
- 
+
 2002-10-31  John Levon  <levon@movementarian.org>
 
 	* QGraphics.C:
 	* QGraphicsDialog.C:
 	* QGraphicsDialog.h:
 	* ui/QGraphicsDialog.ui: bb unit fixes
- 
+
 2002-10-30  John Levon  <levon@movementarian.org>
 
 	* QPrintDialog.[hC]: move to ...
@@ -17,16 +24,16 @@
 
 	* QPrint.h:
 	* QPrint.C:
-	* Dialogs_impl.h: 
+	* Dialogs_impl.h:
 	* Makefile.dialogs: from above
- 
+
 	* QSpellchecker.C: reset progress
- 
+
 2002-10-30  John Levon  <levon@movementarian.org>
 
 	* QGraphics.C:
 	* ui/QGraphicsDialog.ui: some fixes from Herbert
- 
+
 2002-10-30  John Levon  <levon@movementarian.org>
 
 	* ui/QTabularDialog.ui: initial UI from Juergen Spitzmueller
@@ -35,17 +42,17 @@
 
 	* iconpalette.C:
 	* QMathDialog.C: fix symbol insert breakage from Lars' patch
- 
+
 2002-10-26  Juergen Spitzmueller  <j.spitzmueller@gmx.de>
 
 	* ui/QMathMatrixDialog.ui:
 	* QMathMatrixDialog.[Ch]:
 	* Makefile.dialogs:
 	* QMath.C:
- 	* QMathDialog.C: implement Matrix dialog
+	* QMathDialog.C: implement Matrix dialog
 
 	* QMathDialog.C: enlarge Symbols combox (prevent scrollbar)
- 
+
 2002-10-28  Dekel Tsur  <dekelts@tau.ac.il>
 
 	* qfont_loader.C (font_info): Add xfonts to the font path if

src/frontends/qt2/lyx_gui.C

@@ -22,9 +22,6 @@
 #include "debug.h"
 #include "gettext.h"
 
-#include <fcntl.h>
-#include <boost/bind.hpp>
-
 #include "lyx_gui.h"
 #include "lyx_main.h"
 #include "lyxrc.h"
@@ -41,6 +38,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/function/function0.hpp>
 #include <boost/signals/signal1.hpp>
+#include <boost/bind.hpp>
 
 #include "QtView.h"
 #include "QLImage.h"
@@ -51,6 +49,8 @@
 #include <qwidget.h>
 #include <qpaintdevicemetrics.h>
 
+#include <fcntl.h>
+
 #ifndef CXX_GLOBAL_CSTD
 using std::exit;
 #endif
@@ -98,7 +98,7 @@ void lyx_gui::parse_lyxrc()
 }
 
 
-void lyx_gui::start(string const & batch, vector<string> files)
+void lyx_gui::start(string const & batch, vector<string> const & files)
 {
 	// initial geometry
 	int xpos = -1;

src/frontends/qt2/qttableview.C

@@ -1,5 +1,5 @@
 /**********************************************************************
-** $Id: qttableview.C,v 1.3 2002/03/21 21:19:37 larsbj Exp $
+** $Id: qttableview.C,v 1.4 2002/11/04 00:15:54 larsbj Exp $
 **
 ** Implementation of QtTableView class
 **
@@ -12,6 +12,8 @@
 **
 **********************************************************************/
 
+#include <config.h>
+
 #include "qttableview.h"
 #ifndef QT_NO_QTTABLEVIEW
 #include "qscrollbar.h"

src/frontends/xforms/ChangeLog

@@ -1,3 +1,8 @@
+2002-11-04  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* lyx_gui.C (start): adjust signature
+	(start): exchange magic integeres for defined values.
+
 2002-10-31  Rob Lahaye  <lahaye@snu.ac.kr>
 
 	* xformsImage.C (clip): fix crash caused by uint -> int nastiness.
@@ -30,11 +35,11 @@
 2002-10-26  John Levon  <levon@movementarian.org>
 
 	* forms/form_preamble.fd: OK cannot be a RETURN_BUTTON ;)
- 
+
 2002-10-26  John Levon  <levon@movementarian.org>
 
 	* FormTexinfo.C: using vector
- 
+
 2002-10-25  Dekel Tsur  <dekelts@tau.ac.il>
 
 	* xfont_loader.C (getFontinfo): Add xfonts to the font path if
@@ -52,7 +57,7 @@
 	* forms/form_spellchecker.fd:
 	* FormSpellchecker.[Ch]: add tooltips; general clean-up.
 	 add word count to dialog and improve progress status;
-         implement single Start/Stop button;
+	 implement single Start/Stop button;
 
 	* FormTabular.C (build): rearrange lines tab by tab.
 	Use getString not fl_get_inout.
@@ -73,7 +78,7 @@
 
 2002-10-23  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
-	* FormExternal.C (apply): 
+	* FormExternal.C (apply):
 	(input): fix an off-by-one index (causing a crash)
 
 2002-10-24  Rob Lahaye  <lahaye@snu.ac.kr>
@@ -153,7 +158,7 @@
 
 	* forms/form_bibtex.fd:
 	* forms/form_citation.fd: less bulky with proper gravity/resize policy
-         and many other GUI layout improvements.
+	 and many other GUI layout improvements.
 
 	* FormBibtex.C: remove choose button, select directly instead;
 	add Restore/OK/Apply/Cancel buttons; modify tooltip-texts;

src/frontends/xforms/lyx_gui.C

@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author unknown
- * \author John Levon 
+ * \author John Levon
  *
  * Full author contact details are available in file CREDITS
  */
@@ -73,10 +73,10 @@ float getDPI()
 {
 	Screen * scr = ScreenOfDisplay(fl_get_display(), fl_screen);
 	return ((HeightOfScreen(scr) * 25.4 / HeightMMOfScreen(scr)) +
-		(WidthOfScreen(scr) * 25.4 / WidthMMOfScreen(scr))) / 2; 
+		(WidthOfScreen(scr) * 25.4 / WidthMMOfScreen(scr))) / 2;
 }
 
- 
+
 /// set default GUI configuration
 void setDefaults()
 {
@@ -179,7 +179,7 @@ void lyx_gui::parse_init(int & argc, char * argv[])
 	Image::loadableFormats = boost::bind(&ImageXPM::loadableFormats);
 #endif
 
-	// must do this /before/ lyxrc gets read 
+	// must do this /before/ lyxrc gets read
 	lyxrc.dpi = getDPI();
 }
 
@@ -239,7 +239,7 @@ void lyx_gui::parse_lyxrc()
 }
 
 
-void lyx_gui::start(string const & batch, vector<string> files)
+void lyx_gui::start(string const & batch, vector<string> const & files)
 {
 	// initial geometry
 	int xpos = -1;
@@ -247,19 +247,19 @@ void lyx_gui::start(string const & batch, vector<string> files)
 	unsigned int width = 690;
 	unsigned int height = 510;
 
-	static const int geometryBitmask =
+	int const geometryBitmask =
 		XParseGeometry(geometry,
 				&xpos, &ypos, &width, &height);
 
 	// if width is not set by geometry, check it against monitor width
-	if (!(geometryBitmask & 4)) {
+	if (!(geometryBitmask & WidthValue)) {
 		Screen * scr = ScreenOfDisplay(fl_get_display(), fl_screen);
 		if (WidthOfScreen(scr) - 8 < int(width))
 			width = WidthOfScreen(scr) - 8;
 	}
 
 	// if height is not set by geometry, check it against monitor height
-	if (!(geometryBitmask & 8)) {
+	if (!(geometryBitmask & HeightValue)) {
 		Screen * scr = ScreenOfDisplay(fl_get_display(), fl_screen);
 		if (HeightOfScreen(scr) - 24 < int(height))
 			height = HeightOfScreen(scr) - 24;

src/funcrequest.C

@@ -6,6 +6,8 @@
  * \author André Pönitz
  */
 
+#include <config.h>
+
 #include "funcrequest.h"
 #include "BufferView.h"
 #include "lyxfunc.h" // only for setMessage()
@@ -54,13 +56,13 @@ FuncRequest::FuncRequest(FuncRequest const & cmd, string const & arg)
 	: view_(cmd.view_), action(cmd.action), argument(arg),
 	  x(cmd.x), y(cmd.y), button_(cmd.button_)
 {}
-	
+
 
 FuncRequest::FuncRequest(FuncRequest const & cmd, BufferView * view)
 	: view_(view), action(cmd.action), argument(cmd.argument),
 	  x(cmd.x), y(cmd.y), button_(cmd.button_)
 {}
-	
+
 
 BufferView * FuncRequest::view() const
 {

src/graphics/ChangeLog

@@ -1,3 +1,7 @@
+2002-11-04  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* GraphicsTypes.C: include config.h
+
 2002-10-25  Angus Leeming  <leeming@lyx.org>
 
 	* GraphicsConverter.C (Impl::converted)

src/graphics/GraphicsTypes.C

@@ -9,8 +9,11 @@
  * Full author contact details available in file CREDITS
  */
 
+#include <config.h>
+
 #include "graphics/GraphicsTypes.h"
 
+
 namespace grfx {
 
 /// The translator between the Display enum and corresponding lyx string.
@@ -30,7 +33,7 @@ void setDisplayTranslator()
 		displayTranslator.addPair(GrayscaleDisplay, "grayscale");
 		displayTranslator.addPair(ColorDisplay, "color");
 		displayTranslator.addPair(NoDisplay, "none");
-		
+
 		// backward compatibility for old lyxrc.display_graphics
 		displayTranslator.addPair(MonochromeDisplay, "mono");
 		displayTranslator.addPair(GrayscaleDisplay, "gray");

src/insets/ChangeLog

@@ -1,3 +1,7 @@
+2002-11-04  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* insetcommandparams.C: include config.h
+
 2002-10-31  Rob Lahaye  <lahaye@snu.ac.kr>
 
 	* insetgraphicsParams.C (Write): use lyx::float_equal.
@@ -8,7 +12,7 @@
 
 	* insetfloat.C (addToTOC): recursively traverse all
 	  contents looking for captions (fix #568)
- 
+
 2002-10-25  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
 	* insetexternal.C (doSubstitution): do not try to replace
@@ -32,7 +36,7 @@
 	* inset.h: remove unused DISPATCH_RESULT
 
 	* insettext.C: sgml open/close tag now in sgml namespace
- 
+
 2002-10-21  Angus Leeming  <leeming@lyx.org>
 
 	* insetgraphics.C (draw): Fix the drawing of an inset with a relative
@@ -42,7 +46,7 @@
 2002-10-16  John Levon  <levon@movementarian.org>
 
 	* insetspecialchar.C: remove \\protected_separator parsing
- 
+
 2002-09-25  Juergen Spitzmueller  <j.spitzmueller@gmx.de>
 
 	* insetquote.C: fix LaTeX output of quotation marks.

src/insets/insetcommandparams.C

@@ -8,6 +8,8 @@
  * Full author contact details are available in file CREDITS
  */
 
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif

src/mathed/ChangeLog

@@ -1,3 +1,12 @@
+2002-11-04  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* math_factory.C: add using std::endl
+	(math_font_available): use it
+	(initSymbols): use it
+	(createMathInset): use it
+
+	* math_cursor.C (MathCursor): reindent
+
 2002-10-28  Dekel Tsur  <dekelts@tau.ac.il>
 
 	* many files: Add support for Maxima.

src/mathed/math_cursor.C

@@ -74,9 +74,9 @@ MathCursor::MathCursor(InsetFormulaBase * formula, bool front)
 
 MathCursor::~MathCursor()
 {
-  // ensure that 'notifyCursorLeave' is called
+	// ensure that 'notifyCursorLeave' is called
-  while (popLeft())
+	while (popLeft())
-    ;
+		;
 }
 
 
@@ -378,7 +378,7 @@ void MathCursor::niceInsert(string const & t)
 	MathArray ar = asArray(t);
 	if (ar.size() == 1)
 		niceInsert(ar[0]);
-	else 
+	else
 		insert(ar);
 }
 
@@ -1200,7 +1200,7 @@ bool MathCursor::interpret(char c)
 	}
 
 	if (c == '\n') {
-		if (currentMode() == MathInset::TEXT_MODE) 
+		if (currentMode() == MathInset::TEXT_MODE)
 			insert(c);
 		return true;
 	}
@@ -1473,4 +1473,3 @@ void releaseMathCursor(BufferView * bv)
 	delete mathcursor;
 	mathcursor = 0;
 }
-

src/mathed/math_factory.C

@@ -1,6 +1,5 @@
-
 #ifdef __GNUG__
-#pragma implementation 
+#pragma implementation
 #endif
 
 #include <config.h>
@@ -56,6 +55,8 @@
 
 bool has_math_fonts;
 
+using std::endl;
+
 namespace {
 
 // file scope
@@ -79,7 +80,8 @@ bool math_font_available(string & name)
 	}
 
 	lyxerr[Debug::MATHED]
-		<< "font " << name << " not available and I can't fake it\n";
+		<< "font " << name << " not available and I can't fake it"
+		<< endl;
 	return false;
 }
 
@@ -87,9 +89,9 @@ bool math_font_available(string & name)
 void initSymbols()
 {
 	string const filename = LibFileSearch(string(), "symbols");
-	lyxerr[Debug::MATHED] << "read symbols from " << filename << "\n";
+	lyxerr[Debug::MATHED] << "read symbols from " << filename << endl;
 	if (filename.empty()) {
-		lyxerr << "Could not find symbols file\n";
+		lyxerr << "Could not find symbols file" << endl;
 		return;
 	}
 
@@ -129,14 +131,14 @@ void initSymbols()
 		istringstream is(line);
 		latexkeys tmp;
 		is >> tmp.name >> tmp.inset;
-		if (isFontName(tmp.inset)) 
+		if (isFontName(tmp.inset))
 			is >> charid >> fallbackid >> tmp.extra >> tmp.xmlname;
 		else
 			is >> tmp.extra;
 		if (!is) {
-			lyxerr[Debug::MATHED] << "skipping line '" << line << "'\n";
+			lyxerr[Debug::MATHED] << "skipping line '" << line << "'" << endl;
 			lyxerr[Debug::MATHED]
-				<< tmp.name << ' ' << tmp.inset << ' ' << tmp.extra << "\n";
+				<< tmp.name << ' ' << tmp.inset << ' ' << tmp.extra << endl;
 			continue;
 		}
 
@@ -144,39 +146,39 @@ void initSymbols()
 			// tmp.inset _is_ the fontname here.
 			// create fallbacks if necessary
 			if (tmp.extra=="func" || tmp.extra=="funclim" || tmp.extra=="special") {
-				lyxerr[Debug::MATHED] << "symbol abuse for " << tmp.name << "\n";
+				lyxerr[Debug::MATHED] << "symbol abuse for " << tmp.name << endl;
 				tmp.draw = tmp.name;
 			} else if (math_font_available(tmp.inset)) {
-				lyxerr[Debug::MATHED] << "symbol available for " << tmp.name << "\n";
+				lyxerr[Debug::MATHED] << "symbol available for " << tmp.name << endl;
 				tmp.draw += char(charid);
 			} else if (fallbackid) {
 				if (tmp.inset == "cmex")
 					tmp.inset  = "lyxsymbol";
 				else
 					tmp.inset  = "lyxboldsymbol";
-				lyxerr[Debug::MATHED] << "symbol fallback for " << tmp.name << "\n";
+				lyxerr[Debug::MATHED] << "symbol fallback for " << tmp.name << endl;
-				tmp.draw += char(fallbackid); 
+				tmp.draw += char(fallbackid);
 			} else {
-				lyxerr[Debug::MATHED] << "faking " << tmp.name << "\n";
+				lyxerr[Debug::MATHED] << "faking " << tmp.name << endl;
 				tmp.draw = tmp.name;
 				tmp.inset = "lyxtex";
 			}
 		} else {
 			// it's a proper inset
 			lyxerr[Debug::MATHED] << "inset " << tmp.inset << " used for "
-				<< tmp.name << "\n";
+				<< tmp.name << endl;
 		}
 
 		if (theWordList.find(tmp.name) != theWordList.end())
 			lyxerr[Debug::MATHED] << "readSymbols: inset " << tmp.name
-				<< " already exists.\n";
+					      << " already exists." << endl;
 		else
 			theWordList[tmp.name] = tmp;
 		lyxerr[Debug::MATHED] << "read symbol '" << tmp.name
 					<<  "  inset: " << tmp.inset
 					<<  "  draw: " << int(tmp.draw[0])
 					<<  "  extra: " << tmp.extra
-					<< "'\n";
+				      << "'" << endl;
 	}
 	string tmp = "cmm";
 	string tmp2 = "cmsy";
@@ -208,11 +210,11 @@ latexkeys const * in_word_set(string const & str)
 
 MathAtom createMathInset(string const & s)
 {
-	lyxerr[Debug::MATHED] << "creating inset with name: '" << s << "'\n";
+	lyxerr[Debug::MATHED] << "creating inset with name: '" << s << "'" << endl;
 	latexkeys const * l = in_word_set(s);
 	if (l) {
 		string const & inset = l->inset;
-		lyxerr[Debug::MATHED] << " found inset: '" << inset << "'\n";
+		lyxerr[Debug::MATHED] << " found inset: '" << inset << "'" << endl;
 		if (inset == "ref")
 			return MathAtom(new RefInset(l->name));
 		if (inset == "underset")
@@ -283,6 +285,6 @@ MathAtom createMathInset(string const & s)
 	if (MathMacroTable::has(s))
 		return MathAtom(new MathMacro(s));
 
-	//lyxerr[Debug::MATHED] << "creating inset 2 with name: '" << s << "'\n";
+	//lyxerr[Debug::MATHED] << "creating inset 2 with name: '" << s << "'" << endl;
 	return MathAtom(new MathUnknownInset(s));
 }

src/support/ChangeLog

@@ -1,3 +1,10 @@
+2002-11-04  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* os.C: include config.h
+
+	* lstrings.C (getVectorFromString): rewrite to use
+	boost::tokenizer
+
 2002-10-31  Angus Leeming  <leeming@lyx.org>
 
 	* forkedcall.C (generateChild): clean it up further.

src/support/lstrings.C

@@ -21,6 +21,7 @@
 #include "debug.h"
 
 #include <boost/regex.hpp>
+#include <boost/tokenizer.hpp>
 
 #include <algorithm>
 
@@ -615,25 +616,32 @@ string const escape(string const & lab)
 vector<string> const getVectorFromString(string const & str,
 					 string const & delim)
 {
-    vector<string> vec;
+#if 0
-    if (str.empty())
+	vector<string> vec;
-	return vec;
+	if (str.empty())
-    string keys(rtrim(str));
+		return vec;
-    for(;;) {
+	string keys(rtrim(str));
-	string::size_type const idx = keys.find(delim);
+	for(;;) {
-	if (idx == string::npos) {
+		string::size_type const idx = keys.find(delim);
-	    vec.push_back(ltrim(keys));
+		if (idx == string::npos) {
-	    break;
+			vec.push_back(ltrim(keys));
+			break;
+		}
+		string const key = trim(keys.substr(0, idx));
+		if (!key.empty())
+			vec.push_back(key);
+		string::size_type const start = idx + delim.size();
+		keys = keys.substr(start);
 	}
-	string const key = trim(keys.substr(0, idx));
+	return vec;
-	if (!key.empty())
+#else
-	    vec.push_back(key);
+	boost::char_separator<char> sep(delim.c_str());
-	string::size_type const start = idx + delim.size();
+	boost::tokenizer<boost::char_separator<char> > tokens(str, sep);
-	keys = keys.substr(start);
+	return vector<string>(tokens.begin(), tokens.end());
-    }
+#endif
-    return vec;
 }
 
+
 // the same vice versa
 string const getStringFromVector(vector<string> const & vec,
 				 string const & delim)

src/support/os.C

@@ -1,3 +1,5 @@
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif

src/vc-backend.C

@@ -257,8 +257,8 @@ void CVS::scanMaster()
 
 			//sm[0]; // whole matched string
 			//sm[1]; // filename
-			version_ = sm[2];
+			version_ = sm.str(2);
-			string file_date = sm[3];
+			string file_date = sm.str(3);
 			//sm[4]; // options
 			//sm[5]; // tag or tagdate
 			FileInfo fi(file_);