X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.h;h=9d097efc5a991fdd79cb9993d45300b1e3f9f53f;hb=10f096880fec5afc402fc0910ff44220de0398c9;hp=a5acfada54c0306518aed693dfd3d2aea39a0ea7;hpb=fe1306ac6518d62060e55ea961321b702d4ff470;p=lyx.git

diff --git a/src/buffer.h b/src/buffer.h
index a5acfada54..9d097efc5a 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -70,14 +70,6 @@ public:
 	/// Destructor
 	~Buffer();
 
-	/** Save the buffer's parameters as user default.
-	    This function saves a file \c user_lyxdir/templates/defaults.lyx
-	    which parameters are those of the current buffer. This file
-	    is used as a default template when creating a new
-	    file. Returns \c true on success.
-	*/
-	bool saveParamsAsDefaults();
-
 	/** High-level interface to buffer functionality.
 	    This function parses a command string and executes it
 	*/
@@ -131,7 +123,7 @@ public:
 					Paragraph::depth_type & depth, 
 					LyXFont &);
 	///
-	void insertStringAsLines(Paragraph *&, Paragraph::size_type &,
+	void insertStringAsLines(Paragraph *&, lyx::pos_type &,
 				 LyXFont const &, string const &) const;
 #ifndef NO_COMPABILITY
 	///
@@ -170,25 +162,33 @@ public:
 	*/
 	void latexParagraphs(std::ostream & os, Paragraph * par,
 			     Paragraph * endpar, TexRow & texrow) const;
-
-        ///
-	void simpleDocBookOnePar(std::ostream &, string & extra,
+	///
+	void simpleDocBookOnePar(std::ostream &,
 				 Paragraph * par, int & desc_on,
 				 Paragraph::depth_type depth) const ;
-
 	///
-	int runChktex();
-
+	void simpleLinuxDocOnePar(std::ostream & os, Paragraph * par, 
+				  Paragraph::depth_type depth);
 	///
 	void makeLinuxDocFile(string const & filename,
 			      bool nice, bool only_body = false);
 	///
 	void makeDocBookFile(string const & filename,
 			     bool nice, bool only_body = false);
+	/// Open SGML/XML tag.
+	void sgmlOpenTag(std::ostream & os, Paragraph::depth_type depth,
+		string const & latexname) const;
+	/// Closes SGML/XML tag.
+	void sgmlCloseTag(std::ostream & os, Paragraph::depth_type depth,
+		string const & latexname) const;
+	///
+	void sgmlError(Paragraph * par, int pos, string const & message) const;
 
 	/// returns the main language for the buffer (document)
 	Language const * getLanguage() const;
 	///
+	int runChktex();
+	///
 	bool isLyxClean() const;
 	///
 	bool isBakClean() const;
@@ -248,9 +248,6 @@ public:
         /// returns \c true if the buffer contains a Wed document
         bool isLiterate() const;
 
-	///
-	void setPaperStuff();
-
 	/** Validate a buffer for LaTeX.
 	    This validates the buffer, and returns a struct for use by
 	    #makeLaTeX# and others. Its main use is to figure out what
@@ -296,10 +293,10 @@ public:
 	bool isMultiLingual();
 
 	/// Does this mean that this is buffer local?
-        UndoStack undostack;
+	UndoStack undostack;
 	
 	/// Does this mean that this is buffer local? 
-        UndoStack redostack;
+	UndoStack redostack;
 	
 	///
 	BufferParams params;
@@ -327,19 +324,6 @@ public:
 	/// Used when typesetting to place errorboxes.
 	TexRow texrow;
 private:
-	/// Open SGML/XML tag.
-        void sgmlOpenTag(std::ostream & os, Paragraph::depth_type depth,
-			 string const & latexname) const;
-        /// Closes SGML/XML tag.
-        void sgmlCloseTag(std::ostream & os, Paragraph::depth_type depth,
-			  string const & latexname) const;
-	///
-	void linuxDocError(Paragraph * par, int pos,
-			   string const & message);
-        ///
-	void simpleLinuxDocOnePar(std::ostream & os, Paragraph * par, 
-				  Paragraph::depth_type depth);
-
 	/// is save needed
 	mutable bool lyx_clean;
 	
@@ -387,8 +371,7 @@ public:
 			setParagraph();
 		}
 		///
-		inset_iterator(Paragraph * paragraph,
-			       Paragraph::size_type pos);
+		inset_iterator(Paragraph * paragraph, lyx::pos_type pos);
 		///
 		inset_iterator & operator++() { // prefix ++
 			if (par) {
@@ -418,7 +401,7 @@ public:
 		///
 		Paragraph * getPar() { return par; }
 		///
-		Paragraph::size_type getPos() const { return it.getPos(); }
+		lyx::pos_type getPos() const { return it.getPos(); }
 		///
 		friend
 		bool operator==(inset_iterator const & iter1,
@@ -574,7 +557,8 @@ void Buffer::setParentName(string const & name)
 
 ///
 inline
-bool operator==(Buffer::TocItem const & a, Buffer::TocItem const & b) {
+bool operator==(Buffer::TocItem const & a, Buffer::TocItem const & b)
+{
 	return a.par == b.par && a.str == b.str;
 	// No need to compare depth.
 }
@@ -582,7 +566,8 @@ bool operator==(Buffer::TocItem const & a, Buffer::TocItem const & b) {
 
 ///
 inline
-bool operator!=(Buffer::TocItem const & a, Buffer::TocItem const & b) {
+bool operator!=(Buffer::TocItem const & a, Buffer::TocItem const & b)
+{
 	return !(a == b);
 	// No need to compare depth.
 }
@@ -591,7 +576,8 @@ bool operator!=(Buffer::TocItem const & a, Buffer::TocItem const & b) {
 ///
 inline
 bool operator==(Buffer::inset_iterator const & iter1,
-		Buffer::inset_iterator const & iter2) {
+		Buffer::inset_iterator const & iter2)
+{
 	return iter1.par == iter2.par
 		&& (iter1.par == 0 || iter1.it == iter2.it);
 }
@@ -600,7 +586,8 @@ bool operator==(Buffer::inset_iterator const & iter1,
 ///
 inline
 bool operator!=(Buffer::inset_iterator const & iter1,
-		Buffer::inset_iterator const & iter2) {
+		Buffer::inset_iterator const & iter2)
+{
 	return !(iter1 == iter2);
 }