From 41d1c7e0e11da97258f0b592a2ce9f64b1f09c36 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 13 Jan 2015 14:26:33 +0100 Subject: [PATCH] GLSL: Do not leak engine Change-Id: I756361cc2aa4ad7bd91acde23dc0267520c6490c Reviewed-by: Tobias Hunger --- src/plugins/glsleditor/glsleditor.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp index 3f3af8751c6..e624bd8219c 100644 --- a/src/plugins/glsleditor/glsleditor.cpp +++ b/src/plugins/glsleditor/glsleditor.cpp @@ -213,13 +213,13 @@ void GlslEditorWidget::updateDocumentNow() const QByteArray preprocessedCode = contents.toLatin1(); // ### use the QtCreator C++ preprocessor. Document::Ptr doc(new Document()); - Engine *engine = new GLSL::Engine(); + Engine engine; doc->_engine = new GLSL::Engine(); Parser parser(doc->_engine, preprocessedCode.constData(), preprocessedCode.size(), variant); TranslationUnitAST *ast = parser.parse(); if (ast != 0 || extraSelections(CodeWarningsSelection).isEmpty()) { Semantic sem; - Scope *globalScope = engine->newNamespace(); + Scope *globalScope = engine.newNamespace(); doc->_globalScope = globalScope; const GlslEditorPlugin::InitFile *file = GlslEditorPlugin::shaderInit(variant); sem.translationUnit(file->ast, globalScope, file->engine); @@ -231,7 +231,7 @@ void GlslEditorWidget::updateDocumentNow() file = GlslEditorPlugin::fragmentShaderInit(variant); sem.translationUnit(file->ast, globalScope, file->engine); } - sem.translationUnit(ast, globalScope, engine); + sem.translationUnit(ast, globalScope, &engine); CreateRanges createRanges(document(), doc); createRanges(ast); @@ -247,7 +247,7 @@ void GlslEditorWidget::updateDocumentNow() QList sels; QSet errors; - foreach (const DiagnosticMessage &m, engine->diagnosticMessages()) { + foreach (const DiagnosticMessage &m, engine.diagnosticMessages()) { if (! m.line()) continue; else if (errors.contains(m.line()))