Battle with include files (lost).

diff --git a/bookview.cpp b/bookview.cpp
index f273d1f..d1dc21b 100644 (file)
--- a/bookview.cpp
+++ b/bookview.cpp
@@ -1,9 +1,6 @@
-#include <QDebug>
-#include <QWebFrame>
-#include <QMouseEvent>
-#include <QFile>
 #include <QDir>
-#include <QTimer>
+#include <QtGui>
+#include <QWebFrame>
 
 #if defined(Q_WS_MAEMO_5)
 #   include <QAbstractKineticScroller>

diff --git a/chaptersdialog.cpp b/chaptersdialog.cpp
index 44d16bb..2c8704a 100644 (file)
--- a/chaptersdialog.cpp
+++ b/chaptersdialog.cpp
@@ -1,4 +1,4 @@
-#include <QtGui>
+#include <QStringListModel>
 
 #include "chaptersdialog.h"
 #include "book.h"

diff --git a/devtools.cpp b/devtools.cpp
index c3938c7..12538bb 100644 (file)
--- a/devtools.cpp
+++ b/devtools.cpp
@@ -1,5 +1,4 @@
 #include <QtGui>
-#include <QDebug>
 
 #include "devtools.h"
 #include "trace.h"

diff --git a/librarydialog.cpp b/librarydialog.cpp
index 6ca466a..3fdfe16 100644 (file)
--- a/librarydialog.cpp
+++ b/librarydialog.cpp
@@ -1,8 +1,5 @@
-#include <QtGui>
-#include <QDebug>
-#include <QFileInfo>
 #include <QDir>
-#include <QModelIndex>
+#include <QtGui>
 
 #ifdef Q_WS_MAEMO_5
 #include <QtMaemo5/QMaemo5InformationBox>

diff --git a/mainwindow.cpp b/mainwindow.cpp
index f8093ee..493374f 100755 (executable)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,11 +1,4 @@
 #include <QtGui>
-#include <QtDebug>
-#include <QDir>
-#include <QApplication>
-#include <QFileInfo>
-#include <QStringList>
-#include <QWebView>
-#include <QWebFrame>
 
 #ifdef Q_WS_MAEMO_5
 #   include <QtMaemo5/QMaemo5InformationBox>

diff --git a/mainwindow.h b/mainwindow.h
index 82c7f98..b284919 100755 (executable)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -1,7 +1,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QtGui>
+#include <QModelIndex>
 
 #include "adopterwindow.h"
 

diff --git a/model/book.cpp b/model/book.cpp
index 0a5c8d1..c2d3c99 100644 (file)
--- a/model/book.cpp
+++ b/model/book.cpp
@@ -1,12 +1,4 @@
-#include <QDir>
-#include <QString>
-#include <QDebug>
-#include <QtXml>
 #include <qtextdocument.h>  // Qt::escape is currently defined here...
-#include <QDirIterator>
-#include <QFileInfo>
-#include <QtAlgorithms>
-#include <QVariantHash>
 
 #include "book.h"
 #include "opshandler.h"

diff --git a/model/bookdb.cpp b/model/bookdb.cpp
index 609f555..0dee139 100644 (file)
--- a/model/bookdb.cpp
+++ b/model/bookdb.cpp
@@ -1,5 +1,3 @@
-#include <QFileInfo>
-
 #include "bookdb.h"
 #include "platform.h"
 #include "trace.h"

diff --git a/model/bookfinder.cpp b/model/bookfinder.cpp
index 7eca25e..99647ea 100644 (file)
--- a/model/bookfinder.cpp
+++ b/model/bookfinder.cpp
@@ -1,6 +1,6 @@
+#include <QFileInfoList>
 #include <QStringList>
 #include <QDir>
-#include <QFileInfoList>
 
 #include "bookfinder.h"
 #include "trace.h"

diff --git a/model/extractzip.cpp b/model/extractzip.cpp
index 6f5db8e..98272bc 100644 (file)
--- a/model/extractzip.cpp
+++ b/model/extractzip.cpp
@@ -1,8 +1,6 @@
-#include <QDebug>
 #include <QFile>
 #include <QDir>
-#include <QString>
-#include <QStringList>
+#include <QDebug>
 
 #include "extractzip.h"
 #include "unzip/unzip.h"

diff --git a/model/library.cpp b/model/library.cpp
index bc18925..b440780 100644 (file)
--- a/model/library.cpp
+++ b/model/library.cpp
@@ -1,7 +1,3 @@
-#include <QSettings>
-#include <QDebug>
-#include <QFileInfo>
-
 #include "library.h"
 #include "book.h"
 #include "trace.h"
@@ -220,7 +216,7 @@ void Library::upgrade()
     TRACE;
     QSettings settings;
     QString oldVersion = settings.value("lib/version").toString();
-    if (/* true */ oldVersion.isEmpty()) {
+    if (oldVersion.isEmpty()) {
         int size = settings.value("lib/size").toInt();
         emit beginUpgrade(size);
         for (int i = 0; i < size; i++) {

diff --git a/platform.cpp b/platform.cpp
index 1c4172b..ca21dc8 100644 (file)
--- a/platform.cpp
+++ b/platform.cpp
@@ -1,10 +1,10 @@
+#include <QtGlobal>
+#include <QDir>
+
 #if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
 #include <unistd.h>
 #endif
 
-#include <QDir>
-#include <QtGui>
-
 #include "platform.h"
 
 #if defined(Q_OS_WIN32) || defined(Q_OS_SYMBIAN)

diff --git a/search.cpp b/search.cpp
index 6243d86..df928c7 100644 (file)
--- a/search.cpp
+++ b/search.cpp
@@ -1,11 +1,11 @@
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
 #include <QNetworkRequest>
-#include <QWebFrame>
+#include <QNetworkReply>
+#include <QtGui>
+#include <QFile>
+#include <QNetworkAccessManager>
 #include <QWebPage>
 #include <QWebElementCollection>
-#include <QWebElement>
-#include <QFile>
+#include <QWebFrame>
 
 #include "search.h"
 #include "platform.h"

diff --git a/searchresultsdialog.cpp b/searchresultsdialog.cpp
index 6d7216b..88958f6 100644 (file)
--- a/searchresultsdialog.cpp
+++ b/searchresultsdialog.cpp
@@ -1,5 +1,9 @@
 #include <stdio.h>
+
 #include <QtGui>
+#include <QStringListModel>
+#include <QDir>
+#include <QFile>
 
 #ifdef Q_WS_MAEMO_5
 #include <QtMaemo5/QMaemo5InformationBox>

diff --git a/settingswindow.h b/settingswindow.h
index 7a9ced5..e2b3353 100644 (file)
--- a/settingswindow.h
+++ b/settingswindow.h
@@ -2,6 +2,8 @@
 #define SETTINGSWINDOW_H
 
 #include <QMainWindow>
+#include <QLabel>
+#include <QSlider>
 
 class QPushButton;
 class QFontComboBox;

diff --git a/widgets/adopterwindow.cpp b/widgets/adopterwindow.cpp
index e394847..fc20cdb 100644 (file)
--- a/widgets/adopterwindow.cpp
+++ b/widgets/adopterwindow.cpp
@@ -6,9 +6,9 @@
 #   include <X11/Xatom.h>
 #endif // Q_WS_MAEMO_5
 
+#include "trace.h"
 #include "adopterwindow.h"
 #include "platform.h"
-#include "trace.h"
 
 AdopterWindow::AdopterWindow(QWidget *parent):
         QMainWindow(parent), grabbingZoomKeys(false), mainChild(0)

diff --git a/widgets/progressdialog.cpp b/widgets/progressdialog.cpp
index 0532866..492d5da 100644 (file)
--- a/widgets/progressdialog.cpp
+++ b/widgets/progressdialog.cpp
@@ -1,4 +1,3 @@
-#include <QString>
 #include <QtGui>
 
 #include "progressdialog.h"