summaryrefslogtreecommitdiffstats
path: root/experimental/tqtinterface/qt4/src/widgets/tqlabel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'experimental/tqtinterface/qt4/src/widgets/tqlabel.cpp')
-rw-r--r--experimental/tqtinterface/qt4/src/widgets/tqlabel.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/experimental/tqtinterface/qt4/src/widgets/tqlabel.cpp b/experimental/tqtinterface/qt4/src/widgets/tqlabel.cpp
index b29d5999f..0b529f0be 100644
--- a/experimental/tqtinterface/qt4/src/widgets/tqlabel.cpp
+++ b/experimental/tqtinterface/qt4/src/widgets/tqlabel.cpp
@@ -272,7 +272,7 @@ void TQLabel::setText( const TQString &text )
{
if ( ltext == text )
return;
- TQSize osh = tqsizeHint();
+ TQSize osh = sizeHint();
#ifndef TQT_NO_RICHTEXT
bool hadRichtext = doc != 0;
#endif
@@ -338,7 +338,7 @@ void TQLabel::clear()
*/
void TQLabel::setPixmap( const TQPixmap &pixmap )
{
- TQSize osh = tqsizeHint();
+ TQSize osh = sizeHint();
if ( !lpixmap || lpixmap->serialNumber() != pixmap.serialNumber() ) {
clearContents();
@@ -363,7 +363,7 @@ void TQLabel::setPixmap( const TQPixmap &pixmap )
void TQLabel::setPicture( const TQPicture &picture )
{
- TQSize osh = tqsizeHint();
+ TQSize osh = sizeHint();
clearContents();
lpicture = new TQPicture( picture );
@@ -439,7 +439,7 @@ void TQLabel::tqsetAlignment( int tqalignment )
{
if ( tqalignment == align )
return;
- TQSize osh = tqsizeHint();
+ TQSize osh = sizeHint();
#ifndef TQT_NO_ACCEL
if ( lbuddy )
align = tqalignment | TQt::ShowPrefix;
@@ -508,7 +508,7 @@ void TQLabel::setIndent( int indent )
Auto-resizing is disabled by default.
- \sa autoResize(), adjustSize(), tqsizeHint()
+ \sa autoResize(), adjustSize(), sizeHint()
*/
void TQLabel::setAutoResize( bool enable )
@@ -524,7 +524,7 @@ void TQLabel::setAutoResize( bool enable )
/*!
Returns the size that will be used if the width of the label is \a
- w. If \a w is -1, the tqsizeHint() is returned.
+ w. If \a w is -1, the sizeHint() is returned.
*/
TQSize TQLabel::sizeForWidth( int w ) const
@@ -620,7 +620,7 @@ int TQLabel::heightForWidth( int w ) const
/*!\reimp
*/
-TQSize TQLabel::tqsizeHint() const
+TQSize TQLabel::sizeHint() const
{
if ( d->valid_hints != frameWidth() )
(void) TQLabel::tqminimumSizeHint();
@@ -654,9 +654,9 @@ TQSize TQLabel::tqminimumSizeHint() const
if ( d->sh.height() < sz.height() )
sz.rheight() = d->sh.height();
}
- if ( tqsizePolicy().horData() == TQSizePolicy::Ignored )
+ if ( sizePolicy().horData() == TQSizePolicy::Ignored )
sz.rwidth() = -1;
- if ( tqsizePolicy().verData() == TQSizePolicy::Ignored )
+ if ( sizePolicy().verData() == TQSizePolicy::Ignored )
sz.rheight() = -1;
d->msh = sz;
return sz;
@@ -854,12 +854,12 @@ void TQLabel::drawContents( TQPainter *p )
void TQLabel::updateLabel( TQSize oldSizeHint )
{
d->valid_hints = -1;
- TQSizePolicy policy = tqsizePolicy();
+ TQSizePolicy policy = sizePolicy();
bool wordBreak = align & TQt::WordBreak;
policy.setHeightForWidth( wordBreak );
- if ( policy != tqsizePolicy() )
+ if ( policy != sizePolicy() )
tqsetSizePolicy( policy );
- if ( tqsizeHint() != oldSizeHint )
+ if ( sizeHint() != oldSizeHint )
updateGeometry();
if ( autoresize ) {
adjustSize();
@@ -1026,7 +1026,7 @@ void TQLabel::movieResized( const TQSize& size )
void TQLabel::setMovie( const TQMovie& movie )
{
- TQSize osh = tqsizeHint();
+ TQSize osh = sizeHint();
clearContents();
lmovie = new TQMovie( movie );