Merge remote-tracking branch 'origin/develop'

Change-Id: I3b63e58db8a5555ada270f81f88fa3b04cecada9

1 files changed, 62 insertions, 0 deletions

diff --git a/src/datavisualization/data/qabstractdataproxy_p.h b/src/datavisualization/data/qabstractdataproxy_p.h
new file mode 100644
index 00000000..4aa1b678
--- /dev/null
+++ b/src/datavisualization/data/qabstractdataproxy_p.h
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** 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 the QtDataVisualization module.
+**
+** 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
+**
+****************************************************************************/
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the QtDataVisualization API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+
+#include "datavisualizationglobal_p.h"
+#include "qabstractdataproxy.h"
+#include <QString>
+
+#ifndef QABSTRACTDATAPROXY_P_H
+#define QABSTRACTDATAPROXY_P_H
+
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+
+class QAbstractDataProxyPrivate : public QObject
+{
+    Q_OBJECT
+public:
+    QAbstractDataProxyPrivate(QAbstractDataProxy *q, QAbstractDataProxy::DataType type);
+    virtual ~QAbstractDataProxyPrivate();
+
+    void setItemLabelFormat(const QString &format);
+
+    inline bool isDefaultProxy() { return m_isDefaultProxy; }
+    inline void setDefaultProxy(bool isDefault) { m_isDefaultProxy = isDefault; }
+
+protected:
+    QAbstractDataProxy *q_ptr;
+    QAbstractDataProxy::DataType m_type;
+    QString m_itemLabelFormat;
+    bool m_isDefaultProxy;
+
+private:
+    friend class QAbstractDataProxy;
+};
+
+QT_DATAVISUALIZATION_END_NAMESPACE
+
+#endif // QABSTRACTDATAPROXY_P_H