From a28cdb72a4ea768a898ca07f0df0fa3c17c073a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Tue, 10 Sep 2013 11:42:13 +0300 Subject: Module renamed Task-number: QTRD-2224 Change-Id: Iec18b6121809300b11d85445281d3c626c434f35 Reviewed-by: Miikka Heikkinen --- examples/audiolevels/audiolevels.cpp | 8 ++++---- examples/audiolevels/audiolevels.h | 6 +++--- examples/audiolevels/audiolevelsiodevice.cpp | 4 ++-- examples/audiolevels/audiolevelsiodevice.h | 6 +++--- examples/audiolevels/doc/src/audiolevels.qdoc | 2 +- examples/audiolevels/main.cpp | 6 +++--- examples/barchart/doc/src/barchart.qdoc | 2 +- examples/barchart/main.cpp | 12 ++++++------ examples/examples.pri | 8 ++++---- examples/qmlbarchart/doc/src/qmlbarchart.qdoc | 2 +- examples/qmlbarchart/main.cpp | 2 +- examples/qmlbarchart/qml/qmlbarchart/axes.qml | 4 ++-- examples/qmlbarchart/qml/qmlbarchart/button.qml | 2 +- examples/qmlbarchart/qml/qmlbarchart/data.qml | 4 ++-- examples/qmlbarchart/qml/qmlbarchart/main.qml | 4 ++-- examples/qmlscatter/doc/src/qmlscatter.qdoc | 2 +- examples/qmlscatter/main.cpp | 2 +- examples/qmlscatter/qml/qmlscatter/button.qml | 2 +- examples/qmlscatter/qml/qmlscatter/data.qml | 4 ++-- examples/qmlscatter/qml/qmlscatter/main.qml | 4 ++-- examples/qmlsurface/doc/src/qmlsurface.qdoc | 2 +- examples/qmlsurface/main.cpp | 2 +- examples/qmlsurface/qml/qmlsurface/button.qml | 2 +- examples/qmlsurface/qml/qmlsurface/data.qml | 4 ++-- examples/qmlsurface/qml/qmlsurface/main.qml | 4 ++-- examples/rainfall/doc/src/rainfall.qdoc | 2 +- examples/rainfall/main.cpp | 4 ++-- examples/rainfall/rainfallchart.cpp | 8 ++++---- examples/rainfall/rainfallchart.h | 6 +++--- examples/rainfall/variantbardatamapping.cpp | 2 +- examples/rainfall/variantbardatamapping.h | 6 +++--- examples/rainfall/variantbardataproxy.cpp | 4 ++-- examples/rainfall/variantbardataproxy.h | 4 ++-- examples/rainfall/variantdataset.cpp | 2 +- examples/rainfall/variantdataset.h | 6 +++--- examples/scatterchart/doc/src/scatterchart.qdoc | 2 +- examples/scatterchart/main.cpp | 2 +- examples/scatterchart/scatterchart.cpp | 8 ++++---- examples/scatterchart/scatterchart.h | 6 +++--- examples/surfacechart/chartmodifier.cpp | 4 ++-- examples/surfacechart/chartmodifier.h | 6 +++--- examples/surfacechart/main.cpp | 4 ++-- examples/widget/chart.cpp | 10 +++++----- examples/widget/chart.h | 6 +++--- examples/widget/doc/src/widget.qdoc | 2 +- examples/widget/main.cpp | 2 +- 46 files changed, 98 insertions(+), 98 deletions(-) (limited to 'examples') diff --git a/examples/audiolevels/audiolevels.cpp b/examples/audiolevels/audiolevels.cpp index 73a71562..5c5cf3d1 100644 --- a/examples/audiolevels/audiolevels.cpp +++ b/examples/audiolevels/audiolevels.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -19,13 +19,13 @@ #include "audiolevelsiodevice.h" #include "audiolevels.h" -#include -#include +#include +#include #include #include -QT_DATAVIS3D_USE_NAMESPACE +QT_DATAVISUALIZATION_USE_NAMESPACE AudioLevels::AudioLevels(Q3DBars *chart, QObject *parent) : QObject(parent), diff --git a/examples/audiolevels/audiolevels.h b/examples/audiolevels/audiolevels.h index 5b91a0db..eafb799e 100644 --- a/examples/audiolevels/audiolevels.h +++ b/examples/audiolevels/audiolevels.h @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -19,9 +19,9 @@ #ifndef AUDIOLEVELS_H #define AUDIOLEVELS_H -#include +#include -QT_DATAVIS3D_USE_NAMESPACE +QT_DATAVISUALIZATION_USE_NAMESPACE class AudioLevelsIODevice; class QAudioInput; diff --git a/examples/audiolevels/audiolevelsiodevice.cpp b/examples/audiolevels/audiolevelsiodevice.cpp index 2e36787f..c3a5cfd0 100644 --- a/examples/audiolevels/audiolevelsiodevice.cpp +++ b/examples/audiolevels/audiolevelsiodevice.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -19,7 +19,7 @@ #include "audiolevelsiodevice.h" #include -QT_DATAVIS3D_USE_NAMESPACE +QT_DATAVISUALIZATION_USE_NAMESPACE AudioLevelsIODevice::AudioLevelsIODevice(QBarDataProxy *proxy, QObject *parent) : QIODevice(parent), diff --git a/examples/audiolevels/audiolevelsiodevice.h b/examples/audiolevels/audiolevelsiodevice.h index b2342866..cc2929f8 100644 --- a/examples/audiolevels/audiolevelsiodevice.h +++ b/examples/audiolevels/audiolevelsiodevice.h @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -19,10 +19,10 @@ #ifndef AUDIOLEVELSIODEVICE_H #define AUDIOLEVELSIODEVICE_H -#include +#include #include -QT_DATAVIS3D_USE_NAMESPACE +QT_DATAVISUALIZATION_USE_NAMESPACE class AudioLevelsIODevice : public QIODevice { diff --git a/examples/audiolevels/doc/src/audiolevels.qdoc b/examples/audiolevels/doc/src/audiolevels.qdoc index 6e19e97b..0ac9de78 100644 --- a/examples/audiolevels/doc/src/audiolevels.qdoc +++ b/examples/audiolevels/doc/src/audiolevels.qdoc @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 diff --git a/examples/audiolevels/main.cpp b/examples/audiolevels/main.cpp index 2b8556e1..ea8acd6b 100644 --- a/examples/audiolevels/main.cpp +++ b/examples/audiolevels/main.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -21,7 +21,7 @@ #include #include -using namespace QtDataVis3D; +using namespace QtDataVisualization; int main(int argc, char *argv[]) { @@ -29,7 +29,7 @@ int main(int argc, char *argv[]) Q3DBars window; window.resize(1024, 768); - window.setTitle("QtDataVis3D microphone audio levels visualizer"); + window.setTitle("QtDataVisualization microphone audio levels visualizer"); window.show(); AudioLevels audioLevels(&window); diff --git a/examples/barchart/doc/src/barchart.qdoc b/examples/barchart/doc/src/barchart.qdoc index 6c2c8760..0966bd29 100644 --- a/examples/barchart/doc/src/barchart.qdoc +++ b/examples/barchart/doc/src/barchart.qdoc @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 diff --git a/examples/barchart/main.cpp b/examples/barchart/main.cpp index e102561c..5fa798fd 100644 --- a/examples/barchart/main.cpp +++ b/examples/barchart/main.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -16,10 +16,10 @@ ** ****************************************************************************/ -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -31,7 +31,7 @@ #define USE_STATIC_DATA -using namespace QtDataVis3D; +using namespace QtDataVisualization; class ChartDataGenerator : public QObject { diff --git a/examples/examples.pri b/examples/examples.pri index f1cf3b3b..82692204 100644 --- a/examples/examples.pri +++ b/examples/examples.pri @@ -1,7 +1,7 @@ android { target.path = /libs/$$ANDROID_TARGET_ARCH } else { - target.path = $$[QT_INSTALL_EXAMPLES]/datavis3d/$$TARGET + target.path = $$[QT_INSTALL_EXAMPLES]/datavisualization/$$TARGET } win32 { @@ -15,11 +15,11 @@ LIBS += -L$$OUT_PWD/../../lib TEMPLATE = app -QT += datavis3d +QT += datavisualization contains(TARGET, qml.*) { - uri = com.digia.QtDataVis3D - lib_name = datavis3dqml2 + uri = com.digia.QtDataVisualization + lib_name = datavisualizationqml2 uri_replaced = $$replace(uri, \\., $$QMAKE_DIR_SEP) make_qmldir_path = $$DESTDIR/$$uri_replaced diff --git a/examples/qmlbarchart/doc/src/qmlbarchart.qdoc b/examples/qmlbarchart/doc/src/qmlbarchart.qdoc index 091d4b77..b7b84c0e 100644 --- a/examples/qmlbarchart/doc/src/qmlbarchart.qdoc +++ b/examples/qmlbarchart/doc/src/qmlbarchart.qdoc @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 diff --git a/examples/qmlbarchart/main.cpp b/examples/qmlbarchart/main.cpp index b58e66f8..1a3fcddc 100644 --- a/examples/qmlbarchart/main.cpp +++ b/examples/qmlbarchart/main.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 diff --git a/examples/qmlbarchart/qml/qmlbarchart/axes.qml b/examples/qmlbarchart/qml/qmlbarchart/axes.qml index 588e27ca..36324e0d 100644 --- a/examples/qmlbarchart/qml/qmlbarchart/axes.qml +++ b/examples/qmlbarchart/qml/qmlbarchart/axes.qml @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.1 -import com.digia.QtDataVis3D 1.0 +import com.digia.QtDataVisualization 1.0 Item { property alias row: rowAxis diff --git a/examples/qmlbarchart/qml/qmlbarchart/button.qml b/examples/qmlbarchart/qml/qmlbarchart/button.qml index 7fdc3ff1..ac7d1be4 100644 --- a/examples/qmlbarchart/qml/qmlbarchart/button.qml +++ b/examples/qmlbarchart/qml/qmlbarchart/button.qml @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 diff --git a/examples/qmlbarchart/qml/qmlbarchart/data.qml b/examples/qmlbarchart/qml/qmlbarchart/data.qml index 29d26183..47c08cce 100644 --- a/examples/qmlbarchart/qml/qmlbarchart/data.qml +++ b/examples/qmlbarchart/qml/qmlbarchart/data.qml @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.1 -import com.digia.QtDataVis3D 1.0 +import com.digia.QtDataVisualization 1.0 Item { property alias mapping: valueMapping diff --git a/examples/qmlbarchart/qml/qmlbarchart/main.qml b/examples/qmlbarchart/qml/qmlbarchart/main.qml index e3536ce4..598de15d 100644 --- a/examples/qmlbarchart/qml/qmlbarchart/main.qml +++ b/examples/qmlbarchart/qml/qmlbarchart/main.qml @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -18,7 +18,7 @@ import QtQuick 2.1 import QtQuick.Controls 1.0 -import com.digia.QtDataVis3D 1.0 +import com.digia.QtDataVisualization 1.0 import "." Item { diff --git a/examples/qmlscatter/doc/src/qmlscatter.qdoc b/examples/qmlscatter/doc/src/qmlscatter.qdoc index 4c1d8c2f..a014874e 100644 --- a/examples/qmlscatter/doc/src/qmlscatter.qdoc +++ b/examples/qmlscatter/doc/src/qmlscatter.qdoc @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 diff --git a/examples/qmlscatter/main.cpp b/examples/qmlscatter/main.cpp index f4aac723..150a36a6 100644 --- a/examples/qmlscatter/main.cpp +++ b/examples/qmlscatter/main.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 diff --git a/examples/qmlscatter/qml/qmlscatter/button.qml b/examples/qmlscatter/qml/qmlscatter/button.qml index 8e0e8b86..6da582b4 100644 --- a/examples/qmlscatter/qml/qmlscatter/button.qml +++ b/examples/qmlscatter/qml/qmlscatter/button.qml @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 diff --git a/examples/qmlscatter/qml/qmlscatter/data.qml b/examples/qmlscatter/qml/qmlscatter/data.qml index 30fce67a..8a6ada45 100644 --- a/examples/qmlscatter/qml/qmlscatter/data.qml +++ b/examples/qmlscatter/qml/qmlscatter/data.qml @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.1 -import com.digia.QtDataVis3D 1.0 +import com.digia.QtDataVisualization 1.0 Item { property alias mapping: scatterMapping diff --git a/examples/qmlscatter/qml/qmlscatter/main.qml b/examples/qmlscatter/qml/qmlscatter/main.qml index 9fcce132..947bd867 100644 --- a/examples/qmlscatter/qml/qmlscatter/main.qml +++ b/examples/qmlscatter/qml/qmlscatter/main.qml @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.1 -import com.digia.QtDataVis3D 1.0 +import com.digia.QtDataVisualization 1.0 import "." Item { diff --git a/examples/qmlsurface/doc/src/qmlsurface.qdoc b/examples/qmlsurface/doc/src/qmlsurface.qdoc index 23a5a67d..c589d55a 100644 --- a/examples/qmlsurface/doc/src/qmlsurface.qdoc +++ b/examples/qmlsurface/doc/src/qmlsurface.qdoc @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 diff --git a/examples/qmlsurface/main.cpp b/examples/qmlsurface/main.cpp index b58e66f8..1a3fcddc 100644 --- a/examples/qmlsurface/main.cpp +++ b/examples/qmlsurface/main.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 diff --git a/examples/qmlsurface/qml/qmlsurface/button.qml b/examples/qmlsurface/qml/qmlsurface/button.qml index 75032c39..761bd1e1 100644 --- a/examples/qmlsurface/qml/qmlsurface/button.qml +++ b/examples/qmlsurface/qml/qmlsurface/button.qml @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 diff --git a/examples/qmlsurface/qml/qmlsurface/data.qml b/examples/qmlsurface/qml/qmlsurface/data.qml index 00334897..650662f0 100644 --- a/examples/qmlsurface/qml/qmlsurface/data.qml +++ b/examples/qmlsurface/qml/qmlsurface/data.qml @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -17,7 +17,7 @@ ****************************************************************************/ import QtQuick 2.1 -import com.digia.QtDataVis3D 1.0 +import com.digia.QtDataVisualization 1.0 Item { property alias mapping: surfaceMapping diff --git a/examples/qmlsurface/qml/qmlsurface/main.qml b/examples/qmlsurface/qml/qmlsurface/main.qml index 6fde95cb..4be6aa68 100644 --- a/examples/qmlsurface/qml/qmlsurface/main.qml +++ b/examples/qmlsurface/qml/qmlsurface/main.qml @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -18,7 +18,7 @@ import QtQuick 2.1 import QtQuick.Controls 1.0 -import com.digia.QtDataVis3D 1.0 +import com.digia.QtDataVisualization 1.0 import "." Item { diff --git a/examples/rainfall/doc/src/rainfall.qdoc b/examples/rainfall/doc/src/rainfall.qdoc index bfe7fc36..95050dff 100644 --- a/examples/rainfall/doc/src/rainfall.qdoc +++ b/examples/rainfall/doc/src/rainfall.qdoc @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 diff --git a/examples/rainfall/main.cpp b/examples/rainfall/main.cpp index a4e316be..638fb842 100644 --- a/examples/rainfall/main.cpp +++ b/examples/rainfall/main.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -19,7 +19,7 @@ #include "rainfallchart.h" #include -using namespace QtDataVis3D; +using namespace QtDataVisualization; int main(int argc, char **argv) { diff --git a/examples/rainfall/rainfallchart.cpp b/examples/rainfall/rainfallchart.cpp index 15ed6b65..f6e9ae0c 100644 --- a/examples/rainfall/rainfallchart.cpp +++ b/examples/rainfall/rainfallchart.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -17,15 +17,15 @@ ****************************************************************************/ #include "rainfallchart.h" -#include -#include +#include +#include #include #include #include #include #include -using namespace QtDataVis3D; +using namespace QtDataVisualization; RainfallChart::RainfallChart(Q3DBars *rainfall) : m_chart(rainfall) diff --git a/examples/rainfall/rainfallchart.h b/examples/rainfall/rainfallchart.h index 9c8a3b5f..2c596f5c 100644 --- a/examples/rainfall/rainfallchart.h +++ b/examples/rainfall/rainfallchart.h @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -20,9 +20,9 @@ #define RAINFALLCHART_H #include "variantbardataproxy.h" -#include +#include -using namespace QtDataVis3D; +using namespace QtDataVisualization; class RainfallChart : public QObject { diff --git a/examples/rainfall/variantbardatamapping.cpp b/examples/rainfall/variantbardatamapping.cpp index 8d61a643..0c2f146c 100644 --- a/examples/rainfall/variantbardatamapping.cpp +++ b/examples/rainfall/variantbardatamapping.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 diff --git a/examples/rainfall/variantbardatamapping.h b/examples/rainfall/variantbardatamapping.h index 616ee563..0204ddc8 100644 --- a/examples/rainfall/variantbardatamapping.h +++ b/examples/rainfall/variantbardatamapping.h @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -19,10 +19,10 @@ #ifndef VARIANTBARDATAMAPPING_H #define VARIANTBARDATAMAPPING_H -#include "qdatavis3denums.h" +#include "qdatavisualizationenums.h" #include -using namespace QtDataVis3D; +using namespace QtDataVisualization; class VariantBarDataMapping : public QObject { diff --git a/examples/rainfall/variantbardataproxy.cpp b/examples/rainfall/variantbardataproxy.cpp index b01c7616..c907a1e3 100644 --- a/examples/rainfall/variantbardataproxy.cpp +++ b/examples/rainfall/variantbardataproxy.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -18,7 +18,7 @@ #include "variantbardataproxy.h" -using namespace QtDataVis3D; +using namespace QtDataVisualization; VariantBarDataProxy::VariantBarDataProxy() : QBarDataProxy() diff --git a/examples/rainfall/variantbardataproxy.h b/examples/rainfall/variantbardataproxy.h index acef9999..b931aa5c 100644 --- a/examples/rainfall/variantbardataproxy.h +++ b/examples/rainfall/variantbardataproxy.h @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -26,7 +26,7 @@ #include #include -using namespace QtDataVis3D; +using namespace QtDataVisualization; class VariantBarDataProxy : public QBarDataProxy { diff --git a/examples/rainfall/variantdataset.cpp b/examples/rainfall/variantdataset.cpp index 3fe4fa6b..f73d83f8 100644 --- a/examples/rainfall/variantdataset.cpp +++ b/examples/rainfall/variantdataset.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 diff --git a/examples/rainfall/variantdataset.h b/examples/rainfall/variantdataset.h index f3965978..7906d4f5 100644 --- a/examples/rainfall/variantdataset.h +++ b/examples/rainfall/variantdataset.h @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -19,11 +19,11 @@ #ifndef VARIANTDATASET_H #define VARIANTDATASET_H -#include "qdatavis3denums.h" +#include "qdatavisualizationenums.h" #include #include -using namespace QtDataVis3D; +using namespace QtDataVisualization; typedef QVariantList VariantDataItem; typedef QList VariantDataItemList; diff --git a/examples/scatterchart/doc/src/scatterchart.qdoc b/examples/scatterchart/doc/src/scatterchart.qdoc index 6e8dcd03..d6878ff9 100644 --- a/examples/scatterchart/doc/src/scatterchart.qdoc +++ b/examples/scatterchart/doc/src/scatterchart.qdoc @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 diff --git a/examples/scatterchart/main.cpp b/examples/scatterchart/main.cpp index ceecbc69..cdbc6ec9 100644 --- a/examples/scatterchart/main.cpp +++ b/examples/scatterchart/main.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 diff --git a/examples/scatterchart/scatterchart.cpp b/examples/scatterchart/scatterchart.cpp index 19b768a1..a7571252 100644 --- a/examples/scatterchart/scatterchart.cpp +++ b/examples/scatterchart/scatterchart.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -17,10 +17,10 @@ ****************************************************************************/ #include "scatterchart.h" -#include -#include +#include +#include #include -using namespace QtDataVis3D; +using namespace QtDataVisualization; //#define RANDOM_SCATTER // Uncomment this to switch to random scatter diff --git a/examples/scatterchart/scatterchart.h b/examples/scatterchart/scatterchart.h index 9e01f0dc..f19eb60f 100644 --- a/examples/scatterchart/scatterchart.h +++ b/examples/scatterchart/scatterchart.h @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -19,10 +19,10 @@ #ifndef SCATTERDATAMODIFIER_H #define SCATTERDATAMODIFIER_H -#include +#include #include -using namespace QtDataVis3D; +using namespace QtDataVisualization; class ScatterDataModifier : public QObject { diff --git a/examples/surfacechart/chartmodifier.cpp b/examples/surfacechart/chartmodifier.cpp index 48a4bcce..916a3f8c 100644 --- a/examples/surfacechart/chartmodifier.cpp +++ b/examples/surfacechart/chartmodifier.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -24,7 +24,7 @@ #include -QT_DATAVIS3D_USE_NAMESPACE +QT_DATAVISUALIZATION_USE_NAMESPACE ChartModifier::ChartModifier(Q3DSurface *chart) : m_chart(chart), diff --git a/examples/surfacechart/chartmodifier.h b/examples/surfacechart/chartmodifier.h index cb0a20a6..1de5840e 100644 --- a/examples/surfacechart/chartmodifier.h +++ b/examples/surfacechart/chartmodifier.h @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -19,10 +19,10 @@ #ifndef CHARTMODIFIER_H #define CHARTMODIFIER_H -#include +#include #include -using namespace QtDataVis3D; +using namespace QtDataVisualization; class ChartModifier : public QObject { diff --git a/examples/surfacechart/main.cpp b/examples/surfacechart/main.cpp index 660ed25c..8a090570 100644 --- a/examples/surfacechart/main.cpp +++ b/examples/surfacechart/main.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -32,7 +32,7 @@ #include #include -using namespace QtDataVis3D; +using namespace QtDataVisualization; int main(int argc, char *argv[]) { diff --git a/examples/widget/chart.cpp b/examples/widget/chart.cpp index d4bde7f3..79833eaa 100644 --- a/examples/widget/chart.cpp +++ b/examples/widget/chart.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -17,12 +17,12 @@ ****************************************************************************/ #include "chart.h" -#include -#include -#include +#include +#include +#include #include -QT_DATAVIS3D_USE_NAMESPACE +QT_DATAVISUALIZATION_USE_NAMESPACE const QString celsiusString = QString(QChar(0xB0)) + "C"; diff --git a/examples/widget/chart.h b/examples/widget/chart.h index a29f955b..caae4fff 100644 --- a/examples/widget/chart.h +++ b/examples/widget/chart.h @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 @@ -19,14 +19,14 @@ #ifndef CHARTMODIFIER_H #define CHARTMODIFIER_H -#include +#include #include #include #include #include -using namespace QtDataVis3D; +using namespace QtDataVisualization; class ChartModifier : public QObject { diff --git a/examples/widget/doc/src/widget.qdoc b/examples/widget/doc/src/widget.qdoc index 6645d356..d76df2b5 100644 --- a/examples/widget/doc/src/widget.qdoc +++ b/examples/widget/doc/src/widget.qdoc @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 diff --git a/examples/widget/main.cpp b/examples/widget/main.cpp index 76ec6dee..e9fda889 100644 --- a/examples/widget/main.cpp +++ b/examples/widget/main.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** 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 -- cgit v1.2.3