X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftabular.h;h=8c8180e8f619055833c29e0aa7fc69146ca0b3ba;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=b650db8717efdc2aa0e1eddc0a28aaa177dbe8df;hpb=34b7650cbbe6a9ed2de812e75771451b8c8fe983;p=lyx.git

diff --git a/src/tabular.h b/src/tabular.h
index b650db8717..8c8180e8f6 100644
--- a/src/tabular.h
+++ b/src/tabular.h
@@ -23,6 +23,9 @@
 #include <iosfwd>
 #include <vector>
 
+
+namespace lyx {
+
 class InsetTabular;
 class LCursor;
 class OutputParams;
@@ -202,13 +205,13 @@ public:
 		   row_type rows_arg);
 
 	/// Returns true if there is a topline, returns false if not
-	bool topLine(idx_type cell, bool onlycolumn = false) const;
+	bool topLine(idx_type cell, bool wholerow = false) const;
 	/// Returns true if there is a topline, returns false if not
-	bool bottomLine(idx_type cell, bool onlycolumn = false) const;
+	bool bottomLine(idx_type cell, bool wholerow = false) const;
 	/// Returns true if there is a topline, returns false if not
-	bool leftLine(idx_type cell, bool onlycolumn = false) const;
+	bool leftLine(idx_type cell, bool wholecolumn = false) const;
 	/// Returns true if there is a topline, returns false if not
-	bool rightLine(idx_type cell, bool onlycolumn = false) const;
+	bool rightLine(idx_type cell, bool wholecolumn = false) const;
 
 	///
 	bool topAlreadyDrawn(idx_type cell) const;
@@ -243,13 +246,13 @@ public:
 	///
 	void setAllLines(idx_type cell, bool line);
 	///
-	void setTopLine(idx_type cell, bool line, bool onlycolumn = false);
+	void setTopLine(idx_type cell, bool line, bool wholerow = false);
 	///
-	void setBottomLine(idx_type cell, bool line, bool onlycolumn = false);
+	void setBottomLine(idx_type cell, bool line, bool wholerow = false);
 	///
-	void setLeftLine(idx_type cell, bool line, bool onlycolumn = false);
+	void setLeftLine(idx_type cell, bool line, bool wholecolumn = false);
 	///
-	void setRightLine(idx_type cell, bool line, bool onlycolumn = false);
+	void setRightLine(idx_type cell, bool line, bool wholecolumn = false);
 	///
 	void setAlignment(idx_type cell, LyXAlignment align,
 			  bool onlycolumn = false);
@@ -310,13 +313,11 @@ public:
 	///
 	void read(Buffer const &, LyXLex &);
 	///
-	int latex(Buffer const &, std::ostream &,
-		  OutputParams const &) const;
+	int latex(Buffer const &, odocstream &, OutputParams const &) const;
 	//
-	int docbook(Buffer const & buf, std::ostream & os,
-		    OutputParams const &) const;
+	int docbook(Buffer const & buf, odocstream & os, OutputParams const &) const;
 	///
-	int plaintext(Buffer const &, lyx::odocstream &,
+	int plaintext(Buffer const &, odocstream &,
 		  OutputParams const & runparams,
 		  int const depth,
 		  bool onlydata, unsigned char delim) const;
@@ -587,37 +588,37 @@ public:
 	///
 	// helper function for Latex returns number of newlines
 	///
-	int TeXTopHLine(std::ostream &, row_type row) const;
+	int TeXTopHLine(odocstream &, row_type row) const;
 	///
-	int TeXBottomHLine(std::ostream &, row_type row) const;
+	int TeXBottomHLine(odocstream &, row_type row) const;
 	///
-	int TeXCellPreamble(std::ostream &, idx_type cell) const;
+	int TeXCellPreamble(odocstream &, idx_type cell) const;
 	///
-	int TeXCellPostamble(std::ostream &, idx_type cell) const;
+	int TeXCellPostamble(odocstream &, idx_type cell) const;
 	///
-	int TeXLongtableHeaderFooter(std::ostream &, Buffer const & buf,
+	int TeXLongtableHeaderFooter(odocstream &, Buffer const & buf,
 				     OutputParams const &) const;
 	///
 	bool isValidRow(row_type const row) const;
 	///
-	int TeXRow(std::ostream &, row_type const row, Buffer const & buf,
+	int TeXRow(odocstream &, row_type const row, Buffer const & buf,
 		   OutputParams const &) const;
 	///
 	// helper function for ASCII returns number of newlines
 	///
-	int asciiTopHLine(lyx::odocstream &, row_type row,
+	int asciiTopHLine(odocstream &, row_type row,
 			  std::vector<unsigned int> const &) const;
 	///
-	int asciiBottomHLine(lyx::odocstream &, row_type row,
+	int asciiBottomHLine(odocstream &, row_type row,
 			     std::vector<unsigned int> const &) const;
 	///
-	int asciiPrintCell(Buffer const &, lyx::odocstream &,
+	int asciiPrintCell(Buffer const &, odocstream &,
 			   OutputParams const &,
 			   idx_type cell, row_type row, col_type column,
 			   std::vector<unsigned int> const &,
 					   bool onlydata) const;
 	/// auxiliary function for docbook
-	int docbookRow(Buffer const & buf, std::ostream & os, row_type,
+	int docbookRow(Buffer const & buf, odocstream & os, row_type,
 		       OutputParams const &) const;
 
 private:
@@ -625,4 +626,7 @@ private:
 	void fixCellNums();
 };
 
+
+} // namespace lyx
+
 #endif