From e2c3f0e5fca725409e652178267ee27a36bb895c 2012-10-02 10:06:13
From: Jani Honkonen <jani.honkonen@digia.com>
Date: 2012-10-02 10:06:13
Subject: [PATCH] demos: coding style police make a surprise strike

---

diff --git a/demos/chartviewer/charts/axis/barcategoryaxisx.cpp b/demos/chartviewer/charts/axis/barcategoryaxisx.cpp
index c92dd62..2f9119b 100644
--- a/demos/chartviewer/charts/axis/barcategoryaxisx.cpp
+++ b/demos/chartviewer/charts/axis/barcategoryaxisx.cpp
@@ -41,19 +41,18 @@ public:
         QBarSeries *series = new QBarSeries(chart);
         QValueAxis *valueaxis = new QValueAxis();
         QBarCategoryAxis *barcategory = new QBarCategoryAxis();
-                for (int i(0); i < table.count(); i++) {
-                    QBarSet *set = new QBarSet("Bar set " + QString::number(i));
-                    foreach (Data data, table[i])
-                        *set << data.first.y();
-                    series->append(set);
-                }
-                chart->addSeries(series);
+        for (int i(0); i < table.count(); i++) {
+            QBarSet *set = new QBarSet("Bar set " + QString::number(i));
+            foreach (Data data, table[i])
+                *set << data.first.y();
+            series->append(set);
+        }
+        chart->addSeries(series);
 
         int count = series->barSets().first()->count();
 
-        for(int i =0 ; i < count ; i++){
+        for (int i = 0; i < count; i++)
             barcategory->append(QString::number(i));
-        }
 
         chart->setAxisY(valueaxis, series);
         chart->setAxisX(barcategory, series);
diff --git a/demos/chartviewer/charts/axis/barcategoryaxisy.cpp b/demos/chartviewer/charts/axis/barcategoryaxisy.cpp
index 80be1d6..e788e3c 100644
--- a/demos/chartviewer/charts/axis/barcategoryaxisy.cpp
+++ b/demos/chartviewer/charts/axis/barcategoryaxisy.cpp
@@ -41,19 +41,18 @@ public:
         QHorizontalBarSeries *series = new QHorizontalBarSeries(chart);
         QValueAxis *valueaxis = new QValueAxis();
         QBarCategoryAxis *barcategory = new QBarCategoryAxis();
-                for (int i(0); i < table.count(); i++) {
-                    QBarSet *set = new QBarSet("Bar set " + QString::number(i));
-                    foreach (Data data, table[i])
-                        *set << data.first.y();
-                    series->append(set);
-                }
-                chart->addSeries(series);
+        for (int i(0); i < table.count(); i++) {
+            QBarSet *set = new QBarSet("Bar set " + QString::number(i));
+            foreach(Data data, table[i])
+                *set << data.first.y();
+            series->append(set);
+        }
+        chart->addSeries(series);
 
         int count = series->barSets().first()->count();
 
-        for(int i =0 ; i < count ; i++){
+        for (int i = 0; i < count; i++)
             barcategory->append(QString::number(i));
-        }
 
         chart->setAxisX(valueaxis, series);
         chart->setAxisY(barcategory, series);
