remove ParagraphList_fwd.h

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18030 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2007-04-26 08:30:11 +00:00
parent f63d0e05df
commit 345d7c00cd
11 changed files with 26 additions and 54 deletions

View File

@ -16,7 +16,6 @@
#include "InsetList.h" #include "InsetList.h"
#include "DocIterator.h" #include "DocIterator.h"
#include "ParagraphList_fwd.h"
#include "support/FileName.h" #include "support/FileName.h"
#include "support/limited_stack.h" #include "support/limited_stack.h"
@ -52,11 +51,12 @@ class MacroData;
class OutputParams; class OutputParams;
class ParConstIterator; class ParConstIterator;
class ParIterator; class ParIterator;
class ParagraphList;
class StableDocIterator;
class TeXErrors; class TeXErrors;
class TexRow; class TexRow;
class TocBackend; class TocBackend;
class Undo; class Undo;
class StableDocIterator;
/** The buffer object. /** The buffer object.

View File

@ -357,9 +357,11 @@ void copySelectionHelper(Buffer const & buf, ParagraphList & pars,
ParagraphList copy_pars(boost::next(pars.begin(), startpit), ParagraphList copy_pars(boost::next(pars.begin(), startpit),
boost::next(pars.begin(), endpit + 1)); boost::next(pars.begin(), endpit + 1));
// Remove the end of the last paragraph; afterwards, remove the beginning // Remove the end of the last paragraph; afterwards, remove the
// of the first paragraph. Keep this order - there may only be one paragraph! // beginning of the first paragraph. Keep this order - there may only
// Do not track deletions here; this is an internal action not visible to the user // be one paragraph! Do not track deletions here; this is an internal
// action not visible to the user
Paragraph & back = copy_pars.back(); Paragraph & back = copy_pars.back();
back.eraseChars(end, back.size(), false); back.eraseChars(end, back.size(), false);
Paragraph & front = copy_pars.front(); Paragraph & front = copy_pars.front();

View File

@ -14,8 +14,6 @@
#ifndef CUTANDPASTE_H #ifndef CUTANDPASTE_H
#define CUTANDPASTE_H #define CUTANDPASTE_H
#include "ParagraphList_fwd.h"
#include "support/docstring.h" #include "support/docstring.h"
#include <vector> #include <vector>
@ -27,6 +25,7 @@ class ErrorList;
class InsetText; class InsetText;
class LyXTextClass; class LyXTextClass;
class LCursor; class LCursor;
class ParagraphList;
namespace cap { namespace cap {

View File

@ -13,21 +13,17 @@
#define PARITERATOR_H #define PARITERATOR_H
#include "DocIterator.h" #include "DocIterator.h"
#include "ParagraphList_fwd.h"
#include "support/types.h" #include "support/types.h"
#include <boost/optional.hpp>
#include <vector> #include <vector>
namespace lyx { namespace lyx {
class InsetBase; class InsetBase;
class LyXText; class LyXText;
class ParagraphList;
class ParIterator : public std::iterator<std::forward_iterator_tag, Paragraph>, class ParIterator : public std::iterator<std::forward_iterator_tag, Paragraph>,
@ -44,7 +40,6 @@ public:
/// ///
ParIterator() : DocIterator() {} ParIterator() : DocIterator() {}
/// ///
ParIterator(InsetBase &, pit_type pit); ParIterator(InsetBase &, pit_type pit);
/// ///

View File

@ -19,9 +19,17 @@
namespace lyx { namespace lyx {
/// Container for all kind of Paragraphs used in Lyx. /// Container for all kind of Paragraphs used in LyX.
typedef RandomAccessList<Paragraph> ParagraphList; class ParagraphList : public RandomAccessList<Paragraph> {
public:
///
ParagraphList() {}
///
template<class InputIterator>
ParagraphList(InputIterator first, InputIterator last)
: RandomAccessList<Paragraph>(first, last)
{}
};
} // namespace lyx } // namespace lyx

View File

@ -1,26 +0,0 @@
// -*- C++ -*-
/**
* \file ParagraphList_fwd.h
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author Angus Leeming
*
* Full author contact details are available in file CREDITS.
*/
#ifndef PARAGRAPH_LIST_FWD_H
#define PARAGRAPH_LIST_FWD_H
namespace lyx {
template <class T>
class RandomAccessList;
class Paragraph;
typedef RandomAccessList<Paragraph> ParagraphList;
} // namespace lyx
#endif

View File

@ -18,7 +18,6 @@
#include "DocIterator.h" #include "DocIterator.h"
#include "BufferParams.h" #include "BufferParams.h"
#include "ParagraphList_fwd.h"
#include "support/types.h" #include "support/types.h"
@ -32,6 +31,7 @@ class BufferView;
class DocIterator; class DocIterator;
class LCursor; class LCursor;
class MathArray; class MathArray;
class ParagraphList;
/** /**

View File

@ -16,7 +16,6 @@
#include "RowList_fwd.h" #include "RowList_fwd.h"
#include "LyXFont.h" #include "LyXFont.h"
#include "LyXText.h" #include "LyXText.h"
#include "ParagraphList_fwd.h"
#include "support/types.h" #include "support/types.h"
@ -31,6 +30,7 @@ class BufferView;
class CursorSlice; class CursorSlice;
class Dimension; class Dimension;
class LColor_color; class LColor_color;
class ParagraphList;
/** /**
@ -43,8 +43,6 @@ public:
explicit InsetText(BufferParams const &); explicit InsetText(BufferParams const &);
/// ///
InsetText(); InsetText();
///
virtual ~InsetText() {}
/// empty inset to empty par /// empty inset to empty par
void clear(); void clear();

View File

@ -13,16 +13,13 @@
#ifndef OUTPUT_DOCBOOK_H #ifndef OUTPUT_DOCBOOK_H
#define OUTPUT_DOCBOOK_H #define OUTPUT_DOCBOOK_H
#include "ParagraphList_fwd.h"
#include "support/docstream.h" #include "support/docstream.h"
#include <iosfwd>
namespace lyx { namespace lyx {
class Buffer; class Buffer;
class OutputParams; class OutputParams;
class ParagraphList;
/// ///
void docbookParagraphs(ParagraphList const & subset, void docbookParagraphs(ParagraphList const & subset,

View File

@ -12,8 +12,6 @@
#ifndef OUTPUT_LATEX_H #ifndef OUTPUT_LATEX_H
#define OUTPUT_LATEX_H #define OUTPUT_LATEX_H
#include "ParagraphList_fwd.h"
#include "support/docstream.h" #include "support/docstream.h"
@ -22,6 +20,8 @@ namespace lyx {
class Buffer; class Buffer;
class BufferParams; class BufferParams;
class Encoding; class Encoding;
class Paragraph;
class ParagraphList;
class OutputParams; class OutputParams;
class TexRow; class TexRow;

View File

@ -12,8 +12,6 @@
#ifndef PARAGRAPH_FUNCS_H #ifndef PARAGRAPH_FUNCS_H
#define PARAGRAPH_FUNCS_H #define PARAGRAPH_FUNCS_H
#include "ParagraphList_fwd.h"
#include "support/types.h" #include "support/types.h"
@ -24,6 +22,7 @@ class BufferParams;
class InsetBase; class InsetBase;
class LyXFont; class LyXFont;
class Paragraph; class Paragraph;
class ParagraphList;
/** /**
* This breaks a paragraph at the specified position. * This breaks a paragraph at the specified position.