summaryrefslogtreecommitdiffstats
path: root/src/datavisualizationqml2/datavisualizationqml2_plugin.h
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2014-01-15 11:34:59 +0200
committerTomi Korpipää <tomi.korpipaa@digia.com>2014-01-15 11:36:17 +0200
commit64d6b482bfb9dbacd548b72cb9c073513f6aa56f (patch)
tree6adea7f584f31d2b650379a4dba9ff6d7de527e3 /src/datavisualizationqml2/datavisualizationqml2_plugin.h
parentca8eb71e320d08071f0f43393da3bb3fabf56da7 (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/datavisualizationqml2_plugin.h')
-rw-r--r--src/datavisualizationqml2/datavisualizationqml2_plugin.h7
1 files changed, 3 insertions, 4 deletions
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