AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QTextTable/QTextDocumentLayout: remove dead code

Browse Source 
Change-Id: I3eb72a43129c58574036b6ca8c8c8413ca24b43a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
This commit is contained in:
David Faure 2015-03-30 17:12:02 +02:00
parent 762d493990
commit 5d78584523
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/text/qtextdocumentlayout.cpp
View File

@ -504,8 +504,6 @@ public:
void layoutBlock(const QTextBlock &bl, int blockPosition, const QTextBlockFormat &blockFormat, void layoutBlock(const QTextBlock &bl, int blockPosition, const QTextBlockFormat &blockFormat,
QTextLayoutStruct *layoutStruct, int layoutFrom, int layoutTo, const QTextBlockFormat *previousBlockFormat); QTextLayoutStruct *layoutStruct, int layoutFrom, int layoutTo, const QTextBlockFormat *previousBlockFormat);
void layoutFlow(QTextFrame::Iterator it, QTextLayoutStruct *layoutStruct, int layoutFrom, int layoutTo, QFixed width = 0); void layoutFlow(QTextFrame::Iterator it, QTextLayoutStruct *layoutStruct, int layoutFrom, int layoutTo, QFixed width = 0);
void pageBreakInsideTable(QTextTable *table, QTextLayoutStruct *layoutStruct);
void floatMargins(const QFixed &y, const QTextLayoutStruct *layoutStruct, QFixed *left, QFixed *right) const; void floatMargins(const QFixed &y, const QTextLayoutStruct *layoutStruct, QFixed *left, QFixed *right) const;
QFixed findY(QFixed yFrom, const QTextLayoutStruct *layoutStruct, QFixed requiredWidth) const; QFixed findY(QFixed yFrom, const QTextLayoutStruct *layoutStruct, QFixed requiredWidth) const;

6
src/gui/text/qtexttable.cpp
View File

@ -1264,12 +1264,6 @@ int QTextTable::columns() const
return d->nCols; return d->nCols;
} }
#if 0
void QTextTable::mergeCells(const QTextCursor &selection)
{
}
#endif
/*! /*!
\fn QTextCursor QTextTable::rowStart(const QTextCursor &cursor) const \fn QTextCursor QTextTable::rowStart(const QTextCursor &cursor) const