From 0f9678630c661df5e3376c16cab3a5b2824871e9 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Sun, 7 Sep 2003 01:45:40 +0000 Subject: [PATCH] =?UTF-8?q?Remove=20all=20unnecessary=20#includes=20from?= =?UTF-8?q?=20header=20files.=20Add=20them=20as=20appropriate=20to=20.C=20?= =?UTF-8?q?files.=20Rename=20Voss=20as=20Vo=EF=BF=BD,=20Juergen=20as=20J?= =?UTF-8?q?=EF=BF=BDrgen=20and=20Spitzmueller=20as=20Spitzm=EF=BF=BDller.?= =?UTF-8?q?=20Happy=20compiling.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7701 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 21 +++++++++++++++++-- src/CutAndPaste.C | 2 +- src/CutAndPaste.h | 2 +- src/bufferparams.h | 2 ++ src/frontends/LyXKeySym.h | 2 +- src/frontends/LyXKeySymFactory.h | 2 +- src/frontends/controllers/ControlBibtex.C | 2 +- .../controllers/ControlCommandBuffer.C | 2 +- .../controllers/ControlCommandBuffer.h | 2 +- src/frontends/controllers/ControlGraphics.C | 7 ++++--- src/frontends/controllers/ControlGraphics.h | 2 +- src/frontends/controllers/ControlShowFile.C | 2 +- src/frontends/controllers/ControlShowFile.h | 2 +- src/frontends/controllers/ControlTexinfo.C | 2 +- src/frontends/controllers/ControlTexinfo.h | 2 +- src/frontends/controllers/biblio.C | 2 +- src/frontends/controllers/tex_helpers.C | 2 +- src/frontends/controllers/tex_helpers.h | 2 +- src/frontends/qt2/LyXKeySymFactory.C | 2 +- src/frontends/qt2/QBibtex.C | 2 +- src/frontends/qt2/QGraphics.C | 2 +- src/frontends/qt2/QGraphics.h | 2 +- src/frontends/qt2/QGraphicsDialog.C | 2 +- src/frontends/qt2/QGraphicsDialog.h | 2 +- src/frontends/qt2/QLyXKeySym.C | 2 +- src/frontends/qt2/QLyXKeySym.h | 2 +- src/frontends/qt2/QMathMatrixDialog.C | 2 +- src/frontends/qt2/QMathMatrixDialog.h | 2 +- src/frontends/qt2/QNote.C | 2 +- src/frontends/qt2/QNote.h | 2 +- src/frontends/qt2/QNoteDialog.C | 2 +- src/frontends/qt2/QNoteDialog.h | 2 +- src/frontends/qt2/QSendto.C | 2 +- src/frontends/qt2/QSendto.h | 2 +- src/frontends/qt2/QSendtoDialog.C | 2 +- src/frontends/qt2/QSendtoDialog.h | 2 +- src/frontends/qt2/QTabular.C | 4 ++-- src/frontends/qt2/QTabular.h | 4 ++-- src/frontends/qt2/QTabularDialog.C | 4 ++-- src/frontends/qt2/QTabularDialog.h | 4 ++-- src/frontends/qt2/QWrap.C | 2 +- src/frontends/qt2/QWrap.h | 2 +- src/frontends/qt2/QWrapDialog.C | 2 +- src/frontends/qt2/QWrapDialog.h | 2 +- src/frontends/qt2/lengthcombo.C | 2 +- src/frontends/xforms/FormBibtex.C | 2 +- src/frontends/xforms/FormDocument.C | 2 +- src/frontends/xforms/FormGraphics.C | 2 +- src/frontends/xforms/FormGraphics.h | 2 +- src/frontends/xforms/FormShowFile.C | 2 +- src/frontends/xforms/FormShowFile.h | 2 +- src/frontends/xforms/FormTexinfo.C | 2 +- src/frontends/xforms/FormTexinfo.h | 2 +- src/frontends/xforms/LyXKeySymFactory.C | 2 +- src/frontends/xforms/XLyXKeySym.C | 2 +- src/frontends/xforms/XLyXKeySym.h | 2 +- src/frontends/xforms/XMiniBuffer.C | 2 +- src/frontends/xforms/XMiniBuffer.h | 2 +- src/graphics/GraphicsCacheItem.C | 2 +- src/graphics/GraphicsImage.C | 2 +- src/insets/inset.h | 21 ++++++++----------- src/insets/insetcite.C | 2 +- src/insets/insetcite.h | 2 +- src/insets/insetcollapsable.h | 4 ++-- src/insets/insetexternal.h | 2 +- src/insets/insetgraphics.C | 2 +- src/insets/insetgraphics.h | 2 +- src/insets/insetgraphicsParams.C | 2 +- src/insets/insetgraphicsParams.h | 2 +- src/insets/insetinclude.h | 2 +- src/insets/insetlatexaccent.h | 4 +++- src/insets/insetoptarg.h | 1 - src/insets/insetspace.C | 2 +- src/insets/insetspace.h | 2 +- src/insets/insettext.h | 12 +++++------ src/insets/renderers.h | 3 +-- src/insets/updatableinset.h | 2 ++ src/intl.h | 3 ++- src/kbmap.h | 2 +- src/lengthcommon.h | 2 +- src/lyxfont.h | 4 ++-- src/lyxfunc.h | 9 ++++---- src/lyxrc.h | 2 +- src/lyxtext.h | 16 +++++++------- src/lyxtextclass.h | 4 +--- src/paragraph_pimpl.h | 3 ++- src/pspell.h | 4 ++-- src/support/filetools.C | 2 +- src/trans.h | 6 +++--- src/trans_decl.h | 2 +- src/trans_mgr.h | 3 +-- src/vspace.C | 2 +- src/vspace.h | 2 +- 93 files changed, 151 insertions(+), 134 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 5f0c9124f1..8f3875c06a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,7 +1,24 @@ 2003-09-07 Angus Leeming + * vspace.[Ch] (length): returns a const & to a LyXGlueLength. + * converter.h: forward declare LatexRunParams. - * encoding.h: remove #include "lyxrc.h" + * encoding.h: remove #include "lyxrc.h". + * lyxtext.h: remove #include "LColor.h". + * lyxtextclass.h: remove #include "support/types.h". + * trans.h: remove #include "tex-accent.h". + * trans_mgr.h: remove #include "tex-accent.h". + * insets/inset.h: remove #include "support/types.h", . + * insets/insetcollapsable.h: remove #include "LColor.h". + * insets/insetinclude.h: remove #include "dimension.h". + * insets/insetlatexaccent.h: remove #include "dimension.h". + * insets/insetoptarg.h:: remove #include "insettext.h". + * insets/insettext.h: remove #include "dimension.h", + + * insets/renderers.h: add #include "dimension.h". + * insets/updatableinset.h: add #include "support/types.h". + + * many .C files: Associated changes. 2003-09-06 Angus Leeming @@ -14,7 +31,7 @@ 2003-09-06 Angus Leeming * ParagraphParameters.h: forward declare ParameterStruct rather than - 'including the its file. + including its header file. (depth): moved out-of-line. 2003-09-06 Angus Leeming diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C index d85fe208a5..f03569133d 100644 --- a/src/CutAndPaste.C +++ b/src/CutAndPaste.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Juergen Vigna + * \author Jürgen Vigna * \author Lars Gullik Bjønnes * \author Alfredo Braunstein * diff --git a/src/CutAndPaste.h b/src/CutAndPaste.h index 74d0f09185..ceefdc20d6 100644 --- a/src/CutAndPaste.h +++ b/src/CutAndPaste.h @@ -4,7 +4,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Juergen Vigna + * \author Jürgen Vigna * \author Lars Gullik Bjønnes * \author Alfredo Braunstein * diff --git a/src/bufferparams.h b/src/bufferparams.h index 5e13ba4f72..70059950fc 100644 --- a/src/bufferparams.h +++ b/src/bufferparams.h @@ -25,6 +25,8 @@ #include "insets/insetquotes.h" +#include "support/types.h" + #include #include "support/std_string.h" diff --git a/src/frontends/LyXKeySym.h b/src/frontends/LyXKeySym.h index 4a42e2649c..79d977383e 100644 --- a/src/frontends/LyXKeySym.h +++ b/src/frontends/LyXKeySym.h @@ -4,7 +4,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Asger and Juergen + * \author Asger and Jürgen * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/LyXKeySymFactory.h b/src/frontends/LyXKeySymFactory.h index c710742bd3..ed4dc4bf06 100644 --- a/src/frontends/LyXKeySymFactory.h +++ b/src/frontends/LyXKeySymFactory.h @@ -4,7 +4,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Asger & Juergen + * \author Asger & Jürgen * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/controllers/ControlBibtex.C b/src/frontends/controllers/ControlBibtex.C index 29f4994ee6..bcbb76b3de 100644 --- a/src/frontends/controllers/ControlBibtex.C +++ b/src/frontends/controllers/ControlBibtex.C @@ -5,7 +5,7 @@ * * \author John Levon * \author Angus Leeming - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/controllers/ControlCommandBuffer.C b/src/frontends/controllers/ControlCommandBuffer.C index 6d937ab92e..e2c348c347 100644 --- a/src/frontends/controllers/ControlCommandBuffer.C +++ b/src/frontends/controllers/ControlCommandBuffer.C @@ -4,7 +4,7 @@ * Licence details can be found in the file COPYING. * * \author Lars - * \author Asger and Juergen + * \author Asger and Jürgen * \author John Levon * * Full author contact details are available in file CREDITS. diff --git a/src/frontends/controllers/ControlCommandBuffer.h b/src/frontends/controllers/ControlCommandBuffer.h index 4cbf30721e..65d47539cf 100644 --- a/src/frontends/controllers/ControlCommandBuffer.h +++ b/src/frontends/controllers/ControlCommandBuffer.h @@ -5,7 +5,7 @@ * Licence details can be found in the file COPYING. * * \author Lars - * \author Asger and Juergen + * \author Asger and Jürgen * \author John Levon * * Full author contact details are available in file CREDITS. diff --git a/src/frontends/controllers/ControlGraphics.C b/src/frontends/controllers/ControlGraphics.C index 66eb79e5b4..52d19bcdf6 100644 --- a/src/frontends/controllers/ControlGraphics.C +++ b/src/frontends/controllers/ControlGraphics.C @@ -4,7 +4,7 @@ * Licence details can be found in the file COPYING. * * \author Angus Leeming - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ @@ -25,10 +25,11 @@ #include "insets/insetgraphics.h" -#include "support/tostr.h" -#include "support/filetools.h" #include "support/FileInfo.h" +#include "support/filetools.h" #include "support/path_defines.h" +#include "support/tostr.h" +#include "support/types.h" using namespace lyx::support; diff --git a/src/frontends/controllers/ControlGraphics.h b/src/frontends/controllers/ControlGraphics.h index 85e1a505ef..aba85420f4 100644 --- a/src/frontends/controllers/ControlGraphics.h +++ b/src/frontends/controllers/ControlGraphics.h @@ -6,7 +6,7 @@ * * \author Baruch Even * \author Angus Leeming - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/controllers/ControlShowFile.C b/src/frontends/controllers/ControlShowFile.C index 0ec4803cfe..093c4b7d8b 100644 --- a/src/frontends/controllers/ControlShowFile.C +++ b/src/frontends/controllers/ControlShowFile.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/controllers/ControlShowFile.h b/src/frontends/controllers/ControlShowFile.h index 4a43c52b8a..dc0ba57704 100644 --- a/src/frontends/controllers/ControlShowFile.h +++ b/src/frontends/controllers/ControlShowFile.h @@ -5,7 +5,7 @@ * * \file ControlShowFile.h * - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/controllers/ControlTexinfo.C b/src/frontends/controllers/ControlTexinfo.C index 276eb414b3..f23de13768 100644 --- a/src/frontends/controllers/ControlTexinfo.C +++ b/src/frontends/controllers/ControlTexinfo.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/controllers/ControlTexinfo.h b/src/frontends/controllers/ControlTexinfo.h index 9de178fb03..82080f43f3 100644 --- a/src/frontends/controllers/ControlTexinfo.h +++ b/src/frontends/controllers/ControlTexinfo.h @@ -4,7 +4,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/controllers/biblio.C b/src/frontends/controllers/biblio.C index 3ee1568c37..632fcc0b03 100644 --- a/src/frontends/controllers/biblio.C +++ b/src/frontends/controllers/biblio.C @@ -4,7 +4,7 @@ * Licence details can be found in the file COPYING. * * \author Angus Leeming - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/controllers/tex_helpers.C b/src/frontends/controllers/tex_helpers.C index e9e106bf0c..78c57e5e9a 100644 --- a/src/frontends/controllers/tex_helpers.C +++ b/src/frontends/controllers/tex_helpers.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/controllers/tex_helpers.h b/src/frontends/controllers/tex_helpers.h index 3132a7da4a..6ffd4c50d6 100644 --- a/src/frontends/controllers/tex_helpers.h +++ b/src/frontends/controllers/tex_helpers.h @@ -4,7 +4,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/qt2/LyXKeySymFactory.C b/src/frontends/qt2/LyXKeySymFactory.C index 13826ad794..2d5aa5b3a2 100644 --- a/src/frontends/qt2/LyXKeySymFactory.C +++ b/src/frontends/qt2/LyXKeySymFactory.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Asger & Juergen + * \author Asger & Jürgen * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/qt2/QBibtex.C b/src/frontends/qt2/QBibtex.C index 5a5c4ccc7c..2be95b9a3f 100644 --- a/src/frontends/qt2/QBibtex.C +++ b/src/frontends/qt2/QBibtex.C @@ -4,7 +4,7 @@ * Licence details can be found in the file COPYING. * * \author John Levon - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/qt2/QGraphics.C b/src/frontends/qt2/QGraphics.C index a2e3f72d2a..80a6f2071b 100644 --- a/src/frontends/qt2/QGraphics.C +++ b/src/frontends/qt2/QGraphics.C @@ -5,7 +5,7 @@ * * \author John Levon * \author Edwin Leuven - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/qt2/QGraphics.h b/src/frontends/qt2/QGraphics.h index 0f9b65c4c0..502399ff1d 100644 --- a/src/frontends/qt2/QGraphics.h +++ b/src/frontends/qt2/QGraphics.h @@ -5,7 +5,7 @@ * Licence details can be found in the file COPYING. * * \author John Levon - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/qt2/QGraphicsDialog.C b/src/frontends/qt2/QGraphicsDialog.C index b7af1442d6..9032ddd567 100644 --- a/src/frontends/qt2/QGraphicsDialog.C +++ b/src/frontends/qt2/QGraphicsDialog.C @@ -4,7 +4,7 @@ * Licence details can be found in the file COPYING. * * \author John Levon - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/qt2/QGraphicsDialog.h b/src/frontends/qt2/QGraphicsDialog.h index 4dd319bfa8..15a696cae3 100644 --- a/src/frontends/qt2/QGraphicsDialog.h +++ b/src/frontends/qt2/QGraphicsDialog.h @@ -5,7 +5,7 @@ * Licence details can be found in the file COPYING. * * \author John Levon - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/qt2/QLyXKeySym.C b/src/frontends/qt2/QLyXKeySym.C index 45fcf70d87..b19a170526 100644 --- a/src/frontends/qt2/QLyXKeySym.C +++ b/src/frontends/qt2/QLyXKeySym.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Asger and Juergen + * \author Asger and Jürgen * \author John Levon * * Full author contact details are available in file CREDITS. diff --git a/src/frontends/qt2/QLyXKeySym.h b/src/frontends/qt2/QLyXKeySym.h index 9c666b98b8..d22d134418 100644 --- a/src/frontends/qt2/QLyXKeySym.h +++ b/src/frontends/qt2/QLyXKeySym.h @@ -4,7 +4,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Asger and Juergen + * \author Asger and Jürgen * \author John Levon * * Full author contact details are available in file CREDITS. diff --git a/src/frontends/qt2/QMathMatrixDialog.C b/src/frontends/qt2/QMathMatrixDialog.C index b3566c1e49..5f74284cac 100644 --- a/src/frontends/qt2/QMathMatrixDialog.C +++ b/src/frontends/qt2/QMathMatrixDialog.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Juergen Spitzmueller + * \author Jürgen Spitzmüller * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/qt2/QMathMatrixDialog.h b/src/frontends/qt2/QMathMatrixDialog.h index b04b0db85d..0f58150811 100644 --- a/src/frontends/qt2/QMathMatrixDialog.h +++ b/src/frontends/qt2/QMathMatrixDialog.h @@ -6,7 +6,7 @@ * * \author John Levon * \author Edwin Leuven - * \author Juergen Spitzmueller + * \author Jürgen Spitzmüller * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/qt2/QNote.C b/src/frontends/qt2/QNote.C index 25ad1eeef9..08200b2b9e 100644 --- a/src/frontends/qt2/QNote.C +++ b/src/frontends/qt2/QNote.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Juergen Spitzmueller + * \author Jürgen Spitzmüller * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/qt2/QNote.h b/src/frontends/qt2/QNote.h index e4d3d4756f..3165115f29 100644 --- a/src/frontends/qt2/QNote.h +++ b/src/frontends/qt2/QNote.h @@ -4,7 +4,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Juergen Spitzmueller + * \author Jürgen Spitzmüller * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/qt2/QNoteDialog.C b/src/frontends/qt2/QNoteDialog.C index 641c502e0b..a1e2bd4e2b 100644 --- a/src/frontends/qt2/QNoteDialog.C +++ b/src/frontends/qt2/QNoteDialog.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Juergen Spitzmueller + * \author Jürgen Spitzmüller * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/qt2/QNoteDialog.h b/src/frontends/qt2/QNoteDialog.h index dda7e8de30..1f487b2de1 100644 --- a/src/frontends/qt2/QNoteDialog.h +++ b/src/frontends/qt2/QNoteDialog.h @@ -4,7 +4,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Juergen Spitzmueller + * \author Jürgen Spitzmüller * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/qt2/QSendto.C b/src/frontends/qt2/QSendto.C index 524c14e3ad..6b17aca2b4 100644 --- a/src/frontends/qt2/QSendto.C +++ b/src/frontends/qt2/QSendto.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Juergen Spitzmueller + * \author Jürgen Spitzmüller * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/qt2/QSendto.h b/src/frontends/qt2/QSendto.h index 8584b82e47..7477702886 100644 --- a/src/frontends/qt2/QSendto.h +++ b/src/frontends/qt2/QSendto.h @@ -4,7 +4,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Juergen Spitzmueller + * \author Jürgen Spitzmüller * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/qt2/QSendtoDialog.C b/src/frontends/qt2/QSendtoDialog.C index a3b0695a62..43c23f367a 100644 --- a/src/frontends/qt2/QSendtoDialog.C +++ b/src/frontends/qt2/QSendtoDialog.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Juergen Spitzmueller + * \author Jürgen Spitzmüller * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/qt2/QSendtoDialog.h b/src/frontends/qt2/QSendtoDialog.h index b56205513d..40915ea1bd 100644 --- a/src/frontends/qt2/QSendtoDialog.h +++ b/src/frontends/qt2/QSendtoDialog.h @@ -4,7 +4,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Juergen Spitzmueller + * \author Jürgen Spitzmüller * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/qt2/QTabular.C b/src/frontends/qt2/QTabular.C index 9db9f9c298..eeca1aed0f 100644 --- a/src/frontends/qt2/QTabular.C +++ b/src/frontends/qt2/QTabular.C @@ -4,8 +4,8 @@ * Licence details can be found in the file COPYING. * * \author John Levon - * \author Juergen Spitzmueller - * \author Herbert Voss + * \author Jürgen Spitzmüller + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/qt2/QTabular.h b/src/frontends/qt2/QTabular.h index 37b2f00242..ced67eedc1 100644 --- a/src/frontends/qt2/QTabular.h +++ b/src/frontends/qt2/QTabular.h @@ -6,8 +6,8 @@ * * \author John Levon * \author Kalle Dalheimer - * \author Juergen Spitzmueller - * \author Herbert Voss + * \author Jürgen Spitzmüller + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/qt2/QTabularDialog.C b/src/frontends/qt2/QTabularDialog.C index e28fcb87f3..e0a15d6f55 100644 --- a/src/frontends/qt2/QTabularDialog.C +++ b/src/frontends/qt2/QTabularDialog.C @@ -4,8 +4,8 @@ * Licence details can be found in the file COPYING. * * \author John Levon - * \author Juergen Spitzmueller - * \author Herbert Voss + * \author Jürgen Spitzmüller + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/qt2/QTabularDialog.h b/src/frontends/qt2/QTabularDialog.h index a1bfa9b388..f24ae522c5 100644 --- a/src/frontends/qt2/QTabularDialog.h +++ b/src/frontends/qt2/QTabularDialog.h @@ -5,8 +5,8 @@ * Licence details can be found in the file COPYING. * * \author John Levon - * \author Juergen Spitzmueller - * \author Herbert Voss + * \author Jürgen Spitzmüller + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/qt2/QWrap.C b/src/frontends/qt2/QWrap.C index cd7ac3d201..59dec65a4c 100644 --- a/src/frontends/qt2/QWrap.C +++ b/src/frontends/qt2/QWrap.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Juergen Spitzmueller + * \author Jürgen Spitzmüller * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/qt2/QWrap.h b/src/frontends/qt2/QWrap.h index 8fa68dacef..e9e1145997 100644 --- a/src/frontends/qt2/QWrap.h +++ b/src/frontends/qt2/QWrap.h @@ -4,7 +4,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Juergen Spitzmueller + * \author Jürgen Spitzmüller * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/qt2/QWrapDialog.C b/src/frontends/qt2/QWrapDialog.C index fdb78ba7a7..d252d99406 100644 --- a/src/frontends/qt2/QWrapDialog.C +++ b/src/frontends/qt2/QWrapDialog.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Juergen Spitzmueller + * \author Jürgen Spitzmüller * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/qt2/QWrapDialog.h b/src/frontends/qt2/QWrapDialog.h index 0626983f6b..88a92850a3 100644 --- a/src/frontends/qt2/QWrapDialog.h +++ b/src/frontends/qt2/QWrapDialog.h @@ -4,7 +4,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Juergen Spitzmueller + * \author Jürgen Spitzmüller * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/qt2/lengthcombo.C b/src/frontends/qt2/lengthcombo.C index 3113c1853b..7b8143b9ec 100644 --- a/src/frontends/qt2/lengthcombo.C +++ b/src/frontends/qt2/lengthcombo.C @@ -4,7 +4,7 @@ * Licence details can be found in the file COPYING. * * \author John Levon - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/xforms/FormBibtex.C b/src/frontends/xforms/FormBibtex.C index 0dee28b1e1..be56c77798 100644 --- a/src/frontends/xforms/FormBibtex.C +++ b/src/frontends/xforms/FormBibtex.C @@ -5,7 +5,7 @@ * * \author Angus Leeming * \author John Levon - * \author Herbert Voss + * \author Herbert Voß * \author Rob Lahaye * * Full author contact details are available in file CREDITS. diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C index bf1b760137..b99e97b1d0 100644 --- a/src/frontends/xforms/FormDocument.C +++ b/src/frontends/xforms/FormDocument.C @@ -6,7 +6,7 @@ * \author Jürgen Vigna * \author Rob Lahaye * \author Martin Vermeer - * \author Juergen Spitzmueller + * \author Jürgen Spitzmüller * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/xforms/FormGraphics.C b/src/frontends/xforms/FormGraphics.C index d3e54ec07a..ef25223c61 100644 --- a/src/frontends/xforms/FormGraphics.C +++ b/src/frontends/xforms/FormGraphics.C @@ -4,7 +4,7 @@ * Licence details can be found in the file COPYING. * * \author Baruch Even - * \author Herbert Voss + * \author Herbert Voß * \author Rob Lahaye * * Full author contact details are available in file CREDITS. diff --git a/src/frontends/xforms/FormGraphics.h b/src/frontends/xforms/FormGraphics.h index 762f52320c..6511f87c25 100644 --- a/src/frontends/xforms/FormGraphics.h +++ b/src/frontends/xforms/FormGraphics.h @@ -5,7 +5,7 @@ * Licence details can be found in the file COPYING. * * \author Baruch Even - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/xforms/FormShowFile.C b/src/frontends/xforms/FormShowFile.C index 594a87d158..c59bea2d2d 100644 --- a/src/frontends/xforms/FormShowFile.C +++ b/src/frontends/xforms/FormShowFile.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/xforms/FormShowFile.h b/src/frontends/xforms/FormShowFile.h index 33aff6562e..1b6b444716 100644 --- a/src/frontends/xforms/FormShowFile.h +++ b/src/frontends/xforms/FormShowFile.h @@ -4,7 +4,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/xforms/FormTexinfo.C b/src/frontends/xforms/FormTexinfo.C index 21a35feeac..9d569e7914 100644 --- a/src/frontends/xforms/FormTexinfo.C +++ b/src/frontends/xforms/FormTexinfo.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/xforms/FormTexinfo.h b/src/frontends/xforms/FormTexinfo.h index 05b625f892..6f67ca1ddb 100644 --- a/src/frontends/xforms/FormTexinfo.h +++ b/src/frontends/xforms/FormTexinfo.h @@ -4,7 +4,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/xforms/LyXKeySymFactory.C b/src/frontends/xforms/LyXKeySymFactory.C index 928482e5d4..00cfdf0fbd 100644 --- a/src/frontends/xforms/LyXKeySymFactory.C +++ b/src/frontends/xforms/LyXKeySymFactory.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Asger & Juergen + * \author Asger & Jürgen * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/xforms/XLyXKeySym.C b/src/frontends/xforms/XLyXKeySym.C index d32b15ba8d..51e3c0ce19 100644 --- a/src/frontends/xforms/XLyXKeySym.C +++ b/src/frontends/xforms/XLyXKeySym.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Asger and Juergen + * \author Asger and Jürgen * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/xforms/XLyXKeySym.h b/src/frontends/xforms/XLyXKeySym.h index ed7dfb6032..9014c5096c 100644 --- a/src/frontends/xforms/XLyXKeySym.h +++ b/src/frontends/xforms/XLyXKeySym.h @@ -4,7 +4,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Asger and Juergen + * \author Asger and Jürgen * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/xforms/XMiniBuffer.C b/src/frontends/xforms/XMiniBuffer.C index 968973d3e0..ab90cbb966 100644 --- a/src/frontends/xforms/XMiniBuffer.C +++ b/src/frontends/xforms/XMiniBuffer.C @@ -4,7 +4,7 @@ * Licence details can be found in the file COPYING. * * \author Lars - * \author Asger and Juergen + * \author Asger and Jürgen * * Full author contact details are available in file CREDITS. */ diff --git a/src/frontends/xforms/XMiniBuffer.h b/src/frontends/xforms/XMiniBuffer.h index 00b6936b46..eb2edfa0e4 100644 --- a/src/frontends/xforms/XMiniBuffer.h +++ b/src/frontends/xforms/XMiniBuffer.h @@ -5,7 +5,7 @@ * Licence details can be found in the file COPYING. * * \author Lars - * \author Asger and Juergen + * \author Asger and Jürgen * \author John Levon * * Full author contact details are available in file CREDITS. diff --git a/src/graphics/GraphicsCacheItem.C b/src/graphics/GraphicsCacheItem.C index 84d66086bd..69cb8e33f9 100644 --- a/src/graphics/GraphicsCacheItem.C +++ b/src/graphics/GraphicsCacheItem.C @@ -4,7 +4,7 @@ * Licence details can be found in the file COPYING. * * \author Baruch Even - * \author Herbert Voss + * \author Herbert Voß * \author Angus Leeming * * Full author contact details are available in file CREDITS. diff --git a/src/graphics/GraphicsImage.C b/src/graphics/GraphicsImage.C index 75f6498a88..78097751dc 100644 --- a/src/graphics/GraphicsImage.C +++ b/src/graphics/GraphicsImage.C @@ -5,7 +5,7 @@ * * \author Baruch Even * \author Angus Leeming - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/insets/inset.h b/src/insets/inset.h index 27738f71ae..9d38ab9d04 100644 --- a/src/insets/inset.h +++ b/src/insets/inset.h @@ -15,25 +15,22 @@ #ifndef INSETOLD_H #define INSETOLD_H -#include "LColor.h" #include "insetbase.h" #include "dimension.h" +#include "LColor.h" #include "ParagraphList_fwd.h" -#include "support/types.h" -#include - -class LyXFont; class Buffer; -class Painter; -class LatexRunParams; -class LyXText; -class LyXLex; -class Paragraph; -class LyXCursor; class FuncRequest; -class WordLangTuple; +class LatexRunParams; +class LyXCursor; +class LyXFont; +class LyXLex; +class LyXText; +class Painter; +class Paragraph; class UpdatableInset; +class WordLangTuple; namespace lyx { namespace graphics { diff --git a/src/insets/insetcite.C b/src/insets/insetcite.C index a4cc7f1e72..f704d12052 100644 --- a/src/insets/insetcite.C +++ b/src/insets/insetcite.C @@ -4,7 +4,7 @@ * Licence details can be found in the file COPYING. * * \author Angus Leeming - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/insets/insetcite.h b/src/insets/insetcite.h index a38e133f62..cc0848274b 100644 --- a/src/insets/insetcite.h +++ b/src/insets/insetcite.h @@ -5,7 +5,7 @@ * Licence details can be found in the file COPYING. * * \author Angus Leeming - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/insets/insetcollapsable.h b/src/insets/insetcollapsable.h index 09ac4d4c23..daa33a52e7 100644 --- a/src/insets/insetcollapsable.h +++ b/src/insets/insetcollapsable.h @@ -16,9 +16,9 @@ #include "inset.h" #include "insettext.h" -#include "lyxfont.h" -#include "LColor.h" + #include "box.h" +#include "lyxfont.h" #include diff --git a/src/insets/insetexternal.h b/src/insets/insetexternal.h index 076dbaffe0..7859b67a4c 100644 --- a/src/insets/insetexternal.h +++ b/src/insets/insetexternal.h @@ -15,11 +15,11 @@ #include "inset.h" #include "graphics/GraphicsTypes.h" #include "support/filename.h" -#include "support/std_string.h" #include #include +#include "support/std_string.h" class RenderInset; diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C index e80ea5bb34..2ffd7751a5 100644 --- a/src/insets/insetgraphics.C +++ b/src/insets/insetgraphics.C @@ -4,7 +4,7 @@ * Licence details can be found in the file COPYING. * * \author Baruch Even - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h index e35ecaec8b..d09edf59c6 100644 --- a/src/insets/insetgraphics.h +++ b/src/insets/insetgraphics.h @@ -5,7 +5,7 @@ * Licence details can be found in the file COPYING. * * \author Baruch Even - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/insets/insetgraphicsParams.C b/src/insets/insetgraphicsParams.C index 0a23644894..b3bcf7d3f9 100644 --- a/src/insets/insetgraphicsParams.C +++ b/src/insets/insetgraphicsParams.C @@ -4,7 +4,7 @@ * Licence details can be found in the file COPYING. * * \author Baruch Even - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/insets/insetgraphicsParams.h b/src/insets/insetgraphicsParams.h index 3d614f76d5..627e1ee476 100644 --- a/src/insets/insetgraphicsParams.h +++ b/src/insets/insetgraphicsParams.h @@ -5,7 +5,7 @@ * Licence details can be found in the file COPYING. * * \author Baruch Even - * \author Herbert Voss + * \author Herbert Voß * * Full author contact details are available in file CREDITS. */ diff --git a/src/insets/insetinclude.h b/src/insets/insetinclude.h index 7e0ee9fdd3..a444276781 100644 --- a/src/insets/insetinclude.h +++ b/src/insets/insetinclude.h @@ -13,12 +13,12 @@ #define INSET_INCLUDE_H #include "insetcommand.h" -#include "dimension.h" #include "renderers.h" #include class Buffer; +class Dimension; struct LaTeXFeatures; // Created by AAS 970521 diff --git a/src/insets/insetlatexaccent.h b/src/insets/insetlatexaccent.h index 4b49eec77f..7d3ac2b540 100644 --- a/src/insets/insetlatexaccent.h +++ b/src/insets/insetlatexaccent.h @@ -14,7 +14,9 @@ #include "inset.h" #include "support/std_string.h" -#include "dimension.h" + +class Dimension; + /** Insertion of accents diff --git a/src/insets/insetoptarg.h b/src/insets/insetoptarg.h index 6abba7f934..b00cec4bf6 100644 --- a/src/insets/insetoptarg.h +++ b/src/insets/insetoptarg.h @@ -13,7 +13,6 @@ #define INSETOPTARG_H -#include "insettext.h" #include "insetcollapsable.h" diff --git a/src/insets/insetspace.C b/src/insets/insetspace.C index 345a5f1f27..6e3472c1e8 100644 --- a/src/insets/insetspace.C +++ b/src/insets/insetspace.C @@ -6,7 +6,7 @@ * \author Asger Alstrup Nielsen * \author Jean-Marc Lasgouttes * \author Lars Gullik Bjønnes - * \author Juergen Spitzmueller + * \author Jürgen Spitzmüller * * Full author contact details are available in file CREDITS. */ diff --git a/src/insets/insetspace.h b/src/insets/insetspace.h index 267ff8121a..c340560ccd 100644 --- a/src/insets/insetspace.h +++ b/src/insets/insetspace.h @@ -7,7 +7,7 @@ * \author Asger Alstrup Nielsen * \author Jean-Marc Lasgouttes * \author Lars Gullik Bjønnes - * \author Juergen Spitzmueller + * \author Jürgen Spitzmüller * * Full author contact details are available in file CREDITS. */ diff --git a/src/insets/insettext.h b/src/insets/insettext.h index c8f6a2be63..dcd71da838 100644 --- a/src/insets/insettext.h +++ b/src/insets/insettext.h @@ -13,27 +13,25 @@ #define INSETTEXT_H #include "updatableinset.h" -#include "support/std_string.h" #include "LColor.h" #include "ParagraphList_fwd.h" #include "RowList_fwd.h" -#include "dimension.h" #include "lyxtext.h" #include "support/types.h" #include "frontends/mouse_state.h" -#include +#include "support/std_string.h" -class Painter; -class BufferView; class Buffer; class BufferParams; +class BufferView; +class Dimension; class LyXCursor; -class LyXText; -class Row; +class Painter; class Paragraph; +class Row; /** A text inset is like a TeX box to write full text diff --git a/src/insets/renderers.h b/src/insets/renderers.h index e74f7ca491..727e017b88 100644 --- a/src/insets/renderers.h +++ b/src/insets/renderers.h @@ -12,12 +12,11 @@ #ifndef RENDERERS_H #define RENDERERS_H -#include "dimension.h" #include "box.h" +#include "dimension.h" #include "graphics/GraphicsLoader.h" #include "graphics/GraphicsParams.h" -#include "graphics/GraphicsTypes.h" #include #include diff --git a/src/insets/updatableinset.h b/src/insets/updatableinset.h index 1694230815..c0a735cd9c 100644 --- a/src/insets/updatableinset.h +++ b/src/insets/updatableinset.h @@ -22,6 +22,8 @@ #include "inset.h" +#include "support/types.h" + /** Extracted from Matthias notes: * diff --git a/src/intl.h b/src/intl.h index 0180c84b1e..b4ca4393a7 100644 --- a/src/intl.h +++ b/src/intl.h @@ -15,9 +15,10 @@ #ifndef INTL_H #define INTL_H -#include "support/std_string.h" #include "trans_mgr.h" +#include "support/std_string.h" + /** * This class is used for managing keymaps diff --git a/src/kbmap.h b/src/kbmap.h index f4a7b06ec8..38516d8644 100644 --- a/src/kbmap.h +++ b/src/kbmap.h @@ -14,11 +14,11 @@ #ifndef KBMAP_H #define KBMAP_H -#include "support/std_string.h" #include "frontends/key_state.h" #include +#include "support/std_string.h" #include class kb_sequence; diff --git a/src/lengthcommon.h b/src/lengthcommon.h index 765816ca3e..b32271c20d 100644 --- a/src/lengthcommon.h +++ b/src/lengthcommon.h @@ -15,8 +15,8 @@ #ifndef LENGTH_COMMON_H #define LENGTH_COMMON_H -#include "support/std_string.h" #include "lyxlength.h" +#include "support/std_string.h" /// the number of units possible extern int const num_units; diff --git a/src/lyxfont.h b/src/lyxfont.h index 6baefa7ebb..69fa775b65 100644 --- a/src/lyxfont.h +++ b/src/lyxfont.h @@ -15,10 +15,10 @@ #ifndef LYXFONT_H #define LYXFONT_H -#include +#include "LColor.h" #include "support/std_string.h" -#include "LColor.h" +#include class LyXLex; class BufferParams; diff --git a/src/lyxfunc.h b/src/lyxfunc.h index f3ce55520f..b67b5c5821 100644 --- a/src/lyxfunc.h +++ b/src/lyxfunc.h @@ -17,17 +17,18 @@ #include "kbsequence.h" #include "lfuns.h" -#include "support/std_string.h" #include #include +#include "support/std_string.h" + +class BufferView; +class FuncRequest; class FuncStatus; class LyXKeySym; -class LyXView; class LyXText; -class FuncRequest; -class BufferView; +class LyXView; /** This class encapsulates all the LyX command operations. diff --git a/src/lyxrc.h b/src/lyxrc.h index dfd00286da..54310500b5 100644 --- a/src/lyxrc.h +++ b/src/lyxrc.h @@ -21,7 +21,7 @@ #include "paper.h" #include "graphics/GraphicsTypes.h" -// #include +#include "support/std_string.h" /// This contains the runtime configuration of LyX class LyXRC //: public noncopyable { diff --git a/src/lyxtext.h b/src/lyxtext.h index ea9c855d39..8da530766c 100644 --- a/src/lyxtext.h +++ b/src/lyxtext.h @@ -14,28 +14,28 @@ #ifndef LYXTEXT_H #define LYXTEXT_H -#include "lyxfont.h" -#include "layout.h" -#include "LColor.h" -#include "insets/inset.h" -#include "RowList_fwd.h" -#include "ParagraphList_fwd.h" #include "bufferview_funcs.h" +#include "layout.h" +#include "lyxfont.h" +#include "ParagraphList_fwd.h" +#include "RowList_fwd.h" #include "textcursor.h" +#include "insets/inset.h" + class Buffer; class BufferParams; class BufferView; +class Dimension; class InsetText; class LyXCursor; +class MetricsInfo; class Paragraph; class Row; class Spacing; class UpdatableInset; class VSpace; class WordLangTuple; -class MetricsInfo; -class Dimension; /** diff --git a/src/lyxtextclass.h b/src/lyxtextclass.h index 9c8b289fac..3de520654c 100644 --- a/src/lyxtextclass.h +++ b/src/lyxtextclass.h @@ -11,13 +11,11 @@ #define LYXTEXTCLASS_H #include "lyxlayout.h" -#include "support/std_string.h" #include "lyxlayout_ptr_fwd.h" -#include "support/types.h" - #include +#include "support/std_string.h" #include class LyXLex; diff --git a/src/paragraph_pimpl.h b/src/paragraph_pimpl.h index 7e5ba6d016..e4514e0bc4 100644 --- a/src/paragraph_pimpl.h +++ b/src/paragraph_pimpl.h @@ -16,8 +16,9 @@ #define PARAGRAPH_PIMPL_H #include "paragraph.h" -#include "ParagraphParameters.h" + #include "changes.h" +#include "ParagraphParameters.h" #include diff --git a/src/pspell.h b/src/pspell.h index deb096c95a..4de75c2320 100644 --- a/src/pspell.h +++ b/src/pspell.h @@ -13,10 +13,10 @@ #ifndef LYX_PSPELL_H #define LYX_PSPELL_H -#include - #include "SpellBase.h" +#include + class PspellManager; class PspellStringEmulation; class PspellCanHaveError; diff --git a/src/support/filetools.C b/src/support/filetools.C index 0ce3da0bfa..3503773906 100644 --- a/src/support/filetools.C +++ b/src/support/filetools.C @@ -12,7 +12,7 @@ * \author Jean-Marc Lasgouttes * \author Angus Leeming * \author John Levon - * \author Herbert Voss + * \author Herbert Voß * * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. diff --git a/src/trans.h b/src/trans.h index a7edae7ce8..5938354768 100644 --- a/src/trans.h +++ b/src/trans.h @@ -14,11 +14,11 @@ #ifndef TRANS_H #define TRANS_H +#include "trans_decl.h" + +#include "support/std_string.h" #include -#include "tex-accent.h" -#include "support/std_string.h" -#include "trans_decl.h" class LyXLex; diff --git a/src/trans_decl.h b/src/trans_decl.h index 57ff760d76..a916fb92d5 100644 --- a/src/trans_decl.h +++ b/src/trans_decl.h @@ -13,9 +13,9 @@ #ifndef TRANS_DECL_H #define TRANS_DECL_H -#include "support/std_string.h" #include "tex-accent.h" +#include "support/std_string.h" #include diff --git a/src/trans_mgr.h b/src/trans_mgr.h index 7336146b8f..0ef601f29b 100644 --- a/src/trans_mgr.h +++ b/src/trans_mgr.h @@ -14,9 +14,8 @@ #ifndef TRANS_MANAGER_H #define TRANS_MANAGER_H -#include "tex-accent.h" -#include "trans_decl.h" #include "chset.h" +#include "trans_decl.h" #include "support/std_string.h" class LyXText; diff --git a/src/vspace.C b/src/vspace.C index 7e44280950..499b3017de 100644 --- a/src/vspace.C +++ b/src/vspace.C @@ -370,7 +370,7 @@ VSpace::vspace_kind VSpace::kind() const } -LyXGlueLength VSpace::length() const +LyXGlueLength const & VSpace::length() const { return len_; } diff --git a/src/vspace.h b/src/vspace.h index 99a92d3417..16a27e3e04 100644 --- a/src/vspace.h +++ b/src/vspace.h @@ -48,7 +48,7 @@ public: /// return the type of vertical space vspace_kind kind() const; /// return the length of this space - LyXGlueLength length() const; + LyXGlueLength const & length() const; // a flag that switches between \vspace and \vspace* bool keep() const;