From 46e62d22b0b4f270d917d93da8c975c32b736501 2012-09-25 07:03:24 From: Jani Honkonen Date: 2012-09-25 07:03:24 Subject: [PATCH] coding style fixes for examples --- diff --git a/examples/areachart/main.cpp b/examples/areachart/main.cpp index cb788b5..6ee7f0a 100644 --- a/examples/areachart/main.cpp +++ b/examples/areachart/main.cpp @@ -37,9 +37,9 @@ int main(int argc, char *argv[]) //![2] *series0 << QPointF(1, 5) << QPointF(3, 7) << QPointF(7, 6) << QPointF(9, 7) << QPointF(12, 6) - << QPointF(16, 7) << QPointF(18, 5); + << QPointF(16, 7) << QPointF(18, 5); *series1 << QPointF(1, 3) << QPointF(3, 4) << QPointF(7, 3) << QPointF(8, 2) << QPointF(12, 3) - << QPointF(16, 4) << QPointF(18, 3); + << QPointF(16, 4) << QPointF(18, 3); //![2] //![3] diff --git a/examples/barchart/main.cpp b/examples/barchart/main.cpp index 97937e6..fceda14 100644 --- a/examples/barchart/main.cpp +++ b/examples/barchart/main.cpp @@ -69,7 +69,7 @@ int main(int argc, char *argv[]) QBarCategoryAxis* axis = new QBarCategoryAxis(); axis->append(categories); chart->createDefaultAxes(); - chart->setAxisX(axis,series); + chart->setAxisX(axis, series); //![4] //![5] diff --git a/examples/barmodelmapper/customtablemodel.cpp b/examples/barmodelmapper/customtablemodel.cpp index 3e954e1..937b877 100644 --- a/examples/barmodelmapper/customtablemodel.cpp +++ b/examples/barmodelmapper/customtablemodel.cpp @@ -27,21 +27,19 @@ CustomTableModel::CustomTableModel(QObject *parent) : QAbstractTableModel(parent) { - qsrand(QTime(0,0,0).secsTo(QTime::currentTime())); + qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); m_columnCount = 6; m_rowCount = 12; // m_data - for (int i = 0; i < m_rowCount; i++) - { + for (int i = 0; i < m_rowCount; i++) { QVector* dataVec = new QVector(m_columnCount); - for (int k = 0; k < dataVec->size(); k++) - { - if (k%2 == 0) - dataVec->replace(k, i * 50 + qrand()%20); + for (int k = 0; k < dataVec->size(); k++) { + if (k % 2 == 0) + dataVec->replace(k, i * 50 + qrand() % 20); else - dataVec->replace(k, qrand()%100); + dataVec->replace(k, qrand() % 100); } m_data.append(dataVec); } @@ -59,35 +57,28 @@ int CustomTableModel::columnCount(const QModelIndex & parent) const return m_columnCount; } -QVariant CustomTableModel::headerData (int section, Qt::Orientation orientation, int role ) const +QVariant CustomTableModel::headerData(int section, Qt::Orientation orientation, int role) const { if (role != Qt::DisplayRole) return QVariant(); if (orientation == Qt::Horizontal) - { return QString("201%1").arg(section); - } else return QString("%1").arg(section + 1); } QVariant CustomTableModel::data(const QModelIndex & index, int role) const { - if (role == Qt::DisplayRole) - { + if (role == Qt::DisplayRole) { return m_data[index.row()]->at(index.column()); - } - else if (role == Qt::EditRole) - { + } else if (role == Qt::EditRole) { return m_data[index.row()]->at(index.column()); - } - else if (role == Qt::BackgroundRole) - { + } else if (role == Qt::BackgroundRole) { QRect rect; foreach(rect, m_mapping) - if(rect.contains(index.column(), index.row())) - return QColor(m_mapping.key(rect)); + if (rect.contains(index.column(), index.row())) + return QColor(m_mapping.key(rect)); // cell not mapped return white color return QColor(Qt::white); @@ -95,10 +86,9 @@ QVariant CustomTableModel::data(const QModelIndex & index, int role) const return QVariant(); } -bool CustomTableModel::setData ( const QModelIndex & index, const QVariant & value, int role) +bool CustomTableModel::setData(const QModelIndex & index, const QVariant & value, int role) { - if (index.isValid() && role == Qt::EditRole) - { + if (index.isValid() && role == Qt::EditRole) { m_data[index.row()]->replace(index.column(), value.toDouble()); emit dataChanged(index, index); return true; @@ -106,7 +96,7 @@ bool CustomTableModel::setData ( const QModelIndex & index, const QVariant & val return false; } -Qt::ItemFlags CustomTableModel::flags ( const QModelIndex & index ) const +Qt::ItemFlags CustomTableModel::flags(const QModelIndex & index) const { return QAbstractItemModel::flags(index) | Qt::ItemIsEditable; } diff --git a/examples/barmodelmapper/customtablemodel.h b/examples/barmodelmapper/customtablemodel.h index 3106f9f..d01ab8b 100644 --- a/examples/barmodelmapper/customtablemodel.h +++ b/examples/barmodelmapper/customtablemodel.h @@ -31,12 +31,12 @@ class CustomTableModel : public QAbstractTableModel public: explicit CustomTableModel(QObject *parent = 0); - int rowCount ( const QModelIndex & parent = QModelIndex() ) const; - int columnCount ( const QModelIndex & parent = QModelIndex() ) const; - QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const; + int rowCount(const QModelIndex & parent = QModelIndex()) const; + int columnCount(const QModelIndex & parent = QModelIndex()) const; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - bool setData ( const QModelIndex & index, const QVariant & value, int role = Qt::EditRole ); - Qt::ItemFlags flags ( const QModelIndex & index ) const; + bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole); + Qt::ItemFlags flags(const QModelIndex & index) const; void addMapping(QString color, QRect area); void clearMapping() { m_mapping.clear(); } diff --git a/examples/barmodelmapper/main.cpp b/examples/barmodelmapper/main.cpp index 3cb39a8..1b64c7b 100644 --- a/examples/barmodelmapper/main.cpp +++ b/examples/barmodelmapper/main.cpp @@ -26,6 +26,5 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); TableWidget w; w.show(); - return a.exec(); } diff --git a/examples/barmodelmapper/tablewidget.cpp b/examples/barmodelmapper/tablewidget.cpp index 46f48cf..10f29bc 100644 --- a/examples/barmodelmapper/tablewidget.cpp +++ b/examples/barmodelmapper/tablewidget.cpp @@ -89,7 +89,7 @@ TableWidget::TableWidget(QWidget *parent) QStringList categories; categories << "April" << "May" << "June" << "July" << "August"; QBarCategoryAxis* axis = new QBarCategoryAxis(); - axis->append(categories); + axis->append(categories); chart->createDefaultAxes(); chart->setAxisX(axis, series); //! [6] diff --git a/examples/barmodelmapper/tablewidget.h b/examples/barmodelmapper/tablewidget.h index 801b5cf..15f92cf 100644 --- a/examples/barmodelmapper/tablewidget.h +++ b/examples/barmodelmapper/tablewidget.h @@ -26,7 +26,7 @@ class TableWidget : public QWidget { Q_OBJECT - + public: TableWidget(QWidget *parent = 0); }; diff --git a/examples/customchart/main.cpp b/examples/customchart/main.cpp index 36eb552..032acf7 100644 --- a/examples/customchart/main.cpp +++ b/examples/customchart/main.cpp @@ -53,8 +53,8 @@ int main(int argc, char *argv[]) // Customize chart background QLinearGradient backgroundGradient; - backgroundGradient.setStart(QPointF(0,0)); - backgroundGradient.setFinalStop(QPointF(0,1)); + backgroundGradient.setStart(QPointF(0, 0)); + backgroundGradient.setFinalStop(QPointF(0, 1)); backgroundGradient.setColorAt(0.0, QRgb(0xd2d0d1)); backgroundGradient.setColorAt(1.0, QRgb(0x4c4547)); backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode); diff --git a/examples/datetimeaxis/main.cpp b/examples/datetimeaxis/main.cpp index c20b365..2ae9305 100644 --- a/examples/datetimeaxis/main.cpp +++ b/examples/datetimeaxis/main.cpp @@ -33,7 +33,7 @@ QTCOMMERCIALCHART_USE_NAMESPACE int main(int argc, char *argv[]) { QApplication a(argc, argv); - qsrand(QTime(0,0,0).secsTo(QTime::currentTime())); + qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); //![1] QLineSeries* series = new QLineSeries(); @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) //![2] //![3] - QChart* chart = new QChart(); + QChart* chart = new QChart(); chart->addSeries(series); chart->legend()->hide(); chart->createDefaultAxes(); diff --git a/examples/donutbreakdown/donutbreakdownchart.cpp b/examples/donutbreakdown/donutbreakdownchart.cpp index 21c8d00..5bb1beb 100644 --- a/examples/donutbreakdown/donutbreakdownchart.cpp +++ b/examples/donutbreakdown/donutbreakdownchart.cpp @@ -24,7 +24,7 @@ QTCOMMERCIALCHART_USE_NAMESPACE //![1] DonutBreakdownChart::DonutBreakdownChart(QGraphicsItem *parent, Qt::WindowFlags wFlags) - :QChart(parent, wFlags) + : QChart(parent, wFlags) { // create the series for main center pie mainSeries = new QPieSeries(); diff --git a/examples/donutbreakdown/main.cpp b/examples/donutbreakdown/main.cpp index e3d948f..3c7bfde 100644 --- a/examples/donutbreakdown/main.cpp +++ b/examples/donutbreakdown/main.cpp @@ -72,6 +72,6 @@ int main(int argc, char *argv[]) window.resize(800, 600); window.show(); //![3] - + return a.exec(); } diff --git a/examples/horizontalbarchart/main.cpp b/examples/horizontalbarchart/main.cpp index 48bb5fd..1b1b0a4 100644 --- a/examples/horizontalbarchart/main.cpp +++ b/examples/horizontalbarchart/main.cpp @@ -69,7 +69,7 @@ int main(int argc, char *argv[]) QBarCategoryAxis* axis = new QBarCategoryAxis(); axis->append(categories); chart->createDefaultAxes(); - chart->setAxisY(axis,series); + chart->setAxisY(axis, series); //![4] //![5] diff --git a/examples/horizontalpercentbarchart/main.cpp b/examples/horizontalpercentbarchart/main.cpp index e2af62a..327d6f8 100644 --- a/examples/horizontalpercentbarchart/main.cpp +++ b/examples/horizontalpercentbarchart/main.cpp @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) QBarCategoryAxis* axis = new QBarCategoryAxis(); axis->append(categories); chart->createDefaultAxes(); - chart->setAxisY(axis,series); + chart->setAxisY(axis, series); //![4] //![5] diff --git a/examples/horizontalstackedbarchart/main.cpp b/examples/horizontalstackedbarchart/main.cpp index 80dd03d..ec15368 100644 --- a/examples/horizontalstackedbarchart/main.cpp +++ b/examples/horizontalstackedbarchart/main.cpp @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) QBarCategoryAxis* axis = new QBarCategoryAxis(); axis->append(categories); chart->createDefaultAxes(); - chart->setAxisY(axis,series); + chart->setAxisY(axis, series); //![4] //![5] diff --git a/examples/legend/mainwidget.cpp b/examples/legend/mainwidget.cpp index ff06099..fe2b2fd 100644 --- a/examples/legend/mainwidget.cpp +++ b/examples/legend/mainwidget.cpp @@ -94,7 +94,7 @@ MainWidget::MainWidget(QWidget *parent) : // Create layout for grid and detached legend m_mainLayout = new QGridLayout(); m_mainLayout->addLayout(m_buttonLayout, 0, 0); - m_mainLayout->addLayout(fontLayout,1,0); + m_mainLayout->addLayout(fontLayout, 1, 0); m_mainLayout->addWidget(m_chartView, 0, 1, 3, 1); setLayout(m_mainLayout); @@ -155,8 +155,8 @@ void MainWidget::toggleAttached() //![2] legend->detachFromChart(); m_chart->legend()->setBackgroundVisible(true); - m_chart->legend()->setBrush(QBrush(QColor(128,128,128,128))); - m_chart->legend()->setPen(QPen(QColor(192,192,192,192))); + m_chart->legend()->setBrush(QBrush(QColor(128, 128, 128, 128))); + m_chart->legend()->setPen(QPen(QColor(192, 192, 192, 192))); //![2] showLegendSpinbox(); updateLegendLayout(); @@ -182,7 +182,7 @@ void MainWidget::removeBarset() { QList sets = m_series->barSets(); if (sets.count() > 0) { - m_series->remove(sets.at(sets.count()-1)); + m_series->remove(sets.at(sets.count() - 1)); } } @@ -238,10 +238,10 @@ void MainWidget::fontSizeChanged() void MainWidget::updateLegendLayout() { //![4] - m_chart->legend()->setGeometry(QRectF(m_legendPosX->value() - ,m_legendPosY->value() - ,m_legendWidth->value() - ,m_legendHeight->value())); + m_chart->legend()->setGeometry(QRectF(m_legendPosX->value(), + m_legendPosY->value(), + m_legendWidth->value(), + m_legendHeight->value())); m_chart->legend()->update(); //![4] } diff --git a/examples/legend/mainwidget.h b/examples/legend/mainwidget.h index 0a94c1f..f17c278 100644 --- a/examples/legend/mainwidget.h +++ b/examples/legend/mainwidget.h @@ -43,9 +43,7 @@ public: void showLegendSpinbox(); void hideLegendSpinbox(); -signals: - -public slots: +public Q_SLOTS: void toggleAttached(); void addBarset(); void removeBarset(); @@ -58,9 +56,7 @@ public slots: void updateLegendLayout(); - private: - QChart *m_chart; QBarSeries *m_series; diff --git a/examples/lineandbar/main.cpp b/examples/lineandbar/main.cpp index 56f685c..cc72c4f 100644 --- a/examples/lineandbar/main.cpp +++ b/examples/lineandbar/main.cpp @@ -60,12 +60,12 @@ int main(int argc, char *argv[]) //![8] QLineSeries* lineseries = new QLineSeries(); - lineseries->append(QPoint(0,4)); - lineseries->append(QPoint(1,15)); - lineseries->append(QPoint(2,20)); - lineseries->append(QPoint(3,4)); - lineseries->append(QPoint(4,12)); - lineseries->append(QPoint(5,17)); + lineseries->append(QPoint(0, 4)); + lineseries->append(QPoint(1, 15)); + lineseries->append(QPoint(2, 20)); + lineseries->append(QPoint(3, 4)); + lineseries->append(QPoint(4, 12)); + lineseries->append(QPoint(5, 17)); //![8] //![3] @@ -80,14 +80,14 @@ int main(int argc, char *argv[]) categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; QBarCategoryAxis* axisX = new QBarCategoryAxis(); axisX->append(categories); - chart->setAxisX(axisX,lineseries); - chart->setAxisX(axisX,barseries); - axisX->setRange(QString("Jan"),QString("Jun")); + chart->setAxisX(axisX, lineseries); + chart->setAxisX(axisX, barseries); + axisX->setRange(QString("Jan"), QString("Jun")); QValueAxis* axisY = new QValueAxis(); - chart->setAxisY(axisY,lineseries); - chart->setAxisY(axisY,barseries); - axisY->setRange(0,20); + chart->setAxisY(axisY, lineseries); + chart->setAxisY(axisY, barseries); + axisY->setRange(0, 20); //![4] //![5] diff --git a/examples/modeldata/customtablemodel.cpp b/examples/modeldata/customtablemodel.cpp index 04ffac8..50895e4 100644 --- a/examples/modeldata/customtablemodel.cpp +++ b/examples/modeldata/customtablemodel.cpp @@ -27,21 +27,19 @@ CustomTableModel::CustomTableModel(QObject *parent) : QAbstractTableModel(parent) { - qsrand(QTime(0,0,0).secsTo(QTime::currentTime())); + qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); m_columnCount = 4; m_rowCount = 15; // m_data - for (int i = 0; i < m_rowCount; i++) - { + for (int i = 0; i < m_rowCount; i++) { QVector* dataVec = new QVector(m_columnCount); - for (int k = 0; k < dataVec->size(); k++) - { - if (k%2 == 0) - dataVec->replace(k, i * 50 + qrand()%20); + for (int k = 0; k < dataVec->size(); k++) { + if (k % 2 == 0) + dataVec->replace(k, i * 50 + qrand() % 20); else - dataVec->replace(k, qrand()%100); + dataVec->replace(k, qrand() % 100); } m_data.append(dataVec); } @@ -59,49 +57,41 @@ int CustomTableModel::columnCount(const QModelIndex & parent) const return m_columnCount; } -QVariant CustomTableModel::headerData (int section, Qt::Orientation orientation, int role ) const +QVariant CustomTableModel::headerData(int section, Qt::Orientation orientation, int role) const { if (role != Qt::DisplayRole) return QVariant(); - if (orientation == Qt::Horizontal) - { - if (section%2 == 0) + if (orientation == Qt::Horizontal) { + if (section % 2 == 0) return "x"; else return "y"; - } - else + } else { return QString("%1").arg(section + 1); + } } QVariant CustomTableModel::data(const QModelIndex & index, int role) const { - if (role == Qt::DisplayRole) - { + if (role == Qt::DisplayRole) { return m_data[index.row()]->at(index.column()); - } - else if (role == Qt::EditRole) - { + } else if (role == Qt::EditRole) { return m_data[index.row()]->at(index.column()); - } - else if (role == Qt::BackgroundRole) - { - QRect rect; - foreach(rect, m_mapping) - if(rect.contains(index.column(), index.row())) + } else if (role == Qt::BackgroundRole) { + foreach (QRect rect, m_mapping) { + if (rect.contains(index.column(), index.row())) return QColor(m_mapping.key(rect)); - + } // cell not mapped return white color return QColor(Qt::white); } return QVariant(); } -bool CustomTableModel::setData ( const QModelIndex & index, const QVariant & value, int role) +bool CustomTableModel::setData(const QModelIndex & index, const QVariant & value, int role) { - if (index.isValid() && role == Qt::EditRole) - { + if (index.isValid() && role == Qt::EditRole) { m_data[index.row()]->replace(index.column(), value.toDouble()); emit dataChanged(index, index); return true; @@ -109,7 +99,7 @@ bool CustomTableModel::setData ( const QModelIndex & index, const QVariant & val return false; } -Qt::ItemFlags CustomTableModel::flags ( const QModelIndex & index ) const +Qt::ItemFlags CustomTableModel::flags(const QModelIndex & index) const { return QAbstractItemModel::flags(index) | Qt::ItemIsEditable; } diff --git a/examples/modeldata/customtablemodel.h b/examples/modeldata/customtablemodel.h index 3106f9f..d01ab8b 100644 --- a/examples/modeldata/customtablemodel.h +++ b/examples/modeldata/customtablemodel.h @@ -31,12 +31,12 @@ class CustomTableModel : public QAbstractTableModel public: explicit CustomTableModel(QObject *parent = 0); - int rowCount ( const QModelIndex & parent = QModelIndex() ) const; - int columnCount ( const QModelIndex & parent = QModelIndex() ) const; - QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const; + int rowCount(const QModelIndex & parent = QModelIndex()) const; + int columnCount(const QModelIndex & parent = QModelIndex()) const; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - bool setData ( const QModelIndex & index, const QVariant & value, int role = Qt::EditRole ); - Qt::ItemFlags flags ( const QModelIndex & index ) const; + bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole); + Qt::ItemFlags flags(const QModelIndex & index) const; void addMapping(QString color, QRect area); void clearMapping() { m_mapping.clear(); } diff --git a/examples/modeldata/main.cpp b/examples/modeldata/main.cpp index 3cb39a8..1b64c7b 100644 --- a/examples/modeldata/main.cpp +++ b/examples/modeldata/main.cpp @@ -26,6 +26,5 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); TableWidget w; w.show(); - return a.exec(); } diff --git a/examples/modeldata/tablewidget.h b/examples/modeldata/tablewidget.h index 801b5cf..15f92cf 100644 --- a/examples/modeldata/tablewidget.h +++ b/examples/modeldata/tablewidget.h @@ -26,7 +26,7 @@ class TableWidget : public QWidget { Q_OBJECT - + public: TableWidget(QWidget *parent = 0); }; diff --git a/examples/multiaxis/main.cpp b/examples/multiaxis/main.cpp index 813fc7a..322dd9f 100644 --- a/examples/multiaxis/main.cpp +++ b/examples/multiaxis/main.cpp @@ -32,7 +32,7 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - qsrand(QTime(0,0,0).secsTo(QTime::currentTime())); + qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); //![1] QLineSeries* series; @@ -42,18 +42,18 @@ int main(int argc, char *argv[]) for (int i = 0; i < 5; i++) { series = new QLineSeries; for (int k(0); k < 8; k++) - series->append(i + k, qrand()%20); + series->append(i + k, qrand() % 20); chart->addSeries(series); axisX = new QValueAxis; axisX->setTickCount(7 + i); axisX->setLinePenColor(series->pen().color()); - if (i%2) + if (i % 2) axisX->setAlternativePlacement(true); axisY = new QValueAxis; axisY->setTickCount(7 + i); axisY->setLinePenColor(series->pen().color()); - if (i%2) + if (i % 2) axisY->setAlternativePlacement(true); chart->setAxisX(axisX, series); diff --git a/examples/percentbarchart/main.cpp b/examples/percentbarchart/main.cpp index 6da248c..eee6d14 100644 --- a/examples/percentbarchart/main.cpp +++ b/examples/percentbarchart/main.cpp @@ -68,7 +68,7 @@ int main(int argc, char *argv[]) QBarCategoryAxis* axis = new QBarCategoryAxis(); axis->append(categories); chart->createDefaultAxes(); - chart->setAxisX(axis,series); + chart->setAxisX(axis, series); //![4] //![5] diff --git a/examples/piechartdrilldown/drilldownchart.cpp b/examples/piechartdrilldown/drilldownchart.cpp index b594584..334732f 100644 --- a/examples/piechartdrilldown/drilldownchart.cpp +++ b/examples/piechartdrilldown/drilldownchart.cpp @@ -23,8 +23,8 @@ QTCOMMERCIALCHART_USE_NAMESPACE DrilldownChart::DrilldownChart(QGraphicsItem *parent, Qt::WindowFlags wFlags) - :QChart(parent, wFlags), - m_currentSeries(0) + : QChart(parent, wFlags), + m_currentSeries(0) { } diff --git a/examples/piechartdrilldown/drilldownslice.cpp b/examples/piechartdrilldown/drilldownslice.cpp index 852873d..ba5c0f8 100644 --- a/examples/piechartdrilldown/drilldownslice.cpp +++ b/examples/piechartdrilldown/drilldownslice.cpp @@ -23,8 +23,8 @@ QTCOMMERCIALCHART_USE_NAMESPACE DrilldownSlice::DrilldownSlice(qreal value, QString prefix, QAbstractSeries* drilldownSeries) - :m_drilldownSeries(drilldownSeries), - m_prefix(prefix) + : m_drilldownSeries(drilldownSeries), + m_prefix(prefix) { setValue(value); updateLabel(); @@ -49,7 +49,7 @@ void DrilldownSlice::updateLabel() label += " $"; label += QString::number(this->value()); label += ", "; - label += QString::number(this->percentage()*100, 'f', 1); + label += QString::number(this->percentage() * 100, 'f', 1); label += "%"; setLabel(label); } diff --git a/examples/piechartdrilldown/main.cpp b/examples/piechartdrilldown/main.cpp index 697f976..0ecc4c7 100644 --- a/examples/piechartdrilldown/main.cpp +++ b/examples/piechartdrilldown/main.cpp @@ -33,7 +33,7 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - qsrand(QTime(0,0,0).secsTo(QTime::currentTime())); + qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); QMainWindow window; diff --git a/examples/presenterchart/chartview.cpp b/examples/presenterchart/chartview.cpp index b350dfd..34c7736 100644 --- a/examples/presenterchart/chartview.cpp +++ b/examples/presenterchart/chartview.cpp @@ -25,14 +25,14 @@ #include #include -ChartView::ChartView(QChart* chart,QWidget* parent): - QChartView(chart,parent), - m_index(-1), - m_chart(chart) +ChartView::ChartView(QChart* chart, QWidget* parent) + : QChartView(chart, parent), + m_index(-1), + m_chart(chart) { m_chart->setTitle("Charts presenter"); m_chart->setDropShadowEnabled(false); - QObject::connect(&m_timer,SIGNAL(timeout()),this,SLOT(handleTimeout())); + QObject::connect(&m_timer, SIGNAL(timeout()), this, SLOT(handleTimeout())); m_timer.setInterval(3000); //![1] @@ -54,21 +54,21 @@ ChartView::ChartView(QChart* chart,QWidget* parent): for (int x = 0; x <= numPoints; ++x) { qreal y = qrand() % 100; - series0->append(x,y); - series1->append(x,y); - series2->append(x,y); + series0->append(x, y); + series1->append(x, y); + series2->append(x, y); } //![2] //![3] - m_series<title()+": LineChart"; - m_series<title()+": ScatterChart"; - m_series<title()+": SplineChart"; - m_series<title()+": AreaChart"; + m_series << series0; + m_titles << m_chart->title() + ": LineChart"; + m_series << series1; + m_titles << m_chart->title() + ": ScatterChart"; + m_series << series2; + m_titles << m_chart->title() + ": SplineChart"; + m_series << series3; + m_titles << m_chart->title() + ": AreaChart"; //![3] m_timer.start(); @@ -77,7 +77,8 @@ ChartView::ChartView(QChart* chart,QWidget* parent): ChartView::~ChartView() { - if(m_series.size() == 0) return; + if (m_series.size() == 0) + return; m_chart->removeSeries(m_series.at(m_index)); m_series.removeLast(); //remove QAreaSeries instance since they will be deleted when QLineSeries instance is gone qDeleteAll(m_series); @@ -86,8 +87,9 @@ ChartView::~ChartView() //![4] void ChartView::handleTimeout() { - if(m_series.size() == 0) return; - if(m_index >= 0) + if (m_series.size() == 0) + return; + if (m_index >= 0) m_chart->removeSeries(m_series.at(m_index)); m_index++; m_index = m_index % m_series.size(); diff --git a/examples/presenterchart/chartview.h b/examples/presenterchart/chartview.h index 557532b..03f55d7 100644 --- a/examples/presenterchart/chartview.h +++ b/examples/presenterchart/chartview.h @@ -31,7 +31,7 @@ class ChartView: public QChartView { Q_OBJECT public: - ChartView(QChart* chart,QWidget* parent = 0); + ChartView(QChart* chart, QWidget* parent = 0); virtual ~ChartView(); public slots: diff --git a/examples/presenterchart/main.cpp b/examples/presenterchart/main.cpp index 8c9aa97..35c8756 100644 --- a/examples/presenterchart/main.cpp +++ b/examples/presenterchart/main.cpp @@ -27,7 +27,7 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); QMainWindow window; QChart* chart = new QChart(); - ChartView chartView(chart,&window); + ChartView chartView(chart, &window); chartView.setRenderHint(QPainter::Antialiasing); chart->setAnimationOptions(QChart::SeriesAnimations); window.setCentralWidget(&chartView); diff --git a/examples/scatterchart/chartview.h b/examples/scatterchart/chartview.h index 05b9454..8cbc39b 100644 --- a/examples/scatterchart/chartview.h +++ b/examples/scatterchart/chartview.h @@ -30,11 +30,6 @@ class ChartView : public QChartView Q_OBJECT public: explicit ChartView(QWidget *parent = 0); - -signals: - -public slots: - }; #endif // CHARTVIEW_H diff --git a/examples/scatterinteractions/chartview.cpp b/examples/scatterinteractions/chartview.cpp index ad1ad0e..6182674 100644 --- a/examples/scatterinteractions/chartview.cpp +++ b/examples/scatterinteractions/chartview.cpp @@ -35,8 +35,8 @@ ChartView::ChartView(QWidget *parent) m_scatter = new QScatterSeries(); m_scatter->setName("scatter1"); - for(qreal x(0.5); x <= 4.0; x += 0.5) { - for(qreal y(0.5); y <= 4.0; y += 0.5) { + for (qreal x(0.5); x <= 4.0; x += 0.5) { + for (qreal y(0.5); y <= 4.0; y += 0.5) { *m_scatter << QPointF(x, y); } } @@ -64,7 +64,7 @@ void ChartView::handleClickedPoint(const QPointF& point) qreal distance(INT_MAX); foreach(QPointF currentPoint, m_scatter->points()) { qreal currentDistance = sqrt((currentPoint.x() - clickedPoint.x()) * (currentPoint.x() - clickedPoint.x()) - + (currentPoint.y() - clickedPoint.y()) * (currentPoint.y() - clickedPoint.y())); + + (currentPoint.y() - clickedPoint.y()) * (currentPoint.y() - clickedPoint.y())); if (currentDistance < distance) { distance = currentDistance; closest = currentPoint; diff --git a/examples/scrollchart/chart.cpp b/examples/scrollchart/chart.cpp index a28e48d..e8d9150 100644 --- a/examples/scrollchart/chart.cpp +++ b/examples/scrollchart/chart.cpp @@ -24,7 +24,7 @@ #include Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags) - :QChart(parent, wFlags) + : QChart(parent, wFlags) { // Seems that QGraphicsView (QChartView) does not grab gestures. // They can only be grabbed here in the QGraphicsWidget (QChart). @@ -49,7 +49,7 @@ bool Chart::gestureEvent(QGestureEvent* event) { if (QGesture *gesture = event->gesture(Qt::PanGesture)) { QPanGesture *pan = static_cast(gesture); - QChart::scroll(pan->delta().x(),pan->delta().y()); + QChart::scroll(pan->delta().x(), pan->delta().y()); } if (QGesture *gesture = event->gesture(Qt::PinchGesture)) { diff --git a/examples/scrollchart/chartview.cpp b/examples/scrollchart/chartview.cpp index 29682dd..30cc5d6 100644 --- a/examples/scrollchart/chartview.cpp +++ b/examples/scrollchart/chartview.cpp @@ -61,7 +61,7 @@ void ChartView::mouseMoveEvent(QMouseEvent *event) if (m_isScrolling) { QPointF delta = m_origin - event->pos(); - chart()->scroll(delta.x(),-delta.y()); + chart()->scroll(delta.x(), -delta.y()); m_origin = event->pos(); } diff --git a/examples/stackedbarchart/main.cpp b/examples/stackedbarchart/main.cpp index 854c931..34cc739 100644 --- a/examples/stackedbarchart/main.cpp +++ b/examples/stackedbarchart/main.cpp @@ -68,7 +68,7 @@ int main(int argc, char *argv[]) QBarCategoryAxis* axis = new QBarCategoryAxis(); axis->append(categories); chart->createDefaultAxes(); - chart->setAxisX(axis,series); + chart->setAxisX(axis, series); //![4] //![5] diff --git a/examples/stackedbarchartdrilldown/drilldownchart.cpp b/examples/stackedbarchartdrilldown/drilldownchart.cpp index 1e8c15d..e014214 100644 --- a/examples/stackedbarchartdrilldown/drilldownchart.cpp +++ b/examples/stackedbarchartdrilldown/drilldownchart.cpp @@ -24,8 +24,8 @@ QTCOMMERCIALCHART_USE_NAMESPACE DrilldownChart::DrilldownChart(QGraphicsItem *parent, Qt::WindowFlags wFlags) - : QChart(parent, wFlags) - ,m_currentSeries(0) + : QChart(parent, wFlags), + m_currentSeries(0) { } @@ -44,7 +44,7 @@ void DrilldownChart::changeSeries(DrilldownBarSeries *series) addSeries(series); createDefaultAxes(); - setAxisX(axis,series); + setAxisX(axis, series); setTitle(series->name()); } @@ -52,7 +52,7 @@ void DrilldownChart::changeSeries(DrilldownBarSeries *series) void DrilldownChart::handleClicked(int index, QBarSet *barset) { Q_UNUSED(barset) - DrilldownBarSeries* series = static_cast (sender()); + DrilldownBarSeries* series = static_cast(sender()); changeSeries(series->drilldownSeries(index)); } diff --git a/examples/stackedbarchartdrilldown/main.cpp b/examples/stackedbarchartdrilldown/main.cpp index a957233..4aa440a 100644 --- a/examples/stackedbarchartdrilldown/main.cpp +++ b/examples/stackedbarchartdrilldown/main.cpp @@ -55,14 +55,14 @@ int main(int argc, char *argv[]) seasonSeries->setName("Crop by month - Season"); // Each month in season series has drilldown series for weekly data - for (int month=0; month < months.count(); month++) { + for (int month = 0; month < months.count(); month++) { // Create drilldown series for every week DrilldownBarSeries* weeklySeries = new DrilldownBarSeries(weeks, drilldownChart); seasonSeries->mapDrilldownSeries(month, weeklySeries); // Drilling down from weekly data brings us back to season data. - for (int week=0; week < weeks.count(); week++) { + for (int week = 0; week < weeks.count(); week++) { weeklySeries->mapDrilldownSeries(week, seasonSeries); weeklySeries->setName(QString("Crop by week - " + months.at(month))); } @@ -79,11 +79,10 @@ int main(int argc, char *argv[]) // Fill monthly and weekly series with data foreach (QString plant, plants) { QBarSet* monthlyCrop = new QBarSet(plant); - for (int month=0; monthdrilldownSeries(month)->append(weeklyCrop); *monthlyCrop << weeklyCrop->sum(); diff --git a/examples/temperaturerecords/main.cpp b/examples/temperaturerecords/main.cpp index 719fbb8..241dcf8 100644 --- a/examples/temperaturerecords/main.cpp +++ b/examples/temperaturerecords/main.cpp @@ -61,8 +61,8 @@ int main(int argc, char *argv[]) QBarCategoryAxis* axis = new QBarCategoryAxis(); axis->append(categories); chart->createDefaultAxes(); - chart->setAxisX(axis,series); - chart->axisY(series)->setRange(-52,52); + chart->setAxisX(axis, series); + chart->axisY(series)->setRange(-52, 52); //![4] //![5] diff --git a/examples/zoomlinechart/chart.cpp b/examples/zoomlinechart/chart.cpp index a28e48d..e8d9150 100644 --- a/examples/zoomlinechart/chart.cpp +++ b/examples/zoomlinechart/chart.cpp @@ -24,7 +24,7 @@ #include Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags) - :QChart(parent, wFlags) + : QChart(parent, wFlags) { // Seems that QGraphicsView (QChartView) does not grab gestures. // They can only be grabbed here in the QGraphicsWidget (QChart). @@ -49,7 +49,7 @@ bool Chart::gestureEvent(QGestureEvent* event) { if (QGesture *gesture = event->gesture(Qt::PanGesture)) { QPanGesture *pan = static_cast(gesture); - QChart::scroll(pan->delta().x(),pan->delta().y()); + QChart::scroll(pan->delta().x(), pan->delta().y()); } if (QGesture *gesture = event->gesture(Qt::PinchGesture)) { diff --git a/examples/zoomlinechart/chartview.cpp b/examples/zoomlinechart/chartview.cpp index f154a51..28c035f 100644 --- a/examples/zoomlinechart/chartview.cpp +++ b/examples/zoomlinechart/chartview.cpp @@ -82,16 +82,16 @@ void ChartView::keyPressEvent(QKeyEvent *event) break; //![1] case Qt::Key_Left: - chart()->scroll(-10,0); + chart()->scroll(-10, 0); break; case Qt::Key_Right: - chart()->scroll(10,0); + chart()->scroll(10, 0); break; case Qt::Key_Up: - chart()->scroll(0,10); + chart()->scroll(0, 10); break; case Qt::Key_Down: - chart()->scroll(0,-10); + chart()->scroll(0, -10); break; default: QGraphicsView::keyPressEvent(event); diff --git a/examples/zoomlinechart/main.cpp b/examples/zoomlinechart/main.cpp index 468ffd9..f0fe44a 100644 --- a/examples/zoomlinechart/main.cpp +++ b/examples/zoomlinechart/main.cpp @@ -33,7 +33,7 @@ int main(int argc, char *argv[]) //![1] QLineSeries* series = new QLineSeries(); - for (int i=0; i < 500; i++) { + for (int i = 0; i < 500; i++) { QPointF p((qreal) i, qSin(M_PI / 50 * i) * 100); p.ry() += qrand() % 20; *series << p;