Fix the books example. Port to new API.

steveire · Mar 3, 2010 · ab359bf · ab359bf
1 parent 4af8d0f
commit ab359bf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/examples/books/bookwindow.cpp b/examples/books/bookwindow.cpp
@@ -122,12 +122,12 @@ BookWindow::BookWindow()
 
     connect(ui.exportButton, SIGNAL(pressed()), SLOT(renderBooks()));
 
-    Grantlee::Engine *engine = Grantlee::Engine::instance();
+    m_engine = new Grantlee::Engine();
     Grantlee::FileSystemTemplateLoader::Ptr loader = Grantlee::FileSystemTemplateLoader::Ptr( new Grantlee::FileSystemTemplateLoader() );
     loader->setTemplateDirs( QStringList() << GRANTLEE_TEMPLATE_PATH );
-    engine->addTemplateLoader(loader);
+    m_engine->addTemplateLoader(loader);
 
-    engine->setPluginDirs( QStringList() << GRANTLEE_PLUGIN_PATH );
+    m_engine->setPluginDirs( QStringList() << GRANTLEE_PLUGIN_PATH );
 }
 
 void BookWindow::showError(const QSqlError &err)
@@ -156,8 +156,8 @@ void BookWindow::renderBooks()
     QString themeName = ui.exportTheme->currentText();
 
     Grantlee::Context c(mapping);
-    Grantlee::Engine *engine = Grantlee::Engine::instance();
-    Grantlee::Template t = engine->loadByName( themeName + ".html" );
+
+    Grantlee::Template t = m_engine->loadByName( themeName + ".html" );
     if (!t)
     {
       return;

diff --git a/examples/books/bookwindow.h b/examples/books/bookwindow.h
@@ -47,6 +47,10 @@
 
 #include "ui_bookwindow.h"
 
+namespace Grantlee
+{
+class Engine;
+}
 
 class BookWindow: public QMainWindow
 {
@@ -62,6 +66,7 @@ protected Q_SLOTS:
     Ui::BookWindow ui;
     QSqlRelationalTableModel *model;
     int authorIdx, genreIdx;
+    Grantlee::Engine *m_engine;
 };
 
 #endif