From 17c8764e0a3c5adcb970fd7803a6255cfe4bf01f Mon Sep 17 00:00:00 2001 From: John Levon Date: Sun, 30 Mar 2003 20:25:44 +0000 Subject: [PATCH] move BoostFormat and boost-inst git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6651 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/BufferView.C | 2 +- src/BufferView_pimpl.C | 2 +- src/ChangeLog | 8 ++++++++ src/Chktex.C | 2 +- src/CutAndPaste.C | 2 +- src/LaTeX.C | 2 +- src/Makefile.am | 2 -- src/buffer.C | 2 +- src/bufferlist.C | 2 +- src/bufferview_funcs.C | 2 +- src/converter.C | 2 +- src/debug.C | 2 +- src/format.C | 2 +- src/frontends/controllers/ControlDocument.C | 2 +- src/frontends/controllers/ControlSpellchecker.C | 2 +- src/frontends/controllers/biblio.C | 2 +- src/frontends/qt2/Alert_pimpl.C | 2 +- src/frontends/qt2/QVCLog.C | 2 +- src/frontends/xforms/ColorHandler.C | 2 +- src/frontends/xforms/FormBase.C | 2 +- src/frontends/xforms/FormDialogView.C | 2 +- src/frontends/xforms/FormGraphics.C | 2 +- src/importer.C | 2 +- src/insets/insetcaption.C | 2 +- src/insets/insetfloatlist.C | 2 +- src/insets/insetgraphics.C | 2 +- src/insets/insetparent.C | 2 +- src/lyx_cb.C | 2 +- src/lyx_main.C | 2 +- src/lyxfont.C | 2 +- src/lyxfunc.C | 2 +- src/lyxvc.C | 2 +- src/mathed/formulamacro.C | 2 +- src/paragraph_funcs.C | 2 +- src/{ => support}/BoostFormat.h | 0 src/support/ChangeLog | 6 ++++++ src/support/Makefile.am | 2 ++ src/{ => support}/boost-inst.C | 2 +- src/text2.C | 2 +- 39 files changed, 50 insertions(+), 36 deletions(-) rename src/{ => support}/BoostFormat.h (100%) rename src/{ => support}/boost-inst.C (96%) diff --git a/src/BufferView.C b/src/BufferView.C index 280315d2a9..63f08f7371 100644 --- a/src/BufferView.C +++ b/src/BufferView.C @@ -43,7 +43,7 @@ #include "support/lyxfunctional.h" // equal_1st_in_pair #include "support/types.h" #include "support/lyxalgo.h" // lyx_count -#include "BoostFormat.h" +#include "support/BoostFormat.h" #include diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C index 95a63eb99d..24d47839f5 100644 --- a/src/BufferView_pimpl.C +++ b/src/BufferView_pimpl.C @@ -57,7 +57,7 @@ #include #include -#include "BoostFormat.h" +#include "support/BoostFormat.h" #include #include diff --git a/src/ChangeLog b/src/ChangeLog index 2985de2915..de42324e06 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2003-03-30 John Levon + + * Makefile.am: + * BoostFormat.h: + * boost-inst.C: moved to support + + * several files: changes as a result + 2003-03-30 Lars Gullik Bjønnes * text2.C (LyXText): adjust. diff --git a/src/Chktex.C b/src/Chktex.C index 1e7f62d2bc..c58328746a 100644 --- a/src/Chktex.C +++ b/src/Chktex.C @@ -25,7 +25,7 @@ #include "support/path.h" #include "support/lstrings.h" -#include "BoostFormat.h" +#include "support/BoostFormat.h" #include diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C index c5c6a20824..18d131816c 100644 --- a/src/CutAndPaste.C +++ b/src/CutAndPaste.C @@ -25,7 +25,7 @@ #include "insets/inseterror.h" -#include "BoostFormat.h" +#include "support/BoostFormat.h" using std::endl; using std::pair; diff --git a/src/LaTeX.C b/src/LaTeX.C index 65f45b9458..8a8ab8596a 100644 --- a/src/LaTeX.C +++ b/src/LaTeX.C @@ -28,7 +28,7 @@ #include "support/path.h" #include -#include "BoostFormat.h" +#include "support/BoostFormat.h" #include #include // sscanf diff --git a/src/Makefile.am b/src/Makefile.am index 1d71aadd13..d211314c28 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -36,7 +36,6 @@ localedir = $(datadir)/locale BUILT_SOURCES = version.C lyx_SOURCES = \ - BoostFormat.h \ BufferView.C \ BufferView.h \ BufferView_pimpl.C \ @@ -94,7 +93,6 @@ lyx_SOURCES = \ author.C \ author.h \ boost.C \ - boost-inst.C \ box.h \ box.C \ broken_headers.h \ diff --git a/src/buffer.C b/src/buffer.C index 4f603d9b21..3cc6dce3e1 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -65,7 +65,7 @@ #include #include -#include "BoostFormat.h" +#include "support/BoostFormat.h" #include #include diff --git a/src/bufferlist.C b/src/bufferlist.C index ea7fd73491..9b76eafb63 100644 --- a/src/bufferlist.C +++ b/src/bufferlist.C @@ -34,7 +34,7 @@ #include "support/LAssert.h" #include -#include "BoostFormat.h" +#include "support/BoostFormat.h" #include #include diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C index cc23921110..8d1a2df746 100644 --- a/src/bufferview_funcs.C +++ b/src/bufferview_funcs.C @@ -35,7 +35,7 @@ #include "insets/updatableinset.h" -#include "BoostFormat.h" +#include "support/BoostFormat.h" namespace { LyXFont freefont(LyXFont::ALL_IGNORE); diff --git a/src/converter.C b/src/converter.C index 405020e2ff..d0f1529c92 100644 --- a/src/converter.C +++ b/src/converter.C @@ -30,7 +30,7 @@ #include "support/path.h" #include "support/systemcall.h" -#include "BoostFormat.h" +#include "support/BoostFormat.h" #include diff --git a/src/debug.C b/src/debug.C index 583640ec11..d3d672ea5f 100644 --- a/src/debug.C +++ b/src/debug.C @@ -13,7 +13,7 @@ #include "gettext.h" #include "support/lstrings.h" -#include "BoostFormat.h" +#include "support/BoostFormat.h" #include diff --git a/src/format.C b/src/format.C index e3ad3f0503..b8df07ce3b 100644 --- a/src/format.C +++ b/src/format.C @@ -15,7 +15,7 @@ #include "lyx_cb.h" // for ShowMessage() ... to be removed? #include "gettext.h" #include "LString.h" -#include "BoostFormat.h" +#include "support/BoostFormat.h" #include "frontends/Alert.h" //to be removed? diff --git a/src/frontends/controllers/ControlDocument.C b/src/frontends/controllers/ControlDocument.C index 78e2c0b51b..d730f2b7b9 100644 --- a/src/frontends/controllers/ControlDocument.C +++ b/src/frontends/controllers/ControlDocument.C @@ -33,7 +33,7 @@ #include "support/lstrings.h" #include "support/filetools.h" -#include "BoostFormat.h" +#include "support/BoostFormat.h" using std::endl; diff --git a/src/frontends/controllers/ControlSpellchecker.C b/src/frontends/controllers/ControlSpellchecker.C index 576c7b6c29..4495b87375 100644 --- a/src/frontends/controllers/ControlSpellchecker.C +++ b/src/frontends/controllers/ControlSpellchecker.C @@ -32,7 +32,7 @@ #include "frontends/Alert.h" -#include "BoostFormat.h" +#include "support/BoostFormat.h" using std::endl; diff --git a/src/frontends/controllers/biblio.C b/src/frontends/controllers/biblio.C index 1c9013f23e..6efab20385 100644 --- a/src/frontends/controllers/biblio.C +++ b/src/frontends/controllers/biblio.C @@ -20,7 +20,7 @@ #include "support/LAssert.h" #include -#include "BoostFormat.h" +#include "support/BoostFormat.h" #include diff --git a/src/frontends/qt2/Alert_pimpl.C b/src/frontends/qt2/Alert_pimpl.C index ad38db003f..3281e70b30 100644 --- a/src/frontends/qt2/Alert_pimpl.C +++ b/src/frontends/qt2/Alert_pimpl.C @@ -23,7 +23,7 @@ #include "Alert.h" #include "Alert_pimpl.h" -#include "BoostFormat.h" +#include "support/BoostFormat.h" #include "gettext.h" using std::pair; diff --git a/src/frontends/qt2/QVCLog.C b/src/frontends/qt2/QVCLog.C index c28508453c..50507e3dae 100644 --- a/src/frontends/qt2/QVCLog.C +++ b/src/frontends/qt2/QVCLog.C @@ -23,7 +23,7 @@ #include #include -#include "BoostFormat.h" +#include "support/BoostFormat.h" typedef QController > base_class; diff --git a/src/frontends/xforms/ColorHandler.C b/src/frontends/xforms/ColorHandler.C index 101f369a9f..53915fef01 100644 --- a/src/frontends/xforms/ColorHandler.C +++ b/src/frontends/xforms/ColorHandler.C @@ -17,7 +17,7 @@ #include "debug.h" #include -#include "BoostFormat.h" +#include "support/BoostFormat.h" #include diff --git a/src/frontends/xforms/FormBase.C b/src/frontends/xforms/FormBase.C index 8613659c11..896785a4b5 100644 --- a/src/frontends/xforms/FormBase.C +++ b/src/frontends/xforms/FormBase.C @@ -21,7 +21,7 @@ #include "xforms_helpers.h" // formatted #include "gettext.h" // _() -#include "BoostFormat.h" +#include "support/BoostFormat.h" #include "support/LAssert.h" #include "support/filetools.h" // LibFileSearch diff --git a/src/frontends/xforms/FormDialogView.C b/src/frontends/xforms/FormDialogView.C index 8a65a6c5e0..c78e62409c 100644 --- a/src/frontends/xforms/FormDialogView.C +++ b/src/frontends/xforms/FormDialogView.C @@ -22,7 +22,7 @@ #include "gettext.h" // _() #include "lyxrc.h" -#include "BoostFormat.h" +#include "support/BoostFormat.h" #include "support/LAssert.h" #include "support/filetools.h" // LibFileSearch diff --git a/src/frontends/xforms/FormGraphics.C b/src/frontends/xforms/FormGraphics.C index 6c4ba4b1e6..32bd0e2011 100644 --- a/src/frontends/xforms/FormGraphics.C +++ b/src/frontends/xforms/FormGraphics.C @@ -36,7 +36,7 @@ #include "support/lyxlib.h" // for float_equal #include "support/filetools.h" // for MakeAbsPath etc -#include "BoostFormat.h" +#include "support/BoostFormat.h" #include FORMS_H_LOCATION diff --git a/src/importer.C b/src/importer.C index bc74a4b8d8..d1ffa0537c 100644 --- a/src/importer.C +++ b/src/importer.C @@ -22,7 +22,7 @@ #include "gettext.h" #include "BufferView.h" -#include "BoostFormat.h" +#include "support/BoostFormat.h" #include diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C index af5e9d8d6e..892c1e6132 100644 --- a/src/insets/insetcaption.C +++ b/src/insets/insetcaption.C @@ -22,7 +22,7 @@ #include "gettext.h" #include "support/lstrings.h" -#include "BoostFormat.h" +#include "support/BoostFormat.h" using std::ostream; using std::endl; diff --git a/src/insets/insetfloatlist.C b/src/insets/insetfloatlist.C index eea56091cc..3df488deb3 100644 --- a/src/insets/insetfloatlist.C +++ b/src/insets/insetfloatlist.C @@ -22,7 +22,7 @@ #include "gettext.h" #include "debug.h" -#include "BoostFormat.h" +#include "support/BoostFormat.h" using std::ostream; using std::endl; diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C index 63dc458487..1182ad0ef1 100644 --- a/src/insets/insetgraphics.C +++ b/src/insets/insetgraphics.C @@ -89,7 +89,7 @@ TODO #include #include #include -#include "BoostFormat.h" +#include "support/BoostFormat.h" #include // For the std::max diff --git a/src/insets/insetparent.C b/src/insets/insetparent.C index f0edc618fa..8c676ebee6 100644 --- a/src/insets/insetparent.C +++ b/src/insets/insetparent.C @@ -24,7 +24,7 @@ #include "buffer.h" #include "gettext.h" -#include "BoostFormat.h" +#include "support/BoostFormat.h" using std::ostream; diff --git a/src/lyx_cb.C b/src/lyx_cb.C index 233395c432..ac98e2fcb5 100644 --- a/src/lyx_cb.C +++ b/src/lyx_cb.C @@ -36,7 +36,7 @@ #include "support/systemcall.h" #include "support/lstrings.h" -#include "BoostFormat.h" +#include "support/BoostFormat.h" #include #include diff --git a/src/lyx_main.C b/src/lyx_main.C index e55212f038..25b984fd3b 100644 --- a/src/lyx_main.C +++ b/src/lyx_main.C @@ -39,7 +39,7 @@ #include "frontends/Alert.h" #include "frontends/lyx_gui.h" -#include "BoostFormat.h" +#include "support/BoostFormat.h" #include #include diff --git a/src/lyxfont.C b/src/lyxfont.C index 22594630d3..861f939f29 100644 --- a/src/lyxfont.C +++ b/src/lyxfont.C @@ -21,7 +21,7 @@ #include "support/lstrings.h" #include "bufferparams.h" // stateText -#include "BoostFormat.h" +#include "support/BoostFormat.h" using std::ostream; using std::endl; diff --git a/src/lyxfunc.C b/src/lyxfunc.C index a695355657..298e7b3cf1 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -68,7 +68,7 @@ #include "support/path.h" #include "support/lyxfunctional.h" -#include "BoostFormat.h" +#include "support/BoostFormat.h" #include #include diff --git a/src/lyxvc.C b/src/lyxvc.C index b919bb1d4f..3def73dfec 100644 --- a/src/lyxvc.C +++ b/src/lyxvc.C @@ -13,7 +13,7 @@ #include "support/filetools.h" #include "support/lyxlib.h" -#include "BoostFormat.h" +#include "support/BoostFormat.h" #include diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C index f44a96aeb1..5cbf21b179 100644 --- a/src/mathed/formulamacro.C +++ b/src/mathed/formulamacro.C @@ -37,7 +37,7 @@ #include "Lsstream.h" -#include "BoostFormat.h" +#include "support/BoostFormat.h" using std::ostream; diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C index 36b4cc0337..cd3937c8c4 100644 --- a/src/paragraph_funcs.C +++ b/src/paragraph_funcs.C @@ -21,7 +21,7 @@ #include "encoding.h" #include "lyxrc.h" #include "lyxlex.h" -#include "BoostFormat.h" +#include "support/BoostFormat.h" #include "factory.h" #include "support/lstrings.h" #include "insets/insetoptarg.h" diff --git a/src/BoostFormat.h b/src/support/BoostFormat.h similarity index 100% rename from src/BoostFormat.h rename to src/support/BoostFormat.h diff --git a/src/support/ChangeLog b/src/support/ChangeLog index 8d847b017f..b5bb83aa88 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -1,3 +1,9 @@ +2003-03-30 John Levon + + * Makefile.am: + * BoostFormat.h: + * boost-inst.C: moved from src/ + 2003-03-29 John Levon * filetools.h: diff --git a/src/support/Makefile.am b/src/support/Makefile.am index 398e582870..344f49b2a6 100644 --- a/src/support/Makefile.am +++ b/src/support/Makefile.am @@ -12,6 +12,7 @@ LYXSTRING = lyxstring.C lyxstring.h endif libsupport_la_SOURCES = \ + BoostFormat.h \ DebugStream.C \ DebugStream.h \ FileInfo.C \ @@ -26,6 +27,7 @@ libsupport_la_SOURCES = \ os.h \ abort.C \ atoi.C \ + boost-inst.C \ chdir.C \ copy.C \ filetools.C \ diff --git a/src/boost-inst.C b/src/support/boost-inst.C similarity index 96% rename from src/boost-inst.C rename to src/support/boost-inst.C index 4ee2fe491a..f16bc6279b 100644 --- a/src/boost-inst.C +++ b/src/support/boost-inst.C @@ -1,6 +1,6 @@ #include -#include "BoostFormat.h" +#include "support/BoostFormat.h" #if USE_BOOST_FORMAT diff --git a/src/text2.C b/src/text2.C index 4c55cab4d9..c04dcb583a 100644 --- a/src/text2.C +++ b/src/text2.C @@ -41,7 +41,7 @@ #include "support/textutils.h" #include "support/lstrings.h" -#include "BoostFormat.h" +#include "support/BoostFormat.h" using std::vector; using std::copy;