Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1

NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 5 insertions, 5 deletions

diff --git a/khtml/misc/arena.cpp b/khtml/misc/arena.cpp
index 5efcaf98d..e259a27c9 100644
--- a/khtml/misc/arena.cpp
+++ b/khtml/misc/arena.cpp
@@ -30,7 +30,7 @@
  * version of this file only under the terms of one of those two
  * licenses (the MPL or the GPL) and not to allow others to use your
  * version of this file under the LGPL, indicate your decision by
- * deletingthe provisions above and replace them with the notice and
+ * deletingthe provisions above and tqreplace them with the notice and
  * other provisions required by the MPL or the GPL, as the case may be.
  * If you do not delete the provisions above, a recipient may use your
  * version of this file under any of the LGPL, the MPL or the GPL.
@@ -104,7 +104,7 @@ void InitArenaPool(ArenaPool *pool, const char* /*name*/,
      unsigned int size = POOL_SIZE;
      if (align == 0)
          align = ARENA_DEFAULT_ALIGN;
-     pool->mask = BITMASK(CeilingLog2(align));
+     pool->tqmask = BITMASK(CeilingLog2(align));
      pool->first.next = NULL;
      pool->first.base = pool->first.avail = pool->first.limit =
          (uword)ARENA_ALIGN(pool, &pool->first + 1);
@@ -140,10 +140,10 @@ void* ArenaAllocate(ArenaPool *pool, unsigned int nb)
     char *rp;     /* returned pointer */
 
 #ifdef DEBUG_ARENA_MALLOC
-    assert((nb & pool->mask) == 0);
+    assert((nb & pool->tqmask) == 0);
 #endif
 
-    nb = (uword)ARENA_ALIGN(pool, nb); /* force alignment */
+    nb = (uword)ARENA_ALIGN(pool, nb); /* force tqalignment */
 
     /* attempt to allocate from arenas at pool->current */
     {
@@ -197,7 +197,7 @@ void* ArenaAllocate(ArenaPool *pool, unsigned int nb)
         } else
 #endif
            sz = pool->arenasize > nb ? pool->arenasize : nb;
-        sz += sizeof *a + pool->mask;  /* header and alignment slop */
+        sz += sizeof *a + pool->tqmask;  /* header and tqalignment slop */
         pool->cumul += sz;
 #ifdef DEBUG_ARENA_MALLOC
         i++;