mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-05 13:26:21 +00:00
Forward declare LatexRunParams in converter.h.
Remove #include "lyxrc.h" from encoding.h. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7700 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
4fb18536e9
commit
ecaf48dc26
@ -1,3 +1,8 @@
|
||||
2003-09-07 Angus Leeming <leeming@lyx.org>
|
||||
|
||||
* converter.h: forward declare LatexRunParams.
|
||||
* encoding.h: remove #include "lyxrc.h"
|
||||
|
||||
2003-09-06 Angus Leeming <leeming@lyx.org>
|
||||
|
||||
* Bullet.[Ch]: factorize all those #ifdef ENABLE_ASSERTIONS to just one,
|
||||
|
@ -15,17 +15,20 @@
|
||||
#include <config.h>
|
||||
|
||||
#include "LaTeXFeatures.h"
|
||||
#include "debug.h"
|
||||
#include "lyx_sty.h"
|
||||
|
||||
#include "bufferparams.h"
|
||||
#include "debug.h"
|
||||
#include "encoding.h"
|
||||
#include "Floating.h"
|
||||
#include "FloatList.h"
|
||||
#include "language.h"
|
||||
#include "encoding.h"
|
||||
#include "support/std_sstream.h"
|
||||
#include "lyx_sty.h"
|
||||
#include "lyxrc.h"
|
||||
|
||||
#include "support/filetools.h"
|
||||
|
||||
#include "support/std_sstream.h"
|
||||
|
||||
using namespace lyx::support;
|
||||
|
||||
using lyx::textclass_type;
|
||||
|
@ -16,13 +16,16 @@
|
||||
#include <config.h>
|
||||
|
||||
#include "bufferparams.h"
|
||||
|
||||
#include "Bullet.h"
|
||||
#include "debug.h"
|
||||
#include "encoding.h"
|
||||
#include "gettext.h"
|
||||
#include "language.h"
|
||||
#include "LaTeXFeatures.h"
|
||||
#include "support/std_sstream.h"
|
||||
#include "latexrunparams.h"
|
||||
#include "lyxlex.h"
|
||||
#include "lyxrc.h"
|
||||
#include "lyxtextclasslist.h"
|
||||
#include "tex-strings.h"
|
||||
#include "texrow.h"
|
||||
@ -31,13 +34,15 @@
|
||||
|
||||
#include "support/lyxalgo.h" // for lyx::count
|
||||
|
||||
#include "support/std_sstream.h"
|
||||
|
||||
using namespace lyx::support;
|
||||
|
||||
using std::endl;
|
||||
|
||||
using std::istringstream;
|
||||
using std::ostream;
|
||||
using std::ostringstream;
|
||||
using std::endl;
|
||||
using std::pair;
|
||||
|
||||
|
||||
|
@ -15,18 +15,19 @@
|
||||
#ifndef BUFFERPARAMS_H
|
||||
#define BUFFERPARAMS_H
|
||||
|
||||
#include "support/std_string.h"
|
||||
#include "vspace.h"
|
||||
#include "Spacing.h"
|
||||
#include "author.h"
|
||||
#include "BranchList.h"
|
||||
#include "Bullet.h"
|
||||
#include "lyxtextclass.h"
|
||||
#include "author.h"
|
||||
#include "paper.h"
|
||||
#include "BranchList.h"
|
||||
#include "Spacing.h"
|
||||
#include "vspace.h"
|
||||
|
||||
#include "insets/insetquotes.h"
|
||||
|
||||
#include <boost/array.hpp>
|
||||
|
||||
#include "support/std_string.h"
|
||||
#include <vector>
|
||||
|
||||
class LyXLex;
|
||||
|
@ -12,15 +12,15 @@
|
||||
#ifndef CONVERTER_H
|
||||
#define CONVERTER_H
|
||||
|
||||
#include "latexrunparams.h"
|
||||
#include "graph.h"
|
||||
|
||||
#include <vector>
|
||||
|
||||
class Buffer;
|
||||
class Format;
|
||||
class Formats;
|
||||
class LatexRunParams;
|
||||
|
||||
class Buffer;
|
||||
|
||||
///
|
||||
class Converter {
|
||||
|
@ -13,8 +13,10 @@
|
||||
#include <config.h>
|
||||
|
||||
#include "encoding.h"
|
||||
#include "lyxlex.h"
|
||||
|
||||
#include "debug.h"
|
||||
#include "lyxlex.h"
|
||||
#include "lyxrc.h"
|
||||
|
||||
#ifndef CXX_GLOBAL_CSTD
|
||||
using std::strtol;
|
||||
|
@ -14,8 +14,6 @@
|
||||
#define ENCODING_H
|
||||
|
||||
#include "support/std_string.h"
|
||||
#include "lyxrc.h"
|
||||
|
||||
#include <map>
|
||||
|
||||
///
|
||||
|
@ -17,15 +17,18 @@
|
||||
#include <config.h>
|
||||
|
||||
#include "exporter.h"
|
||||
|
||||
#include "buffer.h"
|
||||
#include "buffer_funcs.h"
|
||||
#include "support/filetools.h"
|
||||
#include "lyxrc.h"
|
||||
#include "converter.h"
|
||||
#include "format.h"
|
||||
#include "frontends/Alert.h"
|
||||
#include "gettext.h"
|
||||
#include "latexrunparams.h"
|
||||
#include "lyxrc.h"
|
||||
|
||||
#include "frontends/Alert.h"
|
||||
|
||||
#include "support/filetools.h"
|
||||
|
||||
using namespace lyx::support;
|
||||
|
||||
|
@ -22,6 +22,7 @@
|
||||
// FIXME: move this stuff out again
|
||||
#include "bufferlist.h"
|
||||
#include "lyxfunc.h"
|
||||
#include "lyxrc.h"
|
||||
#include "lyxserver.h"
|
||||
#include "BufferView.h"
|
||||
|
||||
|
@ -15,6 +15,7 @@
|
||||
#include "qfont_loader.h"
|
||||
#include "qt_helpers.h"
|
||||
#include "debug.h"
|
||||
#include "lyxrc.h"
|
||||
|
||||
#include "support/lstrings.h"
|
||||
#include "frontends/lyx_gui.h"
|
||||
|
@ -21,6 +21,7 @@
|
||||
#include "encoding.h"
|
||||
#include "language.h"
|
||||
#include "lyxfont.h"
|
||||
#include "lyxrc.h"
|
||||
|
||||
#include "support/lstrings.h"
|
||||
|
||||
|
@ -16,6 +16,7 @@
|
||||
|
||||
#include "encoding.h"
|
||||
#include "language.h"
|
||||
#include "lyxrc.h"
|
||||
|
||||
#include "frontends/lyx_gui.h"
|
||||
|
||||
|
@ -15,8 +15,9 @@
|
||||
|
||||
#include "buffer.h"
|
||||
#include "converter.h"
|
||||
#include "format.h"
|
||||
#include "debug.h"
|
||||
#include "format.h"
|
||||
#include "latexrunparams.h"
|
||||
#include "lyxrc.h"
|
||||
|
||||
#include "frontends/lyx_gui.h" // hexname
|
||||
@ -46,9 +47,9 @@ using std::make_pair;
|
||||
using std::setfill;
|
||||
using std::setw;
|
||||
|
||||
using std::ifstream;
|
||||
using std::list;
|
||||
using std::map;
|
||||
using std::ifstream;
|
||||
using std::ofstream;
|
||||
using std::ostream;
|
||||
using std::ostringstream;
|
||||
|
@ -21,6 +21,7 @@
|
||||
#include "funcrequest.h"
|
||||
#include "gettext.h"
|
||||
#include "LaTeXFeatures.h"
|
||||
#include "latexrunparams.h"
|
||||
#include "lyxlex.h"
|
||||
#include "lyxrc.h"
|
||||
#include "support/std_sstream.h"
|
||||
|
@ -63,7 +63,7 @@ TODO
|
||||
#include "funcrequest.h"
|
||||
#include "gettext.h"
|
||||
#include "LaTeXFeatures.h"
|
||||
#include "support/std_sstream.h"
|
||||
#include "latexrunparams.h"
|
||||
#include "lyxlex.h"
|
||||
#include "lyxrc.h"
|
||||
|
||||
@ -80,6 +80,8 @@ TODO
|
||||
#include <boost/bind.hpp>
|
||||
#include <boost/tuple/tuple.hpp>
|
||||
|
||||
#include "support/std_sstream.h"
|
||||
|
||||
namespace support = lyx::support;
|
||||
using namespace lyx::support;
|
||||
|
||||
|
10
src/ispell.C
10
src/ispell.C
@ -12,13 +12,15 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include "language.h"
|
||||
#include "ispell.h"
|
||||
|
||||
#include "bufferparams.h"
|
||||
#include "debug.h"
|
||||
#include "encoding.h"
|
||||
#include "ispell.h"
|
||||
#include "WordLangTuple.h"
|
||||
#include "gettext.h"
|
||||
#include "bufferparams.h"
|
||||
#include "language.h"
|
||||
#include "lyxrc.h"
|
||||
#include "WordLangTuple.h"
|
||||
|
||||
#include "support/forkedcall.h"
|
||||
|
||||
|
@ -13,9 +13,11 @@
|
||||
#include <config.h>
|
||||
|
||||
#include "language.h"
|
||||
|
||||
#include "debug.h"
|
||||
#include "encoding.h"
|
||||
#include "lyxlex.h"
|
||||
#include "debug.h"
|
||||
#include "lyxrc.h"
|
||||
|
||||
using std::endl;
|
||||
|
||||
|
@ -31,6 +31,7 @@
|
||||
#include "lastfiles.h"
|
||||
#include "lyxfunc.h"
|
||||
#include "lyxlex.h"
|
||||
#include "lyxrc.h"
|
||||
#include "lyxtextclasslist.h"
|
||||
#include "lyxserver.h"
|
||||
#include "MenuBackend.h"
|
||||
|
@ -38,6 +38,7 @@
|
||||
#include "lyx_cb.h"
|
||||
#include "LyXAction.h"
|
||||
#include "lyxfind.h"
|
||||
#include "lyxrc.h"
|
||||
#include "lyxrow.h"
|
||||
#include "lyxserver.h"
|
||||
#include "paragraph.h"
|
||||
|
@ -26,6 +26,7 @@
|
||||
#include "gettext.h"
|
||||
#include "language.h"
|
||||
#include "latexrunparams.h"
|
||||
#include "lyxrc.h"
|
||||
#include "lyxrow.h"
|
||||
|
||||
#include "insets/insetbibitem.h"
|
||||
|
@ -11,31 +11,32 @@
|
||||
#include <config.h>
|
||||
|
||||
#include "paragraph_funcs.h"
|
||||
#include "paragraph_pimpl.h"
|
||||
|
||||
#include "buffer.h"
|
||||
#include "debug.h"
|
||||
#include "encoding.h"
|
||||
#include "errorlist.h"
|
||||
#include "factory.h"
|
||||
#include "gettext.h"
|
||||
#include "iterators.h"
|
||||
#include "language.h"
|
||||
#include "encoding.h"
|
||||
#include "lyxlex.h"
|
||||
#include "factory.h"
|
||||
#include "support/std_sstream.h"
|
||||
#include "lyxrc.h"
|
||||
#include "paragraph_pimpl.h"
|
||||
|
||||
#include "support/lstrings.h"
|
||||
#include "support/LAssert.h"
|
||||
|
||||
#include "insets/insetoptarg.h"
|
||||
#include "insets/insetbibitem.h"
|
||||
#include "insets/insethfill.h"
|
||||
#include "insets/insetlatexaccent.h"
|
||||
#include "insets/insetnewline.h"
|
||||
#include "insets/insetoptarg.h"
|
||||
#include "insets/insetspace.h"
|
||||
#include "insets/insetspecialchar.h"
|
||||
#include "insets/insetlatexaccent.h"
|
||||
#include "insets/insettabular.h"
|
||||
#include "insets/insethfill.h"
|
||||
#include "insets/insetnewline.h"
|
||||
|
||||
extern string bibitemWidest(Buffer const &);
|
||||
#include "support/LAssert.h"
|
||||
#include "support/lstrings.h"
|
||||
|
||||
#include "support/std_sstream.h"
|
||||
|
||||
using namespace lyx::support;
|
||||
|
||||
@ -45,6 +46,8 @@ using std::endl;
|
||||
using std::istringstream;
|
||||
using std::ostream;
|
||||
|
||||
extern string bibitemWidest(Buffer const &);
|
||||
|
||||
|
||||
namespace {
|
||||
|
||||
|
@ -21,6 +21,7 @@
|
||||
#include "language.h"
|
||||
#include "LaTeXFeatures.h"
|
||||
#include "latexrunparams.h"
|
||||
#include "lyxrc.h"
|
||||
#include "texrow.h"
|
||||
|
||||
#include "support/LAssert.h"
|
||||
|
@ -11,24 +11,27 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include "frontends/Painter.h"
|
||||
#include "frontends/font_metrics.h"
|
||||
#include "support/LAssert.h"
|
||||
#include "paragraph_funcs.h"
|
||||
#include "support/textutils.h"
|
||||
#include "rowpainter.h"
|
||||
|
||||
#include "insets/insettext.h"
|
||||
#include "ParagraphParameters.h"
|
||||
#include "BufferView.h"
|
||||
#include "buffer.h"
|
||||
#include "BufferView.h"
|
||||
#include "encoding.h"
|
||||
#include "gettext.h"
|
||||
#include "language.h"
|
||||
#include "encoding.h"
|
||||
#include "rowpainter.h"
|
||||
#include "lyxrc.h"
|
||||
#include "lyxrow.h"
|
||||
#include "lyxrow_funcs.h"
|
||||
#include "metricsinfo.h"
|
||||
#include "paragraph_funcs.h"
|
||||
#include "ParagraphParameters.h"
|
||||
|
||||
#include "frontends/font_metrics.h"
|
||||
#include "frontends/Painter.h"
|
||||
|
||||
#include "insets/insettext.h"
|
||||
|
||||
#include "support/LAssert.h"
|
||||
#include "support/textutils.h"
|
||||
|
||||
using namespace lyx::support;
|
||||
|
||||
|
25
src/text.C
25
src/text.C
@ -17,29 +17,32 @@
|
||||
#include <config.h>
|
||||
|
||||
#include "lyxtext.h"
|
||||
#include "gettext.h"
|
||||
|
||||
#include "buffer.h"
|
||||
#include "BufferView.h"
|
||||
#include "debug.h"
|
||||
#include "encoding.h"
|
||||
#include "funcrequest.h"
|
||||
#include "frontends/LyXView.h"
|
||||
#include "frontends/font_metrics.h"
|
||||
#include "BufferView.h"
|
||||
#include "gettext.h"
|
||||
#include "language.h"
|
||||
#include "ParagraphParameters.h"
|
||||
#include "undo_funcs.h"
|
||||
#include "text_funcs.h"
|
||||
#include "WordLangTuple.h"
|
||||
#include "paragraph_funcs.h"
|
||||
#include "rowpainter.h"
|
||||
#include "lyxrc.h"
|
||||
#include "lyxrow.h"
|
||||
#include "lyxrow_funcs.h"
|
||||
#include "paragraph_funcs.h"
|
||||
#include "ParagraphParameters.h"
|
||||
#include "rowpainter.h"
|
||||
#include "text_funcs.h"
|
||||
#include "undo_funcs.h"
|
||||
#include "WordLangTuple.h"
|
||||
|
||||
#include "frontends/font_metrics.h"
|
||||
#include "frontends/LyXView.h"
|
||||
|
||||
#include "insets/insettext.h"
|
||||
|
||||
#include "support/textutils.h"
|
||||
#include "support/LAssert.h"
|
||||
#include "support/lstrings.h"
|
||||
#include "support/textutils.h"
|
||||
|
||||
|
||||
using namespace lyx::support;
|
||||
|
Loading…
Reference in New Issue
Block a user