HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2101:3e6adf48dbd5

coding style fixes for plugins

Jani Honkonen -

r2101:3e6adf48dbd5

parent child

Context file:

r2101:3e6adf48dbd5

Collapse all files

plugins/declarative/declarativeareaseries.cpp +4 -4

             {
             }
-            void DeclarativeAreaSeries::setUpperSeries(DeclarativeLineSeries* series)
+            void DeclarativeAreaSeries::setUpperSeries(DeclarativeLineSeries *series)
             {
                 QAreaSeries::setUpperSeries(series);
             }
-            DeclarativeLineSeries* DeclarativeAreaSeries::upperSeries() const
+            DeclarativeLineSeries *DeclarativeAreaSeries::upperSeries() const
             {
                 return qobject_cast<DeclarativeLineSeries *>(QAreaSeries::upperSeries());
             }
-            void DeclarativeAreaSeries::setLowerSeries(DeclarativeLineSeries* series)
+            void DeclarativeAreaSeries::setLowerSeries(DeclarativeLineSeries *series)
             {
                 QAreaSeries::setLowerSeries(series);
             }
-            DeclarativeLineSeries* DeclarativeAreaSeries::lowerSeries() const
+            DeclarativeLineSeries *DeclarativeAreaSeries::lowerSeries() const
             {
                 return qobject_cast<DeclarativeLineSeries *>(QAreaSeries::lowerSeries());
             }

plugins/declarative/declarativeareaseries.h +4 -4

             public:
                 explicit DeclarativeAreaSeries(QObject *parent = 0);
-                void setUpperSeries(DeclarativeLineSeries* series);
+                void setUpperSeries(DeclarativeLineSeries *series);
-                DeclarativeLineSeries* upperSeries() const;
+                DeclarativeLineSeries *upperSeries() const;
-                void setLowerSeries(DeclarativeLineSeries* series);
+                void setLowerSeries(DeclarativeLineSeries *series);
-                DeclarativeLineSeries* lowerSeries() const;
+                DeclarativeLineSeries *lowerSeries() const;
                 QAbstractAxis *axisX() { return m_axisX; }
                 void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
                 QAbstractAxis *axisY() { return m_axisY; }

