X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphList.h;h=b1e9d6d2869e6eb7eb2a1ea567697b3d366a7f1c;hb=2e57f2ff0ae7cd4a6efbf634ffe6d2f4379d9cfc;hp=55ee259fd84217c01ba9d01aa26af049a82edfa1;hpb=850ec3731821edbf1903178126a4293e169d862a;p=lyx.git

diff --git a/src/ParagraphList.h b/src/ParagraphList.h
index 55ee259fd8..b1e9d6d286 100644
--- a/src/ParagraphList.h
+++ b/src/ParagraphList.h
@@ -3,161 +3,14 @@
 #ifndef PARAGRAPH_LIST_H
 #define PARAGRAPH_LIST_H
 
-#define NO_STD_LIST 1
-
-#ifndef NO_STD_LIST
-
 #include "paragraph.h"
 
 #include <list>
 
-typedef std::list<Paragraph> ParagraphList;
-
-#else
-
-class Paragraph;
-
-#include <iterator>
-#include <utility>
-
-///
-class ParagraphList {
-public:
-	///
-	class iterator {
-	public:
-		friend class ParagraphList;
-		///
-		typedef std::bidirectional_iterator_tag iterator_category;
-		///
-		typedef Paragraph * value_type;
-		///
-		typedef ptrdiff_t difference_type;
-		///
-		typedef Paragraph * pointer;
-		///
-		typedef Paragraph & reference;
-		///
-		iterator();
-		///
-		reference operator*();
-		///
-		pointer operator->();
-		///
-		iterator & operator++();
-		///
-		iterator operator++(int);
-		///
-		iterator & operator--();
-		///
-		iterator operator--(int);
-	private:
-		///
-		iterator(value_type);
-		///
-		Paragraph * ptr;
-	};
-	///
-	class const_iterator {
-	public:
-		friend class ParagraphList;
-		///
-		typedef std::bidirectional_iterator_tag iterator_category;
-		///
-		typedef Paragraph * value_type;
-		///
-		typedef ptrdiff_t difference_type;
-		///
-		typedef Paragraph const * const_pointer;
-		///
-		typedef Paragraph const & const_reference;
-		///
-		const_iterator();
-		///
-		const_reference operator*();
-		///
-		const_pointer operator->();
-		///
-		const_iterator & operator++();
-		///
-		const_iterator operator++(int);
-		///
-		const_iterator & operator--();
-		///
-		const_iterator operator--(int);
-	private:
-		///
-		const_iterator(value_type);
-		///
-		Paragraph * ptr;
-	};
-	///
-	ParagraphList();
-	///
-	ParagraphList(ParagraphList const &);
-	///
-	ParagraphList & operator=(ParagraphList const &);
-	///
-	iterator insert(iterator it, Paragraph const & par);
-	///
-	void insert(iterator pos, iterator beg, iterator end);
-	///
-	void assign(iterator beg, iterator end);
-	///
-	void splice(iterator pos, ParagraphList & pl);
-	///
-	void clear();
-	///
-	iterator erase(iterator it);
-	///
-	iterator erase(iterator first, iterator last);
-	///
-	iterator begin();
-	///
-	const_iterator begin() const;
-	///
-	iterator end();
-	///
-	const_iterator end() const;
-	///
-	void push_back(Paragraph const &);
-	///
-	Paragraph const & front() const;
-	///
-	Paragraph & front();
-	///
-	Paragraph const & back() const;
-	///
-	Paragraph & back();
-	///
-	int size() const;
-	///
-	bool empty() const;
-private:
-	///
-	Paragraph * parlist;
+struct ParagraphList : public std::list<Paragraph>
+{
 };
 
-
-
 typedef std::pair<ParagraphList::iterator, int> PitPosPair;
 
-
-
-///
-bool operator==(ParagraphList::iterator const & i1,
-		ParagraphList::iterator const & i2);
-///
-bool operator!=(ParagraphList::iterator const & i1,
-		ParagraphList::iterator const & i2);
-
-///
-bool operator==(ParagraphList::const_iterator const & i1,
-		ParagraphList::const_iterator const & i2);
-///
-bool operator!=(ParagraphList::const_iterator const & i1,
-		ParagraphList::const_iterator const & i2);
-
-#endif
-
 #endif