diff options
Diffstat (limited to 'src/datavis3d')
43 files changed, 125 insertions, 131 deletions
diff --git a/src/datavis3d/datavis3d.pro b/src/datavis3d/datavis3d.pro index 63091c55..82ae5618 100644 --- a/src/datavis3d/datavis3d.pro +++ b/src/datavis3d/datavis3d.pro @@ -1,7 +1,7 @@ TARGET = QtDataVis3D QT = core gui opengl #qml -DEFINES += QTENTERPRISE_DATAVIS3D_LIBRARY +DEFINES += QT_DATAVIS3D_LIBRARY QMAKE_DOCS = $$PWD/doc/qtdatavis3d.qdocconf diff --git a/src/datavis3d/engine/bars3dshared.cpp b/src/datavis3d/engine/bars3dshared.cpp index 8df8a368..1f2004b3 100644 --- a/src/datavis3d/engine/bars3dshared.cpp +++ b/src/datavis3d/engine/bars3dshared.cpp @@ -75,7 +75,7 @@ #include <QTime> #endif -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE //#define USE_HAX0R_SELECTION // keep this defined until the "real" method works #define DISPLAY_FULL_DATA_ON_SELECTION // Append selection value text with row and column labels @@ -2420,4 +2420,4 @@ void Bars3dRenderer::closeZoomMode() m_sceneViewPort = QRect(0, 0, this->width(), this->height()); } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/bars3dshared_p.h b/src/datavis3d/engine/bars3dshared_p.h index 9dc15886..6e309f9e 100644 --- a/src/datavis3d/engine/bars3dshared_p.h +++ b/src/datavis3d/engine/bars3dshared_p.h @@ -67,7 +67,7 @@ class QPoint; class QSizeF; class QOpenGLShaderProgram; -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class QDataItem; class QDataRow; @@ -86,7 +86,7 @@ class Bars3dModel : public QObject }; -class QTENTERPRISE_DATAVIS3D_EXPORT Bars3dRenderer : public QObject, public QOpenGLFunctions +class QT_DATAVIS3D_EXPORT Bars3dRenderer : public QObject, public QOpenGLFunctions { Q_OBJECT @@ -339,6 +339,6 @@ private: friend class DeclarativeBarsRenderer; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/drawer.cpp b/src/datavis3d/engine/drawer.cpp index 3c4d30cf..d0edf812 100644 --- a/src/datavis3d/engine/drawer.cpp +++ b/src/datavis3d/engine/drawer.cpp @@ -62,7 +62,7 @@ public: }; StaticLibInitializer staticLibInitializer; -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE Drawer::Drawer(const Theme &theme, const QFont &font, LabelTransparency transparency) : m_theme(theme), @@ -316,4 +316,4 @@ void Drawer::generateLabelItem(LabelItem *item, const QString &text) item->setTextureId(m_textureHelper->create2DTexture(label, true, true)); } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/drawer_p.h b/src/datavis3d/engine/drawer_p.h index e31ab0cb..b19e564c 100644 --- a/src/datavis3d/engine/drawer_p.h +++ b/src/datavis3d/engine/drawer_p.h @@ -59,7 +59,7 @@ #include "labelitem_p.h" #include <QFont> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class QDataItem; class ShaderHelper; @@ -103,6 +103,6 @@ private: TextureHelper *m_textureHelper; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/labelitem.cpp b/src/datavis3d/engine/labelitem.cpp index 19051dd7..7c76df5d 100644 --- a/src/datavis3d/engine/labelitem.cpp +++ b/src/datavis3d/engine/labelitem.cpp @@ -41,7 +41,7 @@ #include "labelitem_p.h" -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE LabelItem::LabelItem() : m_size(QSize(0, 0)), @@ -73,4 +73,4 @@ GLuint LabelItem::textureId() return m_textureId; } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/labelitem_p.h b/src/datavis3d/engine/labelitem_p.h index 47e480b2..fa73c4c2 100644 --- a/src/datavis3d/engine/labelitem_p.h +++ b/src/datavis3d/engine/labelitem_p.h @@ -56,7 +56,7 @@ #include <QOpenGLFunctions> #include <QSize> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class LabelItem { @@ -74,6 +74,6 @@ private: GLuint m_textureId; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/q3dbars.cpp b/src/datavis3d/engine/q3dbars.cpp index f4626115..98a39a15 100644 --- a/src/datavis3d/engine/q3dbars.cpp +++ b/src/datavis3d/engine/q3dbars.cpp @@ -52,7 +52,7 @@ #include <QDebug> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE /*! * \class Q3DBars @@ -446,6 +446,8 @@ void Q3DBars::setBarColor(QColor baseColor, QColor heightColor, QColor depthColo } /*! + * \property Q3DBars::selectionMode + * * \a mode Set bar selection mode from \c SelectionMode. \c ModeBar by default. * * Sets bar selection mode to be used. @@ -455,11 +457,6 @@ void Q3DBars::setSelectionMode(SelectionMode mode) d_ptr->m_shared->setSelectionMode(mode); } -/*! - * \return \c SelectionMode. - * - * Returns selection mode. - */ SelectionMode Q3DBars::selectionMode() { return d_ptr->m_shared->selectionMode(); @@ -528,6 +525,8 @@ QFont Q3DBars::font() } /*! + * \property Q3DBars::labelTransparency + * * \a transparency Transparency level of labels from \c LabelTransparency. * \c TransparencyFromTheme by default. * @@ -538,11 +537,6 @@ void Q3DBars::setLabelTransparency(LabelTransparency transparency) d_ptr->m_shared->setLabelTransparency(transparency); } -/*! - * \return \c LabelTransparency. - * - * Returns label transparency. - */ LabelTransparency Q3DBars::labelTransparency() { return d_ptr->m_shared->labelTransparency(); @@ -583,6 +577,8 @@ bool Q3DBars::isBackgroundVisible() } /*! + * \property Q3DBars::shadowQuality + * * \a quality Shadow quality from \c ShadowQuality. \c ShadowLow by default. * * Sets shadow quality. @@ -592,11 +588,6 @@ void Q3DBars::setShadowQuality(ShadowQuality quality) d_ptr->m_shared->setShadowQuality(quality); } -/*! - * \return \c ShadowQuality. - * - * Returns shadow quality. - */ ShadowQuality Q3DBars::shadowQuality() { return d_ptr->m_shared->shadowQuality(); @@ -723,4 +714,4 @@ Q3DBarsPrivate::~Q3DBarsPrivate() delete m_shared; } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/q3dbars.h b/src/datavis3d/engine/q3dbars.h index 2bddffac..fb4c3198 100644 --- a/src/datavis3d/engine/q3dbars.h +++ b/src/datavis3d/engine/q3dbars.h @@ -48,7 +48,7 @@ #include <QFont> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class Q3DBarsPrivate; class QDataItem; @@ -56,9 +56,12 @@ class QDataRow; class QDataSet; class LabelItem; -class QTENTERPRISE_DATAVIS3D_EXPORT Q3DBars : public Q3DWindow +class QT_DATAVIS3D_EXPORT Q3DBars : public Q3DWindow { Q_OBJECT + Q_PROPERTY(SelectionMode selectionMode READ selectionMode WRITE setSelectionMode) + Q_PROPERTY(LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency) + Q_PROPERTY(ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality) Q_PROPERTY(QString windowTitle READ windowTitle WRITE setWindowTitle) Q_PROPERTY(QFont font READ font WRITE setFont) Q_PROPERTY(float fontSize READ fontSize WRITE setFontSize) @@ -193,6 +196,6 @@ private: Q_DISABLE_COPY(Q3DBars) }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/q3dbars_p.h b/src/datavis3d/engine/q3dbars_p.h index 0b351ab1..38a9b660 100644 --- a/src/datavis3d/engine/q3dbars_p.h +++ b/src/datavis3d/engine/q3dbars_p.h @@ -60,7 +60,7 @@ class QOpenGLPaintDevice; class QPoint; class QSizeF; -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class Q3DBars; @@ -74,6 +74,6 @@ public: Bars3dRenderer *m_shared; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/q3dmaps.cpp b/src/datavis3d/engine/q3dmaps.cpp index 0a1ca7ff..46c41778 100644 --- a/src/datavis3d/engine/q3dmaps.cpp +++ b/src/datavis3d/engine/q3dmaps.cpp @@ -77,7 +77,7 @@ #include <QTime> #endif -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE //#define DISPLAY_FULL_DATA_ON_SELECTION // Append selection value text with row and column labels @@ -1773,4 +1773,4 @@ bool Q3DMapsPrivate::isValid(const QDataItem &item) return retval; } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/q3dmaps.h b/src/datavis3d/engine/q3dmaps.h index 67c8860b..7b82e679 100644 --- a/src/datavis3d/engine/q3dmaps.h +++ b/src/datavis3d/engine/q3dmaps.h @@ -52,7 +52,7 @@ class QOpenGLShaderProgram; class QImage; class QRect; -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class Q3DMapsPrivate; class QDataItem; @@ -60,7 +60,7 @@ class QDataRow; class QDataSet; class LabelItem; -class QTENTERPRISE_DATAVIS3D_EXPORT Q3DMaps : public Q3DWindow +class QT_DATAVIS3D_EXPORT Q3DMaps : public Q3DWindow { Q_OBJECT Q_PROPERTY(QString windowTitle READ windowTitle WRITE setWindowTitle) @@ -174,6 +174,6 @@ private: Q_DISABLE_COPY(Q3DMaps); }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/q3dmaps_p.h b/src/datavis3d/engine/q3dmaps_p.h index 4c94d85e..81932d90 100644 --- a/src/datavis3d/engine/q3dmaps_p.h +++ b/src/datavis3d/engine/q3dmaps_p.h @@ -62,7 +62,7 @@ class QOpenGLPaintDevice; class QPoint; class QSizeF; -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class Q3DMaps; class QDataItem; @@ -169,6 +169,6 @@ public: bool m_bgrHasAlpha; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/q3dwindow.cpp b/src/datavis3d/engine/q3dwindow.cpp index af975cb1..8af57dce 100644 --- a/src/datavis3d/engine/q3dwindow.cpp +++ b/src/datavis3d/engine/q3dwindow.cpp @@ -50,7 +50,7 @@ #include <QDebug> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE /*! * \class Q3DWindow @@ -216,4 +216,4 @@ Q3DWindowPrivate::~Q3DWindowPrivate() { } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/q3dwindow.h b/src/datavis3d/engine/q3dwindow.h index bf7d8f74..3ae67f8b 100644 --- a/src/datavis3d/engine/q3dwindow.h +++ b/src/datavis3d/engine/q3dwindow.h @@ -49,11 +49,11 @@ class QPainter; -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class Q3DWindowPrivate; -class QTENTERPRISE_DATAVIS3D_EXPORT Q3DWindow : public QWindow, protected QOpenGLFunctions +class QT_DATAVIS3D_EXPORT Q3DWindow : public QWindow, protected QOpenGLFunctions { Q_OBJECT @@ -80,6 +80,6 @@ private: friend class Q3DBars; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/q3dwindow_p.h b/src/datavis3d/engine/q3dwindow_p.h index 4c6c5209..fd489c7e 100644 --- a/src/datavis3d/engine/q3dwindow_p.h +++ b/src/datavis3d/engine/q3dwindow_p.h @@ -57,7 +57,7 @@ class QOpenGLContext; class QOpenGLPaintDevice; -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class Q3DWindow; @@ -76,6 +76,6 @@ public: QOpenGLContext *m_context; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/qdataitem.cpp b/src/datavis3d/engine/qdataitem.cpp index 883c190c..d40e4bc1 100644 --- a/src/datavis3d/engine/qdataitem.cpp +++ b/src/datavis3d/engine/qdataitem.cpp @@ -45,7 +45,7 @@ #include <QPoint> #include <QString> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE /*! * \class QDataItem @@ -227,4 +227,4 @@ QPointF QDataItemPrivate::position() return m_position; } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/qdataitem.h b/src/datavis3d/engine/qdataitem.h index 32022fec..f4d10bd1 100644 --- a/src/datavis3d/engine/qdataitem.h +++ b/src/datavis3d/engine/qdataitem.h @@ -50,11 +50,11 @@ class QPoint; -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class QDataItemPrivate; -class QTENTERPRISE_DATAVIS3D_EXPORT QDataItem : public QObject +class QT_DATAVIS3D_EXPORT QDataItem : public QObject { Q_OBJECT Q_PROPERTY(QString label READ label WRITE setLabel) @@ -86,6 +86,6 @@ private: friend class Drawer; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/qdataitem_p.h b/src/datavis3d/engine/qdataitem_p.h index 6b8a9b83..c660b992 100644 --- a/src/datavis3d/engine/qdataitem_p.h +++ b/src/datavis3d/engine/qdataitem_p.h @@ -61,7 +61,7 @@ #include <QString> #include <QVector3D> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class QDataItemPrivate { @@ -97,6 +97,6 @@ class QDataItemPrivate friend class QDataItem; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/qdatarow.cpp b/src/datavis3d/engine/qdatarow.cpp index 6bdd6d14..abf16571 100644 --- a/src/datavis3d/engine/qdatarow.cpp +++ b/src/datavis3d/engine/qdatarow.cpp @@ -46,7 +46,7 @@ #include <QString> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE /*! * \class QDataRow @@ -184,4 +184,4 @@ LabelItem QDataRowPrivate::labelItem() return m_labelItem; } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/qdatarow.h b/src/datavis3d/engine/qdatarow.h index c43cec8c..ca98a47d 100644 --- a/src/datavis3d/engine/qdatarow.h +++ b/src/datavis3d/engine/qdatarow.h @@ -47,12 +47,12 @@ #include <QString> #include <QObject> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class QDataRowPrivate; class QDataItem; -class QTENTERPRISE_DATAVIS3D_EXPORT QDataRow : public QObject +class QT_DATAVIS3D_EXPORT QDataRow : public QObject { Q_OBJECT Q_PROPERTY(QString label READ label WRITE setLabel) @@ -73,6 +73,6 @@ private: friend class QDataSetPrivate; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/qdatarow_p.h b/src/datavis3d/engine/qdatarow_p.h index d563fe8a..ded9bcfe 100644 --- a/src/datavis3d/engine/qdatarow_p.h +++ b/src/datavis3d/engine/qdatarow_p.h @@ -58,7 +58,7 @@ #include <QVector> #include <QString> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class QDataItem; @@ -86,6 +86,6 @@ private: friend class QDataRow; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/qdataset.cpp b/src/datavis3d/engine/qdataset.cpp index 6fd59baf..38d8d0b4 100644 --- a/src/datavis3d/engine/qdataset.cpp +++ b/src/datavis3d/engine/qdataset.cpp @@ -49,7 +49,7 @@ //#include <QDebug> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE const QString empty; @@ -304,4 +304,4 @@ void QDataSetPrivate::updateTextures() } } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/qdataset.h b/src/datavis3d/engine/qdataset.h index 99ffe519..336f0200 100644 --- a/src/datavis3d/engine/qdataset.h +++ b/src/datavis3d/engine/qdataset.h @@ -50,11 +50,11 @@ #include <QVector> #include <QString> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class QDataSetPrivate; -class QTENTERPRISE_DATAVIS3D_EXPORT QDataSet : public QObject +class QT_DATAVIS3D_EXPORT QDataSet : public QObject { Q_OBJECT @@ -76,6 +76,6 @@ private: friend class Q3DMapsPrivate; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/qdataset_p.h b/src/datavis3d/engine/qdataset_p.h index a259aa9a..a7108a57 100644 --- a/src/datavis3d/engine/qdataset_p.h +++ b/src/datavis3d/engine/qdataset_p.h @@ -59,7 +59,7 @@ #include <QVector> #include <QString> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class QDataSetPrivate : public QObject { @@ -102,6 +102,6 @@ private: friend class QDataSet; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/engine/theme.cpp b/src/datavis3d/engine/theme.cpp index 4a258b67..4d5d3536 100644 --- a/src/datavis3d/engine/theme.cpp +++ b/src/datavis3d/engine/theme.cpp @@ -46,7 +46,7 @@ #include <stdio.h> #endif -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE Theme::Theme() : m_baseColor(QColor(Qt::gray)), @@ -295,4 +295,4 @@ void Theme::useTheme(ColorTheme theme) } } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/engine/theme_p.h b/src/datavis3d/engine/theme_p.h index 7caeae15..9025fd50 100644 --- a/src/datavis3d/engine/theme_p.h +++ b/src/datavis3d/engine/theme_p.h @@ -58,7 +58,7 @@ class QColor; -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class Theme { @@ -91,6 +91,6 @@ private: bool m_uniformColor; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/global/qdatavis3dglobal.h b/src/datavis3d/global/qdatavis3dglobal.h index 308e8607..4ae70fe4 100644 --- a/src/datavis3d/global/qdatavis3dglobal.h +++ b/src/datavis3d/global/qdatavis3dglobal.h @@ -28,47 +28,47 @@ // Uncomment this if you want to try hardcoded QML2 -integration h4x0r version of the engine //#define USE_QML2_VERSION -#define QTENTERPRISE_DATAVIS3D_VERSION_STR "0.0.1" +#define QT_DATAVIS3D_VERSION_STR "0.0.1" /* - QTENTERPRISE_DATAVIS3D_VERSION is (major << 16) + (minor << 8) + patch. + QT_DATAVIS3D_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QTENTERPRISE_DATAVIS3D_VERSION 0x000001 +#define QT_DATAVIS3D_VERSION 0x000001 /* - can be used like #if (QTENTERPRISE_DATAVIS3D_VERSION >= QTENTERPRISE_DATAVIS3D_VERSION_CHECK(1, 1, 0)) + can be used like #if (QT_DATAVIS3D_VERSION >= QT_DATAVIS3D_VERSION_CHECK(1, 1, 0)) */ -#define QTENTERPRISE_DATAVIS3D_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) +#define QT_DATAVIS3D_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) -#if defined(QTENTERPRISE_DATAVIS3D_LIBRARY) -# define QTENTERPRISE_DATAVIS3D_EXPORT Q_DECL_EXPORT +#if defined(QT_DATAVIS3D_LIBRARY) +# define QT_DATAVIS3D_EXPORT Q_DECL_EXPORT #else -# define QTENTERPRISE_DATAVIS3D_EXPORT Q_DECL_IMPORT +# define QT_DATAVIS3D_EXPORT Q_DECL_IMPORT #endif -#if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QTENTERPRISE_DATAVIS3D_LIBRARY) -# define QTENTERPRISE_DATAVIS3D_AUTOTEST_EXPORT Q_DECL_EXPORT -#elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QTENTERPRISE_DATAVIS3D_LIBRARY) -# define QTENTERPRISE_DATAVIS3D_AUTOTEST_EXPORT Q_DECL_IMPORT +#if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_DATAVIS3D_LIBRARY) +# define QT_DATAVIS3D_AUTOTEST_EXPORT Q_DECL_EXPORT +#elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_DATAVIS3D_LIBRARY) +# define QT_DATAVIS3D_AUTOTEST_EXPORT Q_DECL_IMPORT #else -# define QTENTERPRISE_DATAVIS3D_AUTOTEST_EXPORT +# define QT_DATAVIS3D_AUTOTEST_EXPORT #endif -#ifdef QTENTERPRISE_DATAVIS3D_STATICLIB -# undef QTENTERPRISE_DATAVIS3D_EXPORT -# undef QTENTERPRISE_DATAVIS3D_AUTOTEST_EXPORT -# define QTENTERPRISE_DATAVIS3D_EXPORT -# define QTENTERPRISE_DATAVIS3D_AUTOTEST_EXPORT +#ifdef QT_DATAVIS3D_STATICLIB +# undef QT_DATAVIS3D_EXPORT +# undef QT_DATAVIS3D_AUTOTEST_EXPORT +# define QT_DATAVIS3D_EXPORT +# define QT_DATAVIS3D_AUTOTEST_EXPORT #endif -#define QTENTERPRISE_DATAVIS3D_NAMESPACE QtDataVis3D +#define QT_DATAVIS3D_NAMESPACE QtDataVis3D -#ifdef QTENTERPRISE_DATAVIS3D_NAMESPACE -# define QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE namespace QTENTERPRISE_DATAVIS3D_NAMESPACE { -# define QTENTERPRISE_DATAVIS3D_END_NAMESPACE } -# define QTENTERPRISE_DATAVIS3D_USE_NAMESPACE using namespace QTENTERPRISE_DATAVIS3D_NAMESPACE; +#ifdef QT_DATAVIS3D_NAMESPACE +# define QT_DATAVIS3D_BEGIN_NAMESPACE namespace QT_DATAVIS3D_NAMESPACE { +# define QT_DATAVIS3D_END_NAMESPACE } +# define QT_DATAVIS3D_USE_NAMESPACE using namespace QT_DATAVIS3D_NAMESPACE; #else -# define QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE -# define QTENTERPRISE_DATAVIS3D_END_NAMESPACE -# define QTENTERPRISE_DATAVIS3D_USE_NAMESPACE +# define QT_DATAVIS3D_BEGIN_NAMESPACE +# define QT_DATAVIS3D_END_NAMESPACE +# define QT_DATAVIS3D_USE_NAMESPACE #endif #if defined(DEVELOPMENT_BUILD) && !defined(QT_NO_DEBUG) diff --git a/src/datavis3d/global/qdatavis3namespace.h b/src/datavis3d/global/qdatavis3namespace.h index e36cc02a..38f0aa23 100644 --- a/src/datavis3d/global/qdatavis3namespace.h +++ b/src/datavis3d/global/qdatavis3namespace.h @@ -46,7 +46,7 @@ #include <QOpenGLFunctions> #include <QVector3D> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE // Constants used in several files const GLfloat m_pi = 3.1415926535897932384626433832795028841971693993751058209749445923078164062862089986280348253421170679f; @@ -142,6 +142,6 @@ enum LabelTransparency { TransparencyNoBackground // Draw just text on transparent background }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/utils/camerahelper.cpp b/src/datavis3d/utils/camerahelper.cpp index 4d59132f..60050e5a 100644 --- a/src/datavis3d/utils/camerahelper.cpp +++ b/src/datavis3d/utils/camerahelper.cpp @@ -45,7 +45,7 @@ #include <QMatrix4x4> #include <QVector3D> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE // Initial camera position QVector3D m_position = QVector3D(0, 0.25, 3); @@ -307,4 +307,4 @@ void CameraHelper::setCameraPreset(CameraPreset preset) } } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/utils/camerahelper_p.h b/src/datavis3d/utils/camerahelper_p.h index 21b6ccac..b95e89ba 100644 --- a/src/datavis3d/utils/camerahelper_p.h +++ b/src/datavis3d/utils/camerahelper_p.h @@ -61,7 +61,7 @@ class QVector3D; class QPoint; class QPointF; -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class CameraHelper { @@ -89,6 +89,6 @@ class CameraHelper static void setCameraPreset(CameraPreset preset); }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/utils/meshloader.cpp b/src/datavis3d/utils/meshloader.cpp index 0bb780ce..4889a888 100644 --- a/src/datavis3d/utils/meshloader.cpp +++ b/src/datavis3d/utils/meshloader.cpp @@ -49,7 +49,7 @@ #include <QDebug> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE QString slashTag = QStringLiteral("/"); @@ -145,4 +145,4 @@ bool MeshLoader::loadOBJ(const QString &path, return true; } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/utils/meshloader_p.h b/src/datavis3d/utils/meshloader_p.h index 88ab89b3..15daf068 100644 --- a/src/datavis3d/utils/meshloader_p.h +++ b/src/datavis3d/utils/meshloader_p.h @@ -57,7 +57,7 @@ class QVector2D; class QVector3D; -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class MeshLoader { @@ -69,6 +69,6 @@ class MeshLoader // TODO: add loaders for other formats? }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/utils/objecthelper.cpp b/src/datavis3d/utils/objecthelper.cpp index d280abf8..b29ec8d6 100644 --- a/src/datavis3d/utils/objecthelper.cpp +++ b/src/datavis3d/utils/objecthelper.cpp @@ -45,7 +45,7 @@ #include <QDebug> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE ObjectHelper::ObjectHelper(const QString &objectFile) : m_objectFile(objectFile), @@ -162,4 +162,4 @@ GLuint ObjectHelper::indexCount() return m_indexCount; } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/utils/objecthelper_p.h b/src/datavis3d/utils/objecthelper_p.h index 6cac8770..010c3b4b 100644 --- a/src/datavis3d/utils/objecthelper_p.h +++ b/src/datavis3d/utils/objecthelper_p.h @@ -55,7 +55,7 @@ #include "qdatavis3dglobal.h" #include <QOpenGLFunctions> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class ObjectHelper: protected QOpenGLFunctions { @@ -86,6 +86,6 @@ class ObjectHelper: protected QOpenGLFunctions GLboolean m_meshDataLoaded; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/utils/shaderhelper.cpp b/src/datavis3d/utils/shaderhelper.cpp index c8a92dae..3a9f8bd9 100644 --- a/src/datavis3d/utils/shaderhelper.cpp +++ b/src/datavis3d/utils/shaderhelper.cpp @@ -43,7 +43,7 @@ #include <QOpenGLShader> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE ShaderHelper::ShaderHelper(QObject *parent, const QString &vertexShader, @@ -249,4 +249,4 @@ GLuint ShaderHelper::normalAtt() return m_normalAttr; } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/utils/shaderhelper_p.h b/src/datavis3d/utils/shaderhelper_p.h index 55d075de..586a7be8 100644 --- a/src/datavis3d/utils/shaderhelper_p.h +++ b/src/datavis3d/utils/shaderhelper_p.h @@ -57,7 +57,7 @@ class QOpenGLShaderProgram; -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class ShaderHelper { @@ -128,6 +128,6 @@ class ShaderHelper GLboolean m_initialized; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/utils/texturehelper.cpp b/src/datavis3d/utils/texturehelper.cpp index 3d827c50..1c9b3af0 100644 --- a/src/datavis3d/utils/texturehelper.cpp +++ b/src/datavis3d/utils/texturehelper.cpp @@ -46,7 +46,7 @@ #include <QDebug> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE TextureHelper::TextureHelper() { @@ -395,4 +395,4 @@ QRgb TextureHelper::qt_gl_convertToGLFormatHelper(QRgb src_pixel, GLenum texture } } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/utils/texturehelper_p.h b/src/datavis3d/utils/texturehelper_p.h index e848f063..d16507d6 100644 --- a/src/datavis3d/utils/texturehelper_p.h +++ b/src/datavis3d/utils/texturehelper_p.h @@ -56,7 +56,7 @@ #include <QOpenGLFunctions> #include <QRgb> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class TextureHelper : protected QOpenGLFunctions { @@ -87,6 +87,6 @@ class TextureHelper : protected QOpenGLFunctions friend class Q3DMapsPrivate; }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/utils/utils.cpp b/src/datavis3d/utils/utils.cpp index 7acca185..d9b157d9 100644 --- a/src/datavis3d/utils/utils.cpp +++ b/src/datavis3d/utils/utils.cpp @@ -51,7 +51,7 @@ #include <QDebug> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE #define NUM_IN_POWER(y, x) for (;y<x;y<<=1) #define MIN_POWER 32 @@ -254,4 +254,4 @@ QVector3D Utils::getSelection(QPoint mousepos, int height) return selectedColor; } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/utils/utils_p.h b/src/datavis3d/utils/utils_p.h index f809dad7..722523ac 100644 --- a/src/datavis3d/utils/utils_p.h +++ b/src/datavis3d/utils/utils_p.h @@ -63,7 +63,7 @@ class QString; class QPoint; class QImage; -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class Utils { @@ -80,6 +80,6 @@ class Utils static QVector3D getSelection(QPoint mousepos, int height); }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif diff --git a/src/datavis3d/utils/vertexindexer.cpp b/src/datavis3d/utils/vertexindexer.cpp index c1dfb1aa..1d03d4c8 100644 --- a/src/datavis3d/utils/vertexindexer.cpp +++ b/src/datavis3d/utils/vertexindexer.cpp @@ -46,7 +46,7 @@ #include <QDebug> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE int unique_vertices = 0; @@ -173,4 +173,4 @@ void VertexIndexer::indexVBO_TBN(const QVector<QVector3D> &in_vertices, //qDebug() << "unique vertices" << unique_vertices; } -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE diff --git a/src/datavis3d/utils/vertexindexer_p.h b/src/datavis3d/utils/vertexindexer_p.h index cced863b..a1bc0d5b 100644 --- a/src/datavis3d/utils/vertexindexer_p.h +++ b/src/datavis3d/utils/vertexindexer_p.h @@ -58,7 +58,7 @@ #include <QVector2D> #include <QVector3D> -QTENTERPRISE_DATAVIS3D_BEGIN_NAMESPACE +QT_DATAVIS3D_BEGIN_NAMESPACE class VertexIndexer { @@ -106,6 +106,6 @@ class VertexIndexer unsigned short &result); }; -QTENTERPRISE_DATAVIS3D_END_NAMESPACE +QT_DATAVIS3D_END_NAMESPACE #endif |