diff --git a/demos/chartviewer/charts/axis/datetimeaxisx.cpp b/demos/chartviewer/charts/axis/datetimeaxisx.cpp
index d78a78b..de09f49 100644
--- a/demos/chartviewer/charts/axis/datetimeaxisx.cpp
+++ b/demos/chartviewer/charts/axis/datetimeaxisx.cpp
@@ -44,9 +44,9 @@ public:
         int nameIndex = 0;
         foreach (DataList list, table) {
             QLineSeries *series = new QLineSeries(chart);
-            foreach (Data data, list){
+            foreach (Data data, list) {
                 QPointF point = data.first;
-                series->append(1000l*60l*60l*24l*365l*30l+point.x()*1000l*60l*60l*24l*365l,point.y());
+                series->append(1000l * 60l * 60l * 24l * 365l * 30l + point.x() * 1000l * 60l * 60l * 24l * 365l, point.y());
             }
             series->setName(name + QString::number(nameIndex));
             nameIndex++;
diff --git a/demos/chartviewer/charts/axis/datetimeaxisy.cpp b/demos/chartviewer/charts/axis/datetimeaxisy.cpp
index 56fae4a..4d1ff07 100644
--- a/demos/chartviewer/charts/axis/datetimeaxisy.cpp
+++ b/demos/chartviewer/charts/axis/datetimeaxisy.cpp
@@ -44,9 +44,9 @@ public:
         int nameIndex = 0;
         foreach (DataList list, table) {
             QLineSeries *series = new QLineSeries(chart);
-            foreach (Data data, list){
+            foreach (Data data, list) {
                 QPointF point = data.first;
-                series->append(point.x(),1000l*60l*60l*24l*365l*30l+point.y()*1000l*60l*60l*24l*365l);
+                series->append(point.x(), 1000l * 60l * 60l * 24l * 365l * 30l + point.y() * 1000l * 60l * 60l * 24l * 365l);
             }
             series->setName(name + QString::number(nameIndex));
             nameIndex++;
diff --git a/demos/chartviewer/charts/pieseries/donutchart.cpp b/demos/chartviewer/charts/pieseries/donutchart.cpp
index 4f35b67..1731930 100644
--- a/demos/chartviewer/charts/pieseries/donutchart.cpp
+++ b/demos/chartviewer/charts/pieseries/donutchart.cpp
@@ -30,7 +30,7 @@ public:
     QString subCategory() { return QString::null; }
 
     QChart *createChart(const DataTable &table)
-     {
+    {
         QChart *chart = new QChart();
         chart->setTitle("Donut chart");
         for (int i = 0, j = table.count(); i < table.count(); i++, j--) {
diff --git a/demos/chartviewer/grid.cpp b/demos/chartviewer/grid.cpp
index d332566..bd659e4 100644
--- a/demos/chartviewer/grid.cpp
+++ b/demos/chartviewer/grid.cpp
@@ -25,16 +25,17 @@
 #include <QGraphicsSceneMouseEvent>
 #include <QDebug>
 
-Grid::Grid(int size,QGraphicsItem *parent):QGraphicsWidget(parent),
-    m_listCount(3),
-    m_valueMax(10),
-    m_valueCount(7),
-    m_size(size),
-    m_dataTable(Model::generateRandomData(m_listCount, m_valueMax, m_valueCount)),
-    m_state(NoState),
-    m_currentState(NoState),
-    m_rubberBand(new QGraphicsRectItem()),
-    m_gridLayout(new QGraphicsGridLayout())
+Grid::Grid(int size, QGraphicsItem *parent)
+    : QGraphicsWidget(parent),
+      m_listCount(3),
+      m_valueMax(10),
+      m_valueCount(7),
+      m_size(size),
+      m_dataTable(Model::generateRandomData(m_listCount, m_valueMax, m_valueCount)),
+      m_state(NoState),
+      m_currentState(NoState),
+      m_rubberBand(new QGraphicsRectItem()),
+      m_gridLayout(new QGraphicsGridLayout())
 {
     setLayout(m_gridLayout);
     m_rubberBand->setParentItem(this);
@@ -47,7 +48,7 @@ Grid::~Grid()
 
 }
 
-void Grid::createCharts(const QString& category)
+void Grid::createCharts(const QString &category)
 {
     clear();
 
@@ -55,23 +56,18 @@ void Grid::createCharts(const QString& category)
     Charts::ChartList list = Charts::chartList();
 
     if (category.isEmpty()) {
-
         for (int i = 0; i < m_size * m_size; ++i) {
             QChart *chart = 0;
             if (i < list.size()) {
                 chart = list.at(i)->createChart(m_dataTable);
-            }
-            else {
+            } else {
                 chart = new QChart();
                 chart->setTitle(QObject::tr("Empty"));
             }
-
             m_gridLayout->addItem(chart, i / m_size, i % m_size);
             m_chartHash[chart] = i;
         }
-    }
-    else {
-
+    } else {
         int j = 0;
         for (int i = 0; i < list.size(); ++i) {
             Chart *chart = list.at(i);
@@ -95,15 +91,14 @@ void Grid::createCharts(const QString& category)
 
 void Grid::clear()
 {
-    for (int i = 0; i < m_gridLayout->count(); ++i) {
+    for (int i = 0; i < m_gridLayout->count(); ++i)
         m_gridLayout->removeAt(i);
-    }
 
     qDeleteAll(m_chartHash.keys());
     m_chartHash.clear();
 }
 
-QList<QChart*> Grid::charts()
+QList<QChart *> Grid::charts()
 {
     return m_chartHash.keys();
 }
@@ -115,19 +110,18 @@ void Grid::setState(State state)
 
 void Grid::setSize(int size)
 {
-    if(m_size !=size)
-    {
-       m_size = size;
-       createCharts(m_category);
+    if (m_size != size) {
+        m_size = size;
+        createCharts(m_category);
     }
 }
 
-void Grid::setRubberPen(const QPen& pen)
+void Grid::setRubberPen(const QPen &pen)
 {
     m_rubberBand->setPen(pen);
 }
 
-void Grid::replaceChart(QChart* oldChart, Chart* newChart)
+void Grid::replaceChart(QChart *oldChart, Chart *newChart)
 {
     int index = m_chartHash[oldChart];
     //not in 4.7.2 m_baseLayout->removeItem(qchart);
@@ -152,7 +146,6 @@ void Grid::mousePressEvent(QGraphicsSceneMouseEvent *event)
         m_currentState = NoState;
 
         foreach (QChart *chart, charts()) {
-
             QRectF geometryRect = chart->geometry();
             QRectF plotArea = chart->plotArea();
             plotArea.translate(geometryRect.topLeft());
@@ -181,11 +174,9 @@ void Grid::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
     if (m_currentState != NoState) {
 
         foreach (QChart *chart, charts()) {
-
             QRectF geometryRect = chart->geometry();
             QRectF plotArea = chart->plotArea();
             plotArea.translate(geometryRect.topLeft());
-
             if (plotArea.contains(m_origin)) {
                 if (m_currentState == ScrollState) {
                     QPointF delta = m_origin - event->pos();
@@ -209,11 +200,9 @@ void Grid::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
             m_rubberBand->setVisible(false);
 
             foreach (QChart *chart, charts()) {
-
                 QRectF geometryRect = chart->geometry();
                 QRectF plotArea = chart->plotArea();
                 plotArea.translate(geometryRect.topLeft());
-
                 if (plotArea.contains(m_origin)) {
                     QRectF rect = m_rubberBand->rect();
                     rect.translate(-geometryRect.topLeft());
@@ -222,20 +211,16 @@ void Grid::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
                 }
             }
         }
-
         m_currentState = NoState;
         event->accept();
     }
 
     if (event->button() == Qt::RightButton) {
-
         if (m_currentState == ZoomState) {
             foreach (QChart *chart, charts()) {
-
                 QRectF geometryRect = chart->geometry();
                 QRectF plotArea = chart->plotArea();
                 plotArea.translate(geometryRect.topLeft());
-
                 if (plotArea.contains(m_origin)) {
                     chart->zoomOut();
                     break;
diff --git a/demos/chartviewer/grid.h b/demos/chartviewer/grid.h
index 4ebcddd..8af7a1f 100644
--- a/demos/chartviewer/grid.h
+++ b/demos/chartviewer/grid.h
@@ -39,24 +39,30 @@ class Grid : public QGraphicsWidget
     Q_OBJECT
 public:
     enum State { NoState = 0, ZoomState, ScrollState};
-    Grid(int size , QGraphicsItem *parent = 0 );
+
+    Grid(int size, QGraphicsItem *parent = 0);
     ~Grid();
-    QList<QChart*> charts();
-    void createCharts(const QString& category = QString());
-    void replaceChart(QChart* oldChart, Chart* newChart);
+
+    QList<QChart *> charts();
+    void createCharts(const QString &category = QString());
+    void replaceChart(QChart *oldChart, Chart *newChart);
     void setState(State state);
     State state() const { return m_state; };
-    void setRubberPen(const QPen& pen);
+    void setRubberPen(const QPen &pen);
     void setSize(int size);
     int size() const {return m_size;}
-Q_SIGNAL
-    void chartSelected(QChart* chart);
+
+Q_SIGNALS:
+    void chartSelected(QChart *chart);
+
 protected:
     void mousePressEvent(QGraphicsSceneMouseEvent *event);
     void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
     void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+
 private:
     void clear();
+
 private:
     int m_listCount;
     int m_valueMax;
@@ -68,7 +74,7 @@ private:
     State m_currentState;
     QPointF m_origin;
     QGraphicsRectItem *m_rubberBand;
-    QGraphicsGridLayout* m_gridLayout;
+    QGraphicsGridLayout *m_gridLayout;
     QString m_category;
 };
 
diff --git a/demos/chartviewer/main.cpp b/demos/chartviewer/main.cpp
index 4c5cddf..0443e22 100644
--- a/demos/chartviewer/main.cpp
+++ b/demos/chartviewer/main.cpp
@@ -34,19 +34,17 @@ QVariantHash parseArgs(QStringList args)
 
             if (args.isEmpty() || args.first().startsWith("--")) {
                 parameters[param] = true;
-            }
-            else {
-
+            } else {
                 QString value = args.takeFirst();
                 if (value == "true" || value == "on" || value == "enabled") {
                     parameters[param] = true;
-                }
-                else if (value == "false" || value == "off" || value == "disable") {
+                } else if (value == "false" || value == "off" || value == "disable") {
                     parameters[param] = false;
-                }
-                else {
-                    if(value.endsWith( '"' )) value.chop(1);
-                    if(value.startsWith( '"' )) value.remove(0,1);
+                } else {
+                    if (value.endsWith('"'))
+                        value.chop(1);
+                    if (value.startsWith('"'))
+                        value.remove(0, 1);
                     parameters[param] = value;
                 }
             }
diff --git a/demos/chartviewer/window.cpp b/demos/chartviewer/window.cpp
index be6546b..4d2d678 100644
--- a/demos/chartviewer/window.cpp
+++ b/demos/chartviewer/window.cpp
@@ -41,24 +41,24 @@
 #include <QMenu>
 #include <QPushButton>
 
-Window::Window(const QVariantHash& parameters,QWidget *parent) :
-    QMainWindow(parent),
-    m_scene(new QGraphicsScene(this)),
-    m_view(0),
-    m_form(0),
-    m_themeComboBox(0),
-    m_antialiasCheckBox(0),
-    m_animatedComboBox(0),
-    m_legendComboBox(0),
-    m_templateComboBox(0),
-    m_viewComboBox(0),
-    m_openGLCheckBox(0),
-    m_zoomCheckBox(0),
-    m_scrollCheckBox(0),
-    m_baseLayout(new QGraphicsLinearLayout()),
-    m_menu(createMenu()),
-    m_template(0),
-    m_grid(new Grid(1))
+Window::Window(const QVariantHash &parameters, QWidget *parent)
+    : QMainWindow(parent),
+      m_scene(new QGraphicsScene(this)),
+      m_view(0),
+      m_form(0),
+      m_themeComboBox(0),
+      m_antialiasCheckBox(0),
+      m_animatedComboBox(0),
+      m_legendComboBox(0),
+      m_templateComboBox(0),
+      m_viewComboBox(0),
+      m_openGLCheckBox(0),
+      m_zoomCheckBox(0),
+      m_scrollCheckBox(0),
+      m_baseLayout(new QGraphicsLinearLayout()),
+      m_menu(createMenu()),
+      m_template(0),
+      m_grid(new Grid(1))
 {
     createProxyWidgets();
     // create layout
@@ -121,7 +121,7 @@ void Window::connectSignals()
     QObject::connect(m_animatedComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI()));
     QObject::connect(m_legendComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI()));
     QObject::connect(m_templateComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI()));
-    QObject::connect(m_grid, SIGNAL(chartSelected(QChart*)),this,SLOT(handleChartSelected(QChart*)));
+    QObject::connect(m_grid, SIGNAL(chartSelected(QChart*)), this, SLOT(handleChartSelected(QChart*)));
 }
 
 void Window::createProxyWidgets()
@@ -212,7 +212,7 @@ QComboBox *Window::createTempleteBox()
     return templateComboBox;
 }
 
-void Window::initializeFromParamaters(const QVariantHash& parameters)
+void Window::initializeFromParamaters(const QVariantHash &parameters)
 {
     if (parameters.contains("template")) {
         QString t = parameters["template"].toString();
@@ -255,15 +255,14 @@ void Window::initializeFromParamaters(const QVariantHash& parameters)
         }
     }
     if (parameters.contains("view")) {
-          int t = parameters["view"].toInt();
-          for (int i = 0; i < m_viewComboBox->count(); ++i) {
-              if (m_viewComboBox->itemData(i).toInt() == t) {
-
-                  m_viewComboBox->setCurrentIndex(i);
-                  break;
-              }
-          }
-      }
+        int t = parameters["view"].toInt();
+        for (int i = 0; i < m_viewComboBox->count(); ++i) {
+            if (m_viewComboBox->itemData(i).toInt() == t) {
+                m_viewComboBox->setCurrentIndex(i);
+                break;
+            }
+        }
+    }
 }
 
 void Window::updateUI()
@@ -322,7 +321,7 @@ void Window::checkAnimationOptions()
     QChart::AnimationOptions options(
         m_animatedComboBox->itemData(m_animatedComboBox->currentIndex()).toInt());
 
-    QList<QChart*> charts = m_grid->charts();
+    QList<QChart *> charts = m_grid->charts();
 
     if (!charts.isEmpty() && charts.at(0)->animationOptions() != options) {
         foreach (QChart *chart, charts)
@@ -415,13 +414,14 @@ void Window::comboBoxFocused(QComboBox *combobox)
 
 void Window::handleChartSelected(QChart *qchart)
 {
-    if(m_templateComboBox->currentIndex() != 0) return;
+    if (m_templateComboBox->currentIndex() != 0)
+        return;
 
     QAction *chosen = m_menu->exec(QCursor::pos());
 
     if (chosen) {
         Chart *chart = (Chart *) chosen->data().value<void *>();
-        m_grid->replaceChart(qchart,chart);
+        m_grid->replaceChart(qchart, chart);
         updateUI();
     }
 }
diff --git a/demos/chartviewer/window.h b/demos/chartviewer/window.h
index 94178cf..4be8cac 100644
--- a/demos/chartviewer/window.h
+++ b/demos/chartviewer/window.h
@@ -46,7 +46,7 @@ class Window: public QMainWindow
 {
     Q_OBJECT
 public:
-    explicit Window(const QVariantHash& parameters, QWidget *parent = 0);
+    explicit Window(const QVariantHash &parameters, QWidget *parent = 0);
     ~Window();
 
 private Q_SLOTS:
@@ -71,7 +71,7 @@ private:
     inline void checkTemplate();
     QMenu *createMenu();
     QAction *createMenuAction(QMenu *menu, const QIcon &icon, const QString &text, const QVariant &data);
-    void initializeFromParamaters(const QVariantHash& parameters);
+    void initializeFromParamaters(const QVariantHash &parameters);
 
 private:
     QGraphicsScene *m_scene;
@@ -91,7 +91,7 @@ private:
     QGraphicsLinearLayout *m_baseLayout;
     QMenu *m_menu;
     int m_template;
-    Grid* m_grid;
+    Grid *m_grid;
 
     friend class ComboBox;
 };