diff options
Diffstat (limited to 'tqtinterface/qt4/src/kernel/tqfont.cpp')
| -rw-r--r-- | tqtinterface/qt4/src/kernel/tqfont.cpp | 80 | 
1 files changed, 40 insertions, 40 deletions
| diff --git a/tqtinterface/qt4/src/kernel/tqfont.cpp b/tqtinterface/qt4/src/kernel/tqfont.cpp index 5570afd..e054114 100644 --- a/tqtinterface/qt4/src/kernel/tqfont.cpp +++ b/tqtinterface/qt4/src/kernel/tqfont.cpp @@ -151,7 +151,7 @@ bool TQFontDef::operator==( const TQFontDef &other ) const  TQFontPrivate::TQFontPrivate()      : engineData( 0 ), painttqdevice( 0 ),        rawMode( FALSE ), underline( FALSE ), overline( FALSE ), strikeOut( FALSE ), -      tqmask( 0 ) +      mask( 0 )  {  #ifdef TQ_WS_X11      screen = TQPaintDevice::x11AppScreen(); @@ -164,7 +164,7 @@ TQFontPrivate::TQFontPrivate( const TQFontPrivate &other )      : TQShared(), request( other.request ), engineData( 0 ),        painttqdevice( other.painttqdevice ), screen( other.screen ),        rawMode( other.rawMode ), underline( other.underline ), overline( other.overline ), -      strikeOut( other.strikeOut ), tqmask( other.tqmask ) +      strikeOut( other.strikeOut ), mask( other.mask )  {  } @@ -181,42 +181,42 @@ void TQFontPrivate::resolve( const TQFontPrivate *other )      TQ_ASSERT( other != 0 );  #endif -    if ( ( tqmask & Complete ) == Complete ) return; +    if ( ( mask & Complete ) == Complete ) return;      // assign the unset-bits with the set-bits of the other font def -    if ( ! ( tqmask & Family ) ) +    if ( ! ( mask & Family ) )  	request.family = other->request.family; -    if ( ! ( tqmask & Size ) ) { +    if ( ! ( mask & Size ) ) {  	request.pointSize = other->request.pointSize;  	request.pixelSize = other->request.pixelSize;      } -    if ( ! ( tqmask & StyleHint ) ) +    if ( ! ( mask & StyleHint ) )  	request.tqstyleHint = other->request.tqstyleHint; -    if ( ! ( tqmask & StyleStrategy ) ) +    if ( ! ( mask & StyleStrategy ) )  	request.styleStrategy = other->request.styleStrategy; -    if ( ! ( tqmask & Weight ) ) +    if ( ! ( mask & Weight ) )  	request.weight = other->request.weight; -    if ( ! ( tqmask & Italic ) ) +    if ( ! ( mask & Italic ) )  	request.italic = other->request.italic; -    if ( ! ( tqmask & FixedPitch ) ) +    if ( ! ( mask & FixedPitch ) )  	request.fixedPitch = other->request.fixedPitch; -    if ( ! ( tqmask & Stretch ) ) +    if ( ! ( mask & Stretch ) )  	request.stretch = other->request.stretch; -    if ( ! ( tqmask & Underline ) ) +    if ( ! ( mask & Underline ) )  	underline = other->underline; -    if ( ! ( tqmask & Overline ) ) +    if ( ! ( mask & Overline ) )  	overline = other->overline; -    if ( ! ( tqmask & StrikeOut ) ) +    if ( ! ( mask & StrikeOut ) )  	strikeOut = other->strikeOut;  } @@ -578,12 +578,12 @@ void TQFont::detach()      /*        if this font is a copy of the application default font, set the -      fontdef tqmask to zero to indicate that *nothing* has been +      fontdef mask to zero to indicate that *nothing* has been        explicitly set by the programmer.      */      const TQFont appfont = TQApplication::font();      if ( old_d == appfont.d ) -	d->tqmask = 0; +	d->mask = 0;      if ( old_d->deref() )  	delete old_d; @@ -624,18 +624,18 @@ TQFont::TQFont( const TQString &family, int pointSize, int weight, bool italic )      d = new TQFontPrivate;      TQ_CHECK_PTR( d ); -    d->tqmask = TQFontPrivate::Family; +    d->mask = TQFontPrivate::Family;      if (pointSize <= 0) {  	pointSize = 12;      } else { -	d->tqmask |= TQFontPrivate::Size; +	d->mask |= TQFontPrivate::Size;      }      if (weight < 0) {  	weight = Normal;      } else { -	d->tqmask |= TQFontPrivate::Weight | TQFontPrivate::Italic; +	d->mask |= TQFontPrivate::Weight | TQFontPrivate::Italic;      }      d->request.family = family; @@ -713,7 +713,7 @@ void TQFont::setFamily( const TQString &family )      d->request.addStyle = TQString::null;  #endif // TQ_WS_X11 -    d->tqmask |= TQFontPrivate::Family; +    d->mask |= TQFontPrivate::Family;  }  /*! @@ -762,7 +762,7 @@ void TQFont::setPointSize( int pointSize )      d->request.pointSize = pointSize * 10;      d->request.pixelSize = -1; -    d->tqmask |= TQFontPrivate::Size; +    d->mask |= TQFontPrivate::Size;  }  /*! @@ -786,7 +786,7 @@ void TQFont::setPointSizeFloat( float pointSize )      d->request.pointSize = tqRound(pointSize * 10.0);      d->request.pixelSize = -1; -    d->tqmask |= TQFontPrivate::Size; +    d->mask |= TQFontPrivate::Size;  }  /*! @@ -823,7 +823,7 @@ void TQFont::setPixelSize( int pixelSize )      d->request.pixelSize = pixelSize;      d->request.pointSize = -1; -    d->tqmask |= TQFontPrivate::Size; +    d->mask |= TQFontPrivate::Size;  }  /*! @@ -869,7 +869,7 @@ void TQFont::setItalic( bool enable )      detach();      d->request.italic = enable; -    d->tqmask |= TQFontPrivate::Italic; +    d->mask |= TQFontPrivate::Italic;  }  /*! @@ -919,7 +919,7 @@ void TQFont::setWeight( int weight )      detach();      d->request.weight = weight; -    d->tqmask |= TQFontPrivate::Weight; +    d->mask |= TQFontPrivate::Weight;  }  /*! @@ -964,7 +964,7 @@ void TQFont::setUnderline( bool enable )      detach();      d->underline = enable; -    d->tqmask |= TQFontPrivate::Underline; +    d->mask |= TQFontPrivate::Underline;  }  /*! @@ -987,7 +987,7 @@ void TQFont::setOverline( bool enable )      detach();      d->overline = enable; -    d->tqmask |= TQFontPrivate::Overline; +    d->mask |= TQFontPrivate::Overline;  }  /*! @@ -1011,7 +1011,7 @@ void TQFont::setStrikeOut( bool enable )      detach();      d->strikeOut = enable; -    d->tqmask |= TQFontPrivate::StrikeOut; +    d->mask |= TQFontPrivate::StrikeOut;  }  /*! @@ -1036,7 +1036,7 @@ void TQFont::setFixedPitch( bool enable )      d->request.fixedPitch = enable;      d->request.ignorePitch = FALSE; -    d->tqmask |= TQFontPrivate::FixedPitch; +    d->mask |= TQFontPrivate::FixedPitch;  }  /*! @@ -1138,15 +1138,15 @@ void TQFont::setStyleHint( StyleHint hint, StyleStrategy strategy )  {      detach(); -    if ( ( d->tqmask & ( TQFontPrivate::StyleHint | TQFontPrivate::StyleStrategy ) ) && +    if ( ( d->mask & ( TQFontPrivate::StyleHint | TQFontPrivate::StyleStrategy ) ) &&  	 (StyleHint) d->request.tqstyleHint == hint &&  	 (StyleStrategy) d->request.styleStrategy == strategy )  	return;      d->request.tqstyleHint = hint;      d->request.styleStrategy = strategy; -    d->tqmask |= TQFontPrivate::StyleHint; -    d->tqmask |= TQFontPrivate::StyleStrategy; +    d->mask |= TQFontPrivate::StyleHint; +    d->mask |= TQFontPrivate::StyleStrategy;  #if defined(TQ_WS_X11)      d->request.addStyle = TQString::null; @@ -1162,12 +1162,12 @@ void TQFont::setStyleStrategy( StyleStrategy s )  {      detach(); -    if ( ( d->tqmask & TQFontPrivate::StyleStrategy ) && +    if ( ( d->mask & TQFontPrivate::StyleStrategy ) &&  	 s == (StyleStrategy)d->request.styleStrategy )  	return;      d->request.styleStrategy = s; -    d->tqmask |= TQFontPrivate::StyleStrategy; +    d->mask |= TQFontPrivate::StyleStrategy;  } @@ -1229,12 +1229,12 @@ void TQFont::setStretch( int factor )      detach(); -    if ( ( d->tqmask & TQFontPrivate::Stretch ) && +    if ( ( d->mask & TQFontPrivate::Stretch ) &&  	 d->request.stretch == (uint)factor )  	return;      d->request.stretch = (uint)factor; -    d->tqmask |= TQFontPrivate::Stretch; +    d->mask |= TQFontPrivate::Stretch;  }  /*! @@ -1341,7 +1341,7 @@ bool TQFont::rawMode() const  */  TQFont TQFont::resolve( const TQFont &other ) const  { -    if ( *this == other && d->tqmask == other.d->tqmask ) +    if ( *this == other && d->mask == other.d->mask )  	return *this;      TQFont font( *this ); @@ -1349,12 +1349,12 @@ TQFont TQFont::resolve( const TQFont &other ) const      /*        if this font is a copy of the application default font, set the -      fontdef tqmask to zero to indicate that *nothing* has been +      fontdef mask to zero to indicate that *nothing* has been        explicitly set by the programmer.      */      const TQFont appfont = TQApplication::font();      if ( d == appfont.d ) -	font.d->tqmask = 0; +	font.d->mask = 0;      font.d->resolve( other.d ); @@ -1782,7 +1782,7 @@ TQDataStream &operator>>( TQDataStream &s, TQFont &font )      if (font.d->deref()) delete font.d;      font.d = new TQFontPrivate; -    font.d->tqmask = TQFontPrivate::Complete; +    font.d->mask = TQFontPrivate::Complete;      TQ_INT16 pointSize, pixelSize = -1;      TQ_UINT8 tqstyleHint, styleStrategy = TQFont::PreferDefault, charSet, weight, bits; | 
