##// END OF EJS Templates
Make public headers compile with -Wzero-as-null-pointer-constant...
Make public headers compile with -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I79c74046eaf224235cc80a4323fefd2c083b007f Task-number: QTBUG-45291 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

File last commit:

r2845:ae12522d475c
r2871:cf15f38aab8d
Show More
declarativecategoryaxis.cpp
114 lines | 3.4 KiB | text/x-c | CppLexer
/ src / chartsqml2 / declarativecategoryaxis.cpp
Titta Heikkala
Updated license headers...
r2845 /******************************************************************************
Tero Ahola
Added missing sources to declarative plugin
r1872 **
Titta Heikkala
Updated license headers...
r2845 ** Copyright (C) 2015 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
Tero Ahola
Added missing sources to declarative plugin
r1872 **
Titta Heikkala
Updated license headers...
r2740 ** This file is part of the Qt Charts module.
Tero Ahola
Added missing sources to declarative plugin
r1872 **
Titta Heikkala
Updated license headers...
r2845 ** $QT_BEGIN_LICENSE:COMM$
Tero Ahola
Added missing sources to declarative plugin
r1872 **
Titta Heikkala
Updated license headers...
r2845 ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us.
Tero Ahola
Added missing sources to declarative plugin
r1872 **
Titta Heikkala
Updated license headers...
r2845 ** $QT_END_LICENSE$
**
******************************************************************************/
Tero Ahola
Added missing sources to declarative plugin
r1872
#include "declarativecategoryaxis.h"
Titta Heikkala
Fix include syntax...
r2714 #include <QtCore/QDebug>
Tero Ahola
Added missing sources to declarative plugin
r1872
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_BEGIN_NAMESPACE
Tero Ahola
Added missing sources to declarative plugin
r1872
Titta Heikkala
Fix Charts documentation...
r2639 /*!
\qmltype CategoryRange
Titta Heikkala
Qt Charts project file structure change...
r2712 \inqmlmodule QtCharts
Titta Heikkala
Fix Charts documentation...
r2639
Titta Heikkala
Qt Charts project file structure change...
r2712 \brief With CategoryRange you can define a range used by a CategoryAxis.
\sa CategoryAxis
Titta Heikkala
Fix Charts documentation...
r2639 */
Tero Ahola
Added missing sources to declarative plugin
r1872
DeclarativeCategoryRange::DeclarativeCategoryRange(QObject *parent) :
QObject(parent),
m_endValue(0),
m_label(QString())
{
}
DeclarativeCategoryAxis::DeclarativeCategoryAxis(QObject *parent) :
QCategoryAxis(parent)
{
}
void DeclarativeCategoryAxis::classBegin()
{
}
void DeclarativeCategoryAxis::componentComplete()
{
Tero Ahola
CategoryRange objects no longer need to be in a specific order
r2080 QList<QPair<QString, qreal> > ranges;
Jani Honkonen
coding style: foreach whitespace fix
r2100 foreach (QObject *child, children()) {
Tero Ahola
Added missing sources to declarative plugin
r1872 if (qobject_cast<DeclarativeCategoryRange *>(child)) {
DeclarativeCategoryRange *range = qobject_cast<DeclarativeCategoryRange *>(child);
Tero Ahola
CategoryRange objects no longer need to be in a specific order
r2080 ranges.append(QPair<QString, qreal>(range->label(), range->endValue()));
Tero Ahola
Added missing sources to declarative plugin
r1872 }
}
Tero Ahola
CategoryRange objects no longer need to be in a specific order
r2080
// Sort and append the range objects according to end value
qSort(ranges.begin(), ranges.end(), endValueLessThan);
for (int i(0); i < ranges.count(); i++)
append(ranges.at(i).first, ranges.at(i).second);
}
bool DeclarativeCategoryAxis::endValueLessThan(const QPair<QString, qreal> &value1, const QPair<QString, qreal> &value2)
{
return value1.second < value2.second;
Tero Ahola
Added missing sources to declarative plugin
r1872 }
Titta Heikkala
Qt Charts project file structure change...
r2712 QQmlListProperty<QObject> DeclarativeCategoryAxis::axisChildren()
Tero Ahola
Added missing sources to declarative plugin
r1872 {
Titta Heikkala
Qt Charts project file structure change...
r2712 return QQmlListProperty<QObject>(this, 0, &DeclarativeCategoryAxis::appendAxisChildren ,0,0,0);
Tero Ahola
Added missing sources to declarative plugin
r1872 }
void DeclarativeCategoryAxis::append(const QString &label, qreal categoryEndValue)
{
QCategoryAxis::append(label, categoryEndValue);
}
void DeclarativeCategoryAxis::remove(const QString &label)
{
QCategoryAxis::remove(label);
}
Jani Honkonen
coding style fixes for plugins
r2101 void DeclarativeCategoryAxis::replace(const QString &oldLabel, const QString &newLabel)
Tero Ahola
Added missing sources to declarative plugin
r1872 {
QCategoryAxis::replaceLabel(oldLabel, newLabel);
}
Titta Heikkala
Qt Charts project file structure change...
r2712 void DeclarativeCategoryAxis::appendAxisChildren(QQmlListProperty<QObject> *list, QObject *element)
Tero Ahola
Added missing sources to declarative plugin
r1872 {
// Empty implementation; the children are parsed in componentComplete instead
Q_UNUSED(list)
Q_UNUSED(element)
}
Titta Heikkala
Added possibility to set labels position for QCategoryAxis...
r2780 DeclarativeCategoryAxis::AxisLabelsPosition DeclarativeCategoryAxis::labelsPosition() const
{
return (DeclarativeCategoryAxis::AxisLabelsPosition) QCategoryAxis::labelsPosition();
}
void DeclarativeCategoryAxis::setLabelsPosition(AxisLabelsPosition position)
{
Miikka Heikkinen
Fix compile errors/warnings in linux...
r2799 if (position != m_labelsPosition) {
QCategoryAxis::setLabelsPosition((QCategoryAxis::AxisLabelsPosition)position);
Titta Heikkala
Added possibility to set labels position for QCategoryAxis...
r2780 emit labelsPositionChanged(position);
}
}
Tero Ahola
Added missing sources to declarative plugin
r1872 #include "moc_declarativecategoryaxis.cpp"
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_END_NAMESPACE