Replace ParagraphList.h with ParagraphList_fwd.h.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7693 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2003-09-06 12:36:58 +00:00
parent b0a5773d95
commit 2e1eeac0b9
34 changed files with 104 additions and 61 deletions

View File

@ -1,7 +1,54 @@
2003-09-06 Angus Leeming <leeming@lyx.org>
* ParagraphList_fwd.h: new file, forward-declaring Paragraph rather than
#including paragraph.h.
* ParagraphList.h:
* RowList.h: deleted. Superfluous.
* CutAndPaste.h:
* iterators.h:
* lyxcursor.h:
* lyxtext.h:
* text_funcs.h:
* undo.h:
* undo_funcs.h:
* insets/inset.h:
* insets/insettext.h: use ParagraphList_fwd.h rather than ParagraphList.h.
* paragraph.h: don't forward declare ParagraphList.
* buffer.h:
* paragraph_funcs.h: #include ParagraphList_fwd.h and paragraph.h
rather than ParagraphList.h. paragraph.h is still needed for the
Paragraph::depth_type parameters.
* textcursor.h: enable it to compile stand-alone in light of the
above changes.
* bufferview_funcs.C:
* iterators.C:
* lyxfunc.C:
* lyxrow_funcs.C:
* paragraph.C:
* rowpainter.C:
* text.C:
* text2.C:
* text3.C:
* text_funcs.C:
* textcursor.C:
* undo.C:
* frontends/controllers/ControlParagraph.C:
* frontends/controllers/ControlTabular.C:
* insets/insetmarginal.C:
* insets/insetminipage.C:
* insets/insetnote.C:
* insets/insetoptarg.C: add header files needed to compile again.
2003-09-06 Angus Leeming <leeming@lyx.org>
* RowList_fwd.h: new file, forward-declaring Row rather than
#including lyxrow.h
#including lyxrow.h.
* lyxrow_funcs.h:
* lyxtext.h:

View File

