From df71b75d4a19b80cd6f1b3359982a1c06fefe4b5 Mon Sep 17 00:00:00 2001 From: John Levon Date: Thu, 12 Sep 2002 14:58:06 +0000 Subject: [PATCH] trivial shit git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5286 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 10 ++++++++++ src/LyXAction.C | 6 +++--- src/factory.C | 9 +++++++++ src/factory.h | 13 ++++++------ src/paragraph_funcs.C | 46 +++++++++++++++++++++---------------------- src/paragraph_funcs.h | 16 +++++++-------- 6 files changed, 60 insertions(+), 40 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 7be6f5ad42..2b3a6127f8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2002-09-12 John Levon + + * LyXAction.C: tidy + + * factory.h: + * factory.C: add header + + * paragraph_funcs.h: + * paragraph_funcs.C: cleanup + 2002-09-11 John Levon * PrinterParams.h: odd/even default to true diff --git a/src/LyXAction.C b/src/LyXAction.C index 3d26ffe271..a7a5e794d5 100644 --- a/src/LyXAction.C +++ b/src/LyXAction.C @@ -536,10 +536,10 @@ string const LyXAction::getActionName(int action) const if (!ev.argument.empty()) ev.argument.insert(0, " "); - info_map::const_iterator iit = lyx_info_map.find(ev.action); + info_map::const_iterator const it = lyx_info_map.find(ev.action); - if (iit != lyx_info_map.end()) - return iit->second.name + ev.argument; + if (it != lyx_info_map.end()) + return it->second.name + ev.argument; return string(); } diff --git a/src/factory.C b/src/factory.C index 520da4ba22..0efe69aa5d 100644 --- a/src/factory.C +++ b/src/factory.C @@ -1,3 +1,12 @@ +/** + * \file factory.C + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. + * + * \author André Pönitz + * + * Full author contact details are available in file CREDITS + */ #include "funcrequest.h" #include "bufferparams.h" diff --git a/src/factory.h b/src/factory.h index 65da9ce2c6..8a4a53dc86 100644 --- a/src/factory.h +++ b/src/factory.h @@ -1,12 +1,13 @@ // -*- C++ -*- -/* This file is part of - * ====================================================== +/** + * \file factory.h + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * LyX, The Document Processor + * \author André Pönitz * - * Copyright 2002 The LyX Team. - * - * ====================================================== */ + * Full author contact details are available in file CREDITS + */ #ifndef FACTORY_H #define FACTORY_H diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C index 597444fa1e..7235db4f18 100644 --- a/src/paragraph_funcs.C +++ b/src/paragraph_funcs.C @@ -1,12 +1,12 @@ -/* This file is part of - * ====================================================== +/** + * \file paragraph_funcs.C + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * LyX, The Document Processor + * \author Lars Gullik Bjønnes * - * Copyright 1995 Matthias Ettrich - * Copyright 1995-2001 The LyX Team. - * - * ====================================================== */ + * Full author contact details are available in file CREDITS + */ #include @@ -43,7 +43,7 @@ void breakParagraph(BufferParams const & bparams, tmp->setLabelWidthString(par->params().labelWidthString()); } - bool isempty = (par->layout()->keepempty && par->empty()); + bool const isempty = (par->layout()->keepempty && par->empty()); if (!isempty && (par->size() > pos || par->empty() || flag == 2)) { tmp->layout(par->layout()); @@ -75,24 +75,24 @@ void breakParagraph(BufferParams const & bparams, } } - // just an idea of me - if (!pos) { - tmp->params().lineTop(par->params().lineTop()); - tmp->params().pagebreakTop(par->params().pagebreakTop()); - tmp->params().spaceTop(par->params().spaceTop()); - tmp->bibkey = par->bibkey; + if (pos) + return; + + tmp->params().lineTop(par->params().lineTop()); + tmp->params().pagebreakTop(par->params().pagebreakTop()); + tmp->params().spaceTop(par->params().spaceTop()); + tmp->bibkey = par->bibkey; - par->bibkey = 0; - par->params().clear(); + par->bibkey = 0; + par->params().clear(); - par->layout(bparams.getLyXTextClass().defaultLayout()); + par->layout(bparams.getLyXTextClass().defaultLayout()); - // layout stays the same with latex-environments - if (flag) { - par->layout(tmp->layout()); - par->setLabelWidthString(tmp->params().labelWidthString()); - par->params().depth(tmp->params().depth()); - } + // layout stays the same with latex-environments + if (flag) { + par->layout(tmp->layout()); + par->setLabelWidthString(tmp->params().labelWidthString()); + par->params().depth(tmp->params().depth()); } } diff --git a/src/paragraph_funcs.h b/src/paragraph_funcs.h index c9322a5609..ea54a654eb 100644 --- a/src/paragraph_funcs.h +++ b/src/paragraph_funcs.h @@ -1,13 +1,13 @@ // -*- C++ -*- -/* This file is part of - * ====================================================== +/** + * \file paragraph_funcs.h + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * LyX, The Document Processor + * \author Lars Gullik Bjønnes * - * Copyright 1995 Matthias Ettrich - * Copyright 1995-2001 The LyX Team. - * - * ====================================================== */ + * Full author contact details are available in file CREDITS + */ #ifndef PARAGRAPH_FUNCS_H #define PARAGRAPH_FUNCS_H @@ -49,4 +49,4 @@ bool isFirstInSequence(Paragraph * par); int getEndLabel(Paragraph * para, BufferParams const & bparams); #endif -#endif +#endif // PARAGRAPH_FUNCS_H -- 2.39.2