From f7e71d47719ab6094cf4a9fafffa5ea351973522 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 13 Jan 2011 08:32:36 +0000
Subject: Initial conversion for TQt for Qt4 3.4.0 TP2 This will also compile
 with TQt for Qt3, and should not cause any problems with dependent modules
 such as kdebase.  If it does then it needs to be fixed!

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 khtml/rendering/render_style.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'khtml/rendering/render_style.h')

diff --git a/khtml/rendering/render_style.h b/khtml/rendering/render_style.h
index 29b369ca1..59e38277d 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
@@ -888,7 +888,7 @@ protected:
 
                 unsigned int unused : 27;
             } f;
-            Q_UINT64 _iflags;
+            TQ_UINT64 _iflags;
         };
     } inherited_flags;
 
@@ -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;
 
@@ -991,7 +991,7 @@ protected:
 	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,7 +1108,7 @@ 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; }
@@ -1272,7 +1272,7 @@ 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; }
-- 
cgit v1.2.1