@ -14,15 +14,17 @@
#ifndef CUTANDPASTE_H
#define CUTANDPASTE_H
#include "ParagraphList_fwd.h"
#include "support/types.h"
#include "ParagraphList.h"
#include "support/std_string.h"
#include <vector>
class Paragraph;
class Buffer;
class BufferParams;
class LyXTextClass;
class ErrorList;
class LyXTextClass;
class Paragraph;
///
namespace CutAndPaste {

View File

@ -1,24 +1,23 @@
// -*- C++ -*-
/**
* \file ParagraphList.h
* \file ParagraphList_fwd.h
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author Lars Gullik Bjønnes
* \author Angus Leeming
*
* Full author contact details are available in file CREDITS.
*/
#ifndef PARAGRAPH_LIST_H
#define PARAGRAPH_LIST_H
#include "paragraph.h"
#ifndef PARAGRAPH_LIST_FWD_H
#define PARAGRAPH_LIST_FWD_H
#include <list>
#include <utility>
struct ParagraphList : public std::list<Paragraph>
{
};
class Paragraph;
typedef std::list<Paragraph> ParagraphList;
typedef std::pair<ParagraphList::iterator, int> PitPosPair;

View File

@ -1,21 +0,0 @@
// -*- C++ -*-
/**
* \file RowList.h
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author Lars Gullik Bjønnes
*
* Full author contact details are available in file CREDITS.
*/
#ifndef ROW_LIST_H
#define ROW_LIST_H
#include "lyxrow.h"
#include <list>
typedef std::list<Row> RowList;
#endif

View File

@ -19,7 +19,8 @@
#include "lyxvc.h"
#include "bufferparams.h"
#include "texrow.h"
#include "ParagraphList.h"
#include "paragraph.h"
#include "ParagraphList_fwd.h"
#include "errorlist.h"
#include <boost/scoped_ptr.hpp>

View File

@ -13,14 +13,14 @@
#include <config.h>
#include "buffer.h"
#include "bufferview_funcs.h"
#include "BufferView.h"
#include "lyxlex.h"
#include "buffer.h"
#include "language.h"
#include "gettext.h"
#include "lyxlex.h"
#include "lyxrow.h"
#include "ParagraphParameters.h"
#include "RowList.h"
#include "frontends/LyXView.h"
#include "frontends/Alert.h"

View File

@ -15,6 +15,7 @@
#include "ButtonController.h"
#include "funcrequest.h"
#include "lyxlex.h"
#include "paragraph.h"
#include "ParagraphParameters.h"
#include "support/LAssert.h"
#include "support/std_sstream.h"

View File

@ -13,6 +13,7 @@
#include "ControlTabular.h"
#include "funcrequest.h"
#include "lyxrc.h"
#include "paragraph.h"
#include "insets/insettabular.h"
#include "support/LAssert.h"

View File

@ -18,6 +18,7 @@
#include "LColor.h"
#include "insetbase.h"
#include "dimension.h"
#include "ParagraphList_fwd.h"
#include "support/types.h"
#include <vector>
@ -32,7 +33,6 @@ class Paragraph;
class LyXCursor;
class FuncRequest;
class WordLangTuple;
class ParagraphList;
class UpdatableInset;
namespace lyx {

View File

@ -14,6 +14,7 @@
#include "insetmarginal.h"
#include "gettext.h"
#include "paragraph.h"
#include "support/std_ostream.h"

View File

@ -19,6 +19,7 @@
#include "gettext.h"
#include "lyxlex.h"
#include "metricsinfo.h"
#include "paragraph.h"
#include "support/std_sstream.h"

View File

@ -20,6 +20,7 @@
#include "LaTeXFeatures.h"
#include "lyxlex.h"
#include "metricsinfo.h"
#include "paragraph.h"
#include "support/std_sstream.h"

View File

@ -14,6 +14,7 @@
#include "debug.h"
#include "gettext.h"
#include "paragraph.h"
using std::auto_ptr;
using std::ostream;

View File

@ -15,7 +15,7 @@
#include "updatableinset.h"
#include "support/std_string.h"
#include "LColor.h"
#include "ParagraphList.h"
#include "ParagraphList_fwd.h"
#include "RowList_fwd.h"
#include "dimension.h"
#include "lyxtext.h"

View File

@ -12,6 +12,7 @@
#include <config.h>
#include "iterators.h"
#include "paragraph.h"
#include <boost/next_prior.hpp>
#include <boost/optional.hpp>

View File

@ -12,7 +12,7 @@
#ifndef ITERATORS_H
#define ITERATORS_H
#include "ParagraphList.h"
#include "ParagraphList_fwd.h"
#include <boost/scoped_ptr.hpp>

View File

@ -17,7 +17,7 @@
#ifndef LYXCURSOR_H
#define LYXCURSOR_H
#include "ParagraphList.h"
#include "ParagraphList_fwd.h"
#include "support/types.h"
/**

View File

@ -30,6 +30,7 @@
#include "lyxserver.h"
#include "intl.h"
#include "lyx_cb.h"
#include "lyxrow.h"
#include "LyXAction.h"
#include "debug.h"
#include "gettext.h"
@ -44,7 +45,6 @@
#include "lyxfind.h"
#include "undo_funcs.h"
#include "ParagraphParameters.h"
#include "RowList.h"
#include "insets/insetcommand.h"
#include "insets/insetexternal.h"

View File

@ -12,10 +12,11 @@
#include <config.h>
#include "lyxrow_funcs.h"
#include "lyxtext.h"
#include "lyxlayout.h"
#include "debug.h"
#include "RowList.h"
#include "lyxlayout.h"
#include "lyxrow.h"
#include "lyxtext.h"
#include "paragraph.h"
#include "support/LAssert.h"

View File

@ -19,6 +19,7 @@
#include "LColor.h"
#include "insets/inset.h"
#include "RowList_fwd.h"
#include "ParagraphList_fwd.h"
#include "bufferview_funcs.h"
#include "textcursor.h"
@ -33,7 +34,6 @@ class Spacing;
class UpdatableInset;
class VSpace;
class WordLangTuple;
class ParagraphList;
class MetricsInfo;
class Dimension;

View File

@ -26,9 +26,7 @@
#include "gettext.h"
#include "language.h"
#include "latexrunparams.h"
#include "RowList.h"
#include "support/std_sstream.h"
#include "lyxrow.h"
#include "insets/insetbibitem.h"
#include "insets/insetoptarg.h"
@ -37,6 +35,8 @@
#include "support/LAssert.h"
#include "support/textutils.h"
#include "support/std_sstream.h"
using namespace lyx::support;

View File

@ -38,7 +38,6 @@ class LaTeXFeatures;
class LatexRunParams;
class ParagraphParameters;
class TexRow;
class ParagraphList;
class UpdatableInset;
/// A Paragraph holds all text, attributes and insets in a text paragraph

View File

@ -12,7 +12,8 @@
#ifndef PARAGRAPH_FUNCS_H
#define PARAGRAPH_FUNCS_H
#include "ParagraphList.h"
#include "paragraph.h"
#include "ParagraphList_fwd.h"
#include "support/types.h"
class Buffer;

View File

@ -25,9 +25,9 @@
#include "language.h"
#include "encoding.h"
#include "rowpainter.h"
#include "lyxrow.h"
#include "lyxrow_funcs.h"
#include "metricsinfo.h"
#include "RowList.h"
using namespace lyx::support;

View File

@ -32,8 +32,8 @@
#include "WordLangTuple.h"
#include "paragraph_funcs.h"
#include "rowpainter.h"
#include "lyxrow.h"
#include "lyxrow_funcs.h"
#include "RowList.h"
#include "insets/insettext.h"

View File

@ -37,10 +37,10 @@
#include "language.h"
#include "ParagraphParameters.h"
#include "counters.h"
#include "lyxrow.h"
#include "lyxrow_funcs.h"
#include "metricsinfo.h"
#include "paragraph_funcs.h"
#include "RowList.h"
#include "insets/insetbibitem.h"
#include "insets/insetenv.h"

View File

@ -22,6 +22,7 @@
#include "support/std_sstream.h"
#include "debug.h"
#include "buffer.h"
#include "lyxrow.h"
#include "ParagraphParameters.h"
#include "gettext.h"
#include "factory.h"
@ -38,7 +39,6 @@
#include "insets/insetnewline.h"
#include "undo_funcs.h"
#include "text_funcs.h"
#include "RowList.h"
#include <clocale>

View File

@ -17,6 +17,7 @@
#include "text_funcs.h"
#include "debug.h"
#include "lyxcursor.h"
#include "paragraph.h"
#include <boost/next_prior.hpp>

View File

@ -16,10 +16,10 @@
#ifndef TEXT_FUNCS_H
#define TEXT_FUNCS_H
#include "ParagraphList_fwd.h"
#include "support/types.h"
class LyXCursor;
class ParagraphList;
// do no use LyXText or BufferView here

View File

@ -11,6 +11,8 @@
#include <config.h>
#include "textcursor.h"
#include "paragraph.h"
void TextCursor::setSelection()
{

View File

@ -12,11 +12,14 @@
* Full author contact details are available in file CREDITS.
*/
#include "lyxcursor.h"
#ifndef TEXTCURSOR_H
#define TEXTCURSOR_H
#include "lyxcursor.h"
#include "support/std_string.h"
class Buffer;
// Do not even think of forward declaring LyXText/BufferView etc here!
// If you need Paragraph proper, go to text_func.h

View File

@ -12,6 +12,7 @@
#include <config.h>
#include "undo.h"
#include "paragraph.h"
Undo::Undo(undo_kind kind_arg, int inset,
int first, int last,

View File

@ -14,7 +14,7 @@
#ifndef UNDO_H
#define UNDO_H
#include "ParagraphList.h"
#include "ParagraphList_fwd.h"
/**
* These are the elements put on the undo stack. Each object

View File

@ -17,7 +17,7 @@
#define UNDO_FUNCS_H
#include "undo.h"
#include "ParagraphList.h"
#include "ParagraphList_fwd.h"
class BufferView;
class Paragraph;