Unnecessary includes removed.

diff --git a/src/detailscreen.cpp b/src/detailscreen.cpp
index 1c3cd10..ba54052 100644 (file)
--- a/src/detailscreen.cpp
+++ b/src/detailscreen.cpp
@@ -18,12 +18,8 @@
 
 #include <QtGui/QGraphicsTextItem>
 #include <QtGui/QGraphicsLineItem>
 
 #include <QtGui/QGraphicsTextItem>
 #include <QtGui/QGraphicsLineItem>

-#include <QtGui/QGraphicsView>
-#include <QtGui/QApplication>
-#include <QtGui/QDesktopWidget>

 #include <QtCore/QString>
 #include <QtCore/QDebug>
 #include <QtCore/QString>
 #include <QtCore/QDebug>

-#include <math.h>

 #include "detailscreen.h"
 #include "odometer.h"
 #include "graphicsscene.h"
 #include "detailscreen.h"
 #include "odometer.h"
 #include "graphicsscene.h"

diff --git a/src/detailscreen.h b/src/detailscreen.h
index 4c30e75..75eee3f 100644 (file)
--- a/src/detailscreen.h
+++ b/src/detailscreen.h
@@ -19,13 +19,11 @@
 #ifndef DETAILSCREEN_H
 #define DETAILSCREEN_H
 
 #ifndef DETAILSCREEN_H
 #define DETAILSCREEN_H
 

-#include "location.h"

 #include "graphicsscreen.h"
 
 #include "graphicsscreen.h"
 

+class QString;

 class QGraphicsTextItem;
 class QGraphicsLineItem;
 class QGraphicsTextItem;
 class QGraphicsLineItem;

