summaryrefslogtreecommitdiffstats
path: root/khtml/rendering/render_arena.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
commit10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch)
tree4bc444c00a79e88105f2cfce5b6209994c413ca0 /khtml/rendering/render_arena.cpp
parent307136d8eef0ba133b78ceee8e901138d4c996a1 (diff)
downloadtdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz
tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khtml/rendering/render_arena.cpp')
-rw-r--r--khtml/rendering/render_arena.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/khtml/rendering/render_arena.cpp b/khtml/rendering/render_arena.cpp
index 448e9b7e9..99fbf4f4d 100644
--- a/khtml/rendering/render_arena.cpp
+++ b/khtml/rendering/render_arena.cpp
@@ -27,7 +27,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 tqreplace them with the notice and
+ * deletingthe provisions above and replace 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.
@@ -52,7 +52,7 @@ typedef struct {
} RenderArenaDebugHeader;
#ifdef VALGRIND_SUPPORT
-Arena* tqfindContainingArena(ArenaPool* pool, void* ptr) {
+Arena* findContainingArena(ArenaPool* pool, void* ptr) {
uword ptrBits = reinterpret_cast<uword>(ptr);
for (Arena* a = &pool->first; a; a = a->next)
if (ptrBits >= a->base && ptrBits < a->limit)
@@ -88,7 +88,7 @@ void* RenderArena::allocate(size_t size)
#else
void* result = 0;
- // Ensure we have correct tqalignment for pointers. Important for Tru64
+ // Ensure we have correct alignment for pointers. Important for Tru64
size = KHTML_ROUNDUP(size, sizeof(void*));
// Check recyclers first
@@ -98,7 +98,7 @@ void* RenderArena::allocate(size_t size)
result = m_recyclers[index];
if (result) {
#ifdef VALGRIND_SUPPORT
- VALGRIND_MEMPOOL_ALLOC(tqfindContainingArena(&m_pool, result)->base, result, size);
+ VALGRIND_MEMPOOL_ALLOC(findContainingArena(&m_pool, result)->base, result, size);
#endif
// Need to move to the next object
void* next = *((void**)result);
@@ -127,10 +127,10 @@ void RenderArena::free(size_t size, void* ptr)
#else
#ifdef VALGRIND_SUPPORT
- VALGRIND_MEMPOOL_FREE(tqfindContainingArena(&m_pool, ptr)->base, ptr);
+ VALGRIND_MEMPOOL_FREE(findContainingArena(&m_pool, ptr)->base, ptr);
#endif
- // Ensure we have correct tqalignment for pointers. Important for Tru64
+ // Ensure we have correct alignment for pointers. Important for Tru64
size = KHTML_ROUNDUP(size, sizeof(void*));
// See if it's a size that we recycle