diff options
Diffstat (limited to 'tests')
22 files changed, 41 insertions, 41 deletions
diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp index 2f21801f..08ce4d94 100644 --- a/tests/barstest/chart.cpp +++ b/tests/barstest/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 <QtDataVis3D/q3dcategoryaxis.h> -#include <QtDataVis3D/q3dvalueaxis.h> -#include <QtDataVis3D/qbardataproxy.h> +#include <QtDataVisualization/q3dcategoryaxis.h> +#include <QtDataVisualization/q3dvalueaxis.h> +#include <QtDataVisualization/qbardataproxy.h> #include <QTime> -QT_DATAVIS3D_USE_NAMESPACE +QT_DATAVISUALIZATION_USE_NAMESPACE const QString celsiusString = QString(QChar(0xB0)) + "C"; diff --git a/tests/barstest/chart.h b/tests/barstest/chart.h index 7210d606..bd601021 100644 --- a/tests/barstest/chart.h +++ b/tests/barstest/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 <QtDataVis3D/q3dbars.h> +#include <QtDataVisualization/q3dbars.h> #include <QFont> #include <QDebug> #include <QStringList> #include <QPointer> -using namespace QtDataVis3D; +using namespace QtDataVisualization; class ChartModifier : public QObject { diff --git a/tests/barstest/main.cpp b/tests/barstest/main.cpp index a59f1de1..b5225d4c 100644 --- a/tests/barstest/main.cpp +++ b/tests/barstest/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/tests/scattertest/main.cpp b/tests/scattertest/main.cpp index b0135ef3..933ae58e 100644 --- a/tests/scattertest/main.cpp +++ b/tests/scattertest/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/tests/scattertest/scatterchart.cpp b/tests/scattertest/scatterchart.cpp index 0542374b..90346559 100644 --- a/tests/scattertest/scatterchart.cpp +++ b/tests/scattertest/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 <QtDataVis3D/qscatterdataproxy.h> -#include <QtDataVis3D/q3dvalueaxis.h> +#include <QtDataVisualization/qscatterdataproxy.h> +#include <QtDataVisualization/q3dvalueaxis.h> #include <qmath.h> -using namespace QtDataVis3D; +using namespace QtDataVisualization; //#define RANDOM_SCATTER diff --git a/tests/scattertest/scatterchart.h b/tests/scattertest/scatterchart.h index 4412af99..eef94ac4 100644 --- a/tests/scattertest/scatterchart.h +++ b/tests/scattertest/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,13 +19,13 @@ #ifndef SCATTERDATAMODIFIER_H #define SCATTERDATAMODIFIER_H -#include <QtDataVis3D/q3dscatter.h> +#include <QtDataVisualization/q3dscatter.h> #include <QFont> #include <QDebug> #include <QTimer> -using namespace QtDataVis3D; +using namespace QtDataVisualization; class ScatterDataModifier : public QObject { diff --git a/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp b/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp index 45aee653..f6fc37e0 100644 --- a/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp +++ b/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the examples of QtDataVis3D. +** This file is part of the examples of QtDataVisualization. ** ** This program is free software: you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as diff --git a/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.h b/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.h index 2fb602de..4cfa580b 100644 --- a/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.h +++ b/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the examples of QtDataVis3D. +** This file is part of the examples of QtDataVisualization. ** ** This program is free software: you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as diff --git a/tests/spectrum/spectrumapp/engine.cpp b/tests/spectrum/spectrumapp/engine.cpp index 60605223..9d049384 100644 --- a/tests/spectrum/spectrumapp/engine.cpp +++ b/tests/spectrum/spectrumapp/engine.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/tests/spectrum/spectrumapp/engine.h b/tests/spectrum/spectrumapp/engine.h index cdd8373f..1ad86065 100644 --- a/tests/spectrum/spectrumapp/engine.h +++ b/tests/spectrum/spectrumapp/engine.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 diff --git a/tests/spectrum/spectrumapp/frequencyspectrum.cpp b/tests/spectrum/spectrumapp/frequencyspectrum.cpp index 013d0454..c5f62cef 100644 --- a/tests/spectrum/spectrumapp/frequencyspectrum.cpp +++ b/tests/spectrum/spectrumapp/frequencyspectrum.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/tests/spectrum/spectrumapp/frequencyspectrum.h b/tests/spectrum/spectrumapp/frequencyspectrum.h index fac9a1b7..0008985f 100644 --- a/tests/spectrum/spectrumapp/frequencyspectrum.h +++ b/tests/spectrum/spectrumapp/frequencyspectrum.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 diff --git a/tests/spectrum/spectrumapp/main.cpp b/tests/spectrum/spectrumapp/main.cpp index 89051da4..6c264516 100644 --- a/tests/spectrum/spectrumapp/main.cpp +++ b/tests/spectrum/spectrumapp/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,9 +19,9 @@ #include "engine.h" #include "utils.h" -#include <QtDataVis3D/q3dbars.h> -#include <QtDataVis3D/qbardataproxy.h> -#include <QtDataVis3D/q3dvalueaxis.h> +#include <QtDataVisualization/q3dbars.h> +#include <QtDataVisualization/qbardataproxy.h> +#include <QtDataVisualization/q3dvalueaxis.h> #include <QGuiApplication> #include <QAudio> @@ -29,7 +29,7 @@ //#define USE_CONES -using namespace QtDataVis3D; +using namespace QtDataVisualization; class MainApp : public QObject { @@ -188,7 +188,7 @@ int MainApp::barIndex(qreal frequency) const int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); - app.setApplicationName("QtDataVis3D spectrum analyzer"); + app.setApplicationName("QtDataVisualization spectrum analyzer"); Q3DBars window; window.resize(1024, 768); diff --git a/tests/spectrum/spectrumapp/spectrum.h b/tests/spectrum/spectrumapp/spectrum.h index 015989d5..97096b1c 100644 --- a/tests/spectrum/spectrumapp/spectrum.h +++ b/tests/spectrum/spectrumapp/spectrum.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 diff --git a/tests/spectrum/spectrumapp/spectrumanalyser.cpp b/tests/spectrum/spectrumapp/spectrumanalyser.cpp index 4cebfde9..b86a851c 100644 --- a/tests/spectrum/spectrumapp/spectrumanalyser.cpp +++ b/tests/spectrum/spectrumapp/spectrumanalyser.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/tests/spectrum/spectrumapp/spectrumanalyser.h b/tests/spectrum/spectrumapp/spectrumanalyser.h index 6d9291ef..0e40fe66 100644 --- a/tests/spectrum/spectrumapp/spectrumanalyser.h +++ b/tests/spectrum/spectrumapp/spectrumanalyser.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 diff --git a/tests/spectrum/spectrumapp/spectrumapp.pro b/tests/spectrum/spectrumapp/spectrumapp.pro index 0fc0584c..940cce75 100644 --- a/tests/spectrum/spectrumapp/spectrumapp.pro +++ b/tests/spectrum/spectrumapp/spectrumapp.pro @@ -50,7 +50,7 @@ RESOURCES = spectrum.qrc android { target.path = /libs/$$ANDROID_TARGET_ARCH } else { - target.path = $$[QT_INSTALL_EXAMPLES]/datavis3d/spectrum + target.path = $$[QT_INSTALL_EXAMPLES]/datavisualization/spectrum } INSTALLS += target diff --git a/tests/spectrum/spectrumapp/utils.cpp b/tests/spectrum/spectrumapp/utils.cpp index bad6cc48..f007959c 100644 --- a/tests/spectrum/spectrumapp/utils.cpp +++ b/tests/spectrum/spectrumapp/utils.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/tests/spectrum/spectrumapp/utils.h b/tests/spectrum/spectrumapp/utils.h index f0ae5633..009f895b 100644 --- a/tests/spectrum/spectrumapp/utils.h +++ b/tests/spectrum/spectrumapp/utils.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 diff --git a/tests/spectrum/spectrumapp/wavfile.cpp b/tests/spectrum/spectrumapp/wavfile.cpp index 24482507..56dd340e 100644 --- a/tests/spectrum/spectrumapp/wavfile.cpp +++ b/tests/spectrum/spectrumapp/wavfile.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/tests/spectrum/spectrumapp/wavfile.h b/tests/spectrum/spectrumapp/wavfile.h index e408911b..25673630 100644 --- a/tests/spectrum/spectrumapp/wavfile.h +++ b/tests/spectrum/spectrumapp/wavfile.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 diff --git a/tests/tests.pri b/tests/tests.pri index e772d18a..815ce4dd 100644 --- a/tests/tests.pri +++ b/tests/tests.pri @@ -1,7 +1,7 @@ android { target.path = /libs/$$ANDROID_TARGET_ARCH } else { - target.path = $$[QT_INSTALL_TESTS]/datavis3d/$$TARGET + target.path = $$[QT_INSTALL_TESTS]/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 |