diff options
Diffstat (limited to 'lib/kotext/KoRichText.h')
| -rw-r--r-- | lib/kotext/KoRichText.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/kotext/KoRichText.h b/lib/kotext/KoRichText.h index 44c360d5..a5fd6b1a 100644 --- a/lib/kotext/KoRichText.h +++ b/lib/kotext/KoRichText.h @@ -477,9 +477,9 @@ public: KoTextTableCell( KoTextTable* table, int row, int column ); virtual ~KoTextTableCell(); - TQSize tqsizeHint() const ; - TQSize tqminimumSize() const ; - TQSize tqmaximumSize() const ; + TQSize sizeHint() const ; + TQSize minimumSize() const ; + TQSize maximumSize() const ; TQSizePolicy::ExpandData expanding() const; bool isEmpty() const; void setGeometry( const TQRect& ) ; @@ -564,8 +564,8 @@ public: TQString richText() const; - int minimumWidth() const { return tqlayout ? tqlayout->tqminimumSize().width() : 0; } - int widthHint() const { return ( tqlayout ? tqlayout->tqsizeHint().width() : 0 ) + 2 * outerborder; } + int minimumWidth() const { return tqlayout ? tqlayout->minimumSize().width() : 0; } + int widthHint() const { return ( tqlayout ? tqlayout->sizeHint().width() : 0 ) + 2 * outerborder; } TQPtrList<KoTextTableCell> tableCells() const { return cells; } @@ -697,7 +697,7 @@ struct KoTextParagLineStart #endif { } #ifndef TQT_NO_COMPLEXTEXT - KoTextParagLineStart( KoBidiContext *c, KoBiditqStatus s ) : y(0), baseLine(0), h(0), + KoTextParagLineStart( KoBidiContext *c, KoBidiStatus s ) : y(0), baseLine(0), h(0), lineSpacing( 0 ), hyphenated( false ), status( s ), bidicontext( c ) { if ( bidicontext ) bidicontext->ref(); } #endif @@ -728,7 +728,7 @@ public: short lineSpacing; bool hyphenated; #ifndef TQT_NO_COMPLEXTEXT - KoBiditqStatus status; + KoBidiStatus status; #endif int w; |