From 467e729eabece018cd42eeee0160f932983561b0 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 7 Jan 2014 13:11:34 +0200 Subject: Rename axis classes Moved the '3D' in axis class names so that the classes would be in line with other '3D' classes. Task-number: QTRD-2674 Change-Id: Ie4f8a10babe3bf1b0b30b366863f55ed02ec66ba Reviewed-by: Mika Salmela --- src/datavisualization/axis/qcategory3daxis_p.h | 57 ++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 src/datavisualization/axis/qcategory3daxis_p.h (limited to 'src/datavisualization/axis/qcategory3daxis_p.h') diff --git a/src/datavisualization/axis/qcategory3daxis_p.h b/src/datavisualization/axis/qcategory3daxis_p.h new file mode 100644 index 00000000..dfcc9961 --- /dev/null +++ b/src/datavisualization/axis/qcategory3daxis_p.h @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** 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 "qcategory3daxis.h" +#include "qabstract3daxis_p.h" +#include "qbardataitem.h" + +#ifndef QCATEGORY3DAXIS_P_H +#define QCATEGORY3DAXIS_P_H + +QT_DATAVISUALIZATION_BEGIN_NAMESPACE + +class QCategory3DAxisPrivate : public QAbstract3DAxisPrivate +{ + Q_OBJECT + +public: + QCategory3DAxisPrivate(QCategory3DAxis *q); + virtual ~QCategory3DAxisPrivate(); + + void setDataLabels(const QStringList &labels); + +private: + QCategory3DAxis *qptr(); + + bool m_labelsExplicitlySet; + friend class QCategory3DAxis; +}; + +QT_DATAVISUALIZATION_END_NAMESPACE + +#endif -- cgit v1.2.3 From 64d6b482bfb9dbacd548b72cb9c073513f6aa56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Wed, 15 Jan 2014 11:34:59 +0200 Subject: Removed QDataVis and namespace macros - docs will be fixed in QTRD-2594 Task-number: QTRD-2699 Task-number: QTRD-2700 Change-Id: Ia89d365c2de5d9254b165feb4f0a54ec099084be Reviewed-by: Miikka Heikkinen --- src/datavisualization/axis/qcategory3daxis_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/datavisualization/axis/qcategory3daxis_p.h') diff --git a/src/datavisualization/axis/qcategory3daxis_p.h b/src/datavisualization/axis/qcategory3daxis_p.h index dfcc9961..6449e999 100644 --- a/src/datavisualization/axis/qcategory3daxis_p.h +++ b/src/datavisualization/axis/qcategory3daxis_p.h @@ -33,7 +33,7 @@ #ifndef QCATEGORY3DAXIS_P_H #define QCATEGORY3DAXIS_P_H -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class QCategory3DAxisPrivate : public QAbstract3DAxisPrivate { @@ -52,6 +52,6 @@ private: friend class QCategory3DAxis; }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif -- cgit v1.2.3 From 8674307d6bafabfcaedfe175b883313f0e7d88b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Thu, 16 Jan 2014 13:33:57 +0200 Subject: Reintroduced namespace macros Task-number: QTRD-2594 Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Reviewed-by: Miikka Heikkinen --- src/datavisualization/axis/qcategory3daxis_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/datavisualization/axis/qcategory3daxis_p.h') diff --git a/src/datavisualization/axis/qcategory3daxis_p.h b/src/datavisualization/axis/qcategory3daxis_p.h index 6449e999..f7a16161 100644 --- a/src/datavisualization/axis/qcategory3daxis_p.h +++ b/src/datavisualization/axis/qcategory3daxis_p.h @@ -33,7 +33,7 @@ #ifndef QCATEGORY3DAXIS_P_H #define QCATEGORY3DAXIS_P_H -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QCategory3DAxisPrivate : public QAbstract3DAxisPrivate { @@ -52,6 +52,6 @@ private: friend class QCategory3DAxis; }; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif -- cgit v1.2.3 From 3b57eb8aaef9886a9975b7b861f31bdf8ed15fdb Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 27 Jan 2014 08:18:03 +0200 Subject: Fix copyright year Task-number: QTRD-2803 Change-Id: If670633f52519741a096abe901d55fd084ddc9c5 Reviewed-by: Miikka Heikkinen --- src/datavisualization/axis/qcategory3daxis_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/datavisualization/axis/qcategory3daxis_p.h') diff --git a/src/datavisualization/axis/qcategory3daxis_p.h b/src/datavisualization/axis/qcategory3daxis_p.h index f7a16161..1ba5ccb0 100644 --- a/src/datavisualization/axis/qcategory3daxis_p.h +++ b/src/datavisualization/axis/qcategory3daxis_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -- cgit v1.2.3