summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--examples/audiolevels/audiolevels.cpp6
-rw-r--r--examples/audiolevels/audiolevels.h2
-rw-r--r--examples/audiolevels/audiolevelsiodevice.cpp2
-rw-r--r--examples/audiolevels/audiolevelsiodevice.h2
-rw-r--r--examples/bars/graphmodifier.cpp10
-rw-r--r--examples/bars/graphmodifier.h2
-rw-r--r--examples/bars/main.cpp36
-rw-r--r--examples/custominput/scatterdatamodifier.cpp6
-rw-r--r--examples/custominput/scatterdatamodifier.h2
-rw-r--r--examples/customproxy/rainfallgraph.cpp4
-rw-r--r--examples/customproxy/variantbardatamapping.h3
-rw-r--r--examples/customproxy/variantdataset.h3
-rw-r--r--examples/itemmodel/main.cpp4
-rw-r--r--examples/scatter/scatterdatamodifier.cpp6
-rw-r--r--examples/scatter/scatterdatamodifier.h2
-rw-r--r--examples/surface/surfacegraph.h12
-rw-r--r--src/datavisualization/axis/qabstract3daxis.cpp4
-rw-r--r--src/datavisualization/axis/qabstract3daxis.h7
-rw-r--r--src/datavisualization/axis/qabstract3daxis_p.h4
-rw-r--r--src/datavisualization/axis/qcategory3daxis.cpp4
-rw-r--r--src/datavisualization/axis/qcategory3daxis.h4
-rw-r--r--src/datavisualization/axis/qcategory3daxis_p.h4
-rw-r--r--src/datavisualization/axis/qvalue3daxis.cpp4
-rw-r--r--src/datavisualization/axis/qvalue3daxis.h4
-rw-r--r--src/datavisualization/axis/qvalue3daxis_p.h4
-rw-r--r--src/datavisualization/data/abstractitemmodelhandler.cpp4
-rw-r--r--src/datavisualization/data/abstractitemmodelhandler_p.h4
-rw-r--r--src/datavisualization/data/abstractrenderitem.cpp4
-rw-r--r--src/datavisualization/data/abstractrenderitem_p.h4
-rw-r--r--src/datavisualization/data/baritemmodelhandler.cpp4
-rw-r--r--src/datavisualization/data/baritemmodelhandler_p.h4
-rw-r--r--src/datavisualization/data/barrenderitem.cpp4
-rw-r--r--src/datavisualization/data/barrenderitem_p.h4
-rw-r--r--src/datavisualization/data/labelitem.cpp4
-rw-r--r--src/datavisualization/data/labelitem_p.h4
-rw-r--r--src/datavisualization/data/qabstract3dseries.cpp4
-rw-r--r--src/datavisualization/data/qabstract3dseries.h5
-rw-r--r--src/datavisualization/data/qabstract3dseries_p.h4
-rw-r--r--src/datavisualization/data/qabstractdataproxy.cpp4
-rw-r--r--src/datavisualization/data/qabstractdataproxy.h7
-rw-r--r--src/datavisualization/data/qabstractdataproxy_p.h4
-rw-r--r--src/datavisualization/data/qbar3dseries.cpp4
-rw-r--r--src/datavisualization/data/qbar3dseries.h4
-rw-r--r--src/datavisualization/data/qbar3dseries_p.h4
-rw-r--r--src/datavisualization/data/qbardataitem.cpp4
-rw-r--r--src/datavisualization/data/qbardataitem.h6
-rw-r--r--src/datavisualization/data/qbardataitem_p.h4
-rw-r--r--src/datavisualization/data/qbardataproxy.cpp4
-rw-r--r--src/datavisualization/data/qbardataproxy.h4
-rw-r--r--src/datavisualization/data/qbardataproxy_p.h4
-rw-r--r--src/datavisualization/data/qheightmapsurfacedataproxy.cpp4
-rw-r--r--src/datavisualization/data/qheightmapsurfacedataproxy.h4
-rw-r--r--src/datavisualization/data/qheightmapsurfacedataproxy_p.h4
-rw-r--r--src/datavisualization/data/qitemmodelbardataproxy.cpp4
-rw-r--r--src/datavisualization/data/qitemmodelbardataproxy.h4
-rw-r--r--src/datavisualization/data/qitemmodelbardataproxy_p.h4
-rw-r--r--src/datavisualization/data/qitemmodelscatterdataproxy.cpp4
-rw-r--r--src/datavisualization/data/qitemmodelscatterdataproxy.h4
-rw-r--r--src/datavisualization/data/qitemmodelscatterdataproxy_p.h4
-rw-r--r--src/datavisualization/data/qitemmodelsurfacedataproxy.cpp4
-rw-r--r--src/datavisualization/data/qitemmodelsurfacedataproxy.h4
-rw-r--r--src/datavisualization/data/qitemmodelsurfacedataproxy_p.h4
-rw-r--r--src/datavisualization/data/qscatter3dseries.cpp4
-rw-r--r--src/datavisualization/data/qscatter3dseries.h4
-rw-r--r--src/datavisualization/data/qscatter3dseries_p.h4
-rw-r--r--src/datavisualization/data/qscatterdataitem.cpp4
-rw-r--r--src/datavisualization/data/qscatterdataitem.h5
-rw-r--r--src/datavisualization/data/qscatterdataitem_p.h4
-rw-r--r--src/datavisualization/data/qscatterdataproxy.cpp4
-rw-r--r--src/datavisualization/data/qscatterdataproxy.h4
-rw-r--r--src/datavisualization/data/qscatterdataproxy_p.h4
-rw-r--r--src/datavisualization/data/qsurface3dseries.cpp4
-rw-r--r--src/datavisualization/data/qsurface3dseries.h6
-rw-r--r--src/datavisualization/data/qsurface3dseries_p.h4
-rw-r--r--src/datavisualization/data/qsurfacedataitem.cpp4
-rw-r--r--src/datavisualization/data/qsurfacedataitem.h5
-rw-r--r--src/datavisualization/data/qsurfacedataitem_p.h4
-rw-r--r--src/datavisualization/data/qsurfacedataproxy.cpp4
-rw-r--r--src/datavisualization/data/qsurfacedataproxy.h4
-rw-r--r--src/datavisualization/data/qsurfacedataproxy_p.h4
-rw-r--r--src/datavisualization/data/scatteritemmodelhandler.cpp4
-rw-r--r--src/datavisualization/data/scatteritemmodelhandler_p.h4
-rw-r--r--src/datavisualization/data/scatterrenderitem.cpp4
-rw-r--r--src/datavisualization/data/scatterrenderitem_p.h4
-rw-r--r--src/datavisualization/data/surfaceitemmodelhandler.cpp4
-rw-r--r--src/datavisualization/data/surfaceitemmodelhandler_p.h4
-rw-r--r--src/datavisualization/doc/src/qtdatavisualization.qdoc11
-rw-r--r--src/datavisualization/engine/abstract3dcontroller.cpp20
-rw-r--r--src/datavisualization/engine/abstract3dcontroller_p.h22
-rw-r--r--src/datavisualization/engine/abstract3drenderer.cpp46
-rw-r--r--src/datavisualization/engine/abstract3drenderer_p.h14
-rw-r--r--src/datavisualization/engine/axisrendercache.cpp4
-rw-r--r--src/datavisualization/engine/axisrendercache_p.h4
-rw-r--r--src/datavisualization/engine/bars3dcontroller.cpp18
-rw-r--r--src/datavisualization/engine/bars3dcontroller_p.h6
-rw-r--r--src/datavisualization/engine/bars3drenderer.cpp64
-rw-r--r--src/datavisualization/engine/bars3drenderer_p.h6
-rw-r--r--src/datavisualization/engine/drawer.cpp9
-rw-r--r--src/datavisualization/engine/drawer_p.h6
-rw-r--r--src/datavisualization/engine/q3dbars.cpp4
-rw-r--r--src/datavisualization/engine/q3dbars.h5
-rw-r--r--src/datavisualization/engine/q3dbars_p.h5
-rw-r--r--src/datavisualization/engine/q3dbox.cpp4
-rw-r--r--src/datavisualization/engine/q3dbox.h5
-rw-r--r--src/datavisualization/engine/q3dcamera.cpp4
-rw-r--r--src/datavisualization/engine/q3dcamera.h4
-rw-r--r--src/datavisualization/engine/q3dcamera_p.h4
-rw-r--r--src/datavisualization/engine/q3dlight.cpp4
-rw-r--r--src/datavisualization/engine/q3dlight.h4
-rw-r--r--src/datavisualization/engine/q3dlight_p.h4
-rw-r--r--src/datavisualization/engine/q3dobject.cpp4
-rw-r--r--src/datavisualization/engine/q3dobject.h5
-rw-r--r--src/datavisualization/engine/q3dobject_p.h4
-rw-r--r--src/datavisualization/engine/q3dscatter.cpp4
-rw-r--r--src/datavisualization/engine/q3dscatter.h5
-rw-r--r--src/datavisualization/engine/q3dscatter_p.h5
-rw-r--r--src/datavisualization/engine/q3dscene.cpp4
-rw-r--r--src/datavisualization/engine/q3dscene.h7
-rw-r--r--src/datavisualization/engine/q3dscene_p.h4
-rw-r--r--src/datavisualization/engine/q3dsurface.cpp4
-rw-r--r--src/datavisualization/engine/q3dsurface.h5
-rw-r--r--src/datavisualization/engine/q3dsurface_p.h5
-rw-r--r--src/datavisualization/engine/qabstract3dgraph.cpp77
-rw-r--r--src/datavisualization/engine/qabstract3dgraph.h53
-rw-r--r--src/datavisualization/engine/qabstract3dgraph_p.h4
-rw-r--r--src/datavisualization/engine/scatter3dcontroller.cpp8
-rw-r--r--src/datavisualization/engine/scatter3dcontroller_p.h6
-rw-r--r--src/datavisualization/engine/scatter3drenderer.cpp44
-rw-r--r--src/datavisualization/engine/scatter3drenderer_p.h6
-rw-r--r--src/datavisualization/engine/selectionpointer.cpp4
-rw-r--r--src/datavisualization/engine/selectionpointer_p.h4
-rw-r--r--src/datavisualization/engine/seriesrendercache.cpp4
-rw-r--r--src/datavisualization/engine/seriesrendercache_p.h4
-rw-r--r--src/datavisualization/engine/surface3dcontroller.cpp24
-rw-r--r--src/datavisualization/engine/surface3dcontroller_p.h9
-rw-r--r--src/datavisualization/engine/surface3drenderer.cpp64
-rw-r--r--src/datavisualization/engine/surface3drenderer_p.h6
-rw-r--r--src/datavisualization/global/datavisualizationglobal_p.h5
-rw-r--r--src/datavisualization/global/global.pri1
-rw-r--r--src/datavisualization/global/qdatavisualizationenums.h63
-rw-r--r--src/datavisualization/global/qdatavisualizationglobal.h12
-rw-r--r--src/datavisualization/global/qtdatavisualizationenums.qdoc90
-rw-r--r--src/datavisualization/input/q3dinputhandler.cpp4
-rw-r--r--src/datavisualization/input/q3dinputhandler.h4
-rw-r--r--src/datavisualization/input/q3dinputhandler_p.h4
-rw-r--r--src/datavisualization/input/qabstract3dinputhandler.cpp4
-rw-r--r--src/datavisualization/input/qabstract3dinputhandler.h5
-rw-r--r--src/datavisualization/input/qabstract3dinputhandler_p.h4
-rw-r--r--src/datavisualization/input/qtouch3dinputhandler.cpp4
-rw-r--r--src/datavisualization/input/qtouch3dinputhandler.h4
-rw-r--r--src/datavisualization/input/qtouch3dinputhandler_p.h4
-rw-r--r--src/datavisualization/theme/q3dtheme.cpp20
-rw-r--r--src/datavisualization/theme/q3dtheme.h7
-rw-r--r--src/datavisualization/theme/q3dtheme_p.h4
-rw-r--r--src/datavisualization/theme/thememanager.cpp4
-rw-r--r--src/datavisualization/theme/thememanager_p.h4
-rw-r--r--src/datavisualization/utils/abstractobjecthelper.cpp4
-rw-r--r--src/datavisualization/utils/abstractobjecthelper_p.h4
-rw-r--r--src/datavisualization/utils/camerahelper.cpp4
-rw-r--r--src/datavisualization/utils/camerahelper_p.h4
-rw-r--r--src/datavisualization/utils/meshloader.cpp4
-rw-r--r--src/datavisualization/utils/meshloader_p.h4
-rw-r--r--src/datavisualization/utils/objecthelper.cpp4
-rw-r--r--src/datavisualization/utils/objecthelper_p.h4
-rw-r--r--src/datavisualization/utils/shaderhelper.cpp4
-rw-r--r--src/datavisualization/utils/shaderhelper_p.h4
-rw-r--r--src/datavisualization/utils/surfaceobject.cpp4
-rw-r--r--src/datavisualization/utils/surfaceobject_p.h4
-rw-r--r--src/datavisualization/utils/texturehelper.cpp4
-rw-r--r--src/datavisualization/utils/texturehelper_p.h4
-rw-r--r--src/datavisualization/utils/utils.cpp4
-rw-r--r--src/datavisualization/utils/utils_p.h4
-rw-r--r--src/datavisualization/utils/vertexindexer.cpp4
-rw-r--r--src/datavisualization/utils/vertexindexer_p.h4
-rw-r--r--src/datavisualizationqml2/abstractdeclarative.cpp43
-rw-r--r--src/datavisualizationqml2/abstractdeclarative_p.h50
-rw-r--r--src/datavisualizationqml2/colorgradient.cpp4
-rw-r--r--src/datavisualizationqml2/colorgradient_p.h4
-rw-r--r--src/datavisualizationqml2/datavisualizationqml2_plugin.cpp6
-rw-r--r--src/datavisualizationqml2/datavisualizationqml2_plugin.h7
-rw-r--r--src/datavisualizationqml2/declarativebars.cpp4
-rw-r--r--src/datavisualizationqml2/declarativebars_p.h4
-rw-r--r--src/datavisualizationqml2/declarativecolor.cpp4
-rw-r--r--src/datavisualizationqml2/declarativecolor_p.h4
-rw-r--r--src/datavisualizationqml2/declarativescatter.cpp4
-rw-r--r--src/datavisualizationqml2/declarativescatter_p.h4
-rw-r--r--src/datavisualizationqml2/declarativescene.cpp4
-rw-r--r--src/datavisualizationqml2/declarativescene_p.h4
-rw-r--r--src/datavisualizationqml2/declarativeseries.cpp4
-rw-r--r--src/datavisualizationqml2/declarativeseries_p.h4
-rw-r--r--src/datavisualizationqml2/declarativesurface.cpp4
-rw-r--r--src/datavisualizationqml2/declarativesurface_p.h4
-rw-r--r--src/datavisualizationqml2/declarativetheme.cpp4
-rw-r--r--src/datavisualizationqml2/declarativetheme_p.h4
-rw-r--r--tests/barstest/chart.cpp16
-rw-r--r--tests/barstest/chart.h2
-rw-r--r--tests/directional/scatterdatamodifier.cpp6
-rw-r--r--tests/directional/scatterdatamodifier.h2
-rw-r--r--tests/multigraphs/data.cpp12
-rw-r--r--tests/scattertest/scatterchart.cpp8
-rw-r--r--tests/scattertest/scatterchart.h2
-rw-r--r--tests/spectrum/spectrumapp/main.cpp6
-rw-r--r--tests/surfacetest/graphmodifier.cpp6
-rw-r--r--tests/surfacetest/main.cpp24
204 files changed, 784 insertions, 834 deletions
diff --git a/examples/audiolevels/audiolevels.cpp b/examples/audiolevels/audiolevels.cpp
index ec63e555..a6e775ff 100644
--- a/examples/audiolevels/audiolevels.cpp
+++ b/examples/audiolevels/audiolevels.cpp
@@ -29,7 +29,7 @@
#include <QAudioDeviceInfo>
#include <QAudioInput>
-QT_DATAVISUALIZATION_USE_NAMESPACE
+using namespace QtDataVisualization;
AudioLevels::AudioLevels(Q3DBars *graph, QObject *parent)
: QObject(parent),
@@ -43,8 +43,8 @@ AudioLevels::AudioLevels(Q3DBars *graph, QObject *parent)
m_graph->valueAxis()->setRange(-100.0f, 100.0f);
m_graph->valueAxis()->setSegmentCount(20);
m_graph->valueAxis()->setLabelFormat(QStringLiteral("%d%%"));
- m_graph->setShadowQuality(QDataVis::ShadowQualityNone);
- m_graph->setSelectionMode(QDataVis::SelectionNone);
+ m_graph->setShadowQuality(QAbstract3DGraph::ShadowQualityNone);
+ m_graph->setSelectionMode(QAbstract3DGraph::SelectionNone);
m_graph->scene()->activeCamera()->setCameraPosition(-25.0f, 10.0f, 190.0f);
m_graph->activeTheme()->setType(Q3DTheme::ThemeIsabelle);
m_graph->activeTheme()->setGridEnabled(true);
diff --git a/examples/audiolevels/audiolevels.h b/examples/audiolevels/audiolevels.h
index db1d8936..b039a1d9 100644
--- a/examples/audiolevels/audiolevels.h
+++ b/examples/audiolevels/audiolevels.h
@@ -21,7 +21,7 @@
#include <QtDataVisualization/q3dbars.h>
-QT_DATAVISUALIZATION_USE_NAMESPACE
+using namespace QtDataVisualization;
class AudioLevelsIODevice;
class QAudioInput;
diff --git a/examples/audiolevels/audiolevelsiodevice.cpp b/examples/audiolevels/audiolevelsiodevice.cpp
index e4576638..6ea11bbe 100644
--- a/examples/audiolevels/audiolevelsiodevice.cpp
+++ b/examples/audiolevels/audiolevelsiodevice.cpp
@@ -19,7 +19,7 @@
#include "audiolevelsiodevice.h"
#include <QDebug>
-QT_DATAVISUALIZATION_USE_NAMESPACE
+using namespace QtDataVisualization;
//! [1]
static const int resolution = 8;
diff --git a/examples/audiolevels/audiolevelsiodevice.h b/examples/audiolevels/audiolevelsiodevice.h
index 8d665fe8..0346b45d 100644
--- a/examples/audiolevels/audiolevelsiodevice.h
+++ b/examples/audiolevels/audiolevelsiodevice.h
@@ -22,7 +22,7 @@
#include <QtDataVisualization/qbardataproxy.h>
#include <QIODevice>
-QT_DATAVISUALIZATION_USE_NAMESPACE
+using namespace QtDataVisualization;
class AudioLevelsIODevice : public QIODevice
{
diff --git a/examples/bars/graphmodifier.cpp b/examples/bars/graphmodifier.cpp
index cd0ecd77..1b84ae7b 100644
--- a/examples/bars/graphmodifier.cpp
+++ b/examples/bars/graphmodifier.cpp
@@ -27,7 +27,7 @@
#include <QTime>
#include <QComboBox>
-QT_DATAVISUALIZATION_USE_NAMESPACE
+using namespace QtDataVisualization;
const QString celsiusString = QString(QChar(0xB0)) + "C";
@@ -52,7 +52,7 @@ GraphModifier::GraphModifier(Q3DBars *bargraph)
m_smooth(false)
{
//! [2]
- m_graph->setShadowQuality(QDataVis::ShadowQualitySoftMedium);
+ m_graph->setShadowQuality(QAbstract3DGraph::ShadowQualitySoftMedium);
m_graph->activeTheme()->setBackgroundEnabled(false);
m_graph->activeTheme()->setFont(QFont("Times New Roman", m_fontSize));
m_graph->activeTheme()->setLabelBackgroundEnabled(true);
@@ -200,7 +200,7 @@ void GraphModifier::changeSelectionMode(int selectionMode)
QComboBox *comboBox = qobject_cast<QComboBox *>(sender());
if (comboBox) {
int flags = comboBox->itemData(selectionMode).toInt();
- m_graph->setSelectionMode(QDataVis::SelectionFlags(flags));
+ m_graph->setSelectionMode(QAbstract3DGraph::SelectionFlags(flags));
}
}
@@ -218,7 +218,7 @@ void GraphModifier::changeFontSize(int fontsize)
m_graph->activeTheme()->setFont(font);
}
-void GraphModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq)
+void GraphModifier::shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality sq)
{
int quality = int(sq);
// Updates the UI component to show correct shadow quality
@@ -227,7 +227,7 @@ void GraphModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq)
void GraphModifier::changeShadowQuality(int quality)
{
- QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality);
+ QAbstract3DGraph::ShadowQuality sq = QAbstract3DGraph::ShadowQuality(quality);
m_graph->setShadowQuality(sq);
emit shadowQualityChanged(quality);
}
diff --git a/examples/bars/graphmodifier.h b/examples/bars/graphmodifier.h
index f4b238b7..5bbb937f 100644
--- a/examples/bars/graphmodifier.h
+++ b/examples/bars/graphmodifier.h
@@ -54,7 +54,7 @@ public slots:
void changeSelectionMode(int selectionMode);
void changeTheme(int theme);
void changeShadowQuality(int quality);
- void shadowQualityUpdatedByVisual(QDataVis::ShadowQuality shadowQuality);
+ void shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality shadowQuality);
signals:
void shadowQualityChanged(int quality);
diff --git a/examples/bars/main.cpp b/examples/bars/main.cpp
index 21a4e0e6..6ae0e2ab 100644
--- a/examples/bars/main.cpp
+++ b/examples/bars/main.cpp
@@ -86,38 +86,38 @@ int main(int argc, char **argv)
QComboBox *selectionModeList = new QComboBox(widget);
selectionModeList->addItem(QStringLiteral("None"),
- int(QDataVis::SelectionNone));
+ int(QAbstract3DGraph::SelectionNone));
selectionModeList->addItem(QStringLiteral("Bar"),
- int(QDataVis::SelectionItem));
+ int(QAbstract3DGraph::SelectionItem));
selectionModeList->addItem(QStringLiteral("Row"),
- int(QDataVis::SelectionRow));
+ int(QAbstract3DGraph::SelectionRow));
selectionModeList->addItem(QStringLiteral("Bar and Row"),
- int(QDataVis::SelectionItemAndRow));
+ int(QAbstract3DGraph::SelectionItemAndRow));
selectionModeList->addItem(QStringLiteral("Column"),
- int(QDataVis::SelectionColumn));
+ int(QAbstract3DGraph::SelectionColumn));
selectionModeList->addItem(QStringLiteral("Bar and Column"),
- int(QDataVis::SelectionItemAndColumn));
+ int(QAbstract3DGraph::SelectionItemAndColumn));
selectionModeList->addItem(QStringLiteral("Row and Column"),
- int(QDataVis::SelectionRowAndColumn));
+ int(QAbstract3DGraph::SelectionRowAndColumn));
selectionModeList->addItem(QStringLiteral("Bar, Row and Column"),
- int(QDataVis::SelectionItemRowAndColumn));
+ int(QAbstract3DGraph::SelectionItemRowAndColumn));
selectionModeList->addItem(QStringLiteral("Slice into Row"),
- int(QDataVis::SelectionSlice | QDataVis::SelectionRow));
+ int(QAbstract3DGraph::SelectionSlice | QAbstract3DGraph::SelectionRow));
selectionModeList->addItem(QStringLiteral("Slice into Row and Item"),
- int(QDataVis::SelectionSlice | QDataVis::SelectionItemAndRow));
+ int(QAbstract3DGraph::SelectionSlice | QAbstract3DGraph::SelectionItemAndRow));
selectionModeList->addItem(QStringLiteral("Slice into Column"),
- int(QDataVis::SelectionSlice | QDataVis::SelectionColumn));
+ int(QAbstract3DGraph::SelectionSlice | QAbstract3DGraph::SelectionColumn));
selectionModeList->addItem(QStringLiteral("Slice into Column and Item"),
- int(QDataVis::SelectionSlice | QDataVis::SelectionItemAndColumn));
+ int(QAbstract3DGraph::SelectionSlice | QAbstract3DGraph::SelectionItemAndColumn));
selectionModeList->addItem(QStringLiteral("Multi: Bar, Row, Col"),
- int(QDataVis::SelectionItemRowAndColumn
- | QDataVis::SelectionMultiSeries));
+ int(QAbstract3DGraph::SelectionItemRowAndColumn
+ | QAbstract3DGraph::SelectionMultiSeries));
selectionModeList->addItem(QStringLiteral("Multi, Slice: Row, Item"),
- int(QDataVis::SelectionSlice | QDataVis::SelectionItemAndRow
- | QDataVis::SelectionMultiSeries));
+ int(QAbstract3DGraph::SelectionSlice | QAbstract3DGraph::SelectionItemAndRow
+ | QAbstract3DGraph::SelectionMultiSeries));
selectionModeList->addItem(QStringLiteral("Multi, Slice: Col, Item"),
- int(QDataVis::SelectionSlice | QDataVis::SelectionItemAndColumn
- | QDataVis::SelectionMultiSeries));
+ int(QAbstract3DGraph::SelectionSlice | QAbstract3DGraph::SelectionItemAndColumn
+ | QAbstract3DGraph::SelectionMultiSeries));
selectionModeList->setCurrentIndex(1);
QCheckBox *backgroundCheckBox = new QCheckBox(widget);
diff --git a/examples/custominput/scatterdatamodifier.cpp b/examples/custominput/scatterdatamodifier.cpp
index 2729316b..54f5571c 100644
--- a/examples/custominput/scatterdatamodifier.cpp
+++ b/examples/custominput/scatterdatamodifier.cpp
@@ -33,7 +33,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
m_inputHandler(new CustomInputHandler())
{
m_graph->activeTheme()->setType(Q3DTheme::ThemeDigia);
- m_graph->setShadowQuality(QDataVis::ShadowQualityMedium);
+ m_graph->setShadowQuality(QAbstract3DGraph::ShadowQualityMedium);
m_graph->scene()->activeCamera()->setCameraPreset(Q3DCamera::CameraPresetFront);
m_graph->setAxisX(new QValue3DAxis);
@@ -159,7 +159,7 @@ void ScatterDataModifier::triggerSelection()
m_graph->scene()->setSelectionQueryPosition(m_inputHandler->inputPosition());
}
-void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq)
+void ScatterDataModifier::shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality sq)
{
int quality = int(sq);
emit shadowQualityChanged(quality); // connected to a checkbox in main.cpp
@@ -167,6 +167,6 @@ void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality s
void ScatterDataModifier::changeShadowQuality(int quality)
{
- QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality);
+ QAbstract3DGraph::ShadowQuality sq = QAbstract3DGraph::ShadowQuality(quality);
m_graph->setShadowQuality(sq);
}
diff --git a/examples/custominput/scatterdatamodifier.h b/examples/custominput/scatterdatamodifier.h
index fc0bc789..32f43474 100644
--- a/examples/custominput/scatterdatamodifier.h
+++ b/examples/custominput/scatterdatamodifier.h
@@ -43,7 +43,7 @@ public:
public slots:
void changeShadowQuality(int quality);
- void shadowQualityUpdatedByVisual(QDataVis::ShadowQuality shadowQuality);
+ void shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality shadowQuality);
void triggerSelection();
signals:
diff --git a/examples/customproxy/rainfallgraph.cpp b/examples/customproxy/rainfallgraph.cpp
index 2e36a865..a9113643 100644
--- a/examples/customproxy/rainfallgraph.cpp
+++ b/examples/customproxy/rainfallgraph.cpp
@@ -66,10 +66,10 @@ RainfallGraph::RainfallGraph(Q3DBars *rainfall)
series->setMesh(QAbstract3DSeries::MeshCylinder);
// Set shadows to medium
- m_graph->setShadowQuality(QDataVis::ShadowQualityMedium);
+ m_graph->setShadowQuality(QAbstract3DGraph::ShadowQualityMedium);
// Set selection mode to bar and column
- m_graph->setSelectionMode(QDataVis::SelectionItemAndColumn | QDataVis::SelectionSlice);
+ m_graph->setSelectionMode(QAbstract3DGraph::SelectionItemAndColumn | QAbstract3DGraph::SelectionSlice);
// Set theme
m_graph->activeTheme()->setType(Q3DTheme::ThemeArmyBlue);
diff --git a/examples/customproxy/variantbardatamapping.h b/examples/customproxy/variantbardatamapping.h
index 9ccf1610..99bcee7f 100644
--- a/examples/customproxy/variantbardatamapping.h
+++ b/examples/customproxy/variantbardatamapping.h
@@ -19,11 +19,8 @@
#ifndef VARIANTBARDATAMAPPING_H
#define VARIANTBARDATAMAPPING_H
-#include "qdatavisualizationenums.h"
#include <QStringList>
-using namespace QtDataVisualization;
-
class VariantBarDataMapping : public QObject
{
Q_OBJECT
diff --git a/examples/customproxy/variantdataset.h b/examples/customproxy/variantdataset.h
index 6beb852f..9802d976 100644
--- a/examples/customproxy/variantdataset.h
+++ b/examples/customproxy/variantdataset.h
@@ -19,12 +19,9 @@
#ifndef VARIANTDATASET_H
#define VARIANTDATASET_H
-#include "qdatavisualizationenums.h"
#include <QScopedPointer>
#include <QVariantList>
-using namespace QtDataVisualization;
-
//! [1]
typedef QVariantList VariantDataItem;
typedef QList<VariantDataItem *> VariantDataItemList;
diff --git a/examples/itemmodel/main.cpp b/examples/itemmodel/main.cpp
index f7a4b737..46824993 100644
--- a/examples/itemmodel/main.cpp
+++ b/examples/itemmodel/main.cpp
@@ -88,7 +88,7 @@ GraphDataGenerator::GraphDataGenerator(Q3DBars *bargraph, QTableWidget *tableWid
m_tableWidget->setColumnCount(m_columnCount);
// Set selection mode to full
- m_graph->setSelectionMode(QDataVis::SelectionItemRowAndColumn);
+ m_graph->setSelectionMode(QAbstract3DGraph::SelectionItemRowAndColumn);
// Hide axis labels by explicitly setting one empty string as label list
m_graph->rowAxis()->setCategoryLabels(QStringList(QString()));
@@ -99,7 +99,7 @@ GraphDataGenerator::GraphDataGenerator(Q3DBars *bargraph, QTableWidget *tableWid
//! [6]
// Set selection mode to slice row
- m_graph->setSelectionMode(QDataVis::SelectionItemAndRow | QDataVis::SelectionSlice);
+ m_graph->setSelectionMode(QAbstract3DGraph::SelectionItemAndRow | QAbstract3DGraph::SelectionSlice);
//! [6]
#endif
diff --git a/examples/scatter/scatterdatamodifier.cpp b/examples/scatter/scatterdatamodifier.cpp
index 15bbbb94..2a269d22 100644
--- a/examples/scatter/scatterdatamodifier.cpp
+++ b/examples/scatter/scatterdatamodifier.cpp
@@ -43,7 +43,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
QFont font = m_graph->activeTheme()->font();
font.setPointSize(m_fontSize);
m_graph->activeTheme()->setFont(font);
- m_graph->setShadowQuality(QDataVis::ShadowQualitySoftLow);
+ m_graph->setShadowQuality(QAbstract3DGraph::ShadowQualitySoftLow);
m_graph->scene()->activeCamera()->setCameraPreset(Q3DCamera::CameraPresetFront);
//! [0]
@@ -160,7 +160,7 @@ void ScatterDataModifier::changeFont(const QFont &font)
m_graph->activeTheme()->setFont(newFont);
}
-void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq)
+void ScatterDataModifier::shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality sq)
{
int quality = int(sq);
emit shadowQualityChanged(quality); // connected to a checkbox in main.cpp
@@ -168,7 +168,7 @@ void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality s
void ScatterDataModifier::changeShadowQuality(int quality)
{
- QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality);
+ QAbstract3DGraph::ShadowQuality sq = QAbstract3DGraph::ShadowQuality(quality);
m_graph->setShadowQuality(sq);
}
diff --git a/examples/scatter/scatterdatamodifier.h b/examples/scatter/scatterdatamodifier.h
index 78dd45e3..5d6e8b9f 100644
--- a/examples/scatter/scatterdatamodifier.h
+++ b/examples/scatter/scatterdatamodifier.h
@@ -47,7 +47,7 @@ public slots:
void changeStyle(int style);
void changeTheme(int theme);
void changeShadowQuality(int quality);
- void shadowQualityUpdatedByVisual(QDataVis::ShadowQuality shadowQuality);
+ void shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality shadowQuality);
signals:
void backgroundEnabledChanged(bool enabled);
diff --git a/examples/surface/surfacegraph.h b/examples/surface/surfacegraph.h
index ecdec672..4a214876 100644
--- a/examples/surface/surfacegraph.h
+++ b/examples/surface/surfacegraph.h
@@ -38,12 +38,12 @@ public:
void enableSqrtSinModel(bool enable);
//! [0]
- void toggleModeNone() { m_graph->setSelectionMode(QDataVis::SelectionNone); }
- void toggleModeItem() { m_graph->setSelectionMode(QDataVis::SelectionItem); }
- void toggleModeSliceRow() { m_graph->setSelectionMode(QDataVis::SelectionItemAndRow
- | QDataVis::SelectionSlice); }
- void toggleModeSliceColumn() { m_graph->setSelectionMode(QDataVis::SelectionItemAndColumn
- | QDataVis::SelectionSlice); }
+ void toggleModeNone() { m_graph->setSelectionMode(QAbstract3DGraph::SelectionNone); }
+ void toggleModeItem() { m_graph->setSelectionMode(QAbstract3DGraph::SelectionItem); }
+ void toggleModeSliceRow() { m_graph->setSelectionMode(QAbstract3DGraph::SelectionItemAndRow
+ | QAbstract3DGraph::SelectionSlice); }
+ void toggleModeSliceColumn() { m_graph->setSelectionMode(QAbstract3DGraph::SelectionItemAndColumn
+ | QAbstract3DGraph::SelectionSlice); }
//! [0]
void setBlackToYellowGradient();
diff --git a/src/datavisualization/axis/qabstract3daxis.cpp b/src/datavisualization/axis/qabstract3daxis.cpp
index 5f1121c4..d2c0f6e8 100644
--- a/src/datavisualization/axis/qabstract3daxis.cpp
+++ b/src/datavisualization/axis/qabstract3daxis.cpp
@@ -19,7 +19,7 @@
#include "qabstract3daxis.h"
#include "qabstract3daxis_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
* \class QAbstract3DAxis
@@ -401,4 +401,4 @@ void QAbstract3DAxisPrivate::setMax(float max)
}
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/axis/qabstract3daxis.h b/src/datavisualization/axis/qabstract3daxis.h
index ef9f9c78..c85e50d0 100644
--- a/src/datavisualization/axis/qabstract3daxis.h
+++ b/src/datavisualization/axis/qabstract3daxis.h
@@ -19,13 +19,14 @@
#ifndef QABSTRACT3DAXIS_H
#define QABSTRACT3DAXIS_H
-#include <QtDataVisualization/qdatavisualizationenums.h>
+#include <QtDataVisualization/qdatavisualizationglobal.h>
+
#include <QObject>
#include <QScopedPointer>
#include <QVector>
#include <QStringList>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QAbstract3DAxisPrivate;
@@ -102,6 +103,6 @@ private:
friend class Bars3DController;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/axis/qabstract3daxis_p.h b/src/datavisualization/axis/qabstract3daxis_p.h
index da6964ad..4403cc16 100644
--- a/src/datavisualization/axis/qabstract3daxis_p.h
+++ b/src/datavisualization/axis/qabstract3daxis_p.h
@@ -33,7 +33,7 @@
#ifndef QABSTRACT3DAXIS_P_H
#define QABSTRACT3DAXIS_P_H
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QAbstract3DAxisPrivate : public QObject
{
@@ -72,6 +72,6 @@ protected:
friend class QCategory3DAxis;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/axis/qcategory3daxis.cpp b/src/datavisualization/axis/qcategory3daxis.cpp
index b5999aaa..0a0cc2e8 100644
--- a/src/datavisualization/axis/qcategory3daxis.cpp
+++ b/src/datavisualization/axis/qcategory3daxis.cpp
@@ -21,7 +21,7 @@
#include "bars3dcontroller_p.h"
#include "qbardataproxy.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
* \class QCategory3DAxis
@@ -153,4 +153,4 @@ QCategory3DAxis *QCategory3DAxisPrivate::qptr()
return static_cast<QCategory3DAxis *>(q_ptr);
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/axis/qcategory3daxis.h b/src/datavisualization/axis/qcategory3daxis.h
index fdedf795..2d3235b4 100644
--- a/src/datavisualization/axis/qcategory3daxis.h
+++ b/src/datavisualization/axis/qcategory3daxis.h
@@ -21,7 +21,7 @@
#include <QtDataVisualization/qabstract3daxis.h>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QCategory3DAxisPrivate;
@@ -48,6 +48,6 @@ private:
friend class Bars3DController;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/axis/qcategory3daxis_p.h b/src/datavisualization/axis/qcategory3daxis_p.h
index dfcc9961..6449e999 100644
--- a/src/datavisualization/axis/qcategory3daxis_p.h
+++ b/src/datavisualization/axis/qcategory3daxis_p.h
@@ -33,7 +33,7 @@
#ifndef QCATEGORY3DAXIS_P_H
#define QCATEGORY3DAXIS_P_H
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QCategory3DAxisPrivate : public QAbstract3DAxisPrivate
{
@@ -52,6 +52,6 @@ private:
friend class QCategory3DAxis;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/axis/qvalue3daxis.cpp b/src/datavisualization/axis/qvalue3daxis.cpp
index a88a9ef5..b34d7511 100644
--- a/src/datavisualization/axis/qvalue3daxis.cpp
+++ b/src/datavisualization/axis/qvalue3daxis.cpp
@@ -20,7 +20,7 @@
#include "qvalue3daxis_p.h"
#include "utils_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
* \class QValue3DAxis
@@ -267,4 +267,4 @@ QValue3DAxis *QValue3DAxisPrivate::qptr()
return static_cast<QValue3DAxis *>(q_ptr);
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/axis/qvalue3daxis.h b/src/datavisualization/axis/qvalue3daxis.h
index 3bdeb678..c842167c 100644
--- a/src/datavisualization/axis/qvalue3daxis.h
+++ b/src/datavisualization/axis/qvalue3daxis.h
@@ -21,7 +21,7 @@
#include <QtDataVisualization/qabstract3daxis.h>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QValue3DAxisPrivate;
@@ -60,6 +60,6 @@ private:
friend class Surface3DController;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/axis/qvalue3daxis_p.h b/src/datavisualization/axis/qvalue3daxis_p.h
index 508453e8..08dab486 100644
--- a/src/datavisualization/axis/qvalue3daxis_p.h
+++ b/src/datavisualization/axis/qvalue3daxis_p.h
@@ -32,7 +32,7 @@
#ifndef QVALUE3DAXIS_P_H
#define QVALUE3DAXIS_P_H
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QValue3DAxisPrivate : public QAbstract3DAxisPrivate
{
@@ -61,6 +61,6 @@ private:
friend class QValue3DAxis;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/abstractitemmodelhandler.cpp b/src/datavisualization/data/abstractitemmodelhandler.cpp
index 41f520a4..6cae79c8 100644
--- a/src/datavisualization/data/abstractitemmodelhandler.cpp
+++ b/src/datavisualization/data/abstractitemmodelhandler.cpp
@@ -19,7 +19,7 @@
#include "abstractitemmodelhandler_p.h"
#include <QTimer>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
AbstractItemModelHandler::AbstractItemModelHandler(QObject *parent)
: QObject(parent),
@@ -196,4 +196,4 @@ void AbstractItemModelHandler::handlePendingResolve()
resolveModel();
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/abstractitemmodelhandler_p.h b/src/datavisualization/data/abstractitemmodelhandler_p.h
index b4d55b4a..6771dcc8 100644
--- a/src/datavisualization/data/abstractitemmodelhandler_p.h
+++ b/src/datavisualization/data/abstractitemmodelhandler_p.h
@@ -34,7 +34,7 @@
#include <QPointer>
#include <QTimer>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class AbstractItemModelHandler : public QObject
{
@@ -79,6 +79,6 @@ private:
Q_DISABLE_COPY(AbstractItemModelHandler)
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/abstractrenderitem.cpp b/src/datavisualization/data/abstractrenderitem.cpp
index 22a1c6de..268c1e9b 100644
--- a/src/datavisualization/data/abstractrenderitem.cpp
+++ b/src/datavisualization/data/abstractrenderitem.cpp
@@ -18,7 +18,7 @@
#include "abstractrenderitem_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
AbstractRenderItem::AbstractRenderItem()
: m_selectionLabelItem(0)
@@ -57,4 +57,4 @@ QString &AbstractRenderItem::selectionLabel()
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/abstractrenderitem_p.h b/src/datavisualization/data/abstractrenderitem_p.h
index ca71c0b0..15860933 100644
--- a/src/datavisualization/data/abstractrenderitem_p.h
+++ b/src/datavisualization/data/abstractrenderitem_p.h
@@ -37,7 +37,7 @@
#include <QVector3D>
#include <QQuaternion>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class AbstractRenderItem
{
@@ -65,6 +65,6 @@ protected:
friend class QAbstractDataItem;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/baritemmodelhandler.cpp b/src/datavisualization/data/baritemmodelhandler.cpp
index b67a3d8a..bd6f127b 100644
--- a/src/datavisualization/data/baritemmodelhandler.cpp
+++ b/src/datavisualization/data/baritemmodelhandler.cpp
@@ -18,7 +18,7 @@
#include "baritemmodelhandler_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
BarItemModelHandler::BarItemModelHandler(QItemModelBarDataProxy *proxy, QObject *parent)
: AbstractItemModelHandler(parent),
@@ -143,4 +143,4 @@ void BarItemModelHandler::resolveModel()
m_proxy->resetArray(m_proxyArray, rowLabels, columnLabels);
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/baritemmodelhandler_p.h b/src/datavisualization/data/baritemmodelhandler_p.h
index 99192b55..c977103e 100644
--- a/src/datavisualization/data/baritemmodelhandler_p.h
+++ b/src/datavisualization/data/baritemmodelhandler_p.h
@@ -32,7 +32,7 @@
#include "abstractitemmodelhandler_p.h"
#include "qitemmodelbardataproxy_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class BarItemModelHandler : public AbstractItemModelHandler
{
@@ -49,6 +49,6 @@ protected:
int m_columnCount;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/barrenderitem.cpp b/src/datavisualization/data/barrenderitem.cpp
index 67029c60..678d6ba0 100644
--- a/src/datavisualization/data/barrenderitem.cpp
+++ b/src/datavisualization/data/barrenderitem.cpp
@@ -19,7 +19,7 @@
#include "barrenderitem_p.h"
#include "bars3drenderer_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
BarRenderItem::BarRenderItem()
: AbstractRenderItem(),
@@ -66,4 +66,4 @@ QString &BarRenderItem::sliceLabel()
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/barrenderitem_p.h b/src/datavisualization/data/barrenderitem_p.h
index 480d5049..5a44e2fd 100644
--- a/src/datavisualization/data/barrenderitem_p.h
+++ b/src/datavisualization/data/barrenderitem_p.h
@@ -31,7 +31,7 @@
#include "abstractrenderitem_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class Bars3DRenderer;
@@ -90,6 +90,6 @@ void BarRenderItem::setValue(float value)
typedef QVector<BarRenderItem> BarRenderItemRow;
typedef QVector<BarRenderItemRow> BarRenderItemArray;
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/labelitem.cpp b/src/datavisualization/data/labelitem.cpp
index 5e27a50e..78e8d0f2 100644
--- a/src/datavisualization/data/labelitem.cpp
+++ b/src/datavisualization/data/labelitem.cpp
@@ -18,7 +18,7 @@
#include "labelitem_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
LabelItem::LabelItem()
: m_size(QSize(0, 0)),
@@ -61,4 +61,4 @@ void LabelItem::clear()
m_size = QSize(0, 0);
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/labelitem_p.h b/src/datavisualization/data/labelitem_p.h
index c10c1f12..40e1030a 100644
--- a/src/datavisualization/data/labelitem_p.h
+++ b/src/datavisualization/data/labelitem_p.h
@@ -33,7 +33,7 @@
#include <QOpenGLFunctions>
#include <QSize>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class LabelItem
{
@@ -54,6 +54,6 @@ private:
GLuint m_textureId;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/qabstract3dseries.cpp b/src/datavisualization/data/qabstract3dseries.cpp
index 1afb63c4..577a04a9 100644
--- a/src/datavisualization/data/qabstract3dseries.cpp
+++ b/src/datavisualization/data/qabstract3dseries.cpp
@@ -21,7 +21,7 @@
#include "qabstractdataproxy_p.h"
#include "abstract3dcontroller_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
* \class QAbstract3DSeries
@@ -704,4 +704,4 @@ void QAbstract3DSeriesPrivate::resetToTheme(const Q3DTheme &theme, int seriesInd
}
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qabstract3dseries.h b/src/datavisualization/data/qabstract3dseries.h
index bbcf60ad..615d882e 100644
--- a/src/datavisualization/data/qabstract3dseries.h
+++ b/src/datavisualization/data/qabstract3dseries.h
@@ -19,13 +19,12 @@
#ifndef QABSTRACT3DSERIES_H
#define QABSTRACT3DSERIES_H
-#include <QtDataVisualization/qdatavisualizationenums.h>
#include <QtDataVisualization/q3dtheme.h>
#include <QObject>
#include <QScopedPointer>
#include <QLinearGradient>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QAbstract3DSeriesPrivate;
@@ -143,6 +142,6 @@ private:
friend class Abstract3DRenderer;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/qabstract3dseries_p.h b/src/datavisualization/data/qabstract3dseries_p.h
index 8e83ff84..c8a39818 100644
--- a/src/datavisualization/data/qabstract3dseries_p.h
+++ b/src/datavisualization/data/qabstract3dseries_p.h
@@ -33,7 +33,7 @@
#ifndef QABSTRACT3DSERIES_P_H
#define QABSTRACT3DSERIES_P_H
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QAbstractDataProxy;
class Abstract3DController;
@@ -142,6 +142,6 @@ public:
QString m_name;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // QAbstract3DSeries_P_H
diff --git a/src/datavisualization/data/qabstractdataproxy.cpp b/src/datavisualization/data/qabstractdataproxy.cpp
index fa0934c3..631bd8ac 100644
--- a/src/datavisualization/data/qabstractdataproxy.cpp
+++ b/src/datavisualization/data/qabstractdataproxy.cpp
@@ -20,7 +20,7 @@
#include "qabstractdataproxy_p.h"
#include "qabstract3dseries_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
* \class QAbstractDataProxy
@@ -110,4 +110,4 @@ void QAbstractDataProxyPrivate::setSeries(QAbstract3DSeries *series)
m_series = series;
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qabstractdataproxy.h b/src/datavisualization/data/qabstractdataproxy.h
index 2a053c60..cbe70333 100644
--- a/src/datavisualization/data/qabstractdataproxy.h
+++ b/src/datavisualization/data/qabstractdataproxy.h
@@ -19,11 +19,12 @@
#ifndef QABSTRACTDATAPROXY_H
#define QABSTRACTDATAPROXY_H
-#include <QtDataVisualization/qdatavisualizationenums.h>
+#include <QtDataVisualization/qdatavisualizationglobal.h>
+
#include <QObject>
#include <QScopedPointer>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QAbstractDataProxyPrivate;
@@ -58,6 +59,6 @@ private:
friend class QAbstract3DSeriesPrivate;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // QABSTRACTDATAPROXY_H
diff --git a/src/datavisualization/data/qabstractdataproxy_p.h b/src/datavisualization/data/qabstractdataproxy_p.h
index 90504ccb..365ff5f2 100644
--- a/src/datavisualization/data/qabstractdataproxy_p.h
+++ b/src/datavisualization/data/qabstractdataproxy_p.h
@@ -33,7 +33,7 @@
#ifndef QABSTRACTDATAPROXY_P_H
#define QABSTRACTDATAPROXY_P_H
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QAbstract3DSeries;
@@ -56,6 +56,6 @@ private:
friend class QAbstractDataProxy;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // QABSTRACTDATAPROXY_P_H
diff --git a/src/datavisualization/data/qbar3dseries.cpp b/src/datavisualization/data/qbar3dseries.cpp
index cdf9333a..d7403712 100644
--- a/src/datavisualization/data/qbar3dseries.cpp
+++ b/src/datavisualization/data/qbar3dseries.cpp
@@ -19,7 +19,7 @@
#include "qbar3dseries_p.h"
#include "bars3dcontroller_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
* \class QBar3DSeries
@@ -275,4 +275,4 @@ void QBar3DSeriesPrivate::setSelectedBar(const QPoint &position)
}
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qbar3dseries.h b/src/datavisualization/data/qbar3dseries.h
index d4e948ad..96467a95 100644
--- a/src/datavisualization/data/qbar3dseries.h
+++ b/src/datavisualization/data/qbar3dseries.h
@@ -23,7 +23,7 @@
#include <QtDataVisualization/qbardataproxy.h>
#include <QPoint>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QBar3DSeriesPrivate;
@@ -60,6 +60,6 @@ private:
friend class Bars3DController;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/qbar3dseries_p.h b/src/datavisualization/data/qbar3dseries_p.h
index 89edb84a..8944a5f6 100644
--- a/src/datavisualization/data/qbar3dseries_p.h
+++ b/src/datavisualization/data/qbar3dseries_p.h
@@ -32,7 +32,7 @@
#include "qbar3dseries.h"
#include "qabstract3dseries_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QBar3DSeriesPrivate : public QAbstract3DSeriesPrivate
{
@@ -55,6 +55,6 @@ private:
friend class QBar3DSeries;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/qbardataitem.cpp b/src/datavisualization/data/qbardataitem.cpp
index e564bd5d..0d69bc95 100644
--- a/src/datavisualization/data/qbardataitem.cpp
+++ b/src/datavisualization/data/qbardataitem.cpp
@@ -18,7 +18,7 @@
#include "qbardataitem_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
* \class QBarDataItem
@@ -107,4 +107,4 @@ QBarDataItemPrivate::~QBarDataItemPrivate()
{
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qbardataitem.h b/src/datavisualization/data/qbardataitem.h
index 60a4a19f..db604a5b 100644
--- a/src/datavisualization/data/qbardataitem.h
+++ b/src/datavisualization/data/qbardataitem.h
@@ -19,9 +19,7 @@
#ifndef QBARDATAITEM_H
#define QBARDATAITEM_H
-#include <QtDataVisualization/qdatavisualizationenums.h>
-
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QBarDataItemPrivate;
@@ -47,6 +45,6 @@ private:
float m_value;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/qbardataitem_p.h b/src/datavisualization/data/qbardataitem_p.h
index 20b7ea69..94cdf0a0 100644
--- a/src/datavisualization/data/qbardataitem_p.h
+++ b/src/datavisualization/data/qbardataitem_p.h
@@ -32,7 +32,7 @@
#include "datavisualizationglobal_p.h"
#include "qbardataitem.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QBarDataItemPrivate
{
@@ -46,6 +46,6 @@ protected:
friend class QBarDataItem;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp
index 71680ff2..5c89f7d4 100644
--- a/src/datavisualization/data/qbardataproxy.cpp
+++ b/src/datavisualization/data/qbardataproxy.cpp
@@ -20,7 +20,7 @@
#include "qbardataproxy_p.h"
#include "qbar3dseries_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
* \class QBarDataProxy
@@ -713,4 +713,4 @@ void QBarDataProxyPrivate::setSeries(QAbstract3DSeries *series)
emit qptr()->seriesChanged(barSeries);
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qbardataproxy.h b/src/datavisualization/data/qbardataproxy.h
index 94e15116..c5938531 100644
--- a/src/datavisualization/data/qbardataproxy.h
+++ b/src/datavisualization/data/qbardataproxy.h
@@ -24,7 +24,7 @@
#include <QVector>
#include <QStringList>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
typedef QVector<QBarDataItem> QBarDataRow;
typedef QList<QBarDataRow *> QBarDataArray;
@@ -104,6 +104,6 @@ private:
friend class Bars3DController;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // QBARDATAPROXY_H
diff --git a/src/datavisualization/data/qbardataproxy_p.h b/src/datavisualization/data/qbardataproxy_p.h
index 84726a02..f6ad0d51 100644
--- a/src/datavisualization/data/qbardataproxy_p.h
+++ b/src/datavisualization/data/qbardataproxy_p.h
@@ -33,7 +33,7 @@
#include "qabstractdataproxy_p.h"
#include "qbardataitem.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QBarDataProxyPrivate : public QAbstractDataProxyPrivate
{
@@ -72,6 +72,6 @@ private:
friend class QBarDataProxy;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // QBARDATAPROXY_P_H
diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp
index ce379592..96d6e45a 100644
--- a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp
@@ -18,7 +18,7 @@
#include "qheightmapsurfacedataproxy_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
// Default ranges correspond value axis defaults
const float defaultMinValue = 0.0f;
@@ -548,4 +548,4 @@ void QHeightMapSurfaceDataProxyPrivate::handlePendingResolve()
emit qptr()->heightMapChanged(m_heightMap);
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.h b/src/datavisualization/data/qheightmapsurfacedataproxy.h
index 16132b0d..42592bca 100644
--- a/src/datavisualization/data/qheightmapsurfacedataproxy.h
+++ b/src/datavisualization/data/qheightmapsurfacedataproxy.h
@@ -23,7 +23,7 @@
#include <QImage>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QHeightMapSurfaceDataProxyPrivate;
@@ -77,6 +77,6 @@ private:
friend class Surface3DController;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy_p.h b/src/datavisualization/data/qheightmapsurfacedataproxy_p.h
index 2d773344..0137511b 100644
--- a/src/datavisualization/data/qheightmapsurfacedataproxy_p.h
+++ b/src/datavisualization/data/qheightmapsurfacedataproxy_p.h
@@ -33,7 +33,7 @@
#include "qsurfacedataproxy_p.h"
#include <QTimer>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QHeightMapSurfaceDataProxyPrivate : public QSurfaceDataProxyPrivate
{
@@ -64,6 +64,6 @@ private:
friend class QHeightMapSurfaceDataProxy;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/qitemmodelbardataproxy.cpp b/src/datavisualization/data/qitemmodelbardataproxy.cpp
index e3354015..77c0463e 100644
--- a/src/datavisualization/data/qitemmodelbardataproxy.cpp
+++ b/src/datavisualization/data/qitemmodelbardataproxy.cpp
@@ -20,7 +20,7 @@
#include "baritemmodelhandler_p.h"
#include <QTimer>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
* \class QItemModelBarDataProxy
@@ -489,4 +489,4 @@ QItemModelBarDataProxy *QItemModelBarDataProxyPrivate::qptr()
return static_cast<QItemModelBarDataProxy *>(q_ptr);
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qitemmodelbardataproxy.h b/src/datavisualization/data/qitemmodelbardataproxy.h
index 597ab48f..8a946ca7 100644
--- a/src/datavisualization/data/qitemmodelbardataproxy.h
+++ b/src/datavisualization/data/qitemmodelbardataproxy.h
@@ -23,7 +23,7 @@
#include <QAbstractItemModel>
#include <QStringList>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QItemModelBarDataProxyPrivate;
@@ -104,6 +104,6 @@ private:
friend class BarItemModelHandler;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/qitemmodelbardataproxy_p.h b/src/datavisualization/data/qitemmodelbardataproxy_p.h
index 63c5b3ff..16d48f9f 100644
--- a/src/datavisualization/data/qitemmodelbardataproxy_p.h
+++ b/src/datavisualization/data/qitemmodelbardataproxy_p.h
@@ -32,7 +32,7 @@
#include "qitemmodelbardataproxy.h"
#include "qbardataproxy_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class BarItemModelHandler;
@@ -66,6 +66,6 @@ private:
friend class QItemModelBarDataProxy;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp
index 50b57423..e2ba8fec 100644
--- a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp
@@ -20,7 +20,7 @@
#include "scatteritemmodelhandler_p.h"
#include <QTimer>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
* \class QItemModelScatterDataProxy
@@ -265,4 +265,4 @@ QItemModelScatterDataProxy *QItemModelScatterDataProxyPrivate::qptr()
return static_cast<QItemModelScatterDataProxy *>(q_ptr);
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.h b/src/datavisualization/data/qitemmodelscatterdataproxy.h
index f2a7d78c..96fab6b6 100644
--- a/src/datavisualization/data/qitemmodelscatterdataproxy.h
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy.h
@@ -23,7 +23,7 @@
#include <QAbstractItemModel>
#include <QStringList>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QItemModelScatterDataProxyPrivate;
@@ -71,6 +71,6 @@ private:
friend class ScatterItemModelHandler;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy_p.h b/src/datavisualization/data/qitemmodelscatterdataproxy_p.h
index 8c86ef09..7b33704c 100644
--- a/src/datavisualization/data/qitemmodelscatterdataproxy_p.h
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy_p.h
@@ -32,7 +32,7 @@
#include "qitemmodelscatterdataproxy.h"
#include "qscatterdataproxy_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class ScatterItemModelHandler;
@@ -57,6 +57,6 @@ private:
friend class QItemModelScatterDataProxy;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
index 191e0d7f..7ca9842e 100644
--- a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
@@ -20,7 +20,7 @@
#include "surfaceitemmodelhandler_p.h"
#include <QTimer>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
// TODO: CHECK DOCUMENTATION!
@@ -499,4 +499,4 @@ QItemModelSurfaceDataProxy *QItemModelSurfaceDataProxyPrivate::qptr()
return static_cast<QItemModelSurfaceDataProxy *>(q_ptr);
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.h b/src/datavisualization/data/qitemmodelsurfacedataproxy.h
index ee6b4d99..8c5b9ed4 100644
--- a/src/datavisualization/data/qitemmodelsurfacedataproxy.h
+++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.h
@@ -23,7 +23,7 @@
#include <QAbstractItemModel>
#include <QStringList>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QItemModelSurfaceDataProxyPrivate;
@@ -104,6 +104,6 @@ private:
friend class SurfaceItemModelHandler;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h b/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h
index e4505c40..81230ab7 100644
--- a/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h
+++ b/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h
@@ -32,7 +32,7 @@
#include "qitemmodelsurfacedataproxy.h"
#include "qsurfacedataproxy_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class SurfaceItemModelHandler;
@@ -66,6 +66,6 @@ private:
friend class QItemModelSurfaceDataProxy;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/qscatter3dseries.cpp b/src/datavisualization/data/qscatter3dseries.cpp
index 10b2f84b..38e564f5 100644
--- a/src/datavisualization/data/qscatter3dseries.cpp
+++ b/src/datavisualization/data/qscatter3dseries.cpp
@@ -19,7 +19,7 @@
#include "qscatter3dseries_p.h"
#include "scatter3dcontroller_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
* \class QScatter3DSeries
@@ -301,4 +301,4 @@ void QScatter3DSeriesPrivate::setItemSize(float size)
m_controller->markSeriesVisualsDirty();
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qscatter3dseries.h b/src/datavisualization/data/qscatter3dseries.h
index 758277c0..a3192003 100644
--- a/src/datavisualization/data/qscatter3dseries.h
+++ b/src/datavisualization/data/qscatter3dseries.h
@@ -22,7 +22,7 @@
#include <QtDataVisualization/qabstract3dseries.h>
#include <QtDataVisualization/qscatterdataproxy.h>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QScatter3DSeriesPrivate;
@@ -64,6 +64,6 @@ private:
friend class Scatter3DController;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/qscatter3dseries_p.h b/src/datavisualization/data/qscatter3dseries_p.h
index a09536c9..aa638445 100644
--- a/src/datavisualization/data/qscatter3dseries_p.h
+++ b/src/datavisualization/data/qscatter3dseries_p.h
@@ -32,7 +32,7 @@
#include "qscatter3dseries.h"
#include "qabstract3dseries_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QScatter3DSeriesPrivate : public QAbstract3DSeriesPrivate
{
@@ -56,6 +56,6 @@ private:
friend class QScatter3DSeries;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/qscatterdataitem.cpp b/src/datavisualization/data/qscatterdataitem.cpp
index 18c67ee8..cb6d5c70 100644
--- a/src/datavisualization/data/qscatterdataitem.cpp
+++ b/src/datavisualization/data/qscatterdataitem.cpp
@@ -18,7 +18,7 @@
#include "qscatterdataitem_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
* \class QScatterDataItem
@@ -148,4 +148,4 @@ QScatterDataItemPrivate::~QScatterDataItemPrivate()
{
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qscatterdataitem.h b/src/datavisualization/data/qscatterdataitem.h
index f139abd4..92f34f30 100644
--- a/src/datavisualization/data/qscatterdataitem.h
+++ b/src/datavisualization/data/qscatterdataitem.h
@@ -19,11 +19,10 @@
#ifndef QSCATTERDATAITEM_H
#define QSCATTERDATAITEM_H
-#include <QtDataVisualization/qdatavisualizationenums.h>
#include <QVector3D>
#include <QQuaternion>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QScatterDataItemPrivate;
@@ -58,6 +57,6 @@ private:
QQuaternion m_rotation;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/qscatterdataitem_p.h b/src/datavisualization/data/qscatterdataitem_p.h
index acc67347..c4dec45e 100644
--- a/src/datavisualization/data/qscatterdataitem_p.h
+++ b/src/datavisualization/data/qscatterdataitem_p.h
@@ -32,7 +32,7 @@
#include "datavisualizationglobal_p.h"
#include "qscatterdataitem.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QScatterDataItemPrivate
{
@@ -46,6 +46,6 @@ protected:
friend class QScatterDataItem;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/qscatterdataproxy.cpp b/src/datavisualization/data/qscatterdataproxy.cpp
index e0876d64..a58149a1 100644
--- a/src/datavisualization/data/qscatterdataproxy.cpp
+++ b/src/datavisualization/data/qscatterdataproxy.cpp
@@ -20,7 +20,7 @@
#include "qscatterdataproxy_p.h"
#include "qscatter3dseries_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
* \class QScatterDataProxy
@@ -408,4 +408,4 @@ QScatterDataProxy *QScatterDataProxyPrivate::qptr()
return static_cast<QScatterDataProxy *>(q_ptr);
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qscatterdataproxy.h b/src/datavisualization/data/qscatterdataproxy.h
index acb3d3d4..b1c451b0 100644
--- a/src/datavisualization/data/qscatterdataproxy.h
+++ b/src/datavisualization/data/qscatterdataproxy.h
@@ -22,7 +22,7 @@
#include <QtDataVisualization/qabstractdataproxy.h>
#include <QtDataVisualization/qscatterdataitem.h>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
typedef QVector<QScatterDataItem> QScatterDataArray;
@@ -79,6 +79,6 @@ private:
friend class Scatter3DController;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/qscatterdataproxy_p.h b/src/datavisualization/data/qscatterdataproxy_p.h
index 322c8937..18ab7887 100644
--- a/src/datavisualization/data/qscatterdataproxy_p.h
+++ b/src/datavisualization/data/qscatterdataproxy_p.h
@@ -33,7 +33,7 @@
#include "qabstractdataproxy_p.h"
#include "qscatterdataitem.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QScatterDataProxyPrivate : public QAbstractDataProxyPrivate
{
@@ -61,6 +61,6 @@ private:
friend class QScatterDataProxy;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // QBARDATAPROXY_P_H
diff --git a/src/datavisualization/data/qsurface3dseries.cpp b/src/datavisualization/data/qsurface3dseries.cpp
index 74b0ca90..0994e010 100644
--- a/src/datavisualization/data/qsurface3dseries.cpp
+++ b/src/datavisualization/data/qsurface3dseries.cpp
@@ -19,7 +19,7 @@
#include "qsurface3dseries_p.h"
#include "surface3dcontroller_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
* \class QSurface3DSeries
@@ -380,4 +380,4 @@ void QSurface3DSeriesPrivate::setDrawMode(QSurface3DSeries::DrawFlags mode)
m_controller->markSeriesVisualsDirty();
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qsurface3dseries.h b/src/datavisualization/data/qsurface3dseries.h
index 0ddd53da..d2109b3e 100644
--- a/src/datavisualization/data/qsurface3dseries.h
+++ b/src/datavisualization/data/qsurface3dseries.h
@@ -22,7 +22,7 @@
#include <QtDataVisualization/qabstract3dseries.h>
#include <QtDataVisualization/qsurfacedataproxy.h>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QSurface3DSeriesPrivate;
@@ -34,7 +34,7 @@ class QT_DATAVISUALIZATION_EXPORT QSurface3DSeries : public QAbstract3DSeries
Q_PROPERTY(QPoint selectedPoint READ selectedPoint WRITE setSelectedPoint NOTIFY selectedPointChanged)
Q_PROPERTY(bool flatShadingEnabled READ isFlatShadingEnabled WRITE setFlatShadingEnabled NOTIFY flatShadingEnabledChanged)
Q_PROPERTY(bool flatShadingSupported READ isFlatShadingSupported NOTIFY flatShadingSupportedChanged)
- Q_PROPERTY(QtDataVisualization::QSurface3DSeries::DrawFlags drawMode READ drawMode WRITE setDrawMode NOTIFY drawModeChanged)
+ Q_PROPERTY(DrawFlags drawMode READ drawMode WRITE setDrawMode NOTIFY drawModeChanged)
public:
enum DrawFlag {
@@ -81,6 +81,6 @@ private:
friend class Surface3DController;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/qsurface3dseries_p.h b/src/datavisualization/data/qsurface3dseries_p.h
index 00bfbed2..a9305268 100644
--- a/src/datavisualization/data/qsurface3dseries_p.h
+++ b/src/datavisualization/data/qsurface3dseries_p.h
@@ -32,7 +32,7 @@
#include "qsurface3dseries.h"
#include "qabstract3dseries_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QSurface3DSeriesPrivate : public QAbstract3DSeriesPrivate
{
@@ -59,6 +59,6 @@ private:
friend class QSurface3DSeries;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/qsurfacedataitem.cpp b/src/datavisualization/data/qsurfacedataitem.cpp
index f5f91464..291038e2 100644
--- a/src/datavisualization/data/qsurfacedataitem.cpp
+++ b/src/datavisualization/data/qsurfacedataitem.cpp
@@ -18,7 +18,7 @@
#include "qsurfacedataitem_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
* \class QSurfaceDataItem
@@ -140,4 +140,4 @@ QSurfaceDataItemPrivate::~QSurfaceDataItemPrivate()
{
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qsurfacedataitem.h b/src/datavisualization/data/qsurfacedataitem.h
index dbc849d3..a4d0eb27 100644
--- a/src/datavisualization/data/qsurfacedataitem.h
+++ b/src/datavisualization/data/qsurfacedataitem.h
@@ -19,10 +19,9 @@
#ifndef QSURFACEDATAITEM_H
#define QSURFACEDATAITEM_H
-#include <QtDataVisualization/qdatavisualizationenums.h>
#include <QVector3D>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QSurfaceDataItemPrivate;
@@ -54,6 +53,6 @@ private:
QVector3D m_position;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/qsurfacedataitem_p.h b/src/datavisualization/data/qsurfacedataitem_p.h
index d13679a8..538bb6d9 100644
--- a/src/datavisualization/data/qsurfacedataitem_p.h
+++ b/src/datavisualization/data/qsurfacedataitem_p.h
@@ -32,7 +32,7 @@
#include "datavisualizationglobal_p.h"
#include "qsurfacedataitem.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QSurfaceDataItemPrivate
{
@@ -46,6 +46,6 @@ protected:
friend class QSurfaceDataItem;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/qsurfacedataproxy.cpp b/src/datavisualization/data/qsurfacedataproxy.cpp
index 5ea05d75..e3a6cb13 100644
--- a/src/datavisualization/data/qsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qsurfacedataproxy.cpp
@@ -20,7 +20,7 @@
#include "qsurfacedataproxy_p.h"
#include "qsurface3dseries_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
* \class QSurfaceDataProxy
@@ -520,4 +520,4 @@ void QSurfaceDataProxyPrivate::setSeries(QAbstract3DSeries *series)
emit qptr()->seriesChanged(surfaceSeries);
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/qsurfacedataproxy.h b/src/datavisualization/data/qsurfacedataproxy.h
index 04c6dbf7..f4015fee 100644
--- a/src/datavisualization/data/qsurfacedataproxy.h
+++ b/src/datavisualization/data/qsurfacedataproxy.h
@@ -22,7 +22,7 @@
#include <QtDataVisualization/qabstractdataproxy.h>
#include <QtDataVisualization/qsurfacedataitem.h>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
typedef QVector<QSurfaceDataItem> QSurfaceDataRow;
typedef QList<QSurfaceDataRow *> QSurfaceDataArray;
@@ -86,6 +86,6 @@ private:
friend class Surface3DController;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // QSURFACEDATAPROXY_H
diff --git a/src/datavisualization/data/qsurfacedataproxy_p.h b/src/datavisualization/data/qsurfacedataproxy_p.h
index 1fda354c..d01b4383 100644
--- a/src/datavisualization/data/qsurfacedataproxy_p.h
+++ b/src/datavisualization/data/qsurfacedataproxy_p.h
@@ -34,7 +34,7 @@
#include <QSize>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QSurfaceDataProxyPrivate : public QAbstractDataProxyPrivate
{
@@ -67,6 +67,6 @@ private:
friend class QSurfaceDataProxy;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // QSURFACEDATAPROXY_P_H
diff --git a/src/datavisualization/data/scatteritemmodelhandler.cpp b/src/datavisualization/data/scatteritemmodelhandler.cpp
index a70b35b0..f5bac672 100644
--- a/src/datavisualization/data/scatteritemmodelhandler.cpp
+++ b/src/datavisualization/data/scatteritemmodelhandler.cpp
@@ -19,7 +19,7 @@
#include "scatteritemmodelhandler_p.h"
#include <QTimer>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
ScatterItemModelHandler::ScatterItemModelHandler(QItemModelScatterDataProxy *proxy, QObject *parent)
: AbstractItemModelHandler(parent),
@@ -77,4 +77,4 @@ void ScatterItemModelHandler::resolveModel()
m_proxy->resetArray(m_proxyArray);
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/scatteritemmodelhandler_p.h b/src/datavisualization/data/scatteritemmodelhandler_p.h
index 72f8f76c..b59b3aa7 100644
--- a/src/datavisualization/data/scatteritemmodelhandler_p.h
+++ b/src/datavisualization/data/scatteritemmodelhandler_p.h
@@ -32,7 +32,7 @@
#include "abstractitemmodelhandler_p.h"
#include "qitemmodelscatterdataproxy_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class ScatterItemModelHandler : public AbstractItemModelHandler
{
@@ -48,6 +48,6 @@ protected:
QScatterDataArray *m_proxyArray; // Not owned
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/scatterrenderitem.cpp b/src/datavisualization/data/scatterrenderitem.cpp
index 83c66583..be6d3852 100644
--- a/src/datavisualization/data/scatterrenderitem.cpp
+++ b/src/datavisualization/data/scatterrenderitem.cpp
@@ -20,7 +20,7 @@
#include "scatter3drenderer_p.h"
#include "qscatterdataproxy.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
ScatterRenderItem::ScatterRenderItem()
: AbstractRenderItem(),
@@ -39,4 +39,4 @@ ScatterRenderItem::~ScatterRenderItem()
{
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/scatterrenderitem_p.h b/src/datavisualization/data/scatterrenderitem_p.h
index 047caeb6..7b7d51f6 100644
--- a/src/datavisualization/data/scatterrenderitem_p.h
+++ b/src/datavisualization/data/scatterrenderitem_p.h
@@ -31,7 +31,7 @@
#include "abstractrenderitem_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class Scatter3DRenderer;
@@ -82,6 +82,6 @@ void ScatterRenderItem::setRotation(const QQuaternion &rotation)
typedef QVector<ScatterRenderItem> ScatterRenderItemArray;
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/data/surfaceitemmodelhandler.cpp b/src/datavisualization/data/surfaceitemmodelhandler.cpp
index 10b4ccc5..ac1a8b81 100644
--- a/src/datavisualization/data/surfaceitemmodelhandler.cpp
+++ b/src/datavisualization/data/surfaceitemmodelhandler.cpp
@@ -18,7 +18,7 @@
#include "surfaceitemmodelhandler_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
SurfaceItemModelHandler::SurfaceItemModelHandler(QItemModelSurfaceDataProxy *proxy, QObject *parent)
: AbstractItemModelHandler(parent),
@@ -139,4 +139,4 @@ void SurfaceItemModelHandler::resolveModel()
m_proxy->resetArray(m_proxyArray);
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/data/surfaceitemmodelhandler_p.h b/src/datavisualization/data/surfaceitemmodelhandler_p.h
index de0d2885..edca9dca 100644
--- a/src/datavisualization/data/surfaceitemmodelhandler_p.h
+++ b/src/datavisualization/data/surfaceitemmodelhandler_p.h
@@ -32,7 +32,7 @@
#include "abstractitemmodelhandler_p.h"
#include "qitemmodelsurfacedataproxy_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class SurfaceItemModelHandler : public AbstractItemModelHandler
{
@@ -48,6 +48,6 @@ protected:
QSurfaceDataArray *m_proxyArray; // Not owned
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/doc/src/qtdatavisualization.qdoc b/src/datavisualization/doc/src/qtdatavisualization.qdoc
index d29de4f7..e23940ea 100644
--- a/src/datavisualization/doc/src/qtdatavisualization.qdoc
+++ b/src/datavisualization/doc/src/qtdatavisualization.qdoc
@@ -17,6 +17,17 @@
****************************************************************************/
/*!
+ \namespace QtDataVisualization
+ \inmodule QtDataVisualization
+ \target QtDataVisualization namespace
+
+ QtDataVisualization namespace holds all the classes and enumerations in the QtDataVisualization
+ module.
+
+ \generatelist{classesbymodule QtDataVisualization}
+*/
+
+/*!
\module QtDataVisualization
\title Qt Data Visualization C++ Classes
\ingroup modules
diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp
index 919db22c..454ff7a4 100644
--- a/src/datavisualization/engine/abstract3dcontroller.cpp
+++ b/src/datavisualization/engine/abstract3dcontroller.cpp
@@ -33,13 +33,13 @@
#include <QThread>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
Abstract3DController::Abstract3DController(QRect initialViewport, Q3DScene *scene, QObject *parent) :
QObject(parent),
m_themeManager(new ThemeManager(this)),
- m_selectionMode(QDataVis::SelectionItem),
- m_shadowQuality(QDataVis::ShadowQualityMedium),
+ m_selectionMode(QAbstract3DGraph::SelectionItem),
+ m_shadowQuality(QAbstract3DGraph::ShadowQualityMedium),
m_scene(scene),
m_activeInputHandler(0),
m_axisX(0),
@@ -668,7 +668,7 @@ Q3DTheme *Abstract3DController::activeTheme() const
return m_themeManager->activeTheme();
}
-void Abstract3DController::setSelectionMode(QDataVis::SelectionFlags mode)
+void Abstract3DController::setSelectionMode(QAbstract3DGraph::SelectionFlags mode)
{
if (mode != m_selectionMode) {
m_selectionMode = mode;
@@ -678,12 +678,12 @@ void Abstract3DController::setSelectionMode(QDataVis::SelectionFlags mode)
}
}
-QDataVis::SelectionFlags Abstract3DController::selectionMode() const
+QAbstract3DGraph::SelectionFlags Abstract3DController::selectionMode() const
{
return m_selectionMode;
}
-void Abstract3DController::setShadowQuality(QDataVis::ShadowQuality quality)
+void Abstract3DController::setShadowQuality(QAbstract3DGraph::ShadowQuality quality)
{
if (quality != m_shadowQuality) {
m_shadowQuality = quality;
@@ -693,7 +693,7 @@ void Abstract3DController::setShadowQuality(QDataVis::ShadowQuality quality)
}
}
-QDataVis::ShadowQuality Abstract3DController::shadowQuality() const
+QAbstract3DGraph::ShadowQuality Abstract3DController::shadowQuality() const
{
return m_shadowQuality;
}
@@ -844,7 +844,7 @@ void Abstract3DController::handleAxisLabelFormatChanged(const QString &format)
void Abstract3DController::handleInputStateChanged(QAbstract3DInputHandler::InputState state)
{
// When in automatic slicing mode, input state change to overview disables slice mode
- if (m_selectionMode.testFlag(QDataVis::SelectionSlice)
+ if (m_selectionMode.testFlag(QAbstract3DGraph::SelectionSlice)
&& state == QAbstract3DInputHandler::InputStateOnPrimaryView) {
setSlicingActive(false);
}
@@ -868,7 +868,7 @@ void Abstract3DController::handleSeriesVisibilityChanged(bool visible)
handleSeriesVisibilityChangedBySender(sender());
}
-void Abstract3DController::handleRequestShadowQuality(QDataVis::ShadowQuality quality)
+void Abstract3DController::handleRequestShadowQuality(QAbstract3DGraph::ShadowQuality quality)
{
setShadowQuality(quality);
}
@@ -1001,4 +1001,4 @@ void Abstract3DController::emitNeedRender()
}
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h
index 0f951e5a..a68272d6 100644
--- a/src/datavisualization/engine/abstract3dcontroller_p.h
+++ b/src/datavisualization/engine/abstract3dcontroller_p.h
@@ -42,7 +42,7 @@
class QFont;
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class CameraHelper;
class Abstract3DRenderer;
@@ -136,8 +136,8 @@ private:
GLfloat m_horizontalRotation;
GLfloat m_verticalRotation;
ThemeManager *m_themeManager;
- QDataVis::SelectionFlags m_selectionMode;
- QDataVis::ShadowQuality m_shadowQuality;
+ QAbstract3DGraph::SelectionFlags m_selectionMode;
+ QAbstract3DGraph::ShadowQuality m_shadowQuality;
Q3DScene *m_scene;
protected:
@@ -198,11 +198,11 @@ public:
virtual Q3DTheme *activeTheme() const;
virtual QList<Q3DTheme *> themes() const;
- virtual void setSelectionMode(QDataVis::SelectionFlags mode);
- virtual QDataVis::SelectionFlags selectionMode() const;
+ virtual void setSelectionMode(QAbstract3DGraph::SelectionFlags mode);
+ virtual QAbstract3DGraph::SelectionFlags selectionMode() const;
- virtual void setShadowQuality(QDataVis::ShadowQuality quality);
- virtual QDataVis::ShadowQuality shadowQuality() const;
+ virtual void setShadowQuality(QAbstract3DGraph::ShadowQuality quality);
+ virtual QAbstract3DGraph::ShadowQuality shadowQuality() const;
bool isSlicingActive() const;
void setSlicingActive(bool isSlicing);
@@ -253,13 +253,13 @@ public slots:
void handleThemeTypeChanged(Q3DTheme::Theme theme);
// Renderer callback handlers
- void handleRequestShadowQuality(QDataVis::ShadowQuality quality);
+ void handleRequestShadowQuality(QAbstract3DGraph::ShadowQuality quality);
signals:
- void shadowQualityChanged(QDataVis::ShadowQuality quality);
+ void shadowQualityChanged(QAbstract3DGraph::ShadowQuality quality);
void activeInputHandlerChanged(QAbstract3DInputHandler *inputHandler);
void activeThemeChanged(Q3DTheme *activeTheme);
- void selectionModeChanged(QDataVis::SelectionFlags mode);
+ void selectionModeChanged(QAbstract3DGraph::SelectionFlags mode);
void needRender();
void axisXChanged(QAbstract3DAxis *axis);
void axisYChanged(QAbstract3DAxis *axis);
@@ -277,6 +277,6 @@ private:
friend class Bars3DController;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp
index e812496c..9c7cfb39 100644
--- a/src/datavisualization/engine/abstract3drenderer.cpp
+++ b/src/datavisualization/engine/abstract3drenderer.cpp
@@ -27,18 +27,16 @@
#include "q3dtheme_p.h"
#include "objecthelper_p.h"
-Q_DECLARE_METATYPE(QtDataVisualization::QDataVis::ShadowQuality)
-
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
Abstract3DRenderer::Abstract3DRenderer(Abstract3DController *controller)
: QObject(0),
m_hasNegativeValues(false),
m_cachedTheme(new Q3DTheme()),
m_drawer(new Drawer(m_cachedTheme)),
- m_cachedShadowQuality(QDataVis::ShadowQualityMedium),
+ m_cachedShadowQuality(QAbstract3DGraph::ShadowQualityMedium),
m_autoScaleAdjustment(1.0f),
- m_cachedSelectionMode(QDataVis::SelectionNone),
+ m_cachedSelectionMode(QAbstract3DGraph::SelectionNone),
m_textureHelper(0),
m_cachedScene(new Q3DScene()),
m_selectionDirty(true),
@@ -220,7 +218,7 @@ void Abstract3DRenderer::updateScene(Q3DScene *scene)
void Abstract3DRenderer::reInitShaders()
{
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
initGradientShaders(QStringLiteral(":/shaders/vertexShadow"),
QStringLiteral(":/shaders/fragmentShadowNoTexColorOnY"));
initShaders(QStringLiteral(":/shaders/vertexShadow"),
@@ -250,15 +248,15 @@ void Abstract3DRenderer::handleShadowQualityChange()
reInitShaders();
#if defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality != QDataVis::ShadowQualityNone) {
- emit requestShadowQuality(QDataVis::ShadowQualityNone);
+ if (m_cachedShadowQuality != QAbstract3DGraph::ShadowQualityNone) {
+ emit requestShadowQuality(QAbstract3DGraph::ShadowQualityNone);
qWarning("Shadows are not yet supported for OpenGL ES2");
- m_cachedShadowQuality = QDataVis::ShadowQualityNone;
+ m_cachedShadowQuality = QAbstract3DGraph::ShadowQualityNone;
}
#endif
}
-void Abstract3DRenderer::updateSelectionMode(QDataVis::SelectionFlags mode)
+void Abstract3DRenderer::updateSelectionMode(QAbstract3DGraph::SelectionFlags mode)
{
m_cachedSelectionMode = mode;
m_selectionDirty = true;
@@ -382,32 +380,32 @@ AxisRenderCache &Abstract3DRenderer::axisCacheForOrientation(QAbstract3DAxis::Ax
void Abstract3DRenderer::lowerShadowQuality()
{
- QDataVis::ShadowQuality newQuality = QDataVis::ShadowQualityNone;
+ QAbstract3DGraph::ShadowQuality newQuality = QAbstract3DGraph::ShadowQualityNone;
switch (m_cachedShadowQuality) {
- case QDataVis::ShadowQualityHigh:
+ case QAbstract3DGraph::ShadowQualityHigh:
qWarning("Creating high quality shadows failed. Changing to medium quality.");
- newQuality = QDataVis::ShadowQualityMedium;
+ newQuality = QAbstract3DGraph::ShadowQualityMedium;
break;
- case QDataVis::ShadowQualityMedium:
+ case QAbstract3DGraph::ShadowQualityMedium:
qWarning("Creating medium quality shadows failed. Changing to low quality.");
- newQuality = QDataVis::ShadowQualityLow;
+ newQuality = QAbstract3DGraph::ShadowQualityLow;
break;
- case QDataVis::ShadowQualityLow:
+ case QAbstract3DGraph::ShadowQualityLow:
qWarning("Creating low quality shadows failed. Switching shadows off.");
- newQuality = QDataVis::ShadowQualityNone;
+ newQuality = QAbstract3DGraph::ShadowQualityNone;
break;
- case QDataVis::ShadowQualitySoftHigh:
+ case QAbstract3DGraph::ShadowQualitySoftHigh:
qWarning("Creating soft high quality shadows failed. Changing to soft medium quality.");
- newQuality = QDataVis::ShadowQualitySoftMedium;
+ newQuality = QAbstract3DGraph::ShadowQualitySoftMedium;
break;
- case QDataVis::ShadowQualitySoftMedium:
+ case QAbstract3DGraph::ShadowQualitySoftMedium:
qWarning("Creating soft medium quality shadows failed. Changing to soft low quality.");
- newQuality = QDataVis::ShadowQualitySoftLow;
+ newQuality = QAbstract3DGraph::ShadowQualitySoftLow;
break;
- case QDataVis::ShadowQualitySoftLow:
+ case QAbstract3DGraph::ShadowQualitySoftLow:
qWarning("Creating soft low quality shadows failed. Switching shadows off.");
- newQuality = QDataVis::ShadowQualityNone;
+ newQuality = QAbstract3DGraph::ShadowQualityNone;
break;
default:
// You'll never get here
@@ -432,4 +430,4 @@ void Abstract3DRenderer::fixGradientAndGenerateTexture(QLinearGradient *gradient
*gradientTexture = m_textureHelper->createGradientTexture(*gradient);
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h
index c375b0b8..c38135ed 100644
--- a/src/datavisualization/engine/abstract3drenderer_p.h
+++ b/src/datavisualization/engine/abstract3drenderer_p.h
@@ -41,7 +41,7 @@
//#define DISPLAY_RENDER_SPEED
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class TextureHelper;
class Theme;
@@ -70,7 +70,7 @@ public:
virtual void render(GLuint defaultFboHandle);
virtual void updateTheme(Q3DTheme *theme);
- virtual void updateSelectionMode(QDataVis::SelectionFlags newMode);
+ virtual void updateSelectionMode(QAbstract3DGraph::SelectionFlags newMode);
virtual void updateScene(Q3DScene *scene);
virtual void updateTextures() = 0;
virtual void initSelectionBuffer() = 0;
@@ -80,7 +80,7 @@ public:
#if !defined(QT_OPENGL_ES_2)
virtual void updateDepthBuffer() = 0;
#endif
- virtual void updateShadowQuality(QDataVis::ShadowQuality quality) = 0;
+ virtual void updateShadowQuality(QAbstract3DGraph::ShadowQuality quality) = 0;
virtual void initShaders(const QString &vertexShader, const QString &fragmentShader) = 0;
virtual void initGradientShaders(const QString &vertexShader, const QString &fragmentShader);
virtual void initBackgroundShaders(const QString &vertexShader, const QString &fragmentShader) = 0;
@@ -97,7 +97,7 @@ public:
signals:
void needRender(); // Emit this if something in renderer causes need for another render pass.
- void requestShadowQuality(QDataVis::ShadowQuality quality); // For automatic quality adjustments
+ void requestShadowQuality(QAbstract3DGraph::ShadowQuality quality); // For automatic quality adjustments
protected:
Abstract3DRenderer(Abstract3DController *controller);
@@ -118,10 +118,10 @@ protected:
Q3DTheme *m_cachedTheme;
Drawer *m_drawer;
QRect m_viewport;
- QDataVis::ShadowQuality m_cachedShadowQuality;
+ QAbstract3DGraph::ShadowQuality m_cachedShadowQuality;
GLfloat m_autoScaleAdjustment;
- QDataVis::SelectionFlags m_cachedSelectionMode;
+ QAbstract3DGraph::SelectionFlags m_cachedSelectionMode;
AxisRenderCache m_axisCacheX;
AxisRenderCache m_axisCacheY;
@@ -146,6 +146,6 @@ protected:
#endif
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // ABSTRACT3DRENDERER_P_H
diff --git a/src/datavisualization/engine/axisrendercache.cpp b/src/datavisualization/engine/axisrendercache.cpp
index 5ada62ca..9fcd8b5d 100644
--- a/src/datavisualization/engine/axisrendercache.cpp
+++ b/src/datavisualization/engine/axisrendercache.cpp
@@ -20,7 +20,7 @@
#include "qmath.h"
#include <QFontMetrics>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
AxisRenderCache::AxisRenderCache()
: m_type(QAbstract3DAxis::AxisTypeNone),
@@ -183,4 +183,4 @@ int AxisRenderCache::maxLabelWidth(const QStringList &labels) const
return labelWidth;
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/axisrendercache_p.h b/src/datavisualization/engine/axisrendercache_p.h
index 991cff76..595ba83b 100644
--- a/src/datavisualization/engine/axisrendercache_p.h
+++ b/src/datavisualization/engine/axisrendercache_p.h
@@ -34,7 +34,7 @@
#include "qabstract3daxis_p.h"
#include "drawer_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class AxisRenderCache : public QObject
{
@@ -96,6 +96,6 @@ private:
Q_DISABLE_COPY(AxisRenderCache)
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp
index 8bf0cb8c..c9a9706c 100644
--- a/src/datavisualization/engine/bars3dcontroller.cpp
+++ b/src/datavisualization/engine/bars3dcontroller.cpp
@@ -30,7 +30,7 @@
#include <QMatrix4x4>
#include <qmath.h>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
Bars3DController::Bars3DController(QRect boundRect, Q3DScene *scene)
: Abstract3DController(boundRect, scene),
@@ -341,13 +341,13 @@ bool Bars3DController::isBarSpecRelative()
return m_isBarSpecRelative;
}
-void Bars3DController::setSelectionMode(QDataVis::SelectionFlags mode)
+void Bars3DController::setSelectionMode(QAbstract3DGraph::SelectionFlags mode)
{
- if (mode.testFlag(QDataVis::SelectionSlice)
- && (mode.testFlag(QDataVis::SelectionRow) == mode.testFlag(QDataVis::SelectionColumn))) {
+ if (mode.testFlag(QAbstract3DGraph::SelectionSlice)
+ && (mode.testFlag(QAbstract3DGraph::SelectionRow) == mode.testFlag(QAbstract3DGraph::SelectionColumn))) {
qWarning("Must specify one of either row or column selection mode in conjunction with slicing mode.");
} else {
- QDataVis::SelectionFlags oldMode = selectionMode();
+ QAbstract3DGraph::SelectionFlags oldMode = selectionMode();
Abstract3DController::setSelectionMode(mode);
@@ -358,8 +358,8 @@ void Bars3DController::setSelectionMode(QDataVis::SelectionFlags mode)
// Special case: Always deactivate slicing when changing away from slice
// automanagement, as this can't be handled in setSelectedBar.
- if (!mode.testFlag(QDataVis::SelectionSlice)
- && oldMode.testFlag(QDataVis::SelectionSlice)) {
+ if (!mode.testFlag(QAbstract3DGraph::SelectionSlice)
+ && oldMode.testFlag(QAbstract3DGraph::SelectionSlice)) {
scene()->setSlicingActive(false);
}
}
@@ -377,7 +377,7 @@ void Bars3DController::setSelectedBar(const QPoint &position, QBar3DSeries *seri
adjustSelectionPosition(pos, series);
- if (selectionMode().testFlag(QDataVis::SelectionSlice)) {
+ if (selectionMode().testFlag(QAbstract3DGraph::SelectionSlice)) {
// If the selected bar is outside data window, or there is no visible selected bar, disable slicing
if (pos.x() < m_axisZ->min() || pos.x() > m_axisZ->max()
|| pos.y() < m_axisX->min() || pos.y() > m_axisX->max()
@@ -529,4 +529,4 @@ QAbstract3DAxis *Bars3DController::createDefaultAxis(QAbstract3DAxis::AxisOrient
return defaultAxis;
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/bars3dcontroller_p.h b/src/datavisualization/engine/bars3dcontroller_p.h
index 3fcae959..0c9bf71c 100644
--- a/src/datavisualization/engine/bars3dcontroller_p.h
+++ b/src/datavisualization/engine/bars3dcontroller_p.h
@@ -34,7 +34,7 @@
//#define DISPLAY_RENDER_SPEED
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class Bars3DRenderer;
class QBar3DSeries;
@@ -89,7 +89,7 @@ public:
QSizeF barSpacing();
bool isBarSpecRelative();
- void setSelectionMode(QDataVis::SelectionFlags mode);
+ void setSelectionMode(QAbstract3DGraph::SelectionFlags mode);
void setSelectedBar(const QPoint &position, QBar3DSeries *series);
virtual void handleAxisAutoAdjustRangeChangedInOrientation(QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust);
@@ -131,6 +131,6 @@ private:
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp
index 38e85499..02b26821 100644
--- a/src/datavisualization/engine/bars3drenderer.cpp
+++ b/src/datavisualization/engine/bars3drenderer.cpp
@@ -38,7 +38,7 @@
// You should see the scene from where the light is
//#define SHOW_DEPTH_TEXTURE_SCENE
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
const GLfloat labelMargin = 0.05f;
const GLfloat gridLineWidth = 0.005f;
@@ -301,8 +301,8 @@ void Bars3DRenderer::drawSlicedScene()
// Draw the selected row / column
QMatrix4x4 projectionViewMatrix = projectionMatrix * viewMatrix;
- bool rowMode = m_cachedSelectionMode.testFlag(QDataVis::SelectionRow);
- bool itemMode = m_cachedSelectionMode.testFlag(QDataVis::SelectionItem);
+ bool rowMode = m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionRow);
+ bool itemMode = m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionItem);
GLfloat barPosYAdjustment = -0.8f; // Translate to -1.0 + 0.2 for row/column labels
GLfloat scaleFactor = 0.0f;
@@ -778,10 +778,10 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
QMatrix4x4 projectionViewMatrix = projectionMatrix * viewMatrix;
- bool rowMode = m_cachedSelectionMode.testFlag(QDataVis::SelectionRow);
+ bool rowMode = m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionRow);
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Render scene into a depth texture for using with shadow mapping
// Enable drawing to depth framebuffer
glBindFramebuffer(GL_FRAMEBUFFER, m_depthFrameBuffer);
@@ -904,7 +904,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
// TODO: Selection must be enabled currently to support clicked signal. (QTRD-2517)
// Skip selection mode drawing if we're slicing or have no selection mode
- if (!m_cachedIsSlicingActivated && m_cachedSelectionMode > QDataVis::SelectionNone
+ if (!m_cachedIsSlicingActivated && m_cachedSelectionMode > QAbstract3DGraph::SelectionNone
&& m_selectionState == SelectOnScene && seriesCount > 0) {
// Bind selection shader
m_selectionShader->bind();
@@ -1044,7 +1044,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
reserveAmount = m_cachedColumnCount;
else
reserveAmount = m_cachedRowCount;
- if (m_cachedSelectionMode.testFlag(QDataVis::SelectionMultiSeries))
+ if (m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionMultiSeries))
reserveAmount *= m_visibleSeriesList.size();
m_sliceSelection.resize(reserveAmount);
@@ -1092,7 +1092,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
}
// Always use base color when no selection mode
- if (m_cachedSelectionMode == QDataVis::SelectionNone) {
+ if (m_cachedSelectionMode == QAbstract3DGraph::SelectionNone) {
if (colorStyleIsUniform)
barColor = baseColor;
else
@@ -1103,7 +1103,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
int sliceSeriesAdjust = 0;
if (m_selectionDirty && m_cachedIsSlicingActivated) {
int seriesMultiplier = 0;
- if (m_cachedSelectionMode.testFlag(QDataVis::SelectionMultiSeries))
+ if (m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionMultiSeries))
seriesMultiplier = series;
if (rowMode)
sliceSeriesAdjust = seriesMultiplier * m_cachedColumnCount;
@@ -1141,7 +1141,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
GLfloat lightStrength = m_cachedTheme->lightStrength();
GLfloat shadowLightStrength = adjustedLightStrength;
- if (m_cachedSelectionMode > QDataVis::SelectionNone) {
+ if (m_cachedSelectionMode > QAbstract3DGraph::SelectionNone) {
Bars3DController::SelectionType selectionType = Bars3DController::SelectionNone;
if (somethingSelected)
selectionType = isSelected(row, bar, series);
@@ -1164,7 +1164,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
}
if (m_selectionDirty && m_cachedIsSlicingActivated) {
QVector3D translation = modelMatrix.column(3).toVector3D();
- if (m_cachedSelectionMode & QDataVis::SelectionColumn
+ if (m_cachedSelectionMode & QAbstract3DGraph::SelectionColumn
&& seriesCount > 1) {
translation.setZ((m_columnDepth - ((row + 0.5f + seriesPos)
* (m_cachedBarSpacing.height())))
@@ -1254,7 +1254,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
}
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Set shadow shader bindings
QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
barShader->setUniformValue(barShader->shadowQ(), m_shadowQualityToShader);
@@ -1324,7 +1324,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
m_cachedTheme->ambientLightStrength() * 2.0f);
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Set shadow shader bindings
QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
m_backgroundShader->setUniformValue(m_backgroundShader->shadowQ(),
@@ -1372,7 +1372,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
m_backgroundShader->setUniformValue(m_backgroundShader->MVP(), MVPMatrix);
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Set shadow shader bindings
QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
m_backgroundShader->setUniformValue(m_backgroundShader->depth(), depthMVPMatrix);
@@ -1405,7 +1405,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
lineShader->setUniformValue(lineShader->color(), barColor);
lineShader->setUniformValue(lineShader->ambientS(), m_cachedTheme->ambientLightStrength());
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Set shadowed shader bindings
lineShader->setUniformValue(lineShader->shadowQ(), m_shadowQualityToShader);
lineShader->setUniformValue(lineShader->lightS(),
@@ -1453,7 +1453,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Set shadow shader bindings
QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1491,7 +1491,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Set shadow shader bindings
QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1548,7 +1548,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Set shadow shader bindings
QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1597,7 +1597,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Set shadow shader bindings
QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1926,31 +1926,31 @@ void Bars3DRenderer::updateSelectedBar(const QPoint &position, const QBar3DSerie
}
}
-void Bars3DRenderer::updateShadowQuality(QDataVis::ShadowQuality quality)
+void Bars3DRenderer::updateShadowQuality(QAbstract3DGraph::ShadowQuality quality)
{
m_cachedShadowQuality = quality;
switch (quality) {
- case QDataVis::ShadowQualityLow:
+ case QAbstract3DGraph::ShadowQualityLow:
m_shadowQualityToShader = 33.3f;
m_shadowQualityMultiplier = 1;
break;
- case QDataVis::ShadowQualityMedium:
+ case QAbstract3DGraph::ShadowQualityMedium:
m_shadowQualityToShader = 100.0f;
m_shadowQualityMultiplier = 3;
break;
- case QDataVis::ShadowQualityHigh:
+ case QAbstract3DGraph::ShadowQualityHigh:
m_shadowQualityToShader = 200.0f;
m_shadowQualityMultiplier = 5;
break;
- case QDataVis::ShadowQualitySoftLow:
+ case QAbstract3DGraph::ShadowQualitySoftLow:
m_shadowQualityToShader = 7.5f;
m_shadowQualityMultiplier = 1;
break;
- case QDataVis::ShadowQualitySoftMedium:
+ case QAbstract3DGraph::ShadowQualitySoftMedium:
m_shadowQualityToShader = 10.0f;
m_shadowQualityMultiplier = 3;
break;
- case QDataVis::ShadowQualitySoftHigh:
+ case QAbstract3DGraph::ShadowQualitySoftHigh:
m_shadowQualityToShader = 15.0f;
m_shadowQualityMultiplier = 4;
break;
@@ -2058,17 +2058,17 @@ Bars3DController::SelectionType Bars3DRenderer::isSelected(int row, int bar, int
{
Bars3DController::SelectionType isSelectedType = Bars3DController::SelectionNone;
- if ((m_cachedSelectionMode.testFlag(QDataVis::SelectionMultiSeries)
+ if ((m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionMultiSeries)
&& m_visualSelectedBarSeriesIndex >= 0)
|| seriesIndex == m_visualSelectedBarSeriesIndex) {
if (row == m_visualSelectedBarPos.x() && bar == m_visualSelectedBarPos.y()
- && (m_cachedSelectionMode.testFlag(QDataVis::SelectionItem))) {
+ && (m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionItem))) {
isSelectedType = Bars3DController::SelectionItem;
} else if (row == m_visualSelectedBarPos.x()
- && (m_cachedSelectionMode.testFlag(QDataVis::SelectionRow))) {
+ && (m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionRow))) {
isSelectedType = Bars3DController::SelectionRow;
} else if (bar == m_visualSelectedBarPos.y()
- && (m_cachedSelectionMode.testFlag(QDataVis::SelectionColumn))) {
+ && (m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionColumn))) {
isSelectedType = Bars3DController::SelectionColumn;
}
}
@@ -2173,7 +2173,7 @@ void Bars3DRenderer::updateDepthBuffer()
if (m_primarySubViewport.size().isEmpty())
return;
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
m_depthTexture = m_textureHelper->createDepthTextureFrameBuffer(m_primarySubViewport.size(),
m_depthFrameBuffer,
m_shadowQualityMultiplier);
@@ -2200,4 +2200,4 @@ void Bars3DRenderer::initLabelShaders(const QString &vertexShader, const QString
m_labelShader->initialize();
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/bars3drenderer_p.h b/src/datavisualization/engine/bars3drenderer_p.h
index 2cdb28e4..03e490b8 100644
--- a/src/datavisualization/engine/bars3drenderer_p.h
+++ b/src/datavisualization/engine/bars3drenderer_p.h
@@ -39,7 +39,7 @@ class QPoint;
class QSizeF;
class QOpenGLShaderProgram;
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class ShaderHelper;
class ObjectHelper;
@@ -133,7 +133,7 @@ signals:
private:
virtual void initShaders(const QString &vertexShader, const QString &fragmentShader);
virtual void initGradientShaders(const QString &vertexShader, const QString &fragmentShader);
- virtual void updateShadowQuality(QDataVis::ShadowQuality quality);
+ virtual void updateShadowQuality(QAbstract3DGraph::ShadowQuality quality);
virtual void updateTextures();
virtual void fixMeshFileName(QString &fileName, QAbstract3DSeries::Mesh mesh);
@@ -163,6 +163,6 @@ private:
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/engine/drawer.cpp b/src/datavisualization/engine/drawer.cpp
index c9db4563..ec36befd 100644
--- a/src/datavisualization/engine/drawer.cpp
+++ b/src/datavisualization/engine/drawer.cpp
@@ -16,7 +16,6 @@
**
****************************************************************************/
-#include "qdatavisualizationenums.h"
#include "drawer_p.h"
#include "shaderhelper_p.h"
#include "objecthelper_p.h"
@@ -39,7 +38,7 @@ public:
};
StaticLibInitializer staticLibInitializer;
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
// Vertex array buffer for point
const GLfloat point_data[] = {0.0f, 0.0f, 0.0f};
@@ -205,7 +204,7 @@ void Drawer::drawPoint(ShaderHelper *shader)
void Drawer::drawLabel(const AbstractRenderItem &item, const LabelItem &labelItem,
const QMatrix4x4 &viewmatrix, const QMatrix4x4 &projectionmatrix,
const QVector3D &positionComp, const QVector3D &rotation,
- GLfloat itemHeight, QDataVis::SelectionFlags mode,
+ GLfloat itemHeight, QAbstract3DGraph::SelectionFlags mode,
ShaderHelper *shader, ObjectHelper *object,
const Q3DCamera *camera, bool useDepth, bool rotateAlong,
LabelPosition position, Qt::AlignmentFlag alignment, bool isSlicing)
@@ -334,7 +333,7 @@ void Drawer::drawLabel(const AbstractRenderItem &item, const LabelItem &labelIte
xPosition = item.translation().x();
if (useDepth)
zPosition = item.translation().z();
- else if (mode.testFlag(QDataVis::SelectionColumn) && isSlicing)
+ else if (mode.testFlag(QAbstract3DGraph::SelectionColumn) && isSlicing)
xPosition = -(item.translation().z()) + positionComp.z(); // flip first to left
}
@@ -401,4 +400,4 @@ void Drawer::generateLabelItem(LabelItem &item, const QString &text, int widestL
}
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/drawer_p.h b/src/datavisualization/engine/drawer_p.h
index 8bc62209..82163c08 100644
--- a/src/datavisualization/engine/drawer_p.h
+++ b/src/datavisualization/engine/drawer_p.h
@@ -36,7 +36,7 @@
#include "abstractrenderitem_p.h"
#include <QFont>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class ShaderHelper;
class ObjectHelper;
@@ -81,7 +81,7 @@ public:
void drawLabel(const AbstractRenderItem &item, const LabelItem &labelItem,
const QMatrix4x4 &viewmatrix, const QMatrix4x4 &projectionmatrix,
const QVector3D &positionComp, const QVector3D &rotation, GLfloat itemHeight,
- QDataVis::SelectionFlags mode, ShaderHelper *shader, ObjectHelper *object,
+ QAbstract3DGraph::SelectionFlags mode, ShaderHelper *shader, ObjectHelper *object,
const Q3DCamera *camera, bool useDepth = false, bool rotateAlong = false,
LabelPosition position = LabelOver,
Qt::AlignmentFlag alignment = Qt::AlignCenter, bool isSlicing = false);
@@ -100,6 +100,6 @@ private:
GLuint m_pointbuffer;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp
index fe121e0d..00530f7f 100644
--- a/src/datavisualization/engine/q3dbars.cpp
+++ b/src/datavisualization/engine/q3dbars.cpp
@@ -24,7 +24,7 @@
#include "q3dcamera.h"
#include "qbar3dseries_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
* \class Q3DBars
@@ -338,4 +338,4 @@ Q3DBars *Q3DBarsPrivate::qptr()
return static_cast<Q3DBars *>(q_ptr);
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/q3dbars.h b/src/datavisualization/engine/q3dbars.h
index 2ed27c50..10535eab 100644
--- a/src/datavisualization/engine/q3dbars.h
+++ b/src/datavisualization/engine/q3dbars.h
@@ -19,12 +19,11 @@
#ifndef Q3DBARS_H
#define Q3DBARS_H
-#include <QtDataVisualization/qdatavisualizationenums.h>
#include <QtDataVisualization/qabstract3dgraph.h>
#include <QFont>
#include <QLinearGradient>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class Q3DBarsPrivate;
class QAbstract3DAxis;
@@ -83,6 +82,6 @@ private:
Q_DISABLE_COPY(Q3DBars)
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/engine/q3dbars_p.h b/src/datavisualization/engine/q3dbars_p.h
index 37ae3d70..3e7c97ac 100644
--- a/src/datavisualization/engine/q3dbars_p.h
+++ b/src/datavisualization/engine/q3dbars_p.h
@@ -30,10 +30,9 @@
#define Q3DBARS_P_H
#include "bars3dcontroller_p.h"
-#include "qdatavisualizationenums.h"
#include "qabstract3dgraph_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class Q3DBars;
@@ -53,6 +52,6 @@ public:
Bars3DController *m_shared;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/engine/q3dbox.cpp b/src/datavisualization/engine/q3dbox.cpp
index cc1e0265..ce5f76b1 100644
--- a/src/datavisualization/engine/q3dbox.cpp
+++ b/src/datavisualization/engine/q3dbox.cpp
@@ -20,7 +20,7 @@
#include "q3dbox.h"
#include <QtCore/QList>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
\class Q3DBox
@@ -478,4 +478,4 @@ QDataStream &operator>>(QDataStream &stream, Q3DBox &box)
#endif // QT_NO_DATASTREAM
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/q3dbox.h b/src/datavisualization/engine/q3dbox.h
index aa63ec39..e89f1cca 100644
--- a/src/datavisualization/engine/q3dbox.h
+++ b/src/datavisualization/engine/q3dbox.h
@@ -19,11 +19,10 @@
#ifndef Q3DBOX_H
#define Q3DBOX_H
-#include <QtDataVisualization/qdatavisualizationenums.h>
#include <QtGui/QMatrix4x4>
#include <QtGui/QVector3D>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class Q3DBox; // Needed to circumvent an issue with qdoc. If this line is removed, make docs will not work for this.
@@ -179,6 +178,6 @@ QT_DATAVISUALIZATION_EXPORT QDataStream &operator<<(QDataStream &stream, const Q
QT_DATAVISUALIZATION_EXPORT QDataStream &operator>>(QDataStream &stream, Q3DBox &box);
#endif
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/engine/q3dcamera.cpp b/src/datavisualization/engine/q3dcamera.cpp
index 6378051c..c9460c44 100644
--- a/src/datavisualization/engine/q3dcamera.cpp
+++ b/src/datavisualization/engine/q3dcamera.cpp
@@ -26,7 +26,7 @@
#include <qmath.h>
#include <QVector3D>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
* \class Q3DCamera
@@ -868,4 +868,4 @@ void Q3DCameraPrivate::updateViewMatrix(float zoomAdjustment)
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/q3dcamera.h b/src/datavisualization/engine/q3dcamera.h
index 9287e15a..b4341bb7 100644
--- a/src/datavisualization/engine/q3dcamera.h
+++ b/src/datavisualization/engine/q3dcamera.h
@@ -25,7 +25,7 @@
class QVector3D;
class QPoint;
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class Q3DCameraPrivate;
@@ -157,6 +157,6 @@ private:
friend class QMac3DInputHandler;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // Q3DCAMERA_H
diff --git a/src/datavisualization/engine/q3dcamera_p.h b/src/datavisualization/engine/q3dcamera_p.h
index ac32248e..cfaaeb4d 100644
--- a/src/datavisualization/engine/q3dcamera_p.h
+++ b/src/datavisualization/engine/q3dcamera_p.h
@@ -32,7 +32,7 @@
#include "datavisualizationglobal_p.h"
#include "q3dcamera.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class Q3DCamera;
@@ -82,6 +82,6 @@ public:
friend class QMac3DInputHandler;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // Q3DCAMERA_P_H
diff --git a/src/datavisualization/engine/q3dlight.cpp b/src/datavisualization/engine/q3dlight.cpp
index bc43c3d7..73ddc0fe 100644
--- a/src/datavisualization/engine/q3dlight.cpp
+++ b/src/datavisualization/engine/q3dlight.cpp
@@ -20,7 +20,7 @@
#include "q3dscene.h"
#include "q3dlight_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
* \class Q3DLight
@@ -79,4 +79,4 @@ void Q3DLightPrivate::sync(Q3DLight &other)
}
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/q3dlight.h b/src/datavisualization/engine/q3dlight.h
index f9109183..6515b1ae 100644
--- a/src/datavisualization/engine/q3dlight.h
+++ b/src/datavisualization/engine/q3dlight.h
@@ -21,7 +21,7 @@
#include <QtDataVisualization/q3dobject.h>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class Q3DLightPrivate;
class Q3DScene;
@@ -43,6 +43,6 @@ private:
friend class Q3DScenePrivate;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // Q3DLIGHT_H
diff --git a/src/datavisualization/engine/q3dlight_p.h b/src/datavisualization/engine/q3dlight_p.h
index dad6d670..bd871427 100644
--- a/src/datavisualization/engine/q3dlight_p.h
+++ b/src/datavisualization/engine/q3dlight_p.h
@@ -32,7 +32,7 @@
#include "datavisualizationglobal_p.h"
#include "q3dlight.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class Q3DScene;
class Q3DLight;
@@ -49,7 +49,7 @@ public:
Q3DLight *q_ptr;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // Q3DLIGHT_P_H
diff --git a/src/datavisualization/engine/q3dobject.cpp b/src/datavisualization/engine/q3dobject.cpp
index 89a682e1..1ef78add 100644
--- a/src/datavisualization/engine/q3dobject.cpp
+++ b/src/datavisualization/engine/q3dobject.cpp
@@ -20,7 +20,7 @@
#include "q3dobject_p.h"
#include "q3dscene_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
\class Q3DObject
@@ -120,4 +120,4 @@ Q3DObjectPrivate::~Q3DObjectPrivate()
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/q3dobject.h b/src/datavisualization/engine/q3dobject.h
index b5ce7804..c32203cc 100644
--- a/src/datavisualization/engine/q3dobject.h
+++ b/src/datavisualization/engine/q3dobject.h
@@ -19,13 +19,12 @@
#ifndef Q3DOBJECT_H
#define Q3DOBJECT_H
-#include <QtDataVisualization/qdatavisualizationenums.h>
#include <QtDataVisualization/q3dscene.h>
#include <QObject>
#include <QVector3D>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class Q3DObjectPrivate;
@@ -61,6 +60,6 @@ private:
friend class Q3DScenePrivate;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // Q3DOBJECT_H
diff --git a/src/datavisualization/engine/q3dobject_p.h b/src/datavisualization/engine/q3dobject_p.h
index bac18cfe..51bf1b08 100644
--- a/src/datavisualization/engine/q3dobject_p.h
+++ b/src/datavisualization/engine/q3dobject_p.h
@@ -31,7 +31,7 @@
#include "datavisualizationglobal_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class Q3DObject;
class Q3DScene;
@@ -48,6 +48,6 @@ public:
bool m_isDirty;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // Q3DOBJECT_P_H
diff --git a/src/datavisualization/engine/q3dscatter.cpp b/src/datavisualization/engine/q3dscatter.cpp
index f83ca17e..d6805232 100644
--- a/src/datavisualization/engine/q3dscatter.cpp
+++ b/src/datavisualization/engine/q3dscatter.cpp
@@ -23,7 +23,7 @@
#include "q3dcamera.h"
#include "qscatter3dseries_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
* \class Q3DScatter
@@ -270,5 +270,5 @@ Q3DScatter *Q3DScatterPrivate::qptr()
return static_cast<Q3DScatter *>(q_ptr);
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/q3dscatter.h b/src/datavisualization/engine/q3dscatter.h
index d9ad596c..a03e51f7 100644
--- a/src/datavisualization/engine/q3dscatter.h
+++ b/src/datavisualization/engine/q3dscatter.h
@@ -19,13 +19,12 @@
#ifndef Q3DSCATTER_H
#define Q3DSCATTER_H
-#include <QtDataVisualization/qdatavisualizationenums.h>
#include <QtDataVisualization/qabstract3dgraph.h>
#include <QtDataVisualization/q3dscene.h>
#include <QFont>
#include <QLinearGradient>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class Q3DScatterPrivate;
class QValue3DAxis;
@@ -68,6 +67,6 @@ private:
Q_DISABLE_COPY(Q3DScatter)
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/engine/q3dscatter_p.h b/src/datavisualization/engine/q3dscatter_p.h
index ab547e52..9c6c4480 100644
--- a/src/datavisualization/engine/q3dscatter_p.h
+++ b/src/datavisualization/engine/q3dscatter_p.h
@@ -30,10 +30,9 @@
#define Q3DSCATTER_P_H
#include "scatter3dcontroller_p.h"
-#include "qdatavisualizationenums.h"
#include "qabstract3dgraph_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class Q3DScatter;
@@ -53,6 +52,6 @@ public:
Scatter3DController *m_shared;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/engine/q3dscene.cpp b/src/datavisualization/engine/q3dscene.cpp
index 6fbfac51..cb70876b 100644
--- a/src/datavisualization/engine/q3dscene.cpp
+++ b/src/datavisualization/engine/q3dscene.cpp
@@ -25,7 +25,7 @@
#include "q3dcamera_p.h"
#include "q3dlight_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
* \class Q3DScene
@@ -644,4 +644,4 @@ QRect Q3DScenePrivate::glSecondarySubViewport()
return m_glSecondarySubViewport;
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/q3dscene.h b/src/datavisualization/engine/q3dscene.h
index fb543cdb..d43d06ec 100644
--- a/src/datavisualization/engine/q3dscene.h
+++ b/src/datavisualization/engine/q3dscene.h
@@ -19,11 +19,12 @@
#ifndef Q3DSCENE_H
#define Q3DSCENE_H
-#include <QtDataVisualization/qdatavisualizationenums.h>
+#include <QtDataVisualization/qdatavisualizationglobal.h>
+
#include <QObject>
#include <QRect>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class Q3DCamera;
class Q3DBox;
@@ -107,6 +108,6 @@ private:
friend class Q3DObject;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // Q3DSCENE_H
diff --git a/src/datavisualization/engine/q3dscene_p.h b/src/datavisualization/engine/q3dscene_p.h
index 94265568..65d5e4c8 100644
--- a/src/datavisualization/engine/q3dscene_p.h
+++ b/src/datavisualization/engine/q3dscene_p.h
@@ -32,7 +32,7 @@
#include "datavisualizationglobal_p.h"
#include <QRect>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class Q3DCamera;
class Q3DLight;
@@ -110,6 +110,6 @@ public:
bool m_sceneDirty;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // Q3DSCENE_P_H
diff --git a/src/datavisualization/engine/q3dsurface.cpp b/src/datavisualization/engine/q3dsurface.cpp
index 15c48dbf..84e2c455 100644
--- a/src/datavisualization/engine/q3dsurface.cpp
+++ b/src/datavisualization/engine/q3dsurface.cpp
@@ -23,7 +23,7 @@
#include "q3dcamera.h"
#include "qsurface3dseries_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
* \class Q3DSurface
@@ -293,4 +293,4 @@ Q3DSurface *Q3DSurfacePrivate::qptr()
return static_cast<Q3DSurface *>(q_ptr);
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/q3dsurface.h b/src/datavisualization/engine/q3dsurface.h
index a5107ef1..833e983a 100644
--- a/src/datavisualization/engine/q3dsurface.h
+++ b/src/datavisualization/engine/q3dsurface.h
@@ -19,12 +19,11 @@
#ifndef Q3DSURFACE_H
#define Q3DSURFACE_H
-#include <QtDataVisualization/qdatavisualizationenums.h>
#include <QtDataVisualization/qabstract3dgraph.h>
#include <QtDataVisualization/q3dscene.h>
#include <QFont>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class Q3DSurfacePrivate;
class QValue3DAxis;
@@ -67,6 +66,6 @@ private:
Q_DISABLE_COPY(Q3DSurface)
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // Q3DSURFACE_H
diff --git a/src/datavisualization/engine/q3dsurface_p.h b/src/datavisualization/engine/q3dsurface_p.h
index 0cbb6997..d604fc51 100644
--- a/src/datavisualization/engine/q3dsurface_p.h
+++ b/src/datavisualization/engine/q3dsurface_p.h
@@ -30,12 +30,11 @@
#define Q3DSURFACE_P_H
#include "surface3dcontroller_p.h"
-#include "qdatavisualizationenums.h"
#include "qabstract3dgraph_p.h"
#include <QList>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class Q3DSurface;
@@ -55,6 +54,6 @@ public:
Surface3DController *m_shared;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // Q3DSURFACE_P_H
diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp
index c7063438..2d62a4ee 100644
--- a/src/datavisualization/engine/qabstract3dgraph.cpp
+++ b/src/datavisualization/engine/qabstract3dgraph.cpp
@@ -29,7 +29,7 @@
#include <QPainter>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
* \class QAbstract3DGraph
@@ -60,6 +60,59 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
*/
/*!
+ \enum QAbstract3DGraph::SelectionFlag
+
+ Item selection modes. Values of this enumeration can be combined with OR operator.
+
+ \value SelectionNone
+ Selection mode disabled.
+ \value SelectionItem
+ Selection highlights a single item.
+ \value SelectionRow
+ Selection highlights a single row.
+ \value SelectionItemAndRow
+ Combination flag for highlighting both item and row with different colors.
+ \value SelectionColumn
+ Selection highlights a single column.
+ \value SelectionItemAndColumn
+ Combination flag for highlighting both item and column with different colors.
+ \value SelectionRowAndColumn
+ Combination flag for highlighting both row and column.
+ \value SelectionItemRowAndColumn
+ Combination flag for highlighting item, row, and column.
+ \value SelectionSlice
+ Setting this mode flag indicates that the graph should take care of the slice view handling
+ automatically. If you wish to control the slice view yourself via Q3DScene, do not set this
+ flag. When setting this mode flag, either \c SelectionRow or \c SelectionColumn must also
+ be set, but not both. Slicing is supported by Q3DBars and Q3DSurface only.
+ \value SelectionMultiSeries
+ Setting this mode means that items for all series at same position are highlighted, instead
+ of just the selected item. The actual selection in the other series doesn't change.
+ Multi-series selection is only supported for Q3DBars.
+*/
+
+/*!
+ \enum QAbstract3DGraph::ShadowQuality
+
+ Quality of shadows.
+
+ \value ShadowQualityNone
+ Shadows are disabled.
+ \value ShadowQualityLow
+ Shadows are rendered in low quality.
+ \value ShadowQualityMedium
+ Shadows are rendered in medium quality.
+ \value ShadowQualityHigh
+ Shadows are rendered in high quality.
+ \value ShadowQualitySoftLow
+ Shadows are rendered in low quality with softened edges.
+ \value ShadowQualitySoftMedium
+ Shadows are rendered in medium quality with softened edges.
+ \value ShadowQualitySoftHigh
+ Shadows are rendered in high quality with softened edges.
+*/
+
+/*!
* \internal
*/
QAbstract3DGraph::QAbstract3DGraph(QAbstract3DGraphPrivate *d, const QSurfaceFormat *format, QWindow *parent)
@@ -232,17 +285,17 @@ QList<Q3DTheme *> QAbstract3DGraph::themes() const
/*!
* \property QAbstract3DGraph::selectionMode
*
- * Sets selection \a mode to a combination of \c QDataVis::SelectionFlags. It is preset to
- * \c QDataVis::SelectionItem by default.
- * Different graph types support different selection modes. See \c QDataVis::SelectionFlags
+ * Sets selection \a mode to a combination of SelectionFlags. It is preset to
+ * \c SelectionItem by default.
+ * Different graph types support different selection modes. See \c SelectionFlags
* documentation for details.
*/
-void QAbstract3DGraph::setSelectionMode(QDataVis::SelectionFlags mode)
+void QAbstract3DGraph::setSelectionMode(SelectionFlags mode)
{
d_ptr->m_visualController->setSelectionMode(mode);
}
-QDataVis::SelectionFlags QAbstract3DGraph::selectionMode() const
+QAbstract3DGraph::SelectionFlags QAbstract3DGraph::selectionMode() const
{
return d_ptr->m_visualController->selectionMode();
}
@@ -250,19 +303,19 @@ QDataVis::SelectionFlags QAbstract3DGraph::selectionMode() const
/*!
* \property QAbstract3DGraph::shadowQuality
*
- * Sets shadow \a quality to one of \c QDataVis::ShadowQuality. It is preset to
- * \c QDataVis::ShadowQualityMedium by default.
+ * Sets shadow \a quality to one of ShadowQuality. It is preset to
+ * \c ShadowQualityMedium by default.
*
- * \note If setting QDataVis::ShadowQuality of a certain level fails, a level is lowered
+ * \note If setting ShadowQuality of a certain level fails, a level is lowered
* until it is successful and shadowQualityChanged signal is emitted for each time the change is
* done.
*/
-void QAbstract3DGraph::setShadowQuality(QDataVis::ShadowQuality quality)
+void QAbstract3DGraph::setShadowQuality(ShadowQuality quality)
{
d_ptr->m_visualController->setShadowQuality(quality);
}
-QDataVis::ShadowQuality QAbstract3DGraph::shadowQuality() const
+QAbstract3DGraph::ShadowQuality QAbstract3DGraph::shadowQuality() const
{
return d_ptr->m_visualController->shadowQuality();
}
@@ -443,4 +496,4 @@ void QAbstract3DGraphPrivate::renderNow()
m_context->swapBuffers(q_ptr);
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/qabstract3dgraph.h b/src/datavisualization/engine/qabstract3dgraph.h
index 5e39221c..9441544b 100644
--- a/src/datavisualization/engine/qabstract3dgraph.h
+++ b/src/datavisualization/engine/qabstract3dgraph.h
@@ -19,15 +19,13 @@
#ifndef QABSTRACT3DGRAPH_H
#define QABSTRACT3DGRAPH_H
-#include <QtDataVisualization/qdatavisualizationenums.h>
+#include <QtDataVisualization/qdatavisualizationglobal.h>
#include <QWindow>
#include <QOpenGLFunctions>
#include <QScreen>
-class QPainter;
-
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QAbstract3DGraphPrivate;
class Abstract3DController;
@@ -38,14 +36,42 @@ class Q3DScene;
class QT_DATAVISUALIZATION_EXPORT QAbstract3DGraph : public QWindow, protected QOpenGLFunctions
{
Q_OBJECT
+ Q_ENUMS(ShadowQuality)
+ Q_FLAGS(SelectionFlag SelectionFlags)
Q_PROPERTY(QAbstract3DInputHandler* activeInputHandler READ activeInputHandler WRITE setActiveInputHandler NOTIFY activeInputHandlerChanged)
Q_PROPERTY(Q3DTheme* activeTheme READ activeTheme WRITE setActiveTheme NOTIFY activeThemeChanged)
- 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_PROPERTY(SelectionFlags selectionMode READ selectionMode WRITE setSelectionMode NOTIFY selectionModeChanged)
+ Q_PROPERTY(ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality NOTIFY shadowQualityChanged)
Q_PROPERTY(Q3DScene* scene READ scene)
protected:
explicit QAbstract3DGraph(QAbstract3DGraphPrivate *d, const QSurfaceFormat *format, QWindow *parent = 0);
+
+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:
virtual ~QAbstract3DGraph();
@@ -61,11 +87,11 @@ public:
Q3DTheme *activeTheme() const;
QList<Q3DTheme *> themes() const;
- void setSelectionMode(QDataVis::SelectionFlags mode);
- QDataVis::SelectionFlags selectionMode() const;
+ void setSelectionMode(SelectionFlags mode);
+ SelectionFlags selectionMode() const;
- void setShadowQuality(QDataVis::ShadowQuality quality);
- QDataVis::ShadowQuality shadowQuality() const;
+ void setShadowQuality(ShadowQuality quality);
+ ShadowQuality shadowQuality() const;
Q3DScene *scene() const;
@@ -85,8 +111,8 @@ protected:
signals:
void activeInputHandlerChanged(QAbstract3DInputHandler *inputHandler);
void activeThemeChanged(Q3DTheme *theme);
- void selectionModeChanged(QDataVis::SelectionFlags mode);
- void shadowQualityChanged(QDataVis::ShadowQuality quality);
+ void selectionModeChanged(SelectionFlags mode);
+ void shadowQualityChanged(ShadowQuality quality);
private:
QScopedPointer<QAbstract3DGraphPrivate> d_ptr;
@@ -95,7 +121,8 @@ private:
friend class Q3DScatter;
friend class Q3DSurface;
};
+Q_DECLARE_OPERATORS_FOR_FLAGS(QAbstract3DGraph::SelectionFlags)
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/engine/qabstract3dgraph_p.h b/src/datavisualization/engine/qabstract3dgraph_p.h
index e1ccab92..43f96e4a 100644
--- a/src/datavisualization/engine/qabstract3dgraph_p.h
+++ b/src/datavisualization/engine/qabstract3dgraph_p.h
@@ -36,7 +36,7 @@
class QOpenGLContext;
class QOpenGLPaintDevice;
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QAbstract3DGraph;
class Abstract3DController;
@@ -71,6 +71,6 @@ public:
float m_devicePixelRatio;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/engine/scatter3dcontroller.cpp b/src/datavisualization/engine/scatter3dcontroller.cpp
index 0c991839..e6e47cb5 100644
--- a/src/datavisualization/engine/scatter3dcontroller.cpp
+++ b/src/datavisualization/engine/scatter3dcontroller.cpp
@@ -27,7 +27,7 @@
#include <QMatrix4x4>
#include <qmath.h>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
Scatter3DController::Scatter3DController(QRect boundRect, Q3DScene *scene)
: Abstract3DController(boundRect, scene),
@@ -214,10 +214,10 @@ void Scatter3DController::handleSeriesVisibilityChangedBySender(QObject *sender)
adjustValueAxisRange();
}
-void Scatter3DController::setSelectionMode(QDataVis::SelectionFlags mode)
+void Scatter3DController::setSelectionMode(QAbstract3DGraph::SelectionFlags mode)
{
// We only support single item selection mode and no selection mode
- if (mode != QDataVis::SelectionItem && mode != QDataVis::SelectionNone) {
+ if (mode != QAbstract3DGraph::SelectionItem && mode != QAbstract3DGraph::SelectionNone) {
qWarning("Unsupported selection mode - only none and item selection modes are supported.");
return;
}
@@ -367,4 +367,4 @@ void Scatter3DController::adjustValueAxisRange()
}
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/scatter3dcontroller_p.h b/src/datavisualization/engine/scatter3dcontroller_p.h
index 2d0c9a9a..8bc43636 100644
--- a/src/datavisualization/engine/scatter3dcontroller_p.h
+++ b/src/datavisualization/engine/scatter3dcontroller_p.h
@@ -34,7 +34,7 @@
//#define DISPLAY_RENDER_SPEED
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class Scatter3DRenderer;
class QScatterDataProxy;
@@ -69,7 +69,7 @@ public:
virtual void initializeOpenGL();
// Change selection mode
- void setSelectionMode(QDataVis::SelectionFlags mode);
+ void setSelectionMode(QAbstract3DGraph::SelectionFlags mode);
void setSelectedItem(int index, QScatter3DSeries *series);
static inline int invalidSelectionIndex() { return -1; }
@@ -101,6 +101,6 @@ private:
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp
index 3eee8ff0..606f1379 100644
--- a/src/datavisualization/engine/scatter3drenderer.cpp
+++ b/src/datavisualization/engine/scatter3drenderer.cpp
@@ -41,7 +41,7 @@
// You should see the scene from where the light is
//#define SHOW_DEPTH_TEXTURE_SCENE
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
//#define USE_UNIFORM_SCALING // Scale x and z uniformly, or based on autoscaled values
@@ -324,7 +324,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
glEnable(GL_PROGRAM_POINT_SIZE);
}
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Render scene into a depth texture for using with shadow mapping
// Bind depth shader
m_depthShader->bind();
@@ -455,7 +455,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
ShaderHelper *selectionShader = m_selectionShader;
// Skip selection mode drawing if we have no selection mode
- if (m_cachedSelectionMode > QDataVis::SelectionNone
+ if (m_cachedSelectionMode > QAbstract3DGraph::SelectionNone
&& SelectOnScene == m_selectionState && seriesCount > 0) {
// Draw dots to selection buffer
glBindFramebuffer(GL_FRAMEBUFFER, m_selectionFrameBuffer);
@@ -704,7 +704,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
gradientTexture = currentSeries.baseGradientTexture();
GLfloat lightStrength = m_cachedTheme->lightStrength();
- if (m_cachedSelectionMode > QDataVis::SelectionNone && (m_selectedItemTotalIndex == dotNo)) {
+ if (m_cachedSelectionMode > QAbstract3DGraph::SelectionNone && (m_selectedItemTotalIndex == dotNo)) {
if (useColor)
dotColor = currentSeries.singleHighlightColor();
else
@@ -730,7 +730,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
(item.position().y() + 1.0f) / 2.0f);
}
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
if (!drawingPoints) {
// Set shadow shader bindings
QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
@@ -821,7 +821,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
m_cachedTheme->ambientLightStrength() * 2.0f);
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Set shadow shader bindings
QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
m_backgroundShader->setUniformValue(m_backgroundShader->shadowQ(),
@@ -869,7 +869,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
lineShader->setUniformValue(lineShader->color(), lineColor);
lineShader->setUniformValue(lineShader->ambientS(), m_cachedTheme->ambientLightStrength());
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Set shadowed shader bindings
lineShader->setUniformValue(lineShader->shadowQ(), m_shadowQualityToShader);
lineShader->setUniformValue(lineShader->lightS(),
@@ -943,7 +943,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
// Set shadow shader bindings
lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -995,7 +995,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Set shadow shader bindings
QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1052,7 +1052,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Set shadow shader bindings
QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1107,7 +1107,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Set shadow shader bindings
QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1171,7 +1171,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Set shadow shader bindings
QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1229,7 +1229,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Set shadow shader bindings
QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1561,31 +1561,31 @@ void Scatter3DRenderer::updateSelectedItem(int index, const QScatter3DSeries *se
}
}
-void Scatter3DRenderer::updateShadowQuality(QDataVis::ShadowQuality quality)
+void Scatter3DRenderer::updateShadowQuality(QAbstract3DGraph::ShadowQuality quality)
{
m_cachedShadowQuality = quality;
switch (quality) {
- case QDataVis::ShadowQualityLow:
+ case QAbstract3DGraph::ShadowQualityLow:
m_shadowQualityToShader = 33.3f;
m_shadowQualityMultiplier = 1;
break;
- case QDataVis::ShadowQualityMedium:
+ case QAbstract3DGraph::ShadowQualityMedium:
m_shadowQualityToShader = 100.0f;
m_shadowQualityMultiplier = 3;
break;
- case QDataVis::ShadowQualityHigh:
+ case QAbstract3DGraph::ShadowQualityHigh:
m_shadowQualityToShader = 200.0f;
m_shadowQualityMultiplier = 5;
break;
- case QDataVis::ShadowQualitySoftLow:
+ case QAbstract3DGraph::ShadowQualitySoftLow:
m_shadowQualityToShader = 5.0f;
m_shadowQualityMultiplier = 1;
break;
- case QDataVis::ShadowQualitySoftMedium:
+ case QAbstract3DGraph::ShadowQualitySoftMedium:
m_shadowQualityToShader = 10.0f;
m_shadowQualityMultiplier = 3;
break;
- case QDataVis::ShadowQualitySoftHigh:
+ case QAbstract3DGraph::ShadowQualitySoftHigh:
m_shadowQualityToShader = 15.0f;
m_shadowQualityMultiplier = 4;
break;
@@ -1733,7 +1733,7 @@ void Scatter3DRenderer::updateDepthBuffer()
if (m_primarySubViewport.size().isEmpty())
return;
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
m_depthTexture = m_textureHelper->createDepthTextureFrameBuffer(m_primarySubViewport.size(),
m_depthFrameBuffer,
m_shadowQualityMultiplier);
@@ -1800,4 +1800,4 @@ void Scatter3DRenderer::selectionColorToSeriesAndIndex(const QVector3D &color, i
series = 0;
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/scatter3drenderer_p.h b/src/datavisualization/engine/scatter3drenderer_p.h
index 7eb75de9..fb1e2698 100644
--- a/src/datavisualization/engine/scatter3drenderer_p.h
+++ b/src/datavisualization/engine/scatter3drenderer_p.h
@@ -39,7 +39,7 @@ class QPoint;
class QSizeF;
class QOpenGLShaderProgram;
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class ShaderHelper;
class ObjectHelper;
@@ -110,7 +110,7 @@ protected:
private:
virtual void initShaders(const QString &vertexShader, const QString &fragmentShader);
virtual void initGradientShaders(const QString &vertexShader, const QString &fragmentShader);
- virtual void updateShadowQuality(QDataVis::ShadowQuality quality);
+ virtual void updateShadowQuality(QAbstract3DGraph::ShadowQuality quality);
virtual void updateTextures();
virtual void fixMeshFileName(QString &fileName, QAbstract3DSeries::Mesh mesh);
@@ -150,6 +150,6 @@ private:
void selectionColorToSeriesAndIndex(const QVector3D &color, int &index, QScatter3DSeries *&series);
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/engine/selectionpointer.cpp b/src/datavisualization/engine/selectionpointer.cpp
index c4eced30..0ce9ce22 100644
--- a/src/datavisualization/engine/selectionpointer.cpp
+++ b/src/datavisualization/engine/selectionpointer.cpp
@@ -32,7 +32,7 @@
#include <QDebug>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
const GLfloat sliceUnits = 2.5;
@@ -259,4 +259,4 @@ void SelectionPointer::loadLabelMesh()
m_labelObj->load();
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/selectionpointer_p.h b/src/datavisualization/engine/selectionpointer_p.h
index 8faeb9ac..b1cb4b63 100644
--- a/src/datavisualization/engine/selectionpointer_p.h
+++ b/src/datavisualization/engine/selectionpointer_p.h
@@ -41,7 +41,7 @@
class QOpenGLShaderProgram;
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class ShaderHelper;
class ObjectHelper;
@@ -93,6 +93,6 @@ private:
QVector3D m_highlightColor;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // NOTIFICATIONLABEL_P_H
diff --git a/src/datavisualization/engine/seriesrendercache.cpp b/src/datavisualization/engine/seriesrendercache.cpp
index cea0f7b1..5ea9a117 100644
--- a/src/datavisualization/engine/seriesrendercache.cpp
+++ b/src/datavisualization/engine/seriesrendercache.cpp
@@ -22,7 +22,7 @@
#include "texturehelper_p.h"
#include "utils_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
const QString smoothString(QStringLiteral("Smooth"));
@@ -179,4 +179,4 @@ void SeriesRenderCache::cleanup(TextureHelper *texHelper)
texHelper->deleteTexture(&m_multiHighlightGradientTexture);
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/seriesrendercache_p.h b/src/datavisualization/engine/seriesrendercache_p.h
index 2bf7a1cc..d543da71 100644
--- a/src/datavisualization/engine/seriesrendercache_p.h
+++ b/src/datavisualization/engine/seriesrendercache_p.h
@@ -32,7 +32,7 @@
#include "datavisualizationglobal_p.h"
#include "qabstract3dseries_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class Abstract3DRenderer;
class ObjectHelper;
@@ -80,7 +80,7 @@ protected:
QString m_name;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/engine/surface3dcontroller.cpp b/src/datavisualization/engine/surface3dcontroller.cpp
index cf844c0f..53535b9d 100644
--- a/src/datavisualization/engine/surface3dcontroller.cpp
+++ b/src/datavisualization/engine/surface3dcontroller.cpp
@@ -30,7 +30,7 @@
#include <QDebug>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
Surface3DController::Surface3DController(QRect rect, Q3DScene *scene)
: Abstract3DController(rect, scene),
@@ -173,18 +173,20 @@ QList<QSurface3DSeries *> Surface3DController::surfaceSeriesList()
return surfaceSeriesList;
}
-void Surface3DController::setSelectionMode(QDataVis::SelectionFlags mode)
+void Surface3DController::setSelectionMode(QAbstract3DGraph::SelectionFlags mode)
{
// Currently surface only supports row and column modes when also slicing
- if ((mode.testFlag(QDataVis::SelectionRow) || mode.testFlag(QDataVis::SelectionColumn))
- && !mode.testFlag(QDataVis::SelectionSlice)) {
+ if ((mode.testFlag(QAbstract3DGraph::SelectionRow)
+ || mode.testFlag(QAbstract3DGraph::SelectionColumn))
+ && !mode.testFlag(QAbstract3DGraph::SelectionSlice)) {
qWarning("Unsupported selection mode.");
return;
- } else if (mode.testFlag(QDataVis::SelectionSlice)
- && (mode.testFlag(QDataVis::SelectionRow) == mode.testFlag(QDataVis::SelectionColumn))) {
+ } else if (mode.testFlag(QAbstract3DGraph::SelectionSlice)
+ && (mode.testFlag(QAbstract3DGraph::SelectionRow)
+ == mode.testFlag(QAbstract3DGraph::SelectionColumn))) {
qWarning("Must specify one of either row or column selection mode in conjunction with slicing mode.");
} else {
- QDataVis::SelectionFlags oldMode = selectionMode();
+ QAbstract3DGraph::SelectionFlags oldMode = selectionMode();
Abstract3DController::setSelectionMode(mode);
@@ -195,8 +197,8 @@ void Surface3DController::setSelectionMode(QDataVis::SelectionFlags mode)
// Special case: Always deactivate slicing when changing away from slice
// automanagement, as this can't be handled in setSelectedBar.
- if (!mode.testFlag(QDataVis::SelectionSlice)
- && oldMode.testFlag(QDataVis::SelectionSlice)) {
+ if (!mode.testFlag(QAbstract3DGraph::SelectionSlice)
+ && oldMode.testFlag(QAbstract3DGraph::SelectionSlice)) {
scene()->setSlicingActive(false);
}
}
@@ -227,7 +229,7 @@ void Surface3DController::setSelectedPoint(const QPoint &position, QSurface3DSer
pos = invalidSelectionPosition();
}
- if (selectionMode().testFlag(QDataVis::SelectionSlice)) {
+ if (selectionMode().testFlag(QAbstract3DGraph::SelectionSlice)) {
if (pos == invalidSelectionPosition() || !series->isVisible()) {
scene()->setSlicingActive(false);
} else {
@@ -509,4 +511,4 @@ void Surface3DController::adjustValueAxisRange()
}
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/surface3dcontroller_p.h b/src/datavisualization/engine/surface3dcontroller_p.h
index 915a3122..dcd55982 100644
--- a/src/datavisualization/engine/surface3dcontroller_p.h
+++ b/src/datavisualization/engine/surface3dcontroller_p.h
@@ -33,7 +33,7 @@
#include "datavisualizationglobal_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class Surface3DRenderer;
class QSurface3DSeries;
@@ -76,10 +76,11 @@ public:
virtual void initializeOpenGL();
virtual void synchDataToRenderer();
- void setSelectionMode(QDataVis::SelectionFlags mode);
+ void setSelectionMode(QAbstract3DGraph::SelectionFlags mode);
void setSelectedPoint(const QPoint &position, QSurface3DSeries *series);
- virtual void handleAxisAutoAdjustRangeChangedInOrientation(QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust);
+ virtual void handleAxisAutoAdjustRangeChangedInOrientation(
+ QAbstract3DAxis::AxisOrientation orientation, bool autoAdjust);
virtual void handleAxisRangeChangedBySender(QObject *sender);
virtual void handleSeriesVisibilityChangedBySender(QObject *sender);
@@ -109,6 +110,6 @@ private:
Q_DISABLE_COPY(Surface3DController)
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // SURFACE3DCONTROLLER_P_H
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index aac74d0f..5f54ed79 100644
--- a/src/datavisualization/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -38,7 +38,7 @@
static const int ID_TO_RGBA_MASK = 0xff;
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
//#define SHOW_DEPTH_TEXTURE_SCENE
@@ -399,7 +399,7 @@ void Surface3DRenderer::updateSliceDataModel(const QPoint &point)
float adjust = (0.025f * m_heightNormalizer) / 2.0f;
float stepDown = 2.0f * adjust;
- if (m_cachedSelectionMode.testFlag(QDataVis::SelectionRow)) {
+ if (m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionRow)) {
QSurfaceDataRow *src = m_dataArray.at(row);
sliceRow = new QSurfaceDataRow(src->size());
for (int i = 0; i < sliceRow->size(); i++)
@@ -539,7 +539,7 @@ void Surface3DRenderer::updateScene(Q3DScene *scene)
Abstract3DRenderer::updateScene(scene);
if (m_selectionPointer && m_selectionActive
- && m_cachedSelectionMode.testFlag(QDataVis::SelectionItem)) {
+ && m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionItem)) {
m_selectionDirty = true; // Ball may need repositioning if scene changes
}
@@ -557,7 +557,7 @@ void Surface3DRenderer::render(GLuint defaultFboHandle)
// Render selection ball
if (m_selectionPointer && m_selectionActive
- && m_cachedSelectionMode.testFlag(QDataVis::SelectionItem)) {
+ && m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionItem)) {
m_selectionPointer->render(defaultFboHandle);
}
}
@@ -588,7 +588,7 @@ void Surface3DRenderer::drawSlicedScene()
QMatrix4x4 projectionViewMatrix = projectionMatrix * viewMatrix;
- bool rowMode = m_cachedSelectionMode.testFlag(QDataVis::SelectionRow);
+ bool rowMode = m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionRow);
GLfloat scaleX = 0.0f;
GLfloat scaleXBackground = 0.0f;
@@ -812,7 +812,7 @@ void Surface3DRenderer::drawSlicedScene()
axisLabelItem = m_axisCacheZ.labelItems().at(labelNbr);
m_drawer->drawLabel(m_dummyRenderItem, *axisLabelItem, viewMatrix, projectionMatrix,
- positionComp, rotation, 0, QDataVis::SelectionRow,
+ positionComp, rotation, 0, QAbstract3DGraph::SelectionRow,
m_labelShader, m_labelObj, m_cachedScene->activeCamera(),
false, false, Drawer::LabelBelow, Qt::AlignBottom, true);
}
@@ -880,7 +880,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
// Draw depth buffer
#if !defined(QT_OPENGL_ES_2)
GLfloat adjustedLightStrength = m_cachedTheme->lightStrength() / 10.0f;
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone && m_surfaceObj && m_cachedSurfaceVisible) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone && m_surfaceObj && m_cachedSurfaceVisible) {
// Render scene into a depth texture for using with shadow mapping
// Enable drawing to depth framebuffer
glBindFramebuffer(GL_FRAMEBUFFER, m_depthFrameBuffer);
@@ -994,7 +994,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
// Draw selection buffer
if (!m_cachedIsSlicingActivated && m_surfaceObj && m_selectionState == SelectOnScene
- && m_cachedSelectionMode > QDataVis::SelectionNone
+ && m_cachedSelectionMode > QAbstract3DGraph::SelectionNone
&& (m_cachedSurfaceVisible || m_cachedSurfaceGridOn)
&& m_visibleSeriesList.size() > 0) {
m_selectionShader->bind();
@@ -1091,7 +1091,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
gradientTexture = m_visibleSeriesList.at(0).baseGradientTexture();
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Set shadow shader bindings
QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
m_surfaceShader->setUniformValue(m_surfaceShader->shadowQ(), m_shadowQualityToShader);
@@ -1168,7 +1168,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
m_cachedTheme->ambientLightStrength() * 2.0f);
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Set shadow shader bindings
QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
m_backgroundShader->setUniformValue(m_backgroundShader->shadowQ(),
@@ -1209,7 +1209,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
lineShader->setUniformValue(lineShader->color(), lineColor);
lineShader->setUniformValue(lineShader->ambientS(), m_cachedTheme->ambientLightStrength());
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Set shadowed shader bindings
lineShader->setUniformValue(lineShader->shadowQ(), m_shadowQualityToShader);
lineShader->setUniformValue(lineShader->lightS(),
@@ -1267,7 +1267,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Set shadow shader bindings
QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1311,7 +1311,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Set shadow shader bindings
QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1356,7 +1356,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Set shadow shader bindings
QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1402,7 +1402,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Set shadow shader bindings
QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1454,7 +1454,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Set shadow shader bindings
QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1499,7 +1499,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
lineShader->setUniformValue(lineShader->MVP(), MVPMatrix);
#if !defined(QT_OPENGL_ES_2)
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
// Set shadow shader bindings
QMatrix4x4 depthMVPMatrix = depthProjectionViewMatrix * modelMatrix;
lineShader->setUniformValue(lineShader->depth(), depthMVPMatrix);
@@ -1703,14 +1703,14 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
}
}
- if (m_cachedSelectionMode == QDataVis::SelectionNone
+ if (m_cachedSelectionMode == QAbstract3DGraph::SelectionNone
|| visiblePoint == Surface3DController::invalidSelectionPosition()) {
m_selectionActive = false;
} else {
// TODO: Need separate selection ball for slice and main surface view QTRD-2515
if (m_cachedIsSlicingActivated)
updateSliceDataModel(visiblePoint);
- if (m_cachedSelectionMode.testFlag(QDataVis::SelectionItem))
+ if (m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionItem))
surfacePointSelected(visiblePoint);
m_selectionActive = true;
}
@@ -1909,13 +1909,13 @@ void Surface3DRenderer::surfacePointSelected(const QPoint &point)
QVector3D pos;
if (m_cachedIsSlicingActivated) {
- if (m_cachedSelectionMode.testFlag(QDataVis::SelectionRow)) {
+ if (m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionRow)) {
pos = m_sliceSurfaceObj->vertexAt(column, 0);
pos *= QVector3D(m_surfaceScaleX, 1.0f, 0.0f);
pos += QVector3D(m_surfaceOffsetX, 0.0f, 0.0f);
m_selectionPointer->updateBoundingRect(m_secondarySubViewport);
m_selectionPointer->updateSliceData(true, m_autoScaleAdjustment);
- } else if (m_cachedSelectionMode.testFlag(QDataVis::SelectionColumn)) {
+ } else if (m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionColumn)) {
pos = m_sliceSurfaceObj->vertexAt(row, 0);
pos *= QVector3D(m_surfaceScaleZ, 1.0f, 0.0f);
pos += QVector3D(-m_surfaceOffsetZ, 0.0f, 0.0f);
@@ -1994,32 +1994,32 @@ QString Surface3DRenderer::createSelectionLabel(float value, int column, int row
return labelText;
}
-void Surface3DRenderer::updateShadowQuality(QDataVis::ShadowQuality quality)
+void Surface3DRenderer::updateShadowQuality(QAbstract3DGraph::ShadowQuality quality)
{
m_cachedShadowQuality = quality;
switch (quality) {
- case QDataVis::ShadowQualityLow:
+ case QAbstract3DGraph::ShadowQualityLow:
m_shadowQualityToShader = 33.3f;
m_shadowQualityMultiplier = 1;
break;
- case QDataVis::ShadowQualityMedium:
+ case QAbstract3DGraph::ShadowQualityMedium:
m_shadowQualityToShader = 100.0f;
m_shadowQualityMultiplier = 3;
break;
- case QDataVis::ShadowQualityHigh:
+ case QAbstract3DGraph::ShadowQualityHigh:
m_shadowQualityToShader = 200.0f;
m_shadowQualityMultiplier = 5;
break;
- case QDataVis::ShadowQualitySoftLow:
+ case QAbstract3DGraph::ShadowQualitySoftLow:
m_shadowQualityToShader = 5.0f;
m_shadowQualityMultiplier = 1;
break;
- case QDataVis::ShadowQualitySoftMedium:
+ case QAbstract3DGraph::ShadowQualitySoftMedium:
m_shadowQualityToShader = 10.0f;
m_shadowQualityMultiplier = 3;
break;
- case QDataVis::ShadowQualitySoftHigh:
+ case QAbstract3DGraph::ShadowQualitySoftHigh:
m_shadowQualityToShader = 15.0f;
m_shadowQualityMultiplier = 4;
break;
@@ -2076,7 +2076,7 @@ void Surface3DRenderer::initShaders(const QString &vertexShader, const QString &
delete m_surfaceShader;
#if !defined(QT_OPENGL_ES_2)
if (!m_cachedFlatShading) {
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
m_surfaceShader = new ShaderHelper(this, QStringLiteral(":/shaders/vertexShadow"),
QStringLiteral(":/shaders/fragmentSurfaceShadowNoTex"));
} else {
@@ -2084,7 +2084,7 @@ void Surface3DRenderer::initShaders(const QString &vertexShader, const QString &
QStringLiteral(":/shaders/fragmentSurface"));
}
} else {
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
m_surfaceShader = new ShaderHelper(this, QStringLiteral(":/shaders/vertexSurfaceShadowFlat"),
QStringLiteral(":/shaders/fragmentSurfaceShadowFlat"));
} else {
@@ -2162,7 +2162,7 @@ void Surface3DRenderer::updateDepthBuffer()
if (m_primarySubViewport.size().isEmpty())
return;
- if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) {
+ if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
m_depthTexture = m_textureHelper->createDepthTextureFrameBuffer(m_primarySubViewport.size(),
m_depthFrameBuffer,
m_shadowQualityMultiplier);
@@ -2188,4 +2188,4 @@ void Surface3DRenderer::generateUniformGradient(const QVector3D newColor)
}
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/engine/surface3drenderer_p.h b/src/datavisualization/engine/surface3drenderer_p.h
index 71e02db5..10c2c723 100644
--- a/src/datavisualization/engine/surface3drenderer_p.h
+++ b/src/datavisualization/engine/surface3drenderer_p.h
@@ -43,7 +43,7 @@
class QOpenGLShaderProgram;
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class ShaderHelper;
class ObjectHelper;
@@ -152,7 +152,7 @@ signals:
private:
void updateSliceDataModel(const QPoint &point);
- void updateShadowQuality(QDataVis::ShadowQuality quality);
+ void updateShadowQuality(QAbstract3DGraph::ShadowQuality quality);
void updateTextures();
void initShaders(const QString &vertexShader, const QString &fragmentShader);
QRect calculateSampleRect(const QSurfaceDataArray &array);
@@ -184,6 +184,6 @@ private:
Q_DISABLE_COPY(Surface3DRenderer)
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // SURFACE3DRENDERER_P_H
diff --git a/src/datavisualization/global/datavisualizationglobal_p.h b/src/datavisualization/global/datavisualizationglobal_p.h
index 8ff36a90..6ceb9658 100644
--- a/src/datavisualization/global/datavisualizationglobal_p.h
+++ b/src/datavisualization/global/datavisualizationglobal_p.h
@@ -30,12 +30,11 @@
#define DATAVISUALIZATIONGLOBAL_P_H
#include "qdatavisualizationglobal.h"
-#include "qdatavisualizationenums.h"
#include <QOpenGLFunctions>
#include <QVector3D>
#include <QDebug>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
// Constants used in several files
// Distance from camera to origin
@@ -57,6 +56,6 @@ static const QVector3D invalidColorVector = QVector3D(-1.0f, -1.0f, -1.0f);
static const GLfloat gradientTextureHeight = 1024.0f;
static const GLfloat gradientTextureWidth = 2.0f;
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/global/global.pri b/src/datavisualization/global/global.pri
index 0fd7c576..00a3eb65 100644
--- a/src/datavisualization/global/global.pri
+++ b/src/datavisualization/global/global.pri
@@ -1,4 +1,3 @@
HEADERS += \
$$PWD/qdatavisualizationglobal.h \
- $$PWD/qdatavisualizationenums.h \
$$PWD/datavisualizationglobal_p.h
diff --git a/src/datavisualization/global/qdatavisualizationenums.h b/src/datavisualization/global/qdatavisualizationenums.h
deleted file mode 100644
index fcbf63a9..00000000
--- a/src/datavisualization/global/qdatavisualizationenums.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtDataVisualization module.
-**
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-**
-****************************************************************************/
-
-#ifndef QDATAVISUALIZATIONENUMS_H
-#define QDATAVISUALIZATIONENUMS_H
-
-#include <QtDataVisualization/qdatavisualizationglobal.h>
-#include <QObject>
-
-// namespace must be declared without using macros for qdoc
-namespace QtDataVisualization {
-
-class QT_DATAVISUALIZATION_EXPORT QDataVis : public QObject
-{
- Q_OBJECT
- Q_ENUMS(ShadowQuality)
- Q_FLAGS(SelectionFlag SelectionFlags)
-
-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
- };
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QDataVis::SelectionFlags)
-}
-
-#endif
diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h
index a125e4b2..e17cc7ea 100644
--- a/src/datavisualization/global/qdatavisualizationglobal.h
+++ b/src/datavisualization/global/qdatavisualizationglobal.h
@@ -52,16 +52,4 @@
# define QT_DATAVISUALIZATION_AUTOTEST_EXPORT
#endif
-#define QT_DATAVISUALIZATION_NAMESPACE QtDataVisualization
-
-#ifdef QT_DATAVISUALIZATION_NAMESPACE
-# define QT_DATAVISUALIZATION_BEGIN_NAMESPACE namespace QT_DATAVISUALIZATION_NAMESPACE {
-# define QT_DATAVISUALIZATION_END_NAMESPACE }
-# define QT_DATAVISUALIZATION_USE_NAMESPACE using namespace QT_DATAVISUALIZATION_NAMESPACE;
-#else
-# define QT_DATAVISUALIZATION_BEGIN_NAMESPACE
-# define QT_DATAVISUALIZATION_END_NAMESPACE
-# define QT_DATAVISUALIZATION_USE_NAMESPACE
-#endif
-
#endif
diff --git a/src/datavisualization/global/qtdatavisualizationenums.qdoc b/src/datavisualization/global/qtdatavisualizationenums.qdoc
deleted file mode 100644
index f3fa406c..00000000
--- a/src/datavisualization/global/qtdatavisualizationenums.qdoc
+++ /dev/null
@@ -1,90 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtDataVisualization module.
-**
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-**
-****************************************************************************/
-
-/*!
- \namespace QtDataVisualization
- \inmodule QtDataVisualization
- \target QtDataVisualization Enums
-
- QtDataVisualization namespace holds all the classes and enumerations in the QtDataVisualization
- module.
-
- \generatelist{classesbymodule QtDataVisualization}
-*/
-
-/*!
- * \class QtDataVisualization::QDataVis
- * \inmodule QtDataVisualization
- * \brief Container class for Qt Data Visualization enums.
- * \since Qt Data Visualization 1.0
- *
- * QDataVis acts as a container for Qt Data Visualization enums. It has no other functionality.
- */
-
-/*!
- \enum QtDataVisualization::QDataVis::SelectionFlag
-
- Item selection modes. Values of this enumeration can be combined with OR operator.
-
- \value SelectionNone
- Selection mode disabled.
- \value SelectionItem
- Selection highlights a single item.
- \value SelectionRow
- Selection highlights a single row.
- \value SelectionItemAndRow
- Combination flag for highlighting both item and row with different colors.
- \value SelectionColumn
- Selection highlights a single column.
- \value SelectionItemAndColumn
- Combination flag for highlighting both item and column with different colors.
- \value SelectionRowAndColumn
- Combination flag for highlighting both row and column.
- \value SelectionItemRowAndColumn
- Combination flag for highlighting item, row, and column.
- \value SelectionSlice
- Setting this mode flag indicates that the graph should take care of the slice view handling
- automatically. If you wish to control the slice view yourself via Q3DScene, do not set this
- flag. When setting this mode flag, either \c SelectionRow or \c SelectionColumn must also
- be set, but not both. Slicing is supported by Q3DBars and Q3DSurface only.
- \value SelectionMultiSeries
- Setting this mode means that items for all series at same position are highlighted, instead
- of just the selected item. The actual selection in the other series doesn't change.
- Multi-series selection is only supported for Q3DBars.
-*/
-
-/*!
- \enum QtDataVisualization::QDataVis::ShadowQuality
-
- Quality of shadows.
-
- \value ShadowQualityNone
- Shadows are disabled.
- \value ShadowQualityLow
- Shadows are rendered in low quality.
- \value ShadowQualityMedium
- Shadows are rendered in medium quality.
- \value ShadowQualityHigh
- Shadows are rendered in high quality.
- \value ShadowQualitySoftLow
- Shadows are rendered in low quality with softened edges.
- \value ShadowQualitySoftMedium
- Shadows are rendered in medium quality with softened edges.
- \value ShadowQualitySoftHigh
- Shadows are rendered in high quality with softened edges.
-*/
diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp
index 5d730c47..80e02d5e 100644
--- a/src/datavisualization/input/q3dinputhandler.cpp
+++ b/src/datavisualization/input/q3dinputhandler.cpp
@@ -21,7 +21,7 @@
#include "q3dcamera_p.h"
#include "q3dlight.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
const int minZoomLevel = 10;
const int halfSizeZoomLevel = 50;
@@ -190,4 +190,4 @@ void Q3DInputHandler::wheelEvent(QWheelEvent *event)
scene()->activeCamera()->setZoomLevel(zoomLevel);
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/input/q3dinputhandler.h b/src/datavisualization/input/q3dinputhandler.h
index a7fa0573..cca2f983 100644
--- a/src/datavisualization/input/q3dinputhandler.h
+++ b/src/datavisualization/input/q3dinputhandler.h
@@ -21,7 +21,7 @@
#include <QtDataVisualization/qabstract3dinputhandler.h>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class Q3DInputHandler; // Workaround for qdoc bug, removing this will cause qdoc compiler to not find the class.
@@ -43,6 +43,6 @@ private:
Q_DISABLE_COPY(Q3DInputHandler)
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // QDEFAULT3DINPUTHANDLER_H
diff --git a/src/datavisualization/input/q3dinputhandler_p.h b/src/datavisualization/input/q3dinputhandler_p.h
index af8bef5f..8724f5bf 100644
--- a/src/datavisualization/input/q3dinputhandler_p.h
+++ b/src/datavisualization/input/q3dinputhandler_p.h
@@ -31,7 +31,7 @@
#include "datavisualizationglobal_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class Q3DInputHandler;
@@ -46,6 +46,6 @@ public:
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // Q3DINPUTHANDLER_P_H
diff --git a/src/datavisualization/input/qabstract3dinputhandler.cpp b/src/datavisualization/input/qabstract3dinputhandler.cpp
index 0aa8372c..9e599535 100644
--- a/src/datavisualization/input/qabstract3dinputhandler.cpp
+++ b/src/datavisualization/input/qabstract3dinputhandler.cpp
@@ -17,7 +17,7 @@
****************************************************************************/
#include "qabstract3dinputhandler_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
* \class QAbstract3DInputHandler
@@ -243,4 +243,4 @@ QAbstract3DInputHandlerPrivate::~QAbstract3DInputHandlerPrivate()
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h
index 313abef3..2ad1514b 100644
--- a/src/datavisualization/input/qabstract3dinputhandler.h
+++ b/src/datavisualization/input/qabstract3dinputhandler.h
@@ -19,11 +19,10 @@
#ifndef QABSTRACT3DINPUTHANDLER_H
#define QABSTRACT3DINPUTHANDLER_H
-#include <QtDataVisualization/qdatavisualizationenums.h>
#include <QtDataVisualization/q3dscene.h>
#include <QMouseEvent>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QAbstract3DInputHandlerPrivate;
@@ -88,6 +87,6 @@ private:
friend class QTouch3DInputHandlerPrivate;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // QABSTRACT3DINPUTHANDLER_H
diff --git a/src/datavisualization/input/qabstract3dinputhandler_p.h b/src/datavisualization/input/qabstract3dinputhandler_p.h
index 205abf66..a44cc40d 100644
--- a/src/datavisualization/input/qabstract3dinputhandler_p.h
+++ b/src/datavisualization/input/qabstract3dinputhandler_p.h
@@ -33,7 +33,7 @@
#include "qabstract3dinputhandler.h"
#include <QRect>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QAbstract3DInputHandler;
class Q3DScene;
@@ -65,6 +65,6 @@ private:
friend class Abstract3DController;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // QABSTRACT3DINPUTHANDLER_P_H
diff --git a/src/datavisualization/input/qtouch3dinputhandler.cpp b/src/datavisualization/input/qtouch3dinputhandler.cpp
index 42769562..0dd5b469 100644
--- a/src/datavisualization/input/qtouch3dinputhandler.cpp
+++ b/src/datavisualization/input/qtouch3dinputhandler.cpp
@@ -21,7 +21,7 @@
#include <QTimer>
#include <qmath.h>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
const float maxTapAndHoldJitter = 20.0f;
const int maxPinchJitter = 10;
@@ -209,4 +209,4 @@ void QTouch3DInputHandlerPrivate::handleRotation(const QPointF &position)
}
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/input/qtouch3dinputhandler.h b/src/datavisualization/input/qtouch3dinputhandler.h
index 1c366926..0f3cd255 100644
--- a/src/datavisualization/input/qtouch3dinputhandler.h
+++ b/src/datavisualization/input/qtouch3dinputhandler.h
@@ -21,7 +21,7 @@
#include <QtDataVisualization/q3dinputhandler.h>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QTouch3DInputHandlerPrivate;
@@ -42,6 +42,6 @@ private:
QScopedPointer<QTouch3DInputHandlerPrivate> d_ptr;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // QTOUCH3DINPUTHANDLER_H
diff --git a/src/datavisualization/input/qtouch3dinputhandler_p.h b/src/datavisualization/input/qtouch3dinputhandler_p.h
index 11163140..e8d1793b 100644
--- a/src/datavisualization/input/qtouch3dinputhandler_p.h
+++ b/src/datavisualization/input/qtouch3dinputhandler_p.h
@@ -21,7 +21,7 @@
#include "qtouch3dinputhandler.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class QAbstract3DInputHandler;
@@ -45,6 +45,6 @@ public:
QPointF m_touchHoldPos;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // QTOUCH3DINPUTHANDLER_H
diff --git a/src/datavisualization/theme/q3dtheme.cpp b/src/datavisualization/theme/q3dtheme.cpp
index bf225b83..aec39637 100644
--- a/src/datavisualization/theme/q3dtheme.cpp
+++ b/src/datavisualization/theme/q3dtheme.cpp
@@ -19,7 +19,7 @@
#include "q3dtheme_p.h"
#include "thememanager_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
/*!
* \class Q3DTheme
@@ -122,22 +122,22 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
* \row
* \li multiHighlightColor
* \li The color to be used for highlighted objects, if \l{Q3DBars::selectionMode}{selectionMode}
- * of the graph has \c QDataVis::SelectionRow or \c QDataVis::SelectionColumn flag set.
+ * of the graph has \c QAbstract3DGraph::SelectionRow or \c QAbstract3DGraph::SelectionColumn flag set.
* \li Qt::blue
* \row
* \li multiHighlightGradient
* \li The gradient to be used for highlighted objects, if \l{Q3DBars::selectionMode}{selectionMode}
- * of the graph has \c QDataVis::SelectionRow or \c QDataVis::SelectionColumn flag set.
+ * of the graph has \c QAbstract3DGraph::SelectionRow or \c QAbstract3DGraph::SelectionColumn flag set.
* \li QLinearGradient(). Essentially fully black.
* \row
* \li singleHighlightColor
* \li The color to be used for a highlighted object, if \l{Q3DBars::selectionMode}{selectionMode}
- * of the graph has \c QDataVis::SelectionItem flag set.
+ * of the graph has \c QAbstract3DGraph::SelectionItem flag set.
* \li Qt::red
* \row
* \li singleHighlightGradient
* \li The gradient to be used for a highlighted object, if \l{Q3DBars::selectionMode}{selectionMode}
- * of the graph has \c QDataVis::SelectionItem flag set.
+ * of the graph has \c QAbstract3DGraph::SelectionItem flag set.
* \li QLinearGradient(). Essentially fully black.
* \row
* \li windowColor
@@ -554,7 +554,7 @@ QColor Q3DTheme::gridLineColor() const
* \property Q3DTheme::singleHighlightColor
*
* Highlight color for a highlighted object. Used if \l{Q3DBars::selectionMode}{selectionMode} has
- * \c QDataVis::SelectionItem flag set.
+ * \c QAbstract3DGraph::SelectionItem flag set.
*/
void Q3DTheme::setSingleHighlightColor(const QColor &color)
{
@@ -574,7 +574,7 @@ QColor Q3DTheme::singleHighlightColor() const
* \property Q3DTheme::multiHighlightColor
*
* Highlight color for highlighted objects. Used if \l{Q3DBars::selectionMode}{selectionMode} has
- * \c QDataVis::SelectionRow or \c QDataVis::SelectionColumn flag set.
+ * \c QAbstract3DGraph::SelectionRow or \c QAbstract3DGraph::SelectionColumn flag set.
*/
void Q3DTheme::setMultiHighlightColor(const QColor &color)
{
@@ -643,7 +643,7 @@ QList<QLinearGradient> Q3DTheme::baseGradients() const
* \property Q3DTheme::singleHighlightGradient
*
* Highlight gradient for a highlighted object. Used if \l{Q3DBars::selectionMode}{selectionMode}
- * has \c QDataVis::SelectionItem flag set.
+ * has \c QAbstract3DGraph::SelectionItem flag set.
*/
void Q3DTheme::setSingleHighlightGradient(const QLinearGradient &gradient)
{
@@ -663,7 +663,7 @@ QLinearGradient Q3DTheme::singleHighlightGradient() const
* \property Q3DTheme::multiHighlightGradient
*
* Highlight gradient for highlighted objects. Used if \l{Q3DBars::selectionMode}{selectionMode}
- * has \c QDataVis::SelectionRow or \c QDataVis::SelectionColumn flag set.
+ * has \c QAbstract3DGraph::SelectionRow or \c QAbstract3DGraph::SelectionColumn flag set.
*/
void Q3DTheme::setMultiHighlightGradient(const QLinearGradient &gradient)
{
@@ -1072,4 +1072,4 @@ bool Q3DThemePrivate::sync(Q3DThemePrivate &other)
return changed;
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/theme/q3dtheme.h b/src/datavisualization/theme/q3dtheme.h
index 44e58e5d..632beb47 100644
--- a/src/datavisualization/theme/q3dtheme.h
+++ b/src/datavisualization/theme/q3dtheme.h
@@ -19,12 +19,13 @@
#ifndef Q3DTHEME_H
#define Q3DTHEME_H
-#include <QtDataVisualization/qdatavisualizationenums.h>
+#include <QtDataVisualization/qdatavisualizationglobal.h>
+
#include <QLinearGradient>
#include <QFont>
#include <QColor>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class Q3DThemePrivate;
@@ -183,6 +184,6 @@ private:
Q_DISABLE_COPY(Q3DTheme)
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/theme/q3dtheme_p.h b/src/datavisualization/theme/q3dtheme_p.h
index 078c2d7d..0180ddc3 100644
--- a/src/datavisualization/theme/q3dtheme_p.h
+++ b/src/datavisualization/theme/q3dtheme_p.h
@@ -32,7 +32,7 @@
#include "datavisualizationglobal_p.h"
#include "q3dtheme.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
struct Q3DThemeDirtyBitField {
bool baseColorDirty : 1;
@@ -144,6 +144,6 @@ protected:
Q3DTheme *q_ptr;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/theme/thememanager.cpp b/src/datavisualization/theme/thememanager.cpp
index d93e9b20..ab3eecc8 100644
--- a/src/datavisualization/theme/thememanager.cpp
+++ b/src/datavisualization/theme/thememanager.cpp
@@ -19,7 +19,7 @@
#include "thememanager_p.h"
#include "q3dtheme_p.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
const float defaultBuiltInColorLevel = 0.7f; // for built-in gradient themes
const float defaultColorLevel = 0.5f; // for built-in uniform themes
@@ -590,4 +590,4 @@ void ThemeManager::setColorStyle(Q3DTheme *theme, Q3DTheme::ColorStyle style)
theme->setColorStyle(style);
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/theme/thememanager_p.h b/src/datavisualization/theme/thememanager_p.h
index 13cbcdc9..343cf8a5 100644
--- a/src/datavisualization/theme/thememanager_p.h
+++ b/src/datavisualization/theme/thememanager_p.h
@@ -33,7 +33,7 @@
#include "abstract3dcontroller_p.h"
#include "q3dtheme.h"
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class ThemeManager : public QObject
{
@@ -81,6 +81,6 @@ private:
Abstract3DController *m_controller;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/utils/abstractobjecthelper.cpp b/src/datavisualization/utils/abstractobjecthelper.cpp
index 96cdc0c4..3192648f 100644
--- a/src/datavisualization/utils/abstractobjecthelper.cpp
+++ b/src/datavisualization/utils/abstractobjecthelper.cpp
@@ -20,7 +20,7 @@
#include <QDebug>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
AbstractObjectHelper::AbstractObjectHelper()
: m_vertexbuffer(0),
@@ -80,4 +80,4 @@ GLuint AbstractObjectHelper::indicesType()
return m_indicesType;
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/utils/abstractobjecthelper_p.h b/src/datavisualization/utils/abstractobjecthelper_p.h
index a6de6941..6f48238d 100644
--- a/src/datavisualization/utils/abstractobjecthelper_p.h
+++ b/src/datavisualization/utils/abstractobjecthelper_p.h
@@ -32,7 +32,7 @@
#include "datavisualizationglobal_p.h"
#include <QOpenGLFunctions>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class AbstractObjectHelper: protected QOpenGLFunctions
{
@@ -60,6 +60,6 @@ public:
GLuint m_indicesType;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // ABSTRACTOBJECTHELPER_H
diff --git a/src/datavisualization/utils/camerahelper.cpp b/src/datavisualization/utils/camerahelper.cpp
index 9e7e58aa..9a07e783 100644
--- a/src/datavisualization/utils/camerahelper.cpp
+++ b/src/datavisualization/utils/camerahelper.cpp
@@ -22,7 +22,7 @@
#include <QMatrix4x4>
#include <QVector3D>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
CameraHelper::CameraHelper(QObject *parent) :
QObject(parent),
@@ -283,4 +283,4 @@ void CameraHelper::setCameraPreset(Q3DCamera::CameraPreset preset)
}
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/utils/camerahelper_p.h b/src/datavisualization/utils/camerahelper_p.h
index 50de93a8..9d411b74 100644
--- a/src/datavisualization/utils/camerahelper_p.h
+++ b/src/datavisualization/utils/camerahelper_p.h
@@ -39,7 +39,7 @@ class QVector3D;
class QPoint;
class QPointF;
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class CameraHelper : public QObject
{
@@ -86,6 +86,6 @@ public:
void setCameraPreset(Q3DCamera::CameraPreset preset);
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/utils/meshloader.cpp b/src/datavisualization/utils/meshloader.cpp
index 119cde3a..08e56c39 100644
--- a/src/datavisualization/utils/meshloader.cpp
+++ b/src/datavisualization/utils/meshloader.cpp
@@ -26,7 +26,7 @@
#include <QDebug>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
QString slashTag = QStringLiteral("/");
@@ -122,4 +122,4 @@ bool MeshLoader::loadOBJ(const QString &path,
return true;
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/utils/meshloader_p.h b/src/datavisualization/utils/meshloader_p.h
index 48551fff..3add8c2d 100644
--- a/src/datavisualization/utils/meshloader_p.h
+++ b/src/datavisualization/utils/meshloader_p.h
@@ -34,7 +34,7 @@
class QVector2D;
class QVector3D;
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class MeshLoader
{
@@ -46,6 +46,6 @@ class MeshLoader
// TODO: add loaders for other formats?
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/utils/objecthelper.cpp b/src/datavisualization/utils/objecthelper.cpp
index 180ce009..ce8f598a 100644
--- a/src/datavisualization/utils/objecthelper.cpp
+++ b/src/datavisualization/utils/objecthelper.cpp
@@ -23,7 +23,7 @@
#include <QDebug>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
ObjectHelper::ObjectHelper(const QString &objectFile)
: m_objectFile(objectFile)
@@ -95,4 +95,4 @@ void ObjectHelper::load()
m_meshDataLoaded = true;
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/utils/objecthelper_p.h b/src/datavisualization/utils/objecthelper_p.h
index 9d643fdd..6e325639 100644
--- a/src/datavisualization/utils/objecthelper_p.h
+++ b/src/datavisualization/utils/objecthelper_p.h
@@ -33,7 +33,7 @@
#include "abstractobjecthelper_p.h"
#include <QOpenGLFunctions>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class ObjectHelper : public AbstractObjectHelper
{
@@ -49,6 +49,6 @@ private:
QString m_objectFile;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/utils/shaderhelper.cpp b/src/datavisualization/utils/shaderhelper.cpp
index b4d2ee76..6fcd2bd2 100644
--- a/src/datavisualization/utils/shaderhelper.cpp
+++ b/src/datavisualization/utils/shaderhelper.cpp
@@ -20,7 +20,7 @@
#include <QOpenGLShader>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
void discardDebugMsgs(QtMsgType type, const QMessageLogContext &context, const QString &msg)
{
@@ -268,4 +268,4 @@ GLuint ShaderHelper::normalAtt()
return m_normalAttr;
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/utils/shaderhelper_p.h b/src/datavisualization/utils/shaderhelper_p.h
index 191b7bf6..996ad7fc 100644
--- a/src/datavisualization/utils/shaderhelper_p.h
+++ b/src/datavisualization/utils/shaderhelper_p.h
@@ -34,7 +34,7 @@
class QOpenGLShaderProgram;
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class ShaderHelper
{
@@ -110,6 +110,6 @@ class ShaderHelper
GLboolean m_initialized;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/utils/surfaceobject.cpp b/src/datavisualization/utils/surfaceobject.cpp
index 6e4765e5..1e00df0a 100644
--- a/src/datavisualization/utils/surfaceobject.cpp
+++ b/src/datavisualization/utils/surfaceobject.cpp
@@ -24,7 +24,7 @@
#include <QDebug>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
SurfaceObject::SurfaceObject()
{
@@ -681,4 +681,4 @@ QVector3D SurfaceObject::normal(const QVector3D &a, const QVector3D &b, const QV
return QVector3D::crossProduct(v1, v2);
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/utils/surfaceobject_p.h b/src/datavisualization/utils/surfaceobject_p.h
index e035d905..91b42c76 100644
--- a/src/datavisualization/utils/surfaceobject_p.h
+++ b/src/datavisualization/utils/surfaceobject_p.h
@@ -36,7 +36,7 @@
#include <QOpenGLFunctions>
#include <QRect>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class SurfaceObject : public AbstractObjectHelper
{
@@ -85,5 +85,5 @@ private:
QVector<QVector3D> m_normals;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif // SURFACEOBJECT_P_H
diff --git a/src/datavisualization/utils/texturehelper.cpp b/src/datavisualization/utils/texturehelper.cpp
index c88fc8dc..fc42b518 100644
--- a/src/datavisualization/utils/texturehelper.cpp
+++ b/src/datavisualization/utils/texturehelper.cpp
@@ -24,7 +24,7 @@
#include <QDebug>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
TextureHelper::TextureHelper()
{
@@ -367,4 +367,4 @@ QRgb TextureHelper::qt_gl_convertToGLFormatHelper(QRgb src_pixel, GLenum texture
}
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/utils/texturehelper_p.h b/src/datavisualization/utils/texturehelper_p.h
index 11022495..e67904d8 100644
--- a/src/datavisualization/utils/texturehelper_p.h
+++ b/src/datavisualization/utils/texturehelper_p.h
@@ -34,7 +34,7 @@
#include <QRgb>
#include <QLinearGradient>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class TextureHelper : protected QOpenGLFunctions
{
@@ -67,6 +67,6 @@ class TextureHelper : protected QOpenGLFunctions
friend class Scatter3DRenderer;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp
index e6f33032..69dbf92d 100644
--- a/src/datavisualization/utils/utils.cpp
+++ b/src/datavisualization/utils/utils.cpp
@@ -26,7 +26,7 @@
#include <QRegExp>
#include <qmath.h>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
#define NUM_IN_POWER(y, x) for (;y<x;y<<=1)
#define MIN_POWER 2
@@ -239,4 +239,4 @@ float Utils::wrapValue(float value, float min, float max)
return value;
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/utils/utils_p.h b/src/datavisualization/utils/utils_p.h
index 3142e4c2..434a366f 100644
--- a/src/datavisualization/utils/utils_p.h
+++ b/src/datavisualization/utils/utils_p.h
@@ -39,7 +39,7 @@ class QString;
class QPoint;
class QImage;
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class Utils
{
@@ -75,6 +75,6 @@ private:
static ParamType mapFormatCharToParamType(const QChar &formatChar);
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
diff --git a/src/datavisualization/utils/vertexindexer.cpp b/src/datavisualization/utils/vertexindexer.cpp
index dafe5dbc..ea25b5d6 100644
--- a/src/datavisualization/utils/vertexindexer.cpp
+++ b/src/datavisualization/utils/vertexindexer.cpp
@@ -23,7 +23,7 @@
#include <QDebug>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
int unique_vertices = 0;
@@ -150,4 +150,4 @@ void VertexIndexer::indexVBO_TBN(const QVector<QVector3D> &in_vertices,
//qDebug() << "unique vertices" << unique_vertices;
}
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
diff --git a/src/datavisualization/utils/vertexindexer_p.h b/src/datavisualization/utils/vertexindexer_p.h
index 0cf1857b..de8f7690 100644
--- a/src/datavisualization/utils/vertexindexer_p.h
+++ b/src/datavisualization/utils/vertexindexer_p.h
@@ -35,7 +35,7 @@
#include <QVector2D>
#include <QVector3D>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+namespace QtDataVisualization {
class VertexIndexer
{
@@ -83,6 +83,6 @@ class VertexIndexer
unsigned short &result);
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+}
#endif
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
diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp
index c83a9389..f162cbff 100644
--- a/tests/barstest/chart.cpp
+++ b/tests/barstest/chart.cpp
@@ -25,7 +25,7 @@
#include <QtDataVisualization/q3dtheme.h>
#include <QTime>
-QT_DATAVISUALIZATION_USE_NAMESPACE
+using namespace QtDataVisualization;
const QString celsiusString = QString(QChar(0xB0)) + "C";
@@ -119,7 +119,7 @@ GraphModifier::GraphModifier(Q3DBars *barchart, QColorDialog *colorDialog)
m_graph->addAxis(m_genericColumnAxis);
m_graph->setActiveTheme(m_builtinTheme);
- m_graph->setShadowQuality(QDataVis::ShadowQualitySoftMedium);
+ m_graph->setShadowQuality(QAbstract3DGraph::ShadowQualitySoftMedium);
m_temperatureData->setName("Oulu");
m_temperatureData2->setName("Helsinki");
@@ -637,10 +637,10 @@ void GraphModifier::changeSelectionMode()
{
static int selectionMode = m_graph->selectionMode();
- if (++selectionMode > (QDataVis::SelectionItemAndColumn | QDataVis::SelectionSlice | QDataVis::SelectionMultiSeries))
- selectionMode = QDataVis::SelectionNone;
+ if (++selectionMode > (QAbstract3DGraph::SelectionItemAndColumn | QAbstract3DGraph::SelectionSlice | QAbstract3DGraph::SelectionMultiSeries))
+ selectionMode = QAbstract3DGraph::SelectionNone;
- m_graph->setSelectionMode((QDataVis::SelectionFlag)selectionMode);
+ m_graph->setSelectionMode((QAbstract3DGraph::SelectionFlag)selectionMode);
}
void GraphModifier::changeFont(const QFont &font)
@@ -658,7 +658,7 @@ void GraphModifier::changeFontSize(int fontsize)
m_graph->activeTheme()->setFont(font);
}
-void GraphModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq)
+void GraphModifier::shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality sq)
{
int quality = int(sq);
// Updates the UI component to show correct shadow quality
@@ -709,7 +709,7 @@ void GraphModifier::handleValueAxisChanged(QValue3DAxis *axis)
void GraphModifier::changeShadowQuality(int quality)
{
- QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality);
+ QAbstract3DGraph::ShadowQuality sq = QAbstract3DGraph::ShadowQuality(quality);
m_graph->setShadowQuality(sq);
emit shadowQualityChanged(quality);
}
@@ -718,7 +718,7 @@ void GraphModifier::showFiveSeries()
{
releaseProxies();
releaseAxes();
- m_graph->setSelectionMode(QDataVis::SelectionItemRowAndColumn | QDataVis::SelectionMultiSeries);
+ m_graph->setSelectionMode(QAbstract3DGraph::SelectionItemRowAndColumn | QAbstract3DGraph::SelectionMultiSeries);
m_dummyData->dataProxy()->resetArray(makeDummyData(), QStringList(), QStringList());
m_dummyData2->dataProxy()->resetArray(makeDummyData(), QStringList(), QStringList());
diff --git a/tests/barstest/chart.h b/tests/barstest/chart.h
index f617a348..9c14e5cd 100644
--- a/tests/barstest/chart.h
+++ b/tests/barstest/chart.h
@@ -85,7 +85,7 @@ public slots:
void flipViews();
void setGradient();
void changeShadowQuality(int quality);
- void shadowQualityUpdatedByVisual(QDataVis::ShadowQuality shadowQuality);
+ void shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality shadowQuality);
void handleSelectionChange(const QPoint &position);
void setUseNullInputHandler(bool useNull);
diff --git a/tests/directional/scatterdatamodifier.cpp b/tests/directional/scatterdatamodifier.cpp
index 065d9a89..f7089ae4 100644
--- a/tests/directional/scatterdatamodifier.cpp
+++ b/tests/directional/scatterdatamodifier.cpp
@@ -44,7 +44,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
QFont font = m_graph->activeTheme()->font();
font.setPointSize(m_fontSize);
m_graph->activeTheme()->setFont(font);
- m_graph->setShadowQuality(QDataVis::ShadowQualitySoftLow);
+ m_graph->setShadowQuality(QAbstract3DGraph::ShadowQualitySoftLow);
m_graph->scene()->activeCamera()->setCameraPreset(Q3DCamera::CameraPresetFront);
m_graph->setAxisX(new QValue3DAxis);
@@ -158,7 +158,7 @@ void ScatterDataModifier::changeFont(const QFont &font)
m_graph->activeTheme()->setFont(newFont);
}
-void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq)
+void ScatterDataModifier::shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality sq)
{
int quality = int(sq);
emit shadowQualityChanged(quality); // connected to a checkbox in main.cpp
@@ -166,7 +166,7 @@ void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality s
void ScatterDataModifier::changeShadowQuality(int quality)
{
- QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality);
+ QAbstract3DGraph::ShadowQuality sq = QAbstract3DGraph::ShadowQuality(quality);
m_graph->setShadowQuality(sq);
}
diff --git a/tests/directional/scatterdatamodifier.h b/tests/directional/scatterdatamodifier.h
index fbb92e86..e3979818 100644
--- a/tests/directional/scatterdatamodifier.h
+++ b/tests/directional/scatterdatamodifier.h
@@ -46,7 +46,7 @@ public slots:
void changeStyle(int style);
void changeTheme(int theme);
void changeShadowQuality(int quality);
- void shadowQualityUpdatedByVisual(QDataVis::ShadowQuality shadowQuality);
+ void shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality shadowQuality);
signals:
void backgroundEnabledChanged(bool enabled);
diff --git a/tests/multigraphs/data.cpp b/tests/multigraphs/data.cpp
index e70a01df..9df5e668 100644
--- a/tests/multigraphs/data.cpp
+++ b/tests/multigraphs/data.cpp
@@ -29,7 +29,7 @@
#include <QSize>
#include <QImage>
-QT_DATAVISUALIZATION_USE_NAMESPACE
+using namespace QtDataVisualization;
Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars,
QTextEdit *statusArea, QWidget *widget) :
@@ -53,7 +53,7 @@ Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars,
gradient.setColorAt(0.33, Qt::blue);
gradient.setColorAt(0.67, Qt::red);
gradient.setColorAt(1.0, Qt::yellow);
- m_surface->setSelectionMode(QDataVis::SelectionNone);
+ m_surface->setSelectionMode(QAbstract3DGraph::SelectionNone);
m_surface->activeTheme()->setGridEnabled(false);
m_surface->activeTheme()->setBackgroundEnabled(false);
m_surface->scene()->activeCamera()->setCameraPosition(0.0, 90.0, 150);
@@ -66,9 +66,9 @@ Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars,
// Initialize scatter
m_scatter->activeTheme()->setType(Q3DTheme::ThemeStoneMoss);
- m_scatter->setSelectionMode(QDataVis::SelectionNone);
+ m_scatter->setSelectionMode(QAbstract3DGraph::SelectionNone);
m_scatter->activeTheme()->setGridEnabled(false);
- m_scatter->setShadowQuality(QDataVis::ShadowQualitySoftLow);
+ m_scatter->setShadowQuality(QAbstract3DGraph::ShadowQualitySoftLow);
m_scatter->scene()->activeCamera()->setCameraPosition(0.0, 85.0, 150);
QScatter3DSeries *series2 = new QScatter3DSeries;
series2->setMesh(QAbstract3DSeries::MeshPoint);
@@ -76,9 +76,9 @@ Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars,
// Initialize bars
m_bars->activeTheme()->setType(Q3DTheme::ThemeQt);
- m_bars->setSelectionMode(QDataVis::SelectionItemAndRow | QDataVis::SelectionSlice);
+ m_bars->setSelectionMode(QAbstract3DGraph::SelectionItemAndRow | QAbstract3DGraph::SelectionSlice);
m_bars->activeTheme()->setGridEnabled(false);
- m_bars->setShadowQuality(QDataVis::ShadowQualityLow);
+ m_bars->setShadowQuality(QAbstract3DGraph::ShadowQualityLow);
m_bars->setBarSpacing(QSizeF(0.0, 0.0));
m_bars->scene()->activeCamera()->setCameraPosition(0.0, 75.0, 150);
QBar3DSeries *series3 = new QBar3DSeries;
diff --git a/tests/scattertest/scatterchart.cpp b/tests/scattertest/scatterchart.cpp
index 9482ee18..bcc0a4ab 100644
--- a/tests/scattertest/scatterchart.cpp
+++ b/tests/scattertest/scatterchart.cpp
@@ -41,7 +41,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
QFont font = m_chart->activeTheme()->font();
font.setPointSize(m_fontSize);
m_chart->activeTheme()->setFont(font);
- m_chart->setShadowQuality(QDataVis::ShadowQualityNone);
+ m_chart->setShadowQuality(QAbstract3DGraph::ShadowQualityNone);
m_chart->scene()->activeCamera()->setCameraPreset(Q3DCamera::CameraPresetFront);
m_chart->setAxisX(new QValue3DAxis);
m_chart->setAxisY(new QValue3DAxis);
@@ -50,7 +50,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
createAndAddSeries();
createAndAddSeries();
- m_chart->setSelectionMode(QDataVis::SelectionItem);
+ m_chart->setSelectionMode(QAbstract3DGraph::SelectionItem);
QObject::connect(&m_timer, &QTimer::timeout, this, &ScatterDataModifier::timeout);
QObject::connect(m_chart, &Q3DScatter::shadowQualityChanged, this,
@@ -201,7 +201,7 @@ void ScatterDataModifier::changePointSize(int pointSize)
m_targetSeries->setItemSize(0.01f * float(pointSize));
}
-void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq)
+void ScatterDataModifier::shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality sq)
{
int quality = int(sq);
// Updates the UI component to show correct shadow quality
@@ -499,7 +499,7 @@ void ScatterDataModifier::handleAxisZChanged(QValue3DAxis *axis)
void ScatterDataModifier::changeShadowQuality(int quality)
{
- QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality);
+ QAbstract3DGraph::ShadowQuality sq = QAbstract3DGraph::ShadowQuality(quality);
m_chart->setShadowQuality(sq);
emit shadowQualityChanged(quality);
}
diff --git a/tests/scattertest/scatterchart.h b/tests/scattertest/scatterchart.h
index ce6c2073..d4908023 100644
--- a/tests/scattertest/scatterchart.h
+++ b/tests/scattertest/scatterchart.h
@@ -49,7 +49,7 @@ public:
public slots:
void changeShadowQuality(int quality);
- void shadowQualityUpdatedByVisual(QDataVis::ShadowQuality shadowQuality);
+ void shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality shadowQuality);
void clear();
void resetAxes();
void addOne();
diff --git a/tests/spectrum/spectrumapp/main.cpp b/tests/spectrum/spectrumapp/main.cpp
index c4fe111d..b1bcb358 100644
--- a/tests/spectrum/spectrumapp/main.cpp
+++ b/tests/spectrum/spectrumapp/main.cpp
@@ -78,14 +78,14 @@ MainApp::MainApp(Q3DBars *window)
// Disable auto-scaling of height by defining explicit range
m_chart->valueAxis()->setRange(0.0f, 1.0f);
// Disable shadows
- m_chart->setShadowQuality(QDataVis::ShadowQualityNone);
+ m_chart->setShadowQuality(QAbstract3DGraph::ShadowQualityNone);
#if USE_CONES
// Set bar specifications; make them a bit wider than deep and make them be drawn 75%
// inside each other
m_chart->setBarThickness(1.25);
m_chart->setBarSpacing(QSizeF(0.2, -0.75));
// Set bar type, smooth cones
- m_chart->setBarType(QDataVis::MeshCones, true);
+ m_chart->setBarType(QAbstract3DGraph::MeshCones, true);
// Adjust zoom manually; automatic zoom level calculation does not work well with negative
// spacings (in setBarSpacing)
m_chart->setCameraPosition(10.0f, 5.0f, 70.0f);
@@ -98,7 +98,7 @@ MainApp::MainApp(Q3DBars *window)
m_chart->scene()->activeCamera()->setCameraPosition(10.0f, 7.5f, 75.0f);
#endif
// Disable selection
- m_chart->setSelectionMode(QDataVis::SelectionNone);
+ m_chart->setSelectionMode(QAbstract3DGraph::SelectionNone);
QObject::connect(m_engine, &Engine::changedSpectrum, this, &MainApp::spectrumChanged);
QObject::connect(m_engine, &Engine::stateChanged, this, &MainApp::stateChanged);
m_restartTimer->setSingleShot(true);
diff --git a/tests/surfacetest/graphmodifier.cpp b/tests/surfacetest/graphmodifier.cpp
index 1c177219..04a41cfe 100644
--- a/tests/surfacetest/graphmodifier.cpp
+++ b/tests/surfacetest/graphmodifier.cpp
@@ -27,7 +27,7 @@
#include <QDebug>
#include <QComboBox>
-QT_DATAVISUALIZATION_USE_NAMESPACE
+using namespace QtDataVisualization;
//#define JITTER_PLANE
//#define WONKY_PLANE
@@ -438,7 +438,7 @@ void GraphModifier::resetArrayAndSliders(QSurfaceDataArray *array, float minZ, f
void GraphModifier::changeShadowQuality(int quality)
{
- QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality);
+ QAbstract3DGraph::ShadowQuality sq = QAbstract3DGraph::ShadowQuality(quality);
m_graph->setShadowQuality(sq);
}
@@ -447,7 +447,7 @@ void GraphModifier::changeSelectionMode(int mode)
QComboBox *comboBox = qobject_cast<QComboBox *>(sender());
if (comboBox) {
int flags = comboBox->itemData(mode).toInt();
- m_graph->setSelectionMode(QDataVis::SelectionFlags(flags));
+ m_graph->setSelectionMode(QAbstract3DGraph::SelectionFlags(flags));
}
}
diff --git a/tests/surfacetest/main.cpp b/tests/surfacetest/main.cpp
index 54c27981..7279b27a 100644
--- a/tests/surfacetest/main.cpp
+++ b/tests/surfacetest/main.cpp
@@ -184,29 +184,29 @@ int main(int argc, char *argv[])
QComboBox *selectionMode = new QComboBox(widget);
selectionMode->addItem(QStringLiteral("None"),
- int(QDataVis::SelectionNone));
+ int(QAbstract3DGraph::SelectionNone));
selectionMode->addItem(QStringLiteral("Item"),
- int(QDataVis::SelectionItem));
+ int(QAbstract3DGraph::SelectionItem));
selectionMode->addItem(QStringLiteral("Row"),
- int(QDataVis::SelectionRow));
+ int(QAbstract3DGraph::SelectionRow));
selectionMode->addItem(QStringLiteral("Item and Row"),
- int(QDataVis::SelectionItemAndRow));
+ int(QAbstract3DGraph::SelectionItemAndRow));
selectionMode->addItem(QStringLiteral("Column"),
- int(QDataVis::SelectionColumn));
+ int(QAbstract3DGraph::SelectionColumn));
selectionMode->addItem(QStringLiteral("Item and Column"),
- int(QDataVis::SelectionItemAndColumn));
+ int(QAbstract3DGraph::SelectionItemAndColumn));
selectionMode->addItem(QStringLiteral("Row and Column"),
- int(QDataVis::SelectionRowAndColumn));
+ int(QAbstract3DGraph::SelectionRowAndColumn));
selectionMode->addItem(QStringLiteral("Item, Row and Column"),
- int(QDataVis::SelectionItemRowAndColumn));
+ int(QAbstract3DGraph::SelectionItemRowAndColumn));
selectionMode->addItem(QStringLiteral("Slice into Row"),
- int(QDataVis::SelectionSlice | QDataVis::SelectionRow));
+ int(QAbstract3DGraph::SelectionSlice | QAbstract3DGraph::SelectionRow));
selectionMode->addItem(QStringLiteral("Slice into Row and Item"),
- int(QDataVis::SelectionSlice | QDataVis::SelectionItemAndRow));
+ int(QAbstract3DGraph::SelectionSlice | QAbstract3DGraph::SelectionItemAndRow));
selectionMode->addItem(QStringLiteral("Slice into Column"),
- int(QDataVis::SelectionSlice | QDataVis::SelectionColumn));
+ int(QAbstract3DGraph::SelectionSlice | QAbstract3DGraph::SelectionColumn));
selectionMode->addItem(QStringLiteral("Slice into Column and Item"),
- int(QDataVis::SelectionSlice | QDataVis::SelectionItemAndColumn));
+ int(QAbstract3DGraph::SelectionSlice | QAbstract3DGraph::SelectionItemAndColumn));
selectionMode->setCurrentIndex(1);
QPushButton *selectButton = new QPushButton(widget);