diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-15 11:34:59 +0200 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-15 11:36:17 +0200 |
commit | 64d6b482bfb9dbacd548b72cb9c073513f6aa56f (patch) | |
tree | 6adea7f584f31d2b650379a4dba9ff6d7de527e3 /src/datavisualizationqml2 | |
parent | ca8eb71e320d08071f0f43393da3bb3fabf56da7 (diff) |
Removed QDataVis and namespace macros
- docs will be fixed in QTRD-2594
Task-number: QTRD-2699
Task-number: QTRD-2700
Change-Id: Ia89d365c2de5d9254b165feb4f0a54ec099084be
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualizationqml2')
20 files changed, 106 insertions, 64 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp index 19b3df32..53d2b59d 100644 --- a/src/datavisualizationqml2/abstractdeclarative.cpp +++ b/src/datavisualizationqml2/abstractdeclarative.cpp @@ -23,7 +23,7 @@ #include <QGuiApplication> #include <QSGSimpleRectNode> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { static QList<const QQuickWindow *> clearList; @@ -68,24 +68,26 @@ bool AbstractDeclarative::clearWindowBeforeRendering() const return m_clearWindowBeforeRendering; } -void AbstractDeclarative::setSelectionMode(QDataVis::SelectionFlags mode) +void AbstractDeclarative::setSelectionMode(SelectionFlags mode) { - m_controller->setSelectionMode(mode); + int intmode = int(mode); + m_controller->setSelectionMode(QAbstract3DGraph::SelectionFlags(intmode)); } -QDataVis::SelectionFlags AbstractDeclarative::selectionMode() const +AbstractDeclarative::SelectionFlags AbstractDeclarative::selectionMode() const { - return m_controller->selectionMode(); + int intmode = int(m_controller->selectionMode()); + return SelectionFlags(intmode); } -void AbstractDeclarative::setShadowQuality(QDataVis::ShadowQuality quality) +void AbstractDeclarative::setShadowQuality(ShadowQuality quality) { - m_controller->setShadowQuality(quality); + m_controller->setShadowQuality(QAbstract3DGraph::ShadowQuality(quality)); } -QDataVis::ShadowQuality AbstractDeclarative::shadowQuality() const +AbstractDeclarative::ShadowQuality AbstractDeclarative::shadowQuality() const { - return m_controller->shadowQuality(); + return ShadowQuality(m_controller->shadowQuality()); } void AbstractDeclarative::setSharedController(Abstract3DController *controller) @@ -93,13 +95,13 @@ void AbstractDeclarative::setSharedController(Abstract3DController *controller) Q_ASSERT(controller); m_controller = controller; QObject::connect(m_controller, &Abstract3DController::shadowQualityChanged, this, - &AbstractDeclarative::shadowQualityChanged); + &AbstractDeclarative::handleShadowQualityChange); QObject::connect(m_controller, &Abstract3DController::activeInputHandlerChanged, this, &AbstractDeclarative::inputHandlerChanged); QObject::connect(m_controller, &Abstract3DController::activeThemeChanged, this, &AbstractDeclarative::themeChanged); QObject::connect(m_controller, &Abstract3DController::selectionModeChanged, this, - &AbstractDeclarative::selectionModeChanged); + &AbstractDeclarative::handleSelectionModeChange); QObject::connect(m_controller, &Abstract3DController::axisXChanged, this, &AbstractDeclarative::handleAxisXChanged); @@ -167,11 +169,24 @@ void AbstractDeclarative::updateWindowParameters() } QPointF point = QQuickItem::mapToScene(QPointF(0.0f, 0.0f)); - if (m_controller) - scene->d_ptr->setViewport(QRect(point.x(), point.y(), m_cachedGeometry.width(), m_cachedGeometry.height())); + if (m_controller) { + scene->d_ptr->setViewport(QRect(point.x(), point.y(), m_cachedGeometry.width(), + m_cachedGeometry.height())); + } } } +void AbstractDeclarative::handleSelectionModeChange(QAbstract3DGraph::SelectionFlags mode) +{ + int intmode = int(mode); + emit selectionModeChanged(SelectionFlags(intmode)); +} + +void AbstractDeclarative::handleShadowQualityChange(QAbstract3DGraph::ShadowQuality quality) +{ + emit shadowQualityChanged(ShadowQuality(quality)); +} + void AbstractDeclarative::render() { updateWindowParameters(); @@ -242,4 +257,4 @@ void AbstractDeclarative::wheelEvent(QWheelEvent *event) m_controller->wheelEvent(event); } -QT_DATAVISUALIZATION_END_NAMESPACE +} diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h index 1f16f44d..af66f3ca 100644 --- a/src/datavisualizationqml2/abstractdeclarative_p.h +++ b/src/datavisualizationqml2/abstractdeclarative_p.h @@ -39,27 +39,54 @@ #include <QObject> #include <QQuickWindow> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class AbstractDeclarative : public QQuickItem { Q_OBJECT - Q_PROPERTY(QtDataVisualization::QDataVis::SelectionFlags selectionMode READ selectionMode WRITE setSelectionMode NOTIFY selectionModeChanged) - Q_PROPERTY(QtDataVisualization::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality NOTIFY shadowQualityChanged) + Q_ENUMS(ShadowQuality) + Q_FLAGS(SelectionFlag SelectionFlags) + Q_PROPERTY(SelectionFlags selectionMode READ selectionMode WRITE setSelectionMode NOTIFY selectionModeChanged) + Q_PROPERTY(ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality NOTIFY shadowQualityChanged) Q_PROPERTY(Declarative3DScene* scene READ scene NOTIFY sceneChanged) Q_PROPERTY(QAbstract3DInputHandler* inputHandler READ inputHandler WRITE setInputHandler NOTIFY inputHandlerChanged) Q_PROPERTY(Q3DTheme* theme READ theme WRITE setTheme NOTIFY themeChanged) Q_PROPERTY(bool clearWindowBeforeRendering READ clearWindowBeforeRendering WRITE setClearWindowBeforeRendering NOTIFY clearWindowBeforeRenderingChanged) public: + enum SelectionFlag { + SelectionNone = 0, + SelectionItem = 1, + SelectionRow = 2, + SelectionItemAndRow = SelectionItem | SelectionRow, + SelectionColumn = 4, + SelectionItemAndColumn = SelectionItem | SelectionColumn, + SelectionRowAndColumn = SelectionRow | SelectionColumn, + SelectionItemRowAndColumn = SelectionItem | SelectionRow | SelectionColumn, + SelectionSlice = 8, + SelectionMultiSeries = 16 + }; + Q_DECLARE_FLAGS(SelectionFlags, SelectionFlag) + + enum ShadowQuality { + ShadowQualityNone = 0, + ShadowQualityLow, + ShadowQualityMedium, + ShadowQualityHigh, + ShadowQualitySoftLow, + ShadowQualitySoftMedium, + ShadowQualitySoftHigh + }; + +public: explicit AbstractDeclarative(QQuickItem *parent = 0); virtual ~AbstractDeclarative(); - virtual void setSelectionMode(QDataVis::SelectionFlags mode); - virtual QDataVis::SelectionFlags selectionMode() const; + virtual void setSelectionMode(SelectionFlags mode); + virtual AbstractDeclarative::SelectionFlags selectionMode() const; - virtual void setShadowQuality(QDataVis::ShadowQuality quality); - virtual QDataVis::ShadowQuality shadowQuality() const; + virtual void setShadowQuality(ShadowQuality quality); + virtual AbstractDeclarative::ShadowQuality shadowQuality() const; virtual Declarative3DScene *scene() const; @@ -94,11 +121,13 @@ protected: virtual void handleWindowChanged(QQuickWindow *win); virtual void itemChange(ItemChange change, const ItemChangeData &value); virtual void updateWindowParameters(); + virtual void handleSelectionModeChange(QAbstract3DGraph::SelectionFlags mode); + virtual void handleShadowQualityChange(QAbstract3DGraph::ShadowQuality quality); signals: // Signals shadow quality changes. - void selectionModeChanged(QDataVis::SelectionFlags mode); - void shadowQualityChanged(QDataVis::ShadowQuality quality); + void selectionModeChanged(SelectionFlags mode); + void shadowQualityChanged(ShadowQuality quality); void sceneChanged(Q3DScene *scene); void inputHandlerChanged(QAbstract3DInputHandler *inputHandler); void themeChanged(Q3DTheme *theme); @@ -109,7 +138,8 @@ private: QRectF m_cachedGeometry; bool m_clearWindowBeforeRendering; }; +Q_DECLARE_OPERATORS_FOR_FLAGS(AbstractDeclarative::SelectionFlags) -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif // ABSTRACTDECLARATIVE_P_H diff --git a/src/datavisualizationqml2/colorgradient.cpp b/src/datavisualizationqml2/colorgradient.cpp index e4c16ebe..11ce2a58 100644 --- a/src/datavisualizationqml2/colorgradient.cpp +++ b/src/datavisualizationqml2/colorgradient.cpp @@ -18,7 +18,7 @@ #include "colorgradient_p.h" -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { ColorGradientStop::ColorGradientStop(QObject *parent) : QObject(parent) @@ -74,4 +74,4 @@ void ColorGradient::doUpdate() emit updated(); } -QT_DATAVISUALIZATION_END_NAMESPACE +} diff --git a/src/datavisualizationqml2/colorgradient_p.h b/src/datavisualizationqml2/colorgradient_p.h index 59653331..f2fcae1f 100644 --- a/src/datavisualizationqml2/colorgradient_p.h +++ b/src/datavisualizationqml2/colorgradient_p.h @@ -33,7 +33,7 @@ #include <QColor> #include <QQmlListProperty> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class ColorGradientStop : public QObject { @@ -83,6 +83,6 @@ Q_SIGNALS: void updated(); }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp index a103d847..28f08500 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp @@ -20,15 +20,13 @@ #include <qqml.h> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { void QtDataVisualizationQml2Plugin::registerTypes(const char *uri) { // @uri QtDataVisualization qmlRegisterUncreatableType<const QAbstractItemModel>(uri, 1, 0, "AbstractItemModel", QLatin1String("Trying to create uncreatable: AbstractItemModel.")); - qmlRegisterUncreatableType<QDataVis>(uri, 1, 0, "DataVis", - QLatin1String("Trying to create uncreatable: DataVis.")); qmlRegisterUncreatableType<QAbstract3DAxis>(uri, 1, 0, "AbstractAxis3D", QLatin1String("Trying to create uncreatable: AbstractAxis.")); qmlRegisterUncreatableType<QAbstractDataProxy>(uri, 1, 0, "AbstractDataProxy", @@ -82,5 +80,5 @@ void QtDataVisualizationQml2Plugin::registerTypes(const char *uri) qmlRegisterType<DeclarativeSurface3DSeries>(uri, 1, 0, "Surface3DSeries"); } -QT_DATAVISUALIZATION_END_NAMESPACE +} diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.h b/src/datavisualizationqml2/datavisualizationqml2_plugin.h index fcf5bddf..fc18a1b6 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.h +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.h @@ -46,7 +46,7 @@ #include <QQmlExtensionPlugin> -QT_DATAVISUALIZATION_USE_NAMESPACE +using namespace QtDataVisualization; QML_DECLARE_TYPE(AbstractDeclarative) QML_DECLARE_TYPE(DeclarativeBars) @@ -54,7 +54,6 @@ QML_DECLARE_TYPE(DeclarativeScatter) QML_DECLARE_TYPE(DeclarativeSurface) QML_DECLARE_TYPE(const QAbstractItemModel) -QML_DECLARE_TYPE(QDataVis) QML_DECLARE_TYPE(QAbstract3DAxis) QML_DECLARE_TYPE(QCategory3DAxis) @@ -93,7 +92,7 @@ QML_DECLARE_TYPE(DeclarativeTheme3D) QML_DECLARE_TYPE(QAbstract3DInputHandler) -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class QtDataVisualizationQml2Plugin : public QQmlExtensionPlugin { @@ -104,7 +103,7 @@ public: void registerTypes(const char *uri); }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif // DATAVISUALIZATIONQML2_PLUGIN_H diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp index 3f40ffc2..97299833 100644 --- a/src/datavisualizationqml2/declarativebars.cpp +++ b/src/datavisualizationqml2/declarativebars.cpp @@ -21,7 +21,7 @@ #include "qitemmodelbardataproxy.h" #include "declarativescene_p.h" -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { DeclarativeBars::DeclarativeBars(QQuickItem *parent) : AbstractDeclarative(parent), @@ -167,4 +167,4 @@ void DeclarativeBars::handleAxisZChanged(QAbstract3DAxis *axis) emit rowAxisChanged(static_cast<QCategory3DAxis *>(axis)); } -QT_DATAVISUALIZATION_END_NAMESPACE +} diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h index 2c6a51f5..6a2a3052 100644 --- a/src/datavisualizationqml2/declarativebars_p.h +++ b/src/datavisualizationqml2/declarativebars_p.h @@ -43,7 +43,7 @@ #include <QObject> #include <QQuickWindow> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class DeclarativeBars : public AbstractDeclarative { @@ -103,6 +103,6 @@ private: Bars3DController *m_barsController; }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif diff --git a/src/datavisualizationqml2/declarativecolor.cpp b/src/datavisualizationqml2/declarativecolor.cpp index 5c1ff8c5..f0c9263f 100644 --- a/src/datavisualizationqml2/declarativecolor.cpp +++ b/src/datavisualizationqml2/declarativecolor.cpp @@ -18,7 +18,7 @@ #include "declarativecolor_p.h" -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { DeclarativeColor::DeclarativeColor(QObject *parent) : QObject(parent) @@ -38,4 +38,4 @@ QColor DeclarativeColor::color() const return m_color; } -QT_DATAVISUALIZATION_END_NAMESPACE +} diff --git a/src/datavisualizationqml2/declarativecolor_p.h b/src/datavisualizationqml2/declarativecolor_p.h index 755652b4..5aa062c8 100644 --- a/src/datavisualizationqml2/declarativecolor_p.h +++ b/src/datavisualizationqml2/declarativecolor_p.h @@ -32,7 +32,7 @@ #include "datavisualizationglobal_p.h" #include <QColor> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class DeclarativeColor : public QObject { @@ -52,6 +52,6 @@ private: QColor m_color; }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif diff --git a/src/datavisualizationqml2/declarativescatter.cpp b/src/datavisualizationqml2/declarativescatter.cpp index 9b118db3..035736fd 100644 --- a/src/datavisualizationqml2/declarativescatter.cpp +++ b/src/datavisualizationqml2/declarativescatter.cpp @@ -20,7 +20,7 @@ #include "qitemmodelscatterdataproxy.h" #include "declarativescene_p.h" -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { DeclarativeScatter::DeclarativeScatter(QQuickItem *parent) : AbstractDeclarative(parent), @@ -127,4 +127,4 @@ void DeclarativeScatter::handleAxisZChanged(QAbstract3DAxis *axis) emit axisZChanged(static_cast<QValue3DAxis *>(axis)); } -QT_DATAVISUALIZATION_END_NAMESPACE +} diff --git a/src/datavisualizationqml2/declarativescatter_p.h b/src/datavisualizationqml2/declarativescatter_p.h index e1e3678c..79636963 100644 --- a/src/datavisualizationqml2/declarativescatter_p.h +++ b/src/datavisualizationqml2/declarativescatter_p.h @@ -41,7 +41,7 @@ #include <QQuickItem> #include <QObject> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class DeclarativeScatter : public AbstractDeclarative { @@ -85,6 +85,6 @@ protected: Scatter3DController *m_scatterController; }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif diff --git a/src/datavisualizationqml2/declarativescene.cpp b/src/datavisualizationqml2/declarativescene.cpp index b1fefa33..ab747f9c 100644 --- a/src/datavisualizationqml2/declarativescene.cpp +++ b/src/datavisualizationqml2/declarativescene.cpp @@ -18,7 +18,7 @@ #include "declarativescene_p.h" -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { Declarative3DScene::Declarative3DScene(QObject *parent) : Q3DScene(parent) @@ -46,4 +46,4 @@ QPoint Declarative3DScene::invalidSelectionPoint() const return Q3DScene::invalidSelectionPoint(); } -QT_DATAVISUALIZATION_END_NAMESPACE +} diff --git a/src/datavisualizationqml2/declarativescene_p.h b/src/datavisualizationqml2/declarativescene_p.h index 4b6fef1c..0a80d67f 100644 --- a/src/datavisualizationqml2/declarativescene_p.h +++ b/src/datavisualizationqml2/declarativescene_p.h @@ -32,7 +32,7 @@ #include "datavisualizationglobal_p.h" #include "q3dscene.h" -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class Declarative3DScene : public Q3DScene { @@ -55,6 +55,6 @@ signals: void selectionQueryPositionChanged(const QPointF position); }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif diff --git a/src/datavisualizationqml2/declarativeseries.cpp b/src/datavisualizationqml2/declarativeseries.cpp index 0cb8bdf5..388b3dd4 100644 --- a/src/datavisualizationqml2/declarativeseries.cpp +++ b/src/datavisualizationqml2/declarativeseries.cpp @@ -22,7 +22,7 @@ #include "qsurfacedataproxy.h" #include <QMetaMethod> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { static void setSeriesGradient(QAbstract3DSeries *series, const ColorGradient &gradient, GradientType type) { @@ -348,4 +348,4 @@ void DeclarativeSurface3DSeries::handleMultiHighlightGradientUpdate() setSeriesGradient(this, *m_multiHighlightGradient, GradientTypeMulti); } -QT_DATAVISUALIZATION_END_NAMESPACE +} diff --git a/src/datavisualizationqml2/declarativeseries_p.h b/src/datavisualizationqml2/declarativeseries_p.h index 8d191703..c7e5efb9 100644 --- a/src/datavisualizationqml2/declarativeseries_p.h +++ b/src/datavisualizationqml2/declarativeseries_p.h @@ -36,7 +36,7 @@ #include "colorgradient_p.h" #include <QQmlListProperty> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { enum GradientType { GradientTypeBase, @@ -185,6 +185,6 @@ private: ColorGradient *m_multiHighlightGradient; // Not owned }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif diff --git a/src/datavisualizationqml2/declarativesurface.cpp b/src/datavisualizationqml2/declarativesurface.cpp index ceb733e2..b8fe285d 100644 --- a/src/datavisualizationqml2/declarativesurface.cpp +++ b/src/datavisualizationqml2/declarativesurface.cpp @@ -21,7 +21,7 @@ #include "qitemmodelsurfacedataproxy.h" #include "declarativescene_p.h" -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { DeclarativeSurface::DeclarativeSurface(QQuickItem *parent) : AbstractDeclarative(parent), @@ -128,4 +128,4 @@ void DeclarativeSurface::handleAxisZChanged(QAbstract3DAxis *axis) emit axisZChanged(static_cast<QValue3DAxis *>(axis)); } -QT_DATAVISUALIZATION_END_NAMESPACE +} diff --git a/src/datavisualizationqml2/declarativesurface_p.h b/src/datavisualizationqml2/declarativesurface_p.h index dc4d232c..041d8506 100644 --- a/src/datavisualizationqml2/declarativesurface_p.h +++ b/src/datavisualizationqml2/declarativesurface_p.h @@ -42,7 +42,7 @@ #include <QObject> #include <QQuickWindow> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class DeclarativeSurface : public AbstractDeclarative { @@ -86,6 +86,6 @@ private: Surface3DController *m_surfaceController; }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif diff --git a/src/datavisualizationqml2/declarativetheme.cpp b/src/datavisualizationqml2/declarativetheme.cpp index 850b2200..e591f394 100644 --- a/src/datavisualizationqml2/declarativetheme.cpp +++ b/src/datavisualizationqml2/declarativetheme.cpp @@ -18,7 +18,7 @@ #include "declarativetheme_p.h" -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { DeclarativeTheme3D::DeclarativeTheme3D(QObject *parent) : Q3DTheme(parent), @@ -390,4 +390,4 @@ void DeclarativeTheme3D::clearBaseGradientsFunc(QQmlListProperty<ColorGradient> reinterpret_cast<DeclarativeTheme3D *>(list->data)->clearGradients(); } -QT_DATAVISUALIZATION_END_NAMESPACE +} diff --git a/src/datavisualizationqml2/declarativetheme_p.h b/src/datavisualizationqml2/declarativetheme_p.h index 031ab4bb..8f527f2f 100644 --- a/src/datavisualizationqml2/declarativetheme_p.h +++ b/src/datavisualizationqml2/declarativetheme_p.h @@ -36,7 +36,7 @@ #include <QtQml/qqmlparserstatus.h> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class DeclarativeTheme3D : public Q3DTheme, public QQmlParserStatus { @@ -121,6 +121,6 @@ private: bool m_dummyColors; }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif |