Big cleanup of Qt classes includes in headers of libmarblewidget

parent 5e99b469
......@@ -15,6 +15,7 @@
#include <QUrl>
#include <QTimer>
#include <QPointF>
#include <QRectF>
#include <QtAlgorithms>
#include <QVariant>
#include <QAbstractListModel>
......
......@@ -19,7 +19,6 @@
class QPoint;
class QUrl;
class QAbstractItemModel;
class QString;
class QStringList;
......
......@@ -14,7 +14,7 @@
#include "marble_export.h"
#include "GeoDataCoordinates.h"
#include <QWidget>
#include <QObject>
namespace Marble
{
......
......@@ -12,14 +12,13 @@
#ifndef MARBLE_CLIPPAINTER_H
#define MARBLE_CLIPPAINTER_H
#include <QPointF>
#include <QPainter>
#include "marble_export.h"
#include "MarbleGlobal.h"
class QPaintDevice;
class QPolygonF;
class QPointF;
namespace Marble
{
......
......@@ -20,9 +20,6 @@
#include "TileCoordsPyramid.h"
#include "marble_export.h"
class QHideEvent;
class QShowEvent;
namespace Marble
{
class GeoDataLatLonAltBox;
......
......@@ -16,7 +16,8 @@
#include "marble_export.h"
#include <QObject>
#include <QImage>
class QImage;
namespace Marble
{
......
......@@ -14,12 +14,13 @@
#define FLYTOEDITWIDGET_H
#include <QWidget>
#include <QPersistentModelIndex>
#include "GeoDataCoordinates.h"
class QDoubleSpinBox;
class QToolButton;
class QComboBox;
class QModelIndex;
namespace Marble
{
......
......@@ -15,9 +15,9 @@
#include "GenericScanlineTextureMapper.h"
// Qt
#include <QtCore/qmath.h>
#include <QtCore/QRunnable>
#include <QtGui/QImage>
#include <qmath.h>
#include <QRunnable>
#include <QImage>
// Marble
#include "GeoPainter.h"
......
......@@ -14,8 +14,8 @@
#include "TextureMapperInterface.h"
#include <QtCore/QThreadPool>
#include <QtGui/QImage>
#include <QThreadPool>
#include <QImage>
#include <MarbleGlobal.h>
......
......@@ -23,7 +23,9 @@
#include "TileId.h"
#include "TileCoordsPyramid.h"
#include "MarbleDebug.h"
#include <QMap>
#include <QRect>
namespace Marble
{
......
......@@ -21,9 +21,6 @@
#include <QSizeF>
class QImage;
class QPaintDevice;
class QPolygonF;
class QRect;
class QRectF;
class QRegion;
class QString;
......
......@@ -11,8 +11,6 @@
#ifndef MARBLE_GEOURIPARSER_H
#define MARBLE_GEOURIPARSER_H
#include <QChar>
#include "Planet.h"
#include "GeoDataCoordinates.h"
#include "marble_export.h"
......
......@@ -17,7 +17,6 @@
#include "marble_export.h"
class QStandardItem;
class QStandardItemModel;
class QString;
class QStringList;
......
......@@ -12,9 +12,10 @@
#ifndef MARBLE_MAPTHEMESORTFILTERPROXYMODEL_H
#define MARBLE_MAPTHEMESORTFILTERPROXYMODEL_H
#include <QDateTime>
#include <QSortFilterProxyModel>
class QDateTime;
namespace Marble
{
......
......@@ -17,7 +17,7 @@
#include "MapViewItemDelegate.h"
//Qt
#include <QStyledItemDelegate>
#include <QListView>
#include <QModelIndex>
#include <QTextDocument>
#include <QPainter>
......
......@@ -16,9 +16,10 @@
#ifndef MAPVIEWITEMDELEGATE_H
#define MAPVIEWITEMDELEGATE_H
#include <QListView>
#include <QStyledItemDelegate>
class QListView;
namespace Marble
{
......
......@@ -42,6 +42,7 @@
#include <QTextDocument>
#include <QAbstractTextDocumentLayout>
#include <QStyledItemDelegate>
#include <QDateTime>
using namespace Marble;
// Ui
......
......@@ -21,8 +21,6 @@
// Qt
#include <QWidget>
class QStandardItemModel;
namespace Marble
{
......
......@@ -13,8 +13,8 @@
#ifndef MARBLEABSTRACTPRESENTER_H
#define MARBLEABSTRACTPRESENTER_H
#include <QSharedPointer>
#include <QList>
#include "GeoDataLookAt.h"
#include "GeoDataLatLonBox.h"
#include "MarblePhysics.h"
......
......@@ -14,7 +14,6 @@
#define MARBLE_MARBLEINPUTHANDLER_H
#include <QObject>
#include <QRect>
#include "marble_export.h"
#include "GeoDataCoordinates.h"
......@@ -29,6 +28,7 @@ class QRubberBand;
class QCursor;
class QTimer;
class QString;
class QRect;
namespace Marble
{
......
......@@ -15,8 +15,7 @@
#include "marble_export.h"
#include <QLocale>
#include <QtGlobal>
namespace Marble
{
......
......@@ -29,8 +29,6 @@
* @author Inge Wallin <inge@lysator.liu.se>
*/
class QResizeEvent;
namespace Marble
{
......
......@@ -20,7 +20,6 @@
* @author Inge Wallin <inge@lysator.liu.se>
*/
#include <QPixmap>
#include <QWidget>
#include "GeoDataCoordinates.h"
......@@ -30,9 +29,8 @@
#include "RenderState.h"
// Qt
class QAbstractItemModel;
class QItemSelectionModel;
class QSettings;
class QPixmap;
namespace Marble
{
......
......@@ -15,9 +15,9 @@
#include "marble_export.h"
#include <QObject>
#include <QPoint>
class QAction;
class QPoint;
namespace Marble
{
......
......@@ -16,7 +16,6 @@
#ifndef MARBLE_MERGEDLAYERDECORATOR_H
#define MARBLE_MERGEDLAYERDECORATOR_H
#include <QSize>
#include <QVector>
#include <QList>
......@@ -25,6 +24,7 @@
class QImage;
class QString;
class QSize;
namespace Marble
{
......
......@@ -17,6 +17,7 @@
#include <QMessageBox>
#include <QTimer>
#include <QTime>
#include <QFile>
namespace Marble
{
......
......@@ -12,7 +12,6 @@
#define MOVIECAPTURE_H
#include <QObject>
#include <QFile>
#include "marble_export.h"
......
......@@ -12,6 +12,8 @@
#include "ParseRunnerPlugin.h"
#include <QIcon>
namespace Marble
{
......
......@@ -19,8 +19,6 @@
#include "GeoDataDocument.h"
class QAbstractItemModel;
namespace Marble
{
......
......@@ -17,6 +17,8 @@
#include "MarbleModel.h"
#include "MarbleDebug.h"
#include <QIcon>
using namespace Marble;
PlacemarkPositionProviderPlugin::PlacemarkPositionProviderPlugin( MarbleModel *marbleModel )
......
......@@ -18,10 +18,11 @@
#include <QObject> // for QObject::tr()
#include <QString>
#include <QtPlugin>
#include <QIcon>
#include "marble_export.h"
class QIcon;
namespace Marble
{
......
......@@ -15,7 +15,6 @@
#include <QObject>
#include <QUrl>
#include <QLabel>
#include "BillboardGraphicsItem.h"
......
......@@ -12,7 +12,6 @@
#define MARBLE_QTMARBLECONFIGDIALOG_H
#include <QDialog>
#include <QLocale>
#include "marble_export.h"
#include "MarbleGlobal.h"
......
......@@ -15,6 +15,8 @@
class QString;
class QByteArray;
class QImage;
class QUrl;
namespace Marble
{
......
......@@ -16,7 +16,7 @@
#include <QObject>
#include <QString>
#include <Qt>
#include <QRegion>
#include "RenderPluginInterface.h"
#include "marble_export.h"
......
......@@ -12,6 +12,8 @@
#include "ReverseGeocodingRunnerPlugin.h"
#include <QIcon>
namespace Marble
{
......
......@@ -18,6 +18,8 @@
#include "routing/RoutingManager.h"
#include "routing/RoutingModel.h"
#include <QIcon>
namespace Marble
{
......
......@@ -15,6 +15,7 @@
#include "MarbleLocale.h"
#include <QString>
#include <QVariant>
namespace Marble
{
......
......@@ -12,6 +12,8 @@
#include "RoutingRunnerPlugin.h"
#include <QIcon>
namespace Marble
{
......
......@@ -12,11 +12,11 @@
#ifndef MARBLE_SEARCHRUNNER_H
#define MARBLE_SEARCHRUNNER_H
#include <QObject>
#include "marble_export.h"
#include "GeoDataDocument.h"
#include <QObject>
#include <QVector>
namespace Marble
......
......@@ -19,9 +19,9 @@
#include <QObject>
#include <QVector>
#include <QString>
class QAbstractItemModel;
class QString;
namespace Marble
{
......
......@@ -12,6 +12,8 @@
#include "SearchRunnerPlugin.h"
#include <QIcon>
namespace Marble
{
......
......@@ -11,9 +11,8 @@
#ifndef MARBLE_SERVERLAYOUT_H
#define MARBLE_SERVERLAYOUT_H
#include <QString>
class QUrl;
class QString;
namespace Marble
{
......
......@@ -14,7 +14,7 @@
#include <cmath>
#include <QtCore/qmath.h>
#include <qmath.h>
#include <QRunnable>
#include "MarbleGlobal.h"
......
......@@ -26,7 +26,6 @@
#define MARBLE_STACKEDTILELOADER_H
#include <QObject>
#include <QSize>
#include "GeoSceneTileDataset.h"
#include "TileId.h"
......@@ -34,6 +33,7 @@
class QImage;
class QString;
class QSize;
namespace Marble
{
......
......@@ -20,6 +20,7 @@
#include <QApplication>
#include <QFont>
#include <QImage>
#include <QDate>
#include <QSet>
#include <QScreen>
......
......@@ -11,7 +11,9 @@
#ifndef MARBLE_TEMPLATEDOCUMENT_H
#define MARBLE_TEMPLATEDOCUMENT_H
#include <Qt>
#include <QtGlobal>
class QString;
namespace Marble
{
......
......@@ -22,7 +22,7 @@
#include <QString>
#include <QImage>
#include <QBrush>
#include <QColor>
namespace Marble
{
......
......@@ -13,6 +13,8 @@
#include "TileCoordsPyramid.h"
#include <QRect>
#include <algorithm>
namespace Marble
......
......@@ -14,9 +14,11 @@
#ifndef MARBLE_TILECOORDSPYRAMID_H
#define MARBLE_TILECOORDSPYRAMID_H
#include <QRect>
#include <QtGlobal>
#include "marble_export.h"
class QRect;
namespace Marble
{
......
......@@ -12,14 +12,14 @@
#ifndef MARBLE_TILECREATOR_H
#define MARBLE_TILECREATOR_H
#include <QString>
#include <QThread>
#include <QSize>
#include <QImage>
#include "marble_export.h"
class QSize;
class QImage;
namespace Marble
{
......
......@@ -21,8 +21,6 @@
#define MARBLE_TILELOADER_H
#include <QObject>
#include <QString>
#include <QImage>
#include "TileId.h"
#include "GeoDataContainer.h"
......@@ -32,6 +30,7 @@
class QByteArray;
class QImage;
class QUrl;
class QString;
namespace Marble
{
......
......@@ -14,6 +14,7 @@
#include <QStyleOptionButton>
#include <QPainter>
#include <QApplication>
#include <QListView>
#include "TourItemDelegate.h"
#include "MarblePlacemarkModel.h"
......
......@@ -14,7 +14,8 @@
#define TOURITEMDELEGATE_H
#include <QStyledItemDelegate>
#include <QListView>
class QListView;
namespace Marble
{
......
......@@ -11,9 +11,7 @@
#include "TourPlayback.h"
#include <QList>
#include <QSlider>
#include <qurl.h>
#include <QtCore/qnamespace.h>
#include <QUrl>
#include <QPointer>
#include "MarbleDebug.h"
......