Rename axes to avoid conflicts with Charts

+ Some doc fixes.

Task-number: QTRD-2214
Change-Id: Idecec749a76ef6a5d84857d1396f25be3ef017ca
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

1 files changed, 0 insertions, 88 deletions

diff --git a/src/datavis3d/axis/qabstractaxis.h b/src/datavis3d/axis/qabstractaxis.h
deleted file mode 100644
index 04c25af4..00000000
--- a/src/datavis3d/axis/qabstractaxis.h
+++ /dev/null
@@ -1,88 +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 the QtDataVis3D 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
-**
-****************************************************************************/
-
-#ifndef QABSTRACTAXIS_H
-#define QABSTRACTAXIS_H
-
-#include <QtDataVis3D/qdatavis3denums.h>
-#include <QObject>
-#include <QScopedPointer>
-#include <QVector>
-#include <QStringList>
-
-QT_DATAVIS3D_BEGIN_NAMESPACE
-
-class QAbstractAxisPrivate;
-
-class QT_DATAVIS3D_EXPORT QAbstractAxis : public QObject
-{
-    Q_OBJECT
-    Q_ENUMS(AxisOrientation)
-    Q_ENUMS(AxisType)
-    Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged)
-    Q_PROPERTY(QStringList labels READ labels NOTIFY labelsChanged)
-    Q_PROPERTY(AxisOrientation orientation READ orientation)
-    Q_PROPERTY(AxisType type READ type)
-
-public:
-    enum AxisOrientation {
-        AxisOrientationNone = 0,
-        AxisOrientationX = 1,
-        AxisOrientationY = 2,
-        AxisOrientationZ = 4
-    };
-
-    enum AxisType {
-        AxisTypeNone = 0,
-        AxisTypeCategory = 1,
-        AxisTypeValue = 2
-        //AxisTypeLogValue = 6 // inherits valueaxis (4 + 2) // TODO
-    };
-
-protected:
-    explicit QAbstractAxis(QAbstractAxisPrivate *d, QObject *parent = 0);
-
-public:
-    virtual ~QAbstractAxis();
-
-    QString title() const;
-    QStringList labels() const;
-
-    AxisOrientation orientation() const;
-    AxisType type() const;
-
-public slots:
-    void setTitle(QString title);
-
-signals:
-    void titleChanged(QString newTitle);
-    void labelsChanged();
-
-protected:
-    QScopedPointer<QAbstractAxisPrivate> d_ptr;
-
-private:
-    Q_DISABLE_COPY(QAbstractAxis)
-
-    friend class Abstract3DController;
-    friend class Bars3DController;
-};
-
-QT_DATAVIS3D_END_NAMESPACE
-
-#endif // QABSTRACTAXIS_H