From: Akos Polster <akos@pipacs.com>
Date: Sat, 25 Sep 2010 21:11:38 +0000 (+0200)
Subject: Symbian fixes.
X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;h=269de3cf8d569428c4a99b7997d5162bba9b4e0c;p=dorian

Symbian fixes.
---

diff --git a/dorian.pro b/dorian.pro
index c16e63d..538cdcc 100644
--- a/dorian.pro
+++ b/dorian.pro
@@ -113,7 +113,8 @@ symbian {
     TARGET.UID3 = 0xEA633557
     # TARGET.CAPABILITY = ...
     # FIXME: Add OpenC ZLIB?
-    INCLUDEPATH += C:\NokiaQtSDK\Symbian\SDK\src\3rdparty\zlib
+    INCLUDEPATH += C:/NokiaQtSDK/Symbian/SDK/src/3rdparty/zlib \
+        c:/Qt/4.7.0/src/3rdparty/zlib
 }
 maemo5 {
     QT += maemo5 dbus
diff --git a/model/book.h b/model/book.h
index dbc0b71..5305220 100644
--- a/model/book.h
+++ b/model/book.h
@@ -28,7 +28,7 @@ public:
     struct Bookmark
     {
         Bookmark(int part_, qreal pos_): part(part_), pos(pos_) {}
-        Bookmark() {part = pos = 0;}
+        Bookmark(): part(0), pos(0.0) {}
         int part;
         qreal pos;
         bool operator<(const Bookmark&other) const {
@@ -51,7 +51,7 @@ public:
     /** Extract and parse EPUB contents, fill in all members except mPath. */
     bool open();
 
-    /** Extract and parse EPUB metadata only, fill in all members except mPath. */
+    /** Extract and parse metadata only, fill in all members except mPath. */
     void peek();
 
     /** Clear toc and content members, remove extracted content files. */
diff --git a/model/bookfinder.h b/model/bookfinder.h
index 86ff898..e4023b4 100644
--- a/model/bookfinder.h
+++ b/model/bookfinder.h
@@ -7,6 +7,7 @@
 class QStringList;
 class QString;
 
+/** Find new books in a folder. */
 class BookFinder: public QObject
 {
     Q_OBJECT
diff --git a/trace.cpp b/trace.cpp
index f762b19..d6d4992 100644
--- a/trace.cpp
+++ b/trace.cpp
@@ -204,7 +204,6 @@ Trace::EventName Trace::eventTab[] = {
     {QEvent::UngrabMouse, "QEvent::UngrabMouse"},
     {QEvent::GrabKeyboard, "QEvent::GrabKeyboard"},
     {QEvent::UngrabKeyboard, "QEvent::UngrabKeyboard"},
-    {QEvent::CocoaRequestModal, "QEvent::CocoaRequestModal"},
     {QEvent::MacGLClearDrawable, "QEvent::MacGLClearDrawable"},
 
     {QEvent::StateMachineSignal, "QEvent::StateMachineSignal"},