Minimal fix needed to give Qt a label dialog again.

[lyx.git] / src / tabular.C

diff --git a/src/tabular.C b/src/tabular.C
index 826f3c7aab7f4556969ec9e8395fbe9bb50ada36..dcf10bba2a5abaaf36db45c8840fac480c623a16 100644 (file)
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -97,7 +97,7 @@ LyXTabular::columnstruct::columnstruct()
 }
 
 
-LyXTabular::lttype::lttype()
+LyXTabular::ltType::ltType()
 {
        topDL = false;
        bottomDL = false;
@@ -153,7 +153,7 @@ LyXTabular::LyXTabular(Buffer const * buf, InsetTabular * inset, LyXLex & lex)
 LyXTabular & LyXTabular::operator=(LyXTabular const & lt)
 {
 #if 0
-#warning This while method should look like this: (Lgb)
+#warning This whole method should look like this: (Lgb)
 
                LyXTabular tmp(lt);
                tmp.swap(*this);
@@ -509,7 +509,7 @@ bool LyXTabular::RightLine(int cell, bool onlycolumn) const
 }
 
 
-bool LyXTabular::TopAlreadyDrawed(int cell) const
+bool LyXTabular::topAlreadyDrawn(int cell) const
 {
        int row = row_of_cell(cell);
        if ((row > 0) && !GetAdditionalHeight(row)) {
@@ -528,7 +528,7 @@ bool LyXTabular::TopAlreadyDrawed(int cell) const
 }
 
 
-bool LyXTabular::LeftAlreadyDrawed(int cell) const
+bool LyXTabular::leftAlreadyDrawn(int cell) const
 {
        int column = column_of_cell(cell);
        if (column > 0) {
@@ -1542,7 +1542,7 @@ LyXTabular::cellstruct * LyXTabular::cellinfo_of_cell(int cell) const
 }
 
 
-void LyXTabular::SetMultiColumn(Buffer const * buffer, int cell, int number)
+void LyXTabular::SetMultiColumn(Buffer * buffer, int cell, int number)
 {
        cellinfo_of_cell(cell)->multicolumn = CELL_BEGIN_OF_MULTICOLUMN;
        cellinfo_of_cell(cell)->alignment = column_info[column_of_cell(cell)].alignment;
@@ -1552,7 +1552,7 @@ void LyXTabular::SetMultiColumn(Buffer const * buffer, int cell, int number)
 #if 1
        for (int i = 1; i < number; ++i) {
                cellinfo_of_cell(cell+i)->multicolumn = CELL_PART_OF_MULTICOLUMN;
-               cellinfo_of_cell(cell)->inset.appendParagraphs(buffer->params,
+               cellinfo_of_cell(cell)->inset.appendParagraphs(buffer,
                        cellinfo_of_cell(cell+i)->inset.paragraph());
                cellinfo_of_cell(cell+i)->inset.clear(false);
        }
@@ -2770,11 +2770,13 @@ vector<string> const LyXTabular::getLabelList() const
 
 LyXTabular::BoxType LyXTabular::UseParbox(int cell) const
 {
-       Paragraph * par = GetCellInset(cell)->paragraph();
+       ParagraphList const & parlist = GetCellInset(cell)->paragraphs;
+       ParagraphList::iterator cit = parlist.begin();
+       ParagraphList::iterator end = parlist.end();
 
-       for (; par; par = par->next()) {
-               for (int i = 0; i < par->size(); ++i) {
-                       if (par->getChar(i) == Paragraph::META_NEWLINE)
+       for (; cit != end; ++cit) {
+               for (int i = 0; i < cit->size(); ++i) {
+                       if (cit->getChar(i) == Paragraph::META_NEWLINE)
                                return BOX_PARBOX;
                }
        }