summaryrefslogtreecommitdiff
path: root/src/backend/rendering/cbookdisplay.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/rendering/cbookdisplay.cpp')
-rw-r--r--src/backend/rendering/cbookdisplay.cpp16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/backend/rendering/cbookdisplay.cpp b/src/backend/rendering/cbookdisplay.cpp
index 99990f8..f640628 100644
--- a/src/backend/rendering/cbookdisplay.cpp
+++ b/src/backend/rendering/cbookdisplay.cpp
@@ -7,14 +7,15 @@
*
**********/
-//Backend
-#include "cbookdisplay.h"
-#include "cdisplayrendering.h"
+#include "backend/rendering/cbookdisplay.h"
+
+#include <boost/scoped_ptr.hpp>
+#include <QtAlgorithms>
+
#include "backend/drivers/cswordbookmoduleinfo.h"
#include "backend/keys/cswordtreekey.h"
+#include "backend/rendering/cdisplayrendering.h"
-//Util
-#include <boost/scoped_ptr.hpp>
/** Returns the rendered text using the modules in the list and using the key parameter. The displayoptions and filter options are used, too. */
const QString Rendering::CBookDisplay::text( const QList<CSwordModuleInfo*>& modules, const QString& keyName, const CSwordBackend::DisplayOptions displayOptions, const CSwordBackend::FilterOptions filterOptions ) {
@@ -46,6 +47,8 @@ const QString Rendering::CBookDisplay::text( const QList<CSwordModuleInfo*>& mod
const QString renderedText = render.renderKeyTree(tree);
key->setOffset( offset );
+
+ qDeleteAll(tree); // Dispose of the heap allocated objects pointed to in tree.
return renderedText;
};
@@ -75,6 +78,7 @@ const QString Rendering::CBookDisplay::text( const QList<CSwordModuleInfo*>& mod
const QString renderedText = render.renderKeyTree(tree);
key->setOffset( offset );
+ qDeleteAll(tree); // Dispose of the heap allocated objects pointed to in tree.
return renderedText;
};
@@ -91,6 +95,7 @@ const QString Rendering::CBookDisplay::text( const QList<CSwordModuleInfo*>& mod
const QString renderedText = render.renderKeyTree(tree);
key->setOffset( offset );
+ qDeleteAll(tree); // Dispose of the heap allocated objects pointed to in tree.
return renderedText;
};
};
@@ -109,6 +114,7 @@ const QString Rendering::CBookDisplay::text( const QList<CSwordModuleInfo*>& mod
key->setOffset( offset ); //restore key
+ qDeleteAll(tree); // Dispose of the heap allocated objects pointed to in tree.
return renderedText;
}