diff options
author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-10-23 10:50:48 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-10-23 10:55:43 +0300 |
commit | c6cc3c566c94ff35590f48939fda92fc4879c319 (patch) | |
tree | 6f8905cd3bf4d79e51609508f507fd39ba84bde1 | |
parent | 82abd640acc738b3bb2868e1a9fe7dca05111d31 (diff) |
Make all Q_DISABLE_COPY declarations private.
Task-number: QTRD-1945
Change-Id: I5cf04319ae2e4e9da1122be888c3c3e49928c748
Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
-rw-r--r-- | src/charts/axis/qabstractaxis.h | 4 | ||||
-rw-r--r-- | src/charts/legend/qlegendmarker.h | 4 | ||||
-rw-r--r-- | src/charts/qchart.h | 2 | ||||
-rw-r--r-- | src/charts/qchartview.h | 3 | ||||
-rw-r--r-- | src/charts/qpolarchart.h | 2 |
5 files changed, 11 insertions, 4 deletions
diff --git a/src/charts/axis/qabstractaxis.h b/src/charts/axis/qabstractaxis.h index aef42a72..874ee8eb 100644 --- a/src/charts/axis/qabstractaxis.h +++ b/src/charts/axis/qabstractaxis.h @@ -179,13 +179,15 @@ Q_SIGNALS: protected: QScopedPointer<QAbstractAxisPrivate> d_ptr; - Q_DISABLE_COPY(QAbstractAxis) friend class ChartDataSet; friend class ChartPresenter; friend class ChartThemeManager; friend class AbstractDomain; friend class ChartAxisElement; friend class XYChart; + +private: + Q_DISABLE_COPY(QAbstractAxis) }; QT_CHARTS_END_NAMESPACE diff --git a/src/charts/legend/qlegendmarker.h b/src/charts/legend/qlegendmarker.h index 5be899e3..f84fd81a 100644 --- a/src/charts/legend/qlegendmarker.h +++ b/src/charts/legend/qlegendmarker.h @@ -92,12 +92,14 @@ protected: explicit QLegendMarker(QLegendMarkerPrivate &d, QObject *parent = 0); QScopedPointer<QLegendMarkerPrivate> d_ptr; - Q_DISABLE_COPY(QLegendMarker) friend class QLegendPrivate; friend class QLegendMarkerPrivate; friend class LegendMarkerItem; friend class LegendLayout; friend class LegendScroller; + +private: + Q_DISABLE_COPY(QLegendMarker) }; QT_CHARTS_END_NAMESPACE diff --git a/src/charts/qchart.h b/src/charts/qchart.h index d4d386d9..3e69bb69 100644 --- a/src/charts/qchart.h +++ b/src/charts/qchart.h @@ -177,6 +177,8 @@ protected: friend class ChartThemeManager; friend class QAbstractSeries; friend class QBoxPlotSeriesPrivate; + +private: Q_DISABLE_COPY(QChart) }; diff --git a/src/charts/qchartview.h b/src/charts/qchartview.h index 499392cd..5d5871e4 100644 --- a/src/charts/qchartview.h +++ b/src/charts/qchartview.h @@ -64,8 +64,9 @@ protected: void mouseMoveEvent(QMouseEvent *event); void mouseReleaseEvent(QMouseEvent *event); -protected: QScopedPointer<QChartViewPrivate> d_ptr; + +private: Q_DISABLE_COPY(QChartView) }; diff --git a/src/charts/qpolarchart.h b/src/charts/qpolarchart.h index c50f2e85..4da4a0c1 100644 --- a/src/charts/qpolarchart.h +++ b/src/charts/qpolarchart.h @@ -51,7 +51,7 @@ public: static PolarOrientation axisPolarOrientation(QAbstractAxis *axis); -protected: +private: Q_DISABLE_COPY(QPolarChart) }; |