diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-02-17 16:18:27 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-02-18 12:53:13 +0200 |
commit | d91e065526fe084374b206b6e7c9f0d628abb93d (patch) | |
tree | f4f9df5a31865e25ee97517c9b732eada1d2c8fe /src/datavisualizationqml2 | |
parent | 7eb24d68115619d8d78e6a427d5c723e5ffc15a5 (diff) |
Clean up public API and includes usage
Change-Id: I20ba0ffafa6bbe22d624a15fe3046ef2e33ab6d7
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualizationqml2')
12 files changed, 15 insertions, 30 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp index 7415df9b..3bdb2a3a 100644 --- a/src/datavisualizationqml2/abstractdeclarative.cpp +++ b/src/datavisualizationqml2/abstractdeclarative.cpp @@ -21,9 +21,9 @@ #include "declarativetheme_p.h" #include "declarativerendernode_p.h" -#include <QThread> -#include <QGuiApplication> -#include <QSGSimpleRectNode> +#include <QtCore/QThread> +#include <QtGui/QGuiApplication> +#include <QtQuick/QSGSimpleRectNode> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h index 83a1bbdb..a26f2ffa 100644 --- a/src/datavisualizationqml2/abstractdeclarative_p.h +++ b/src/datavisualizationqml2/abstractdeclarative_p.h @@ -34,11 +34,10 @@ #include "qabstract3dinputhandler.h" #include "declarativescene_p.h" -#include <QAbstractItemModel> -#include <QQuickItem> -#include <QObject> -#include <QQuickWindow> -#include <QPointer> +#include <QtCore/QAbstractItemModel> +#include <QtQuick/QQuickItem> +#include <QtQuick/QQuickWindow> +#include <QtCore/QPointer> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/colorgradient_p.h b/src/datavisualizationqml2/colorgradient_p.h index 31e3d305..c870ebcb 100644 --- a/src/datavisualizationqml2/colorgradient_p.h +++ b/src/datavisualizationqml2/colorgradient_p.h @@ -30,8 +30,8 @@ #define COLORGRADIENT_P_H #include "datavisualizationglobal_p.h" -#include <QColor> -#include <QQmlListProperty> +#include <QtGui/QColor> +#include <QtQml/QQmlListProperty> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp index f926b7fa..04e70ecb 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp @@ -18,7 +18,7 @@ #include "datavisualizationqml2_plugin.h" -#include <qqml.h> +#include <QtQml> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.h b/src/datavisualizationqml2/datavisualizationqml2_plugin.h index c12c2cb2..e39d6b35 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.h +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.h @@ -44,7 +44,7 @@ #include "declarativecolor_p.h" #include "declarativescene_p.h" -#include <QQmlExtensionPlugin> +#include <QtQml/QQmlExtensionPlugin> using namespace QtDataVisualization; diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h index be66860d..97f5882a 100644 --- a/src/datavisualizationqml2/declarativebars_p.h +++ b/src/datavisualizationqml2/declarativebars_p.h @@ -38,11 +38,6 @@ #include "qbardataproxy.h" #include "qbar3dseries.h" -#include <QAbstractItemModel> -#include <QQuickItem> -#include <QObject> -#include <QQuickWindow> - QT_BEGIN_NAMESPACE_DATAVISUALIZATION class DeclarativeBars : public AbstractDeclarative diff --git a/src/datavisualizationqml2/declarativecolor_p.h b/src/datavisualizationqml2/declarativecolor_p.h index 67eb9a2b..87463384 100644 --- a/src/datavisualizationqml2/declarativecolor_p.h +++ b/src/datavisualizationqml2/declarativecolor_p.h @@ -30,7 +30,7 @@ #define DECLARATIVECOLOR_P_H #include "datavisualizationglobal_p.h" -#include <QColor> +#include <QtGui/QColor> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/declarativescatter_p.h b/src/datavisualizationqml2/declarativescatter_p.h index f36d2a7b..79b56e02 100644 --- a/src/datavisualizationqml2/declarativescatter_p.h +++ b/src/datavisualizationqml2/declarativescatter_p.h @@ -37,10 +37,6 @@ #include "qscatterdataproxy.h" #include "qscatter3dseries.h" -#include <QAbstractItemModel> -#include <QQuickItem> -#include <QObject> - QT_BEGIN_NAMESPACE_DATAVISUALIZATION class DeclarativeScatter : public AbstractDeclarative diff --git a/src/datavisualizationqml2/declarativeseries.cpp b/src/datavisualizationqml2/declarativeseries.cpp index 1a762152..21555f45 100644 --- a/src/datavisualizationqml2/declarativeseries.cpp +++ b/src/datavisualizationqml2/declarativeseries.cpp @@ -20,7 +20,7 @@ #include "qbardataproxy.h" #include "qscatterdataproxy.h" #include "qsurfacedataproxy.h" -#include <QMetaMethod> +#include <QtCore/QMetaMethod> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/declarativeseries_p.h b/src/datavisualizationqml2/declarativeseries_p.h index f196e311..25540e9b 100644 --- a/src/datavisualizationqml2/declarativeseries_p.h +++ b/src/datavisualizationqml2/declarativeseries_p.h @@ -34,7 +34,7 @@ #include "qscatter3dseries.h" #include "qsurface3dseries.h" #include "colorgradient_p.h" -#include <QQmlListProperty> +#include <QtQml/QQmlListProperty> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/declarativesurface_p.h b/src/datavisualizationqml2/declarativesurface_p.h index bba3887d..a4747167 100644 --- a/src/datavisualizationqml2/declarativesurface_p.h +++ b/src/datavisualizationqml2/declarativesurface_p.h @@ -37,11 +37,6 @@ #include "qsurfacedataproxy.h" #include "qsurface3dseries.h" -#include <QAbstractItemModel> -#include <QQuickItem> -#include <QObject> -#include <QQuickWindow> - QT_BEGIN_NAMESPACE_DATAVISUALIZATION class DeclarativeSurface : public AbstractDeclarative diff --git a/src/datavisualizationqml2/declarativetheme_p.h b/src/datavisualizationqml2/declarativetheme_p.h index 8101cf71..a7f40b1e 100644 --- a/src/datavisualizationqml2/declarativetheme_p.h +++ b/src/datavisualizationqml2/declarativetheme_p.h @@ -34,7 +34,7 @@ #include "colorgradient_p.h" #include "q3dtheme_p.h" -#include <QtQml/qqmlparserstatus.h> +#include <QtQml/QQmlParserStatus> QT_BEGIN_NAMESPACE_DATAVISUALIZATION |