From 560378aaca1784ba19806a0414a32b20c744de39 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 3 Jan 2011 04:12:51 +0000 Subject: 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 --- khtml/misc/arena.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'khtml/misc/arena.h') diff --git a/khtml/misc/arena.h b/khtml/misc/arena.h index 6415b00bb..bbf8b9d42 100644 --- a/khtml/misc/arena.h +++ b/khtml/misc/arena.h @@ -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. @@ -74,7 +74,7 @@ struct ArenaPool { unsigned int arenasize; unsigned int largealloc; // threshold for fractional allocation strategy unsigned int cumul; // total bytes in pool. - uword mask; // Mask (power-of-2 - 1) + uword tqmask; // Mask (power-of-2 - 1) }; void InitArenaPool(ArenaPool *pool, const char *name, -- cgit v1.2.1