diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-05-08 12:46:49 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-05-08 13:30:48 +0300 |
commit | ee7f5d387934c46442ece1ea17566305ada94cef (patch) | |
tree | 90dd4d95ae2f83f66e2ee42608122a393f5be46c /src/datavis3d/global/qdatavis3dglobal.h | |
parent | 161232582e7f7e7e6e991def2fe87d78e668d08f (diff) |
Directory structure reorganized
Unnecessary subdirectory levels deleted from examples and src
Change-Id: I88892b4fc92784e706be2264eeb7d6208250a50f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavis3d/global/qdatavis3dglobal.h')
-rw-r--r-- | src/datavis3d/global/qdatavis3dglobal.h | 90 |
1 files changed, 0 insertions, 90 deletions
diff --git a/src/datavis3d/global/qdatavis3dglobal.h b/src/datavis3d/global/qdatavis3dglobal.h deleted file mode 100644 index 528180b3..00000000 --- a/src/datavis3d/global/qdatavis3dglobal.h +++ /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 QtDataVis3D. -** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial 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$ -** -****************************************************************************/ - -#ifndef QVIS3DGLOBAL_H -#define QVIS3DGLOBAL_H - -#include <qglobal.h> - -//#define ROTATE_ZOOM_SELECTION - -#define QTCOMMERCIALDATAVIS3D_VERSION_STR "0.0.1" -/* - QTCOMMERCIALDATAVIS3D_VERSION is (major << 16) + (minor << 8) + patch. -*/ -#define QTCOMMERCIALDATAVIS3D_VERSION 0x000001 -/* - can be used like #if (QTCOMMERCIALDATAVIS3D_VERSION >= QTCOMMERCIALDATAVIS3D_VERSION_CHECK(1, 1, 0)) -*/ -#define QTCOMMERCIALDATAVIS3D_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) - -#if defined(QTCOMMERCIALDATAVIS3D_LIBRARY) -# define QTCOMMERCIALDATAVIS3D_EXPORT Q_DECL_EXPORT -#else -# define QTCOMMERCIALDATAVIS3D_EXPORT Q_DECL_IMPORT -#endif - -#if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QTCOMMERCIALDATAVIS3D_LIBRARY) -# define QTCOMMERCIALDATAVIS3D_AUTOTEST_EXPORT Q_DECL_EXPORT -#elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QTCOMMERCIALDATAVIS3D_LIBRARY) -# define QTCOMMERCIALDATAVIS3D_AUTOTEST_EXPORT Q_DECL_IMPORT -#else -# define QTCOMMERCIALDATAVIS3D_AUTOTEST_EXPORT -#endif - -#ifdef QTCOMMERCIALDATAVIS3D_STATICLIB -# undef QTCOMMERCIALDATAVIS3D_EXPORT -# undef QTCOMMERCIALDATAVIS3D_AUTOTEST_EXPORT -# define QTCOMMERCIALDATAVIS3D_EXPORT -# define QTCOMMERCIALDATAVIS3D_AUTOTEST_EXPORT -#endif - -#define QTCOMMERCIALDATAVIS3D_NAMESPACE QtDataVis3D - -#ifdef QTCOMMERCIALDATAVIS3D_NAMESPACE -# define QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE namespace QTCOMMERCIALDATAVIS3D_NAMESPACE { -# define QTCOMMERCIALDATAVIS3D_END_NAMESPACE } -# define QTCOMMERCIALDATAVIS3D_USE_NAMESPACE using namespace QTCOMMERCIALDATAVIS3D_NAMESPACE; -#else -# define QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE -# define QTCOMMERCIALDATAVIS3D_END_NAMESPACE -# define QTCOMMERCIALDATAVIS3D_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); -} -#endif - -#endif // QVIS3DGLOBAL_H |