plugins/declarative/declarativebarseries.cpp +20 -20

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            DeclarativeBarSet::DeclarativeBarSet(QObject *parent) :
+            DeclarativeBarSet::DeclarativeBarSet(QObject *parent)
-                QBarSet("", parent)
+                : QBarSet("", parent)
             {
                 connect(this, SIGNAL(valuesAdded(int,int)), this, SLOT(handleCountChanged(int,int)));
                 connect(this, SIGNAL(valuesRemoved(int,int)), this, SLOT(handleCountChanged(int,int)));
                 foreach (QObject *child, children()) {
                     if (qobject_cast<DeclarativeBarSet *>(child)) {
                         QAbstractBarSeries::append(qobject_cast<DeclarativeBarSet *>(child));
-                    } else if(qobject_cast<QVBarModelMapper *>(child)) {
+                    } else if (qobject_cast<QVBarModelMapper *>(child)) {
                         QVBarModelMapper *mapper = qobject_cast<QVBarModelMapper *>(child);
                         mapper->setSeries(this);
-                    } else if(qobject_cast<QHBarModelMapper *>(child)) {
+                    } else if (qobject_cast<QHBarModelMapper *>(child)) {
                         QHBarModelMapper *mapper = qobject_cast<QHBarModelMapper *>(child);
                         mapper->setSeries(this);
                     }
             DeclarativeBarSet *DeclarativeBarSeries::at(int index)
             {
-                QList<QBarSet*> setList = barSets();
+                QList<QBarSet *> setList = barSets();
                 if (index >= 0 && index < setList.count())
                     return qobject_cast<DeclarativeBarSet *>(setList[index]);
                 foreach (QObject *child, children()) {
                     if (qobject_cast<DeclarativeBarSet *>(child)) {
                         QAbstractBarSeries::append(qobject_cast<DeclarativeBarSet *>(child));
-                    } else if(qobject_cast<QVBarModelMapper *>(child)) {
+                    } else if (qobject_cast<QVBarModelMapper *>(child)) {
                         QVBarModelMapper *mapper = qobject_cast<QVBarModelMapper *>(child);
                         mapper->setSeries(this);
-                    } else if(qobject_cast<QHBarModelMapper *>(child)) {
+                    } else if (qobject_cast<QHBarModelMapper *>(child)) {
                         QHBarModelMapper *mapper = qobject_cast<QHBarModelMapper *>(child);
                         mapper->setSeries(this);
                     }
             DeclarativeBarSet *DeclarativeStackedBarSeries::at(int index)
             {
-                QList<QBarSet*> setList = barSets();
+                QList<QBarSet *> setList = barSets();
                 if (index >= 0 && index < setList.count())
                     return qobject_cast<DeclarativeBarSet *>(setList[index]);
                 foreach (QObject *child, children()) {
                     if (qobject_cast<DeclarativeBarSet *>(child)) {
                         QAbstractBarSeries::append(qobject_cast<DeclarativeBarSet *>(child));
-                    } else if(qobject_cast<QVBarModelMapper *>(child)) {
+                    } else if (qobject_cast<QVBarModelMapper *>(child)) {
                         QVBarModelMapper *mapper = qobject_cast<QVBarModelMapper *>(child);
                         mapper->setSeries(this);
-                    } else if(qobject_cast<QHBarModelMapper *>(child)) {
+                    } else if (qobject_cast<QHBarModelMapper *>(child)) {
                         QHBarModelMapper *mapper = qobject_cast<QHBarModelMapper *>(child);
                         mapper->setSeries(this);
                     }
             DeclarativeBarSet *DeclarativePercentBarSeries::at(int index)
             {
-                QList<QBarSet*> setList = barSets();
+                QList<QBarSet *> setList = barSets();
                 if (index >= 0 && index < setList.count())
                     return qobject_cast<DeclarativeBarSet *>(setList[index]);
                 foreach (QObject *child, children()) {
                     if (qobject_cast<DeclarativeBarSet *>(child)) {
                         QAbstractBarSeries::append(qobject_cast<DeclarativeBarSet *>(child));
-                    } else if(qobject_cast<QVBarModelMapper *>(child)) {
+                    } else if (qobject_cast<QVBarModelMapper *>(child)) {
                         QVBarModelMapper *mapper = qobject_cast<QVBarModelMapper *>(child);
                         mapper->setSeries(this);
-                    } else if(qobject_cast<QHBarModelMapper *>(child)) {
+                    } else if (qobject_cast<QHBarModelMapper *>(child)) {
                         QHBarModelMapper *mapper = qobject_cast<QHBarModelMapper *>(child);
                         mapper->setSeries(this);
                     }
             DeclarativeBarSet *DeclarativeHorizontalBarSeries::at(int index)
             {
-                QList<QBarSet*> setList = barSets();
+                QList<QBarSet *> setList = barSets();
                 if (index >= 0 && index < setList.count())
                     return qobject_cast<DeclarativeBarSet *>(setList[index]);
                 foreach (QObject *child, children()) {
                     if (qobject_cast<DeclarativeBarSet *>(child)) {
                         QAbstractBarSeries::append(qobject_cast<DeclarativeBarSet *>(child));
-                    } else if(qobject_cast<QVBarModelMapper *>(child)) {
+                    } else if (qobject_cast<QVBarModelMapper *>(child)) {
                         QVBarModelMapper *mapper = qobject_cast<QVBarModelMapper *>(child);
                         mapper->setSeries(this);
-                    } else if(qobject_cast<QHBarModelMapper *>(child)) {
+                    } else if (qobject_cast<QHBarModelMapper *>(child)) {
                         QHBarModelMapper *mapper = qobject_cast<QHBarModelMapper *>(child);
                         mapper->setSeries(this);
                     }
             DeclarativeBarSet *DeclarativeHorizontalStackedBarSeries::at(int index)
             {
-                QList<QBarSet*> setList = barSets();
+                QList<QBarSet *> setList = barSets();
                 if (index >= 0 && index < setList.count())
                     return qobject_cast<DeclarativeBarSet *>(setList[index]);
                 foreach (QObject *child, children()) {
                     if (qobject_cast<DeclarativeBarSet *>(child)) {
                         QAbstractBarSeries::append(qobject_cast<DeclarativeBarSet *>(child));
-                    } else if(qobject_cast<QVBarModelMapper *>(child)) {
+                    } else if (qobject_cast<QVBarModelMapper *>(child)) {
                         QVBarModelMapper *mapper = qobject_cast<QVBarModelMapper *>(child);
                         mapper->setSeries(this);
-                    } else if(qobject_cast<QHBarModelMapper *>(child)) {
+                    } else if (qobject_cast<QHBarModelMapper *>(child)) {
                         QHBarModelMapper *mapper = qobject_cast<QHBarModelMapper *>(child);
                         mapper->setSeries(this);
                     }
             DeclarativeBarSet *DeclarativeHorizontalPercentBarSeries::at(int index)
             {
-                QList<QBarSet*> setList = barSets();
+                QList<QBarSet *> setList = barSets();
                 if (index >= 0 && index < setList.count())
                     return qobject_cast<DeclarativeBarSet *>(setList[index]);

plugins/declarative/declarativebarseries.h +12 -12

                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             private:
-                QAbstractAxis* m_axisX;
+                QAbstractAxis *m_axisX;
-                QAbstractAxis* m_axisY;
+                QAbstractAxis *m_axisY;
             };
             class DeclarativeStackedBarSeries : public QStackedBarSeries, public QDeclarativeParserStatus
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             private:
-                QAbstractAxis* m_axisX;
+                QAbstractAxis *m_axisX;
-                QAbstractAxis* m_axisY;
+                QAbstractAxis *m_axisY;
             };
             class DeclarativePercentBarSeries : public QPercentBarSeries, public QDeclarativeParserStatus
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             private:
-                QAbstractAxis* m_axisX;
+                QAbstractAxis *m_axisX;
-                QAbstractAxis* m_axisY;
+                QAbstractAxis *m_axisY;
             };
             class DeclarativeHorizontalBarSeries : public QHorizontalBarSeries, public QDeclarativeParserStatus
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             private:
-                QAbstractAxis* m_axisX;
+                QAbstractAxis *m_axisX;
-                QAbstractAxis* m_axisY;
+                QAbstractAxis *m_axisY;
             };
             class DeclarativeHorizontalStackedBarSeries : public QHorizontalStackedBarSeries, public QDeclarativeParserStatus
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             private:
-                QAbstractAxis* m_axisX;
+                QAbstractAxis *m_axisX;
-                QAbstractAxis* m_axisY;
+                QAbstractAxis *m_axisY;
             };
             class DeclarativeHorizontalPercentBarSeries : public QHorizontalPercentBarSeries, public QDeclarativeParserStatus
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             private:
-                QAbstractAxis* m_axisX;
+                QAbstractAxis *m_axisX;
-                QAbstractAxis* m_axisY;
+                QAbstractAxis *m_axisY;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/declarativecategoryaxis.cpp +1 -1

                 QCategoryAxis::remove(label);
             }
-            void DeclarativeCategoryAxis::replace(const QString& oldLabel, const QString& newLabel)
+            void DeclarativeCategoryAxis::replace(const QString &oldLabel, const QString &newLabel)
             {
                 QCategoryAxis::replaceLabel(oldLabel, newLabel);
             }

plugins/declarative/declarativecategoryaxis.h +1 -1

             public Q_SLOTS:
                 Q_INVOKABLE void append(const QString &label, qreal categoryEndValue);
                 Q_INVOKABLE void remove(const QString &label);
-                Q_INVOKABLE void replace(const QString& oldLabel, const QString& newLabel);
+                Q_INVOKABLE void replace(const QString &oldLabel, const QString &newLabel);
                 static void appendAxisChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
             private:

plugins/declarative/declarativechart.cpp +6 -6

                 QDeclarativeItem::componentComplete();
             }
-            void DeclarativeChart::handleAxisXSet(QAbstractAxis* axis)
+            void DeclarativeChart::handleAxisXSet(QAbstractAxis *axis)
             {
             //    qDebug() << "DeclarativeChart::handleAxisXSet" << sender() << axis;
                 if (axis && qobject_cast<QAbstractSeries *>(sender()))
                     qWarning() << "Trying to set axisX to null.";
             }
-            void DeclarativeChart::handleAxisYSet(QAbstractAxis* axis)
+            void DeclarativeChart::handleAxisYSet(QAbstractAxis *axis)
             {
             //    qDebug() << "DeclarativeChart::handleAxisYSet" << sender() << axis;
                 if (axis && qobject_cast<QAbstractSeries *>(sender()))
                 return m_chart->titleFont();
             }
-            void DeclarativeChart::setTitleFont(const QFont& font)
+            void DeclarativeChart::setTitleFont(const QFont &font)
             {
                 m_chart->setTitleFont(font);
             }
                 qWarning() << "ChartView.createDefaultAxes() is deprecated. Axes are created automatically.";
             }
-            void DeclarativeChart::createDefaultAxes(QAbstractSeries* series)
+            void DeclarativeChart::createDefaultAxes(QAbstractSeries *series)
             {
                 foreach (QAbstractSeries *s, m_chart->series()) {
                     // If there is already an x axis of the correct type, re-use it
                     if (!m_chart->axisX(series) && s != series && m_chart->axisX(s)
-                            && m_chart->axisX(s)->type() == series->d_ptr->defaultAxisType(Qt::Horizontal))
+                        && m_chart->axisX(s)->type() == series->d_ptr->defaultAxisType(Qt::Horizontal))
                         m_chart->setAxisX(m_chart->axisX(s), series);
                     // If there is already a y axis of the correct type, re-use it
                     if (!m_chart->axisY(series) && s != series && m_chart->axisY(s)
-                            && m_chart->axisY(s)->type() == series->d_ptr->defaultAxisType(Qt::Vertical))
+                        && m_chart->axisY(s)->type() == series->d_ptr->defaultAxisType(Qt::Vertical))
                         m_chart->setAxisY(m_chart->axisY(s), series);
                 }

plugins/declarative/declarativechart.h +5 -5

                 enum Animation {
                     NoAnimation = 0x0,
                     GridAxisAnimations = 0x1,
-                    SeriesAnimations =0x2,
+                    SeriesAnimations = 0x2,
                     AllAnimations = 0x3
                 };
                 QString title();
                 QLegend *legend();
                 QFont titleFont() const;
-                void setTitleFont(const QFont& font);
+                void setTitleFont(const QFont &font);
                 void setTitleColor(QColor color);
                 QColor titleColor();
                 void setBackgroundColor(QColor color);
                 qreal bottomMargin();
                 qreal leftMargin();
                 qreal rightMargin();
-                void createDefaultAxes(QAbstractSeries* series);
+                void createDefaultAxes(QAbstractSeries *series);
                 //TODO this is depreciated:
                 DeclarativeMargins *minimumMargins() { return m_margins; }
                 void minimumMarginsChanged();
                 Q_REVISION(2) void marginsChanged();
                 void plotAreaChanged(QRectF plotArea);
-                void seriesAdded(QAbstractSeries* series);
+                void seriesAdded(QAbstractSeries *series);
-                void seriesRemoved(QAbstractSeries* series);
+                void seriesRemoved(QAbstractSeries *series);
             public Q_SLOTS:
                 void changeMinimumMargins(int top, int bottom, int left, int right);

plugins/declarative/declarativepieseries.cpp +7 -7

                 foreach (QObject *child, children()) {
                     if (qobject_cast<QPieSlice *>(child)) {
                         QPieSeries::append(qobject_cast<QPieSlice *>(child));
-                    } else if(qobject_cast<QVPieModelMapper *>(child)) {
+                    } else if (qobject_cast<QVPieModelMapper *>(child)) {
                         QVPieModelMapper *mapper = qobject_cast<QVPieModelMapper *>(child);
                         mapper->setSeries(this);
-                    } else if(qobject_cast<QHPieModelMapper *>(child)) {
+                    } else if (qobject_cast<QHPieModelMapper *>(child)) {
                         QHPieModelMapper *mapper = qobject_cast<QHPieModelMapper *>(child);
                         mapper->setSeries(this);
                     }
             QPieSlice *DeclarativePieSeries::at(int index)
             {
-                QList<QPieSlice*> sliceList = slices();
+                QList<QPieSlice *> sliceList = slices();
                 if (index >= 0 && index < sliceList.count())
                     return sliceList[index];
                 return 0;
             }
-            QPieSlice* DeclarativePieSeries::find(QString label)
+            QPieSlice *DeclarativePieSeries::find(QString label)
             {
                 foreach (QPieSlice *slice, slices()) {
                     if (slice->label() == label)
                 return 0;
             }
-            QPieSlice* DeclarativePieSeries::append(QString label, qreal value)
+            QPieSlice *DeclarativePieSeries::append(QString label, qreal value)
             {
                 QPieSlice *slice = new QPieSlice(this);
                 slice->setLabel(label);
                 QPieSeries::clear();
             }
-            void DeclarativePieSeries::handleAdded(QList<QPieSlice*> slices)
+            void DeclarativePieSeries::handleAdded(QList<QPieSlice *> slices)
             {
                 foreach (QPieSlice *slice, slices)
                     emit sliceAdded(slice);
             }
-            void DeclarativePieSeries::handleRemoved(QList<QPieSlice*> slices)
+            void DeclarativePieSeries::handleRemoved(QList<QPieSlice *> slices)
             {
                 foreach (QPieSlice *slice, slices)
                     emit sliceRemoved(slice);

plugins/declarative/declarativepieseries.h +4 -4

                 void componentComplete();
             Q_SIGNALS:
-                void sliceAdded(QPieSlice* slice);
+                void sliceAdded(QPieSlice *slice);
-                void sliceRemoved(QPieSlice* slice);
+                void sliceRemoved(QPieSlice *slice);
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
-                void handleAdded(QList<QPieSlice*> slices);
+                void handleAdded(QList<QPieSlice *> slices);
-                void handleRemoved(QList<QPieSlice*> slices);
+                void handleRemoved(QList<QPieSlice *> slices);
             };
             QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/declarativexyseries.cpp +2 -2

                     if (qobject_cast<DeclarativeXYPoint *>(child)) {
                         DeclarativeXYPoint *point = qobject_cast<DeclarativeXYPoint *>(child);
                         series->append(point->x(), point->y());
-                    } else if(qobject_cast<QVXYModelMapper *>(child)) {
+                    } else if (qobject_cast<QVXYModelMapper *>(child)) {
                         QVXYModelMapper *mapper = qobject_cast<QVXYModelMapper *>(child);
                         mapper->setSeries(series);
-                    } else if(qobject_cast<QHXYModelMapper *>(child)) {
+                    } else if (qobject_cast<QHXYModelMapper *>(child)) {
                         QHXYModelMapper *mapper = qobject_cast<QHXYModelMapper *>(child);
                         mapper->setSeries(series);
                     }

plugins/declarative/plugin.cpp +1 -1

                 Q_PLUGIN_METADATA(IID "org.qt-project.foo")
             #endif
-                public:
+            public:
                 virtual void registerTypes(const char *uri)
                 {
                     Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCommercial.Chart"));

plugins/designer/qchartsplugin.cpp +7 -8

             QString QChartsPlugin::includeFile() const
             {
-                #ifdef linux
+            #ifdef linux
                 QString myNewLine = "\n";
-                #endif
+            #endif
-                #ifdef WIN32
+            #ifdef WIN32
                 QString myNewLine = "\n\r";
-                #endif
+            #endif
-                #ifdef __APPLE__
+            #ifdef __APPLE__
                 QString myNewLine = "\n";
-                #endif
+            #endif
                 return "<qchartview.h>" + myNewLine + "#include <chartsnamespace.h>";
             }
                 return false;
             }
-            QWidget* QChartsPlugin::createWidget(QWidget *parent)
+            QWidget *QChartsPlugin::createWidget(QWidget *parent)
             {
                 return new QChartView(new QChart(), parent);
             }

plugins/designer/qchartsplugin.h +1 -1

             #include <QDesignerCustomWidgetInterface>
-            class QChartsPlugin: public QObject,public QDesignerCustomWidgetInterface
+            class QChartsPlugin: public QObject, public QDesignerCustomWidgetInterface
             {
             #ifdef QT5_QUICK_1

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages