anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-21 07:12:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

renaming of some methods that hurt the eyes + removal of:

Browse Source 
- column and row count, 
- tabular width and method that goes with it
- method declaration without implementation: void delete_column(col_type)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20032 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Edwin Leuven 2007-09-04 10:52:08 +00:00
parent a8ed1add4d
commit 39ee5b3fb2
3 changed files with 359 additions and 383 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/qt4/GuiTabular.cpp
View File

@ -627,8 +627,8 @@ void GuiTabular::update_contents()
Tabular const & tabular(controller().tabular());
Tabular::idx_type const cell = controller().getActiveCell();
Tabular::row_type const row(tabular.row_of_cell(cell));
Tabular::col_type const col(tabular.column_of_cell(cell));
Tabular::row_type const row(tabular.cellRow(cell));
Tabular::col_type const col(tabular.cellColumn(cell));
dialog_->tabularRowED->setText(toqstr(convert<string>(row + 1)));
dialog_->tabularColumnED->setText(toqstr(convert<string>(col + 1)));

686
src/insets/InsetTabular.cpp
View File

File diff suppressed because it is too large Load Diff

52
src/insets/InsetTabular.h
View File

@ -266,21 +266,21 @@ public:
/* returns the maximum over all rows */
///
int getWidthOfColumn(idx_type cell) const;
int columnWidth(idx_type cell) const;
///
int getWidthOfTabular() const;
int width() const;
///
int getAscentOfRow(row_type row) const;
int height() const;
///
int getDescentOfRow(row_type row) const;
int rowAscent(row_type row) const;
///
int getHeightOfTabular() const;
int rowDescent(row_type row) const;
///
void setAscentOfRow(row_type row, int height);
void setRowAscent(row_type row, int height);
///
void setDescentOfRow(row_type row, int height);
void setRowDescent(row_type row, int height);
///
void setWidthOfCell(idx_type cell, int new_width);
void setCellWidth(idx_type cell, int new_width);
///
void setAllLines(idx_type cell, bool line);
///
@ -319,7 +319,7 @@ public:
///
docstring const getAlignSpecial(idx_type cell, int what) const;
///
int getWidthOfCell(idx_type cell) const;
int cellWidth(idx_type cell) const;
///
int getBeginningOfTextInCell(idx_type cell) const;
///
@ -343,7 +343,7 @@ public:
///
idx_type getLastCellInRow(row_type row) const;
///
idx_type getNumberOfCells() const;
idx_type cellCount() const;
///
idx_type numberOfCellsInRow(idx_type cell) const;
///
@ -369,11 +369,11 @@ public:
///
bool isPartOfMultiColumn(row_type row, col_type column) const;
///
row_type row_of_cell(idx_type cell) const;
row_type cellRow(idx_type cell) const;
///
col_type column_of_cell(idx_type cell) const;
col_type cellColumn(idx_type cell) const;
///
col_type right_column_of_cell(idx_type cell) const;
col_type cellRightColumn(idx_type cell) const;
///
void setBookTabs(bool);
///
@ -403,7 +403,7 @@ public:
///
idx_type getLastCellBelow(idx_type cell) const;
///
idx_type getCellNumber(row_type row, col_type column) const;
idx_type cellIndex(row_type row, col_type column) const;
///
void setUsebox(idx_type cell, BoxType);
///
@ -450,9 +450,9 @@ public:
///
idx_type getCellFromInset(Inset const * inset) const;
///
row_type rows() const { return rows_; }
row_type rowCount() const { return row_info.size(); }
///
col_type columns() const { return columns_;}
col_type columnCount() const { return column_info.size();}
///
void validate(LaTeXFeatures &) const;
///
@ -471,7 +471,7 @@ public:
///
idx_type cellno;
///
int width_of_cell;
int width;
///
int multicolumn;
///
@ -509,9 +509,9 @@ public:
///
rowstruct();
///
int ascent_of_row;
int ascent;
///
int descent_of_row;
int descent;
///
bool top_line;
///
@ -557,7 +557,7 @@ public:
///
bool right_line;
///
int width_of_column;
int width;
///
Length p_width;
///
@ -566,10 +566,6 @@ public:
///
typedef std::vector<columnstruct> column_vector;
///
row_type rows_;
///
col_type columns_;
///
idx_type numberofcells;
///
@ -583,8 +579,6 @@ public:
///
mutable cell_vvector cell_info;
///
int width_of_tabular;
///
bool use_booktabs;
///
bool rotate;
@ -615,10 +609,6 @@ public:
///
bool calculate_width_of_column_NMC(col_type column); // no multi cells
///
void calculate_width_of_tabular();
///
void delete_column(col_type column);
///
idx_type cells_in_multicolumn(idx_type cell) const;
///
BoxType useParbox(idx_type cell) const;
@ -724,7 +714,7 @@ public:
///
bool showInsetDialog(BufferView *) const;
/// number of cells
size_t nargs() const { return tabular.getNumberOfCells(); }
size_t nargs() const { return tabular.cellCount(); }
///
boost::shared_ptr<InsetText const> cell(idx_type) const;
///