From 8fb620db43bb861ea7950e7176106e8aaf00876b Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@digia.com>
Date: Fri, 19 Apr 2013 13:03:42 +0200
Subject: Rename QQmlJS::VM namespace to QV4

Simplifies writing code against it (less stuff to type).

Change-Id: I8ac03ca2519375a204a3245e82c4be4cf1e793eb
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
 src/3rdparty/masm/stubs/ExecutableAllocator.h | 10 +++++-----
 src/3rdparty/masm/stubs/JSGlobalData.h        |  8 +-------
 2 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'src/3rdparty/masm')

diff --git a/src/3rdparty/masm/stubs/ExecutableAllocator.h b/src/3rdparty/masm/stubs/ExecutableAllocator.h
index a6911b34f0..49136a9887 100644
--- a/src/3rdparty/masm/stubs/ExecutableAllocator.h
+++ b/src/3rdparty/masm/stubs/ExecutableAllocator.h
@@ -59,7 +59,7 @@ namespace JSC {
 class JSGlobalData;
 
 struct ExecutableMemoryHandle : public RefCounted<ExecutableMemoryHandle> {
-    ExecutableMemoryHandle(QQmlJS::VM::ExecutableAllocator *allocator, int size)
+    ExecutableMemoryHandle(QV4::ExecutableAllocator *allocator, int size)
         : m_allocator(allocator)
         , m_size(size)
     {
@@ -79,13 +79,13 @@ struct ExecutableMemoryHandle : public RefCounted<ExecutableMemoryHandle> {
     void* start() { return m_allocation->start(); }
     int sizeInBytes() { return m_size; }
 
-    QQmlJS::VM::ExecutableAllocator *m_allocator;
-    QQmlJS::VM::ExecutableAllocator::Allocation *m_allocation;
+    QV4::ExecutableAllocator *m_allocator;
+    QV4::ExecutableAllocator::Allocation *m_allocation;
     int m_size;
 };
 
 struct ExecutableAllocator {
-    ExecutableAllocator(QQmlJS::VM::ExecutableAllocator *alloc)
+    ExecutableAllocator(QV4::ExecutableAllocator *alloc)
         : realAllocator(alloc)
     {}
 
@@ -125,7 +125,7 @@ struct ExecutableAllocator {
 #endif
     }
 
-    QQmlJS::VM::ExecutableAllocator *realAllocator;
+    QV4::ExecutableAllocator *realAllocator;
 };
 
 }
diff --git a/src/3rdparty/masm/stubs/JSGlobalData.h b/src/3rdparty/masm/stubs/JSGlobalData.h
index 281a64de83..c294f5ee50 100644
--- a/src/3rdparty/masm/stubs/JSGlobalData.h
+++ b/src/3rdparty/masm/stubs/JSGlobalData.h
@@ -44,17 +44,11 @@
 #include "ExecutableAllocator.h"
 #include "WeakRandom.h"
 
-namespace QQmlJS {
-namespace VM {
-class ExecutableAllocator;
-}
-}
-
 namespace JSC {
 
 class JSGlobalData {
 public:
-    JSGlobalData(QQmlJS::VM::ExecutableAllocator *realAllocator)
+    JSGlobalData(QV4::ExecutableAllocator *realAllocator)
         : executableAllocator(realAllocator)
     {}
     ExecutableAllocator executableAllocator;
-- 
cgit v1.2.3