summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTitta Heikkala <titta.heikkala@digia.com>2014-05-30 09:14:00 +0300
committerTitta Heikkala <titta.heikkala@digia.com>2014-05-30 09:19:46 +0300
commitd672b074a893e8b24eff8b27650d0824c311e8a6 (patch)
tree7a31b90147206c8a11ecbedfe80c74b4ec7437ad
parent0f386f5dd65404f6fdaf0f49ab66e203976130c0 (diff)
Remove warnings about unmatched parentheses
Property declarations divided into several lines caused qmake to warn of cat() function about deprecated unmatched parentheses. The property declarations are now done in one line. Task-number: QTRD-3159 Change-Id: Ieb839ff81d707a5a40cdebd62a52ac32f51517b7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
-rw-r--r--src/areachart/qareaseries.h12
-rw-r--r--src/barchart/qabstractbarseries.h6
-rw-r--r--src/xychart/qxyseries.h12
3 files changed, 10 insertions, 20 deletions
diff --git a/src/areachart/qareaseries.h b/src/areachart/qareaseries.h
index 034c5fc0..a7c74073 100644
--- a/src/areachart/qareaseries.h
+++ b/src/areachart/qareaseries.h
@@ -37,14 +37,10 @@ class QTCOMMERCIALCHART_EXPORT QAreaSeries : public QAbstractSeries
Q_PROPERTY(QLineSeries *lowerSeries READ lowerSeries)
Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor NOTIFY borderColorChanged)
- Q_PROPERTY(QString pointLabelsFormat READ pointLabelsFormat WRITE setPointLabelsFormat
- NOTIFY pointLabelsFormatChanged)
- Q_PROPERTY(bool pointLabelsVisible READ pointLabelsVisible WRITE setPointLabelsVisible
- NOTIFY pointLabelsVisibilityChanged)
- Q_PROPERTY(QFont pointLabelsFont READ pointLabelsFont WRITE setPointLabelsFont
- NOTIFY pointLabelsFontChanged)
- Q_PROPERTY(QColor pointLabelsColor READ pointLabelsColor WRITE setPointLabelsColor
- NOTIFY pointLabelsColorChanged)
+ Q_PROPERTY(QString pointLabelsFormat READ pointLabelsFormat WRITE setPointLabelsFormat NOTIFY pointLabelsFormatChanged)
+ Q_PROPERTY(bool pointLabelsVisible READ pointLabelsVisible WRITE setPointLabelsVisible NOTIFY pointLabelsVisibilityChanged)
+ Q_PROPERTY(QFont pointLabelsFont READ pointLabelsFont WRITE setPointLabelsFont NOTIFY pointLabelsFontChanged)
+ Q_PROPERTY(QColor pointLabelsColor READ pointLabelsColor WRITE setPointLabelsColor NOTIFY pointLabelsColorChanged)
public:
explicit QAreaSeries(QObject *parent = 0);
diff --git a/src/barchart/qabstractbarseries.h b/src/barchart/qabstractbarseries.h
index 93627f6f..cf23ab90 100644
--- a/src/barchart/qabstractbarseries.h
+++ b/src/barchart/qabstractbarseries.h
@@ -36,10 +36,8 @@ class QTCOMMERCIALCHART_EXPORT QAbstractBarSeries : public QAbstractSeries
Q_PROPERTY(qreal barWidth READ barWidth WRITE setBarWidth)
Q_PROPERTY(int count READ count NOTIFY countChanged)
Q_PROPERTY(bool labelsVisible READ isLabelsVisible WRITE setLabelsVisible NOTIFY labelsVisibleChanged)
- Q_PROPERTY(QString labelsFormat READ labelsFormat WRITE setLabelsFormat
- NOTIFY labelsFormatChanged)
- Q_PROPERTY(LabelsPosition labelsPosition READ labelsPosition
- WRITE setLabelsPosition NOTIFY labelsPositionChanged)
+ Q_PROPERTY(QString labelsFormat READ labelsFormat WRITE setLabelsFormat NOTIFY labelsFormatChanged)
+ Q_PROPERTY(LabelsPosition labelsPosition READ labelsPosition WRITE setLabelsPosition NOTIFY labelsPositionChanged)
Q_ENUMS(LabelsPosition)
public:
diff --git a/src/xychart/qxyseries.h b/src/xychart/qxyseries.h
index 1e8a7210..02c08eb0 100644
--- a/src/xychart/qxyseries.h
+++ b/src/xychart/qxyseries.h
@@ -38,14 +38,10 @@ class QTCOMMERCIALCHART_EXPORT QXYSeries : public QAbstractSeries
Q_OBJECT
Q_PROPERTY(bool pointsVisible READ pointsVisible WRITE setPointsVisible)
Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
- Q_PROPERTY(QString pointLabelsFormat READ pointLabelsFormat WRITE setPointLabelsFormat
- NOTIFY pointLabelsFormatChanged)
- Q_PROPERTY(bool pointLabelsVisible READ pointLabelsVisible WRITE setPointLabelsVisible
- NOTIFY pointLabelsVisibilityChanged)
- Q_PROPERTY(QFont pointLabelsFont READ pointLabelsFont WRITE setPointLabelsFont
- NOTIFY pointLabelsFontChanged)
- Q_PROPERTY(QColor pointLabelsColor READ pointLabelsColor WRITE setPointLabelsColor
- NOTIFY pointLabelsColorChanged)
+ Q_PROPERTY(QString pointLabelsFormat READ pointLabelsFormat WRITE setPointLabelsFormat NOTIFY pointLabelsFormatChanged)
+ Q_PROPERTY(bool pointLabelsVisible READ pointLabelsVisible WRITE setPointLabelsVisible NOTIFY pointLabelsVisibilityChanged)
+ Q_PROPERTY(QFont pointLabelsFont READ pointLabelsFont WRITE setPointLabelsFont NOTIFY pointLabelsFontChanged)
+ Q_PROPERTY(QColor pointLabelsColor READ pointLabelsColor WRITE setPointLabelsColor NOTIFY pointLabelsColorChanged)
protected:
explicit QXYSeries(QXYSeriesPrivate &d, QObject *parent = 0);