diff options
Diffstat (limited to 'khtml/rendering/render_style.h')
| -rw-r--r-- | khtml/rendering/render_style.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/khtml/rendering/render_style.h b/khtml/rendering/render_style.h index 29b369ca1..c54309b46 100644 --- a/khtml/rendering/render_style.h +++ b/khtml/rendering/render_style.h @@ -220,7 +220,7 @@ public: } bool isTransparent() const { - return color.isValid() && qAlpha(color.rgb()) == 0; + return color.isValid() && tqAlpha(color.rgb()) == 0; } bool operator==(const BorderValue& o) const @@ -503,7 +503,7 @@ public: return !(*this == o); } - bool containsImage(CachedImage* c) const { if (c == m_image) return true; if (m_next) return m_next->containsImage(c); return false; } + bool tqcontainsImage(CachedImage* c) const { if (c == m_image) return true; if (m_next) return m_next->tqcontainsImage(c); return false; } bool hasImage() const { if (m_image) @@ -888,7 +888,7 @@ protected: unsigned int unused : 27; } f; - Q_UINT64 _iflags; + TQ_UINT64 _iflags; }; } inherited_flags; @@ -910,7 +910,7 @@ protected: EClear _clear : 2; EPosition _position : 2; EFloat _floating : 3; - ETableLayout _table_layout : 1; + ETableLayout _table_tqlayout : 1; bool _flowAroundFloats :1; EPageBreak _page_break_before : 3; @@ -919,14 +919,14 @@ protected: PseudoId _styleType : 4; bool _hasClip : 1; unsigned _pseudoBits : 8; - EUnicodeBidi _unicodeBidi : 2; + EUnicodeBidi _tqunicodeBidi : 2; // non CSS2 non-inherited bool _textOverflow : 1; // Whether or not lines that spill out should be truncated with "..." unsigned int unused : 11; } f; - Q_UINT64 _niflags; + TQ_UINT64 _niflags; }; } noninherited_flags; @@ -984,14 +984,14 @@ protected: noninherited_flags.f._clear = initialClear(); noninherited_flags.f._position = initialPosition(); noninherited_flags.f._floating = initialFloating(); - noninherited_flags.f._table_layout = initialTableLayout(); + noninherited_flags.f._table_tqlayout = initialTableLayout(); noninherited_flags.f._flowAroundFloats= initialFlowAroundFloats(); noninherited_flags.f._page_break_before = initialPageBreak(); noninherited_flags.f._page_break_after = initialPageBreak(); noninherited_flags.f._styleType = NOPSEUDO; noninherited_flags.f._hasClip = false; noninherited_flags.f._pseudoBits = 0; - noninherited_flags.f._unicodeBidi = initialUnicodeBidi(); + noninherited_flags.f._tqunicodeBidi = initialUnicodeBidi(); noninherited_flags.f._textOverflow = initialTextOverflow(); noninherited_flags.f.unused = 0; } @@ -1029,7 +1029,7 @@ public: bool hasOffset() const { return surround->offset.nonZero(); } bool hasBackground() const { - if (backgroundColor().isValid() && qAlpha(backgroundColor().rgb()) > 0) + if (backgroundColor().isValid() && tqAlpha(backgroundColor().rgb()) > 0) return true; else return background->m_background.hasImage(); @@ -1108,10 +1108,10 @@ public: LengthBox clip() const { return visual->clip; } bool hasClip() const { return noninherited_flags.f._hasClip; } - EUnicodeBidi unicodeBidi() const { return noninherited_flags.f._unicodeBidi; } + EUnicodeBidi tqunicodeBidi() const { return noninherited_flags.f._tqunicodeBidi; } EClear clear() const { return noninherited_flags.f._clear; } - ETableLayout tableLayout() const { return noninherited_flags.f._table_layout; } + ETableLayout tableLayout() const { return noninherited_flags.f._table_tqlayout; } const TQFont & font() const { return inherited->font.f; } // use with care. call font->update() after modifications @@ -1272,10 +1272,10 @@ public: void setClip( Length top, Length right, Length bottom, Length left ); void setHasClip( bool b ) { noninherited_flags.f._hasClip = b; } - void setUnicodeBidi( EUnicodeBidi b ) { noninherited_flags.f._unicodeBidi = b; } + void setUnicodeBidi( EUnicodeBidi b ) { noninherited_flags.f._tqunicodeBidi = b; } void setClear(EClear v) { noninherited_flags.f._clear = v; } - void setTableLayout(ETableLayout v) { noninherited_flags.f._table_layout = v; } + void setTableLayout(ETableLayout v) { noninherited_flags.f._table_tqlayout = v; } bool setFontDef(const khtml::FontDef & v) { // bah, this doesn't compare pointers. broken! (Dirk) if (!(inherited->font.fontDef == v)) { |