qiurui
/
qtdatavis3d
mirror of https://github.com/qt/qtdatavis3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.11' into dev 

Change-Id: I103882a747cf750dfbfba3f3004b1edfbecaca57
This commit is contained in:
Qt Forward Merge Bot 2018-03-10 03:00:03 +01:00
parent 311a1d5dca 8a05311964
commit 191ace1edd
7 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/datavisualization/data/qbardataproxy.cpp
View File

@ -60,14 +60,14 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
*/
/*!
* \typedef QtDataVisualization::QBarDataRow
* \typedef QBarDataRow
* \relates QBarDataProxy
*
* A vector of \l {QBarDataItem} objects.
*/
/*!
* \typedef QtDataVisualization::QBarDataArray
* \typedef QBarDataArray
* \relates QBarDataProxy
*
* A list of pointers to \l {QBarDataRow} objects.

9
src/datavisualization/data/qbardataproxy.h
View File

@ -35,17 +35,14 @@
#include <QtCore/QVector>
#include <QtCore/QStringList>
namespace QtDataVisualization {
// typedefs introduced this way because QDoc doesn't understand namespace macros
typedef QVector<QBarDataItem> QBarDataRow;
typedef QList<QBarDataRow *> QBarDataArray;
}
QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QBarDataProxyPrivate;
class QBar3DSeries;
typedef QVector<QBarDataItem> QBarDataRow;
typedef QList<QBarDataRow *> QBarDataArray;
class QT_DATAVISUALIZATION_EXPORT QBarDataProxy : public QAbstractDataProxy
{
Q_OBJECT

2
src/datavisualization/data/qscatterdataproxy.cpp
View File

@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
*/
/*!
* \typedef QtDataVisualization::QScatterDataArray
* \typedef QScatterDataArray
* \relates QScatterDataProxy
*
* A vector of \l {QScatterDataItem} objects.

7
src/datavisualization/data/qscatterdataproxy.h
View File

@ -33,16 +33,13 @@
#include <QtDataVisualization/qabstractdataproxy.h>
#include <QtDataVisualization/qscatterdataitem.h>
namespace QtDataVisualization {
// typedef introduced this way because QDoc doesn't understand namespace macros
typedef QVector<QScatterDataItem> QScatterDataArray;
}
QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QScatterDataProxyPrivate;
class QScatter3DSeries;
typedef QVector<QScatterDataItem> QScatterDataArray;
class QT_DATAVISUALIZATION_EXPORT QScatterDataProxy : public QAbstractDataProxy
{
Q_OBJECT

4
src/datavisualization/data/qsurfacedataproxy.cpp
View File

@ -76,14 +76,14 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
*/
/*!
* \typedef QtDataVisualization::QSurfaceDataRow
* \typedef QSurfaceDataRow
* \relates QSurfaceDataProxy
*
* A vector of \l {QSurfaceDataItem} objects.
*/
/*!
* \typedef QtDataVisualization::QSurfaceDataArray
* \typedef QSurfaceDataArray
* \relates QSurfaceDataProxy
*
* A list of pointers to \l {QSurfaceDataRow} objects.

9
src/datavisualization/data/qsurfacedataproxy.h
View File

@ -33,17 +33,14 @@
#include <QtDataVisualization/qabstractdataproxy.h>
#include <QtDataVisualization/qsurfacedataitem.h>
namespace QtDataVisualization {
// typedefs introduced this way because QDoc doesn't understand namespace macros
typedef QVector<QSurfaceDataItem> QSurfaceDataRow;
typedef QList<QSurfaceDataRow *> QSurfaceDataArray;
}
QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class QSurfaceDataProxyPrivate;
class QSurface3DSeries;
typedef QVector<QSurfaceDataItem> QSurfaceDataRow;
typedef QList<QSurfaceDataRow *> QSurfaceDataArray;
class QT_DATAVISUALIZATION_EXPORT QSurfaceDataProxy : public QAbstractDataProxy
{
Q_OBJECT

5
src/datavisualization/global/qdatavisualizationglobal.h
View File

@ -52,7 +52,12 @@
# define QT_DATAVISUALIZATION_EXPORT
#endif
#ifndef Q_CLANG_QDOC
#define QT_BEGIN_NAMESPACE_DATAVISUALIZATION namespace QtDataVisualization {
#define QT_END_NAMESPACE_DATAVISUALIZATION }
#else /* Let documentation be generated with the standard Qt namespace */
#define QT_BEGIN_NAMESPACE_DATAVISUALIZATION QT_BEGIN_NAMESPACE
#define QT_END_NAMESPACE_DATAVISUALIZATION QT_END_NAMESPACE
#endif // Q_CLANG_QDOC
#endif