-class QGraphicsView;
-class GraphicsScene;

 
 class DetailScreen : public GraphicsScreen
 {
 
 class DetailScreen : public GraphicsScreen
 {

diff --git a/src/filereader.cpp b/src/filereader.cpp
index 0cd9054..2f24b6f 100644 (file)
--- a/src/filereader.cpp
+++ b/src/filereader.cpp
@@ -17,6 +17,7 @@
  */
 
 #include <QtCore/QString>
  */
 
 #include <QtCore/QString>

+#include <QtCore/QByteArray>

 #include <QtCore/QDir>
 #include <QtCore/QFile>
 #include "filereader.h"
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 #include "filereader.h"

diff --git a/src/graphicselement.cpp b/src/graphicselement.cpp
index b290d87..3befe29 100644 (file)
--- a/src/graphicselement.cpp
+++ b/src/graphicselement.cpp
@@ -19,7 +19,6 @@
 #include <QtCore/QString>
 #include <QtCore/QByteArray>
 #include <QtCore/QDebug>
 #include <QtCore/QString>
 #include <QtCore/QByteArray>
 #include <QtCore/QDebug>

-#include <QtCore/QMap>

 #include <QtGui/QGraphicsScene>
 #include <QtGui/QFont>
 #include <QtGui/QFontDatabase>
 #include <QtGui/QGraphicsScene>
 #include <QtGui/QFont>
 #include <QtGui/QFontDatabase>

diff --git a/src/graphicselement.h b/src/graphicselement.h
index fbd7858..8880c07 100644 (file)
--- a/src/graphicselement.h
+++ b/src/graphicselement.h
@@ -24,9 +24,9 @@
 
 class QString;
 class QByteArray;
 
 class QString;
 class QByteArray;

+class QFont;

 class GraphicsScene;
 class Reader;
 class GraphicsScene;
 class Reader;

-class QFont;

 
 class GraphicsElement
 {
 
 class GraphicsElement
 {

diff --git a/src/graphicsscreen.cpp b/src/graphicsscreen.cpp
index 19dfb36..006a33c 100644 (file)
--- a/src/graphicsscreen.cpp
+++ b/src/graphicsscreen.cpp
@@ -18,8 +18,6 @@
 
 #include <QtGui/QApplication>
 #include <QtGui/QDesktopWidget>
 
 #include <QtGui/QApplication>
 #include <QtGui/QDesktopWidget>

-#include <QtGui/QGraphicsScene>
-#include <QtGui/QApplication>

 #include "graphicsscreen.h"
 #include "imageitem.h"
 #include "graphicsscene.h"
 #include "graphicsscreen.h"
 #include "imageitem.h"
 #include "graphicsscene.h"

diff --git a/src/graphicsscreen.h b/src/graphicsscreen.h
index 75947a7..9799bf3 100644 (file)
--- a/src/graphicsscreen.h
+++ b/src/graphicsscreen.h
@@ -21,11 +21,9 @@
 
 #include <QtGui/QGraphicsView>
 #include "abstractscreen.h"
 
 #include <QtGui/QGraphicsView>
 #include "abstractscreen.h"

-#include "location.h"
-#include "imageitem.h"

 
 

-class QGraphicsScene;

 class GraphicsScene;
 class GraphicsScene;

+class ImageItem;

 
 class GraphicsScreen : public QGraphicsView, public AbstractScreen
 {
 
 class GraphicsScreen : public QGraphicsView, public AbstractScreen
 {

diff --git a/src/imageelement.h b/src/imageelement.h
index c21cba6..0452123 100644 (file)
--- a/src/imageelement.h
+++ b/src/imageelement.h
@@ -22,10 +22,10 @@
 #include "graphicselement.h"
 #include "location.h"
 
 #include "graphicselement.h"
 #include "location.h"
 

-class ZipReader;
-class GraphicsScene;

 class QString;
 class QGraphicsPixmapItem;
 class QString;
 class QGraphicsPixmapItem;

+class Reader;
+class GraphicsScene;

 
 class ImageElement : public GraphicsElement
 {
 
 class ImageElement : public GraphicsElement
 {

diff --git a/src/imageitem.cpp b/src/imageitem.cpp
index 046334c..0891f36 100644 (file)
--- a/src/imageitem.cpp
+++ b/src/imageitem.cpp
@@ -16,6 +16,7 @@
  *
  */
 
  *
  */
 

+#include <QtCore/QString>

 #include "imageitem.h"
 
 ImageItem::ImageItem(QString const& filename, QGraphicsItem *parent):
 #include "imageitem.h"
 
 ImageItem::ImageItem(QString const& filename, QGraphicsItem *parent):

diff --git a/src/imageitem.h b/src/imageitem.h
index 286d561..30ff5e4 100644 (file)
--- a/src/imageitem.h
+++ b/src/imageitem.h
@@ -20,9 +20,10 @@
 #define IMAGEITEM_H
 
 #include <QtCore/QObject>
 #define IMAGEITEM_H
 
 #include <QtCore/QObject>

-#include <QtCore/QString>

 #include <QtGui/QGraphicsPixmapItem>
 
 #include <QtGui/QGraphicsPixmapItem>
 

+class QString;
+

 class ImageItem: public QObject, public QGraphicsPixmapItem
 {
     Q_OBJECT
 class ImageItem: public QObject, public QGraphicsPixmapItem
 {
     Q_OBJECT

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 373fe2d..dba2779 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -19,9 +19,8 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 

-#include <QMainWindow>
+#include <QtGui/QMainWindow>

 
 

-class MainScreen;

 class MainWindowStack;
 class MainMenu;
 class Theme;
 class MainWindowStack;
 class MainMenu;
 class Theme;

diff --git a/src/mainwindowstack.cpp b/src/mainwindowstack.cpp
index ca9b501..388176b 100644 (file)
--- a/src/mainwindowstack.cpp
+++ b/src/mainwindowstack.cpp
@@ -16,7 +16,6 @@
  *
  */
 
  *
  */
 

-#include "widgetscreen.h"

 #include "mainwindowstack.h"
 
 MainWindowStack::MainWindowStack(QWidget* parent): WidgetScreen(parent),
 #include "mainwindowstack.h"
 
 MainWindowStack::MainWindowStack(QWidget* parent): WidgetScreen(parent),

diff --git a/src/mainwindowstack.h b/src/mainwindowstack.h
index 9325044..ef741ec 100644 (file)
--- a/src/mainwindowstack.h
+++ b/src/mainwindowstack.h
@@ -19,8 +19,7 @@
 #ifndef MAINWINDOWSTACK_H
 #define MAINWINDOWSTACK_H
 
 #ifndef MAINWINDOWSTACK_H
 #define MAINWINDOWSTACK_H
 

-#include <QtGui/QStackedWidget>
-#include "abstractscreen.h"
+#include <QtCore/QList>

 #include "widgetscreen.h"
 
 class MainWindowStack : public WidgetScreen
 #include "widgetscreen.h"
 
 class MainWindowStack : public WidgetScreen

diff --git a/src/pointer.cpp b/src/pointer.cpp
index 2431844..973a412 100644 (file)
--- a/src/pointer.cpp
+++ b/src/pointer.cpp
@@ -16,10 +16,9 @@
  *
  */
 
  *
  */
 

+#include <QtGui/QGraphicsPixmapItem>

 #include <QtCore/QDebug>
 #include <QtCore/QTimeLine>
 #include <QtCore/QDebug>
 #include <QtCore/QTimeLine>

-#include <QtGui/QGraphicsItemAnimation>
-#include <QtGui/QGraphicsPixmapItem>

 #include <math.h>
 #include "pointer.h"
 #include "reader.h"
 #include <math.h>
 #include "pointer.h"
 #include "reader.h"

diff --git a/src/pointer.h b/src/pointer.h
index 4ae1818..a5f063f 100644 (file)
--- a/src/pointer.h
+++ b/src/pointer.h
@@ -21,12 +21,11 @@
 
 #include <QtCore/QObject>
 #include "graphicselement.h"
 
 #include <QtCore/QObject>
 #include "graphicselement.h"

-#include "location.h"

 
 

-class Reader;

 class QGraphicsPixmapItem;
 class QGraphicsPixmapItem;

-class GraphicsScene;

 class QTimeLine;
 class QTimeLine;

+class GraphicsScene;
+class Reader;

 
 class Pointer : public QObject, public GraphicsElement
 {
 
 class Pointer : public QObject, public GraphicsElement
 {

diff --git a/src/rectangle.h b/src/rectangle.h
index 72912a0..b9c1fb6 100644 (file)
--- a/src/rectangle.h
+++ b/src/rectangle.h
@@ -22,10 +22,10 @@
 #include "graphicselement.h"
 #include "location.h"
 
 #include "graphicselement.h"
 #include "location.h"
 

-class GraphicsScene;

 class QString;
 class QString;

-class Reader;

 class QGraphicsRectItem;
 class QGraphicsRectItem;

+class Reader;
+class GraphicsScene;

 
 class Rectangle : public GraphicsElement
 {
 
 class Rectangle : public GraphicsElement
 {

diff --git a/src/textelement.cpp b/src/textelement.cpp
index 98b2fb8..5779d1c 100644 (file)
--- a/src/textelement.cpp
+++ b/src/textelement.cpp
@@ -20,11 +20,10 @@
 #include <QtCore/QDebug>
 #include <QtGui/QGraphicsScene>
 #include <QtGui/QGraphicsTextItem>
 #include <QtCore/QDebug>
 #include <QtGui/QGraphicsScene>
 #include <QtGui/QGraphicsTextItem>

-#include "reader.h"

 #include "textelement.h"
 #include "textelement.h"

+#include "reader.h"

 #include "odometer.h"
 #include "graphicsscene.h"
 #include "odometer.h"
 #include "graphicsscene.h"

-#include "location.h"

 
 namespace
 {
 
 namespace
 {

@@ -132,8 +131,6 @@ bool TextElement::setAttribute(QString const& name, QString const& value)
 
 void TextElement::addToScene(GraphicsScene* scene)
 {
 
 void TextElement::addToScene(GraphicsScene* scene)
 {

-    Location::Fix fix;
-

     specialFields_.clear();
 
     for(int i = 0; i < FIELD_COUNT; i++)
     specialFields_.clear();
 
     for(int i = 0; i < FIELD_COUNT; i++)

diff --git a/src/themescreen.h b/src/themescreen.h
index 3e1da8b..320cca1 100644 (file)
--- a/src/themescreen.h
+++ b/src/themescreen.h
@@ -20,7 +20,6 @@
 #define THEMESCREEN_H
 
 #include "graphicsscreen.h"
 #define THEMESCREEN_H
 
 #include "graphicsscreen.h"

-#include "location.h"

 
 class QString;
 class QWidget;
 
 class QString;
 class QWidget;

diff --git a/src/themeselector.h b/src/themeselector.h
index 4543657..7d29ac8 100644 (file)
--- a/src/themeselector.h
+++ b/src/themeselector.h
@@ -21,8 +21,8 @@
 
 #include <QtGui/QDialog>
 
 
 #include <QtGui/QDialog>
 

-class ButtonSelector;

 class QString;
 class QString;

+class ButtonSelector;

 
 class ThemeSelector : public QDialog
 {
 
 class ThemeSelector : public QDialog
 {

diff --git a/src/unitselector.h b/src/unitselector.h
index 793682b..b5baad6 100644 (file)
--- a/src/unitselector.h
+++ b/src/unitselector.h
@@ -21,8 +21,8 @@
 
 #include <QtGui/QDialog>
 
 
 #include <QtGui/QDialog>
 

-class ButtonSelector;

 class QString;
 class QString;

+class ButtonSelector;

 
 class UnitSelector : public QDialog
 {
 
 class UnitSelector : public QDialog
 {

diff --git a/src/widgetscreen.h b/src/widgetscreen.h
index 83c83f5..adef502 100644 (file)
--- a/src/widgetscreen.h
+++ b/src/widgetscreen.h
@@ -19,7 +19,6 @@
 #ifndef WIDGETSCREEN_H
 #define WIDGETSCREEN_H
 
 #ifndef WIDGETSCREEN_H
 #define WIDGETSCREEN_H
 

-#include <QtGui/QWidget>

 #include <QtGui/QStackedWidget>
 #include "abstractscreen.h"
 
 #include <QtGui/QStackedWidget>
 #include "abstractscreen.h"