Use a smart pointer for ExecutionEngine::stringPool

Change-Id: I5434fbd146e9d8dcc0000327c5a5b953bc744b83
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/qmljs_engine.cpp b/qmljs_engine.cpp
index 45db9fc..b65b358 100644 (file)
--- a/qmljs_engine.cpp
+++ b/qmljs_engine.cpp
@@ -73,8 +73,8 @@ ExecutionEngine::ExecutionEngine(MemoryManager *memoryManager, EvalISelFactory *
 {
     MemoryManager::GCBlocker gcBlocker(memoryManager);
 
-    stringPool = new StringPool;
-    memoryManager->setStringPool(stringPool);
+    stringPool.reset(new StringPool);
+    memoryManager->setStringPool(stringPool.data());
     memoryManager->setExecutionEngine(this);
 
     rootContext = newContext();
@@ -212,7 +212,6 @@ ExecutionEngine::~ExecutionEngine()
 {
     delete globalObject.asObject();
     delete rootContext;
-    delete stringPool;
     qDeleteAll(functions);
 }
 

diff --git a/qmljs_engine.h b/qmljs_engine.h
index bcaff09..16d8fc5 100644 (file)
--- a/qmljs_engine.h
+++ b/qmljs_engine.h
@@ -156,7 +156,7 @@ struct ExecutionEngine
     QVector<ExceptionHandler> unwindStack;
     Value exception;
 
-    struct StringPool *stringPool;
+    QScopedPointer<struct StringPool> stringPool;
     QVector<Function *> functions;
 
     ExecutionEngine(MemoryManager *memoryManager, EvalISelFactory *iselFactory);