Show Qt header and runtime versions. Clean temporary files when

destructing a book. Tweak project file to work with Qt 4.6.2/Symbian.

diff --git a/devtools.cpp b/devtools.cpp
index d44c0ac..97ec06c 100644 (file)
--- a/devtools.cpp
+++ b/devtools.cpp
@@ -10,13 +10,14 @@
 DevTools::DevTools(QWidget *parent): Dyalog(parent, false)
 {
     setWindowTitle(tr("Developer"));
+    addWidget(new QLabel(tr("Qt API version %1").arg(QT_VERSION_STR), this));
+    addWidget(new QLabel(tr("Qt runtime version %1").arg(qVersion()), this));
+
     QPushButton *clearSettings = new QPushButton("Clear persistent data", this);
     connect(clearSettings, SIGNAL(clicked()), this, SLOT(onClear()));
     addWidget(clearSettings);
 
-    QLabel *level = new QLabel(tr("Trace level:"), this);
-    addWidget(level);
-
+    addWidget(new QLabel(tr("Trace level:"), this));
     ToolButtonBox *box = new ToolButtonBox(this);
     addWidget(box);
     box->addButton(QtDebugMsg, tr("Debug"));

diff --git a/dorian.pro b/dorian.pro
index 9e20274..fd86323 100644 (file)
--- a/dorian.pro
+++ b/dorian.pro
@@ -139,12 +139,12 @@ symbian {
         WriteUserData\r
     TARGET.EPOCHEAPSIZE = 0x080000 0x4000000\r
     ICON = $$PWD/pkg/symbian/book.svg\r
-    packageheader = "$${LITERAL_HASH}{\"Dorian\"}, (0xA89FC85B), 0, 3, 5"\r
-    vendorinfo = \\r
-        "%{\"Nokia Betalabs \"}" \\r
-        ":\"Nokia Betalabs \""\r
-    my_deployment.pkg_prerules = packageheader vendorinfo\r
-    DEPLOYMENT += my_deployment\r
+    # packageheader = "$${LITERAL_HASH}{\"Dorian\"}, (0xA89FC85B), 0, 3, 5"\r
+    # vendorinfo = \\r
+    #     "%{\"Nokia Betalabs \"}" \\r
+    #     ":\"Nokia Betalabs \""\r
+    # my_deployment.pkg_prerules = packageheader vendorinfo\r
+    # DEPLOYMENT += my_deployment\r
 \r
     INCLUDEPATH += $(QTDIR)/src/3rdparty/zlib\r
     HEADERS += \\r

diff --git a/model/book.cpp b/model/book.cpp
index 5942d6b..2715769 100644 (file)
--- a/model/book.cpp
+++ b/model/book.cpp
@@ -32,6 +32,11 @@ Book::Book(const QString &p, QObject *parent): QObject(parent), loaded(false)
     }
 }
 
+Book::~Book()
+{
+    close();
+}
+
 QString Book::path()
 {
     return mPath;

diff --git a/model/book.h b/model/book.h
index ded10f0..59f2005 100644 (file)
--- a/model/book.h
+++ b/model/book.h
@@ -38,11 +38,14 @@ public:
         }
     };
 
-    /** Construct a book from an EPUB file in path. */
-    Book(const QString &path, QObject *parent = 0);
+    /** Construct a book from an EPUB file. */
+    Book(const QString &fileName, QObject *parent = 0);
 
     /** Default constructor. */
-    Book();
+    // Book();
+
+    /** Destructor. */
+    ~Book();
 
     /** Load book meta-data from persistent storage. */
     void load();