summaryrefslogtreecommitdiffstats
path: root/tqtinterface/qt4/src/widgets/tqlabel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tqtinterface/qt4/src/widgets/tqlabel.cpp')
-rw-r--r--tqtinterface/qt4/src/widgets/tqlabel.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/tqtinterface/qt4/src/widgets/tqlabel.cpp b/tqtinterface/qt4/src/widgets/tqlabel.cpp
index 491adab..206a7cd 100644
--- a/tqtinterface/qt4/src/widgets/tqlabel.cpp
+++ b/tqtinterface/qt4/src/widgets/tqlabel.cpp
@@ -145,14 +145,14 @@ public:
/*!
Constructs an empty label.
- The \a tqparent, \a name and widget flag \a f, arguments are passed
+ The \a parent, \a name and widget flag \a f, arguments are passed
to the TQFrame constructor.
\sa tqsetAlignment(), setFrameStyle(), setIndent()
*/
-TQLabel::TQLabel( TQWidget *tqparent, const char *name, WFlags f )
- : TQFrame( tqparent, name, f | TQt::WMouseNoMask )
+TQLabel::TQLabel( TQWidget *parent, const char *name, WFlags f )
+ : TQFrame( parent, name, f | TQt::WMouseNoMask )
{
init();
}
@@ -161,15 +161,15 @@ TQLabel::TQLabel( TQWidget *tqparent, const char *name, WFlags f )
/*!
Constructs a label that displays the text, \a text.
- The \a tqparent, \a name and widget flag \a f, arguments are passed
+ The \a parent, \a name and widget flag \a f, arguments are passed
to the TQFrame constructor.
\sa setText(), tqsetAlignment(), setFrameStyle(), setIndent()
*/
-TQLabel::TQLabel( const TQString &text, TQWidget *tqparent, const char *name,
+TQLabel::TQLabel( const TQString &text, TQWidget *parent, const char *name,
WFlags f )
- : TQFrame( tqparent, name, f | TQt::WMouseNoMask )
+ : TQFrame( parent, name, f | TQt::WMouseNoMask )
{
init();
setText( text );
@@ -185,15 +185,15 @@ TQLabel::TQLabel( const TQString &text, TQWidget *tqparent, const char *name,
user presses Alt+ the underlined letter, focus is passed to the
buddy widget.
- The \a tqparent, \a name and widget flag, \a f, arguments are passed
+ The \a parent, \a name and widget flag, \a f, arguments are passed
to the TQFrame constructor.
\sa setText(), setBuddy(), tqsetAlignment(), setFrameStyle(),
setIndent()
*/
TQLabel::TQLabel( TQWidget *buddy, const TQString &text,
- TQWidget *tqparent, const char *name, WFlags f )
- : TQFrame( tqparent, name, f | TQt::WMouseNoMask )
+ TQWidget *parent, const char *name, WFlags f )
+ : TQFrame( parent, name, f | TQt::WMouseNoMask )
{
init();
#ifndef TQT_NO_ACCEL
@@ -345,7 +345,7 @@ void TQLabel::setPixmap( const TQPixmap &pixmap )
lpixmap = new TQPixmap( pixmap );
}
- if ( lpixmap->depth() == 1 && !lpixmap->tqmask() )
+ if ( lpixmap->depth() == 1 && !lpixmap->mask() )
lpixmap->setMask( *((TQBitmap *)lpixmap) );
updateLabel( osh );
@@ -1000,7 +1000,7 @@ void TQLabel::movieUpdated(const TQRect& rect)
r.moveBy(rect.x(), rect.y());
r.setWidth(TQMIN(r.width(), rect.width()));
r.setHeight(TQMIN(r.height(), rect.height()));
- tqrepaint( r, mov->framePixmap().tqmask() != 0 );
+ tqrepaint( r, mov->framePixmap().mask() != 0 );
}
}