diff options
Diffstat (limited to 'src/datavis3d/global/qdatavis3dglobal.h')
| -rw-r--r-- | src/datavis3d/global/qdatavis3dglobal.h | 81 |
1 files changed, 29 insertions, 52 deletions
diff --git a/src/datavis3d/global/qdatavis3dglobal.h b/src/datavis3d/global/qdatavis3dglobal.h index 7dad9374..5e2e88b1 100644 --- a/src/datavis3d/global/qdatavis3dglobal.h +++ b/src/datavis3d/global/qdatavis3dglobal.h @@ -4,17 +4,15 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of QtDataVis3D. +** This file is part of the QtDataVis3D module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the +** 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 -** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -23,68 +21,47 @@ #include <qglobal.h> -//#define ROTATE_ZOOM_SELECTION - -#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 -#endif - -#if defined(DEVELOPMENT_BUILD) && !defined(QT_NO_DEBUG) -#include <stdarg.h> -#include <QDebug> - -#define CHART_DEBUG chartDebug(3,__LINE__,__FILE__,__FUNCTION__) - -static inline QDebug chartDebug(int numargs,...) -{ - va_list valist; - va_start(valist, numargs); - //for( int i = 0 ; i < numargs; i++ ) - int line = va_arg(valist, int); - char *file = va_arg(valist, char *); - char *function = va_arg(valist, char *); - va_end(valist); - return qDebug() << QString().append(function).append("(").append(file).append(":%1)").arg(line); -} +# define QT_DATAVIS3D_BEGIN_NAMESPACE +# define QT_DATAVIS3D_END_NAMESPACE +# define QT_DATAVIS3D_USE_NAMESPACE #endif #endif // QVIS3DGLOBAL_H |