Remove the use of Q_SVG_PRIVATE_EXPORT

Task-number: QTBUG-117983
Change-Id: I44ae75bdd91e84dcca95e3a69e969978fcf42241
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

11 files changed, 56 insertions, 56 deletions

diff --git a/src/svg/qsvgfilter_p.h b/src/svg/qsvgfilter_p.h
index 19054ab..baeb0dc 100644
--- a/src/svg/qsvgfilter_p.h
+++ b/src/svg/qsvgfilter_p.h
@@ -26,7 +26,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_SVG_PRIVATE_EXPORT QSvgFeFilterPrimitive : public QSvgStructureNode
+class Q_SVG_EXPORT QSvgFeFilterPrimitive : public QSvgStructureNode
 {
 public:
     QSvgFeFilterPrimitive(QSvgNode *parent, QString input, QString result, const QSvgRectF &rect);
@@ -57,7 +57,7 @@ protected:
 
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgFeColorMatrix : public QSvgFeFilterPrimitive
+class Q_SVG_EXPORT QSvgFeColorMatrix : public QSvgFeFilterPrimitive
 {
 public:
     enum class ColorShiftType : quint8 {
@@ -81,7 +81,7 @@ private:
     Matrix m_matrix;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgFeGaussianBlur : public QSvgFeFilterPrimitive
+class Q_SVG_EXPORT QSvgFeGaussianBlur : public QSvgFeFilterPrimitive
 {
 public:
     enum class EdgeMode : quint8 {
@@ -102,7 +102,7 @@ private:
     EdgeMode m_edgemode;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgFeOffset : public QSvgFeFilterPrimitive
+class Q_SVG_EXPORT QSvgFeOffset : public QSvgFeFilterPrimitive
 {
 public:
     QSvgFeOffset(QSvgNode *parent, QString input, QString result, const QSvgRectF &rect,
@@ -116,7 +116,7 @@ private:
     qreal m_dy;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgFeMerge : public QSvgFeFilterPrimitive
+class Q_SVG_EXPORT QSvgFeMerge : public QSvgFeFilterPrimitive
 {
 public:
     QSvgFeMerge(QSvgNode *parent, QString input, QString result, const QSvgRectF &rect);
@@ -126,7 +126,7 @@ public:
                  QSvg::UnitTypes primitiveUnits, QSvg::UnitTypes filterUnits) const override;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgFeMergeNode : public QSvgFeFilterPrimitive
+class Q_SVG_EXPORT QSvgFeMergeNode : public QSvgFeFilterPrimitive
 {
 public:
     QSvgFeMergeNode(QSvgNode *parent, QString input, QString result, const QSvgRectF &rect);
@@ -136,7 +136,7 @@ public:
                  QSvg::UnitTypes primitiveUnits, QSvg::UnitTypes filterUnits) const override;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgFeComposite : public QSvgFeFilterPrimitive
+class Q_SVG_EXPORT QSvgFeComposite : public QSvgFeFilterPrimitive
 {
 public:
     enum class Operator : quint8 {
@@ -160,7 +160,7 @@ private:
     QVector4D m_k;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgFeFlood : public QSvgFeFilterPrimitive
+class Q_SVG_EXPORT QSvgFeFlood : public QSvgFeFilterPrimitive
 {
 public:
     QSvgFeFlood(QSvgNode *parent, QString input, QString result, const QSvgRectF &rect, const QColor &color);
diff --git a/src/svg/qsvgfont_p.h b/src/svg/qsvgfont_p.h
index 9cf3dfe..b328a84 100644
--- a/src/svg/qsvgfont_p.h
+++ b/src/svg/qsvgfont_p.h
@@ -23,7 +23,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_SVG_PRIVATE_EXPORT QSvgGlyph
+class Q_SVG_EXPORT QSvgGlyph
 {
 public:
     QSvgGlyph(QChar unicode, const QPainterPath &path, qreal horizAdvX);
@@ -35,7 +35,7 @@ public:
 };
 
 
-class Q_SVG_PRIVATE_EXPORT QSvgFont : public QSvgRefCounted
+class Q_SVG_EXPORT QSvgFont : public QSvgRefCounted
 {
 public:
     static constexpr qreal DEFAULT_UNITS_PER_EM = 1000;
diff --git a/src/svg/qsvggraphics_p.h b/src/svg/qsvggraphics_p.h
index 37a3965..a1cdf20 100644
--- a/src/svg/qsvggraphics_p.h
+++ b/src/svg/qsvggraphics_p.h
@@ -28,14 +28,14 @@ QT_BEGIN_NAMESPACE
 
 class QTextCharFormat;
 
-class Q_SVG_PRIVATE_EXPORT QSvgAnimation : public QSvgNode
+class Q_SVG_EXPORT QSvgAnimation : public QSvgNode
 {
 public:
     void drawCommand(QPainter *, QSvgExtraStates &) override;
     Type type() const override;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgEllipse : public QSvgNode
+class Q_SVG_EXPORT QSvgEllipse : public QSvgNode
 {
 public:
     QSvgEllipse(QSvgNode *parent, const QRectF &rect);
@@ -49,14 +49,14 @@ private:
     QRectF m_bounds;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgCircle : public QSvgEllipse
+class Q_SVG_EXPORT QSvgCircle : public QSvgEllipse
 {
 public:
     QSvgCircle(QSvgNode *parent, const QRectF &rect) : QSvgEllipse(parent, rect) { }
     Type type() const override;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgImage : public QSvgNode
+class Q_SVG_EXPORT QSvgImage : public QSvgNode
 {
 public:
     QSvgImage(QSvgNode *parent, const QImage &image,
@@ -72,7 +72,7 @@ private:
     QRectF m_bounds;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgLine : public QSvgNode
+class Q_SVG_EXPORT QSvgLine : public QSvgNode
 {
 public:
     QSvgLine(QSvgNode *parent, const QLineF &line);
@@ -85,7 +85,7 @@ private:
     QLineF m_line;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgPath : public QSvgNode
+class Q_SVG_EXPORT QSvgPath : public QSvgNode
 {
 public:
     QSvgPath(QSvgNode *parent, const QPainterPath &qpath);
@@ -99,7 +99,7 @@ private:
     QPainterPath m_path;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgPolygon : public QSvgNode
+class Q_SVG_EXPORT QSvgPolygon : public QSvgNode
 {
 public:
     QSvgPolygon(QSvgNode *parent, const QPolygonF &poly);
@@ -113,7 +113,7 @@ private:
     QPolygonF m_poly;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgPolyline : public QSvgNode
+class Q_SVG_EXPORT QSvgPolyline : public QSvgNode
 {
 public:
     QSvgPolyline(QSvgNode *parent, const QPolygonF &poly);
@@ -127,7 +127,7 @@ private:
     QPolygonF m_poly;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgRect : public QSvgNode
+class Q_SVG_EXPORT QSvgRect : public QSvgNode
 {
 public:
     QSvgRect(QSvgNode *paren, const QRectF &rect, qreal rx=0, qreal ry=0);
@@ -145,7 +145,7 @@ private:
 
 class  QSvgTspan;
 
-class Q_SVG_PRIVATE_EXPORT QSvgText : public QSvgNode
+class Q_SVG_EXPORT QSvgText : public QSvgNode
 {
 public:
     enum WhitespaceMode
@@ -190,7 +190,7 @@ private:
     WhitespaceMode m_mode;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgTspan : public QSvgNode
+class Q_SVG_EXPORT QSvgTspan : public QSvgNode
 {
 public:
     // tspans are also used to store normal text, so the 'isProperTspan' is used to separate text from tspan.
diff --git a/src/svg/qsvghandler_p.h b/src/svg/qsvghandler_p.h
index 298b97d..39684ac 100644
--- a/src/svg/qsvghandler_p.h
+++ b/src/svg/qsvghandler_p.h
@@ -44,7 +44,7 @@ struct QSvgCssAttribute
 
 #endif
 
-class Q_SVG_PRIVATE_EXPORT QSvgHandler
+class Q_SVG_EXPORT QSvgHandler
 {
 public:
     enum LengthType {
diff --git a/src/svg/qsvghelper_p.h b/src/svg/qsvghelper_p.h
index b11131d..1bcae28 100644
--- a/src/svg/qsvghelper_p.h
+++ b/src/svg/qsvghelper_p.h
@@ -21,7 +21,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_SVG_PRIVATE_EXPORT QSvgRectF : public QRectF
+class Q_SVG_EXPORT QSvgRectF : public QRectF
 {
 public:
     QSvgRectF(const QRectF &r = QRectF(),
diff --git a/src/svg/qsvgnode_p.h b/src/svg/qsvgnode_p.h
index 92832a7..c0fa35c 100644
--- a/src/svg/qsvgnode_p.h
+++ b/src/svg/qsvgnode_p.h
@@ -27,7 +27,7 @@ QT_BEGIN_NAMESPACE
 class QPainter;
 class QSvgTinyDocument;
 
-class Q_SVG_PRIVATE_EXPORT QSvgNode
+class Q_SVG_EXPORT QSvgNode
 {
 public:
     enum Type
diff --git a/src/svg/qsvgstructure_p.h b/src/svg/qsvgstructure_p.h
index 8f03d97..f9e9ae0 100644
--- a/src/svg/qsvgstructure_p.h
+++ b/src/svg/qsvgstructure_p.h
@@ -27,7 +27,7 @@ class QSvgNode;
 class QPainter;
 class QSvgDefs;
 
-class Q_SVG_PRIVATE_EXPORT QSvgStructureNode : public QSvgNode
+class Q_SVG_EXPORT QSvgStructureNode : public QSvgNode
 {
 public:
     QSvgStructureNode(QSvgNode *parent);
@@ -44,7 +44,7 @@ protected:
     mutable bool              m_recursing = false;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgG : public QSvgStructureNode
+class Q_SVG_EXPORT QSvgG : public QSvgStructureNode
 {
 public:
     QSvgG(QSvgNode *parent);
@@ -53,7 +53,7 @@ public:
     Type type() const override;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgDefs : public QSvgStructureNode
+class Q_SVG_EXPORT QSvgDefs : public QSvgStructureNode
 {
 public:
     QSvgDefs(QSvgNode *parent);
@@ -62,7 +62,7 @@ public:
     Type type() const override;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgSymbolLike : public QSvgStructureNode
+class Q_SVG_EXPORT QSvgSymbolLike : public QSvgStructureNode
 {
     // Marker, Symbol and potentially other elements share a lot of common
     // attributes and functionality. By making a common base class we can
@@ -107,7 +107,7 @@ protected:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QSvgSymbolLike::PreserveAspectRatios)
 
-class Q_SVG_PRIVATE_EXPORT QSvgSymbol : public QSvgSymbolLike
+class Q_SVG_EXPORT QSvgSymbol : public QSvgSymbolLike
 {
 public:
     QSvgSymbol(QSvgNode *parent, QRectF bounds, QRectF viewBox, QPointF refP,
@@ -116,7 +116,7 @@ public:
     Type type() const override;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgMarker : public QSvgSymbolLike
+class Q_SVG_EXPORT QSvgMarker : public QSvgSymbolLike
 {
 public:
     enum class Orientation : quint8 {
@@ -157,7 +157,7 @@ private:
     MarkerUnits m_markerUnits;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgFilterContainer : public QSvgStructureNode
+class Q_SVG_EXPORT QSvgFilterContainer : public QSvgStructureNode
 {
 public:
 
@@ -172,7 +172,7 @@ private:
 };
 
 
-class Q_SVG_PRIVATE_EXPORT QSvgSwitch : public QSvgStructureNode
+class Q_SVG_EXPORT QSvgSwitch : public QSvgStructureNode
 {
 public:
     QSvgSwitch(QSvgNode *parent);
@@ -185,7 +185,7 @@ private:
     QString m_systemLanguagePrefix;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgMask : public QSvgStructureNode
+class Q_SVG_EXPORT QSvgMask : public QSvgStructureNode
 {
 public:
     QSvgMask(QSvgNode *parent, QSvgRectF bounds,
@@ -199,7 +199,7 @@ private:
     QSvg::UnitTypes m_contentUnits;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgPattern : public QSvgStructureNode
+class Q_SVG_EXPORT QSvgPattern : public QSvgStructureNode
 {
 public:
     QSvgPattern(QSvgNode *parent, QSvgRectF bounds, QRectF viewBox,
diff --git a/src/svg/qsvgstyle_p.h b/src/svg/qsvgstyle_p.h
index 4ae59bb..77fbe6d 100644
--- a/src/svg/qsvgstyle_p.h
+++ b/src/svg/qsvgstyle_p.h
@@ -81,7 +81,7 @@ private:
     T *t;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgRefCounted
+class Q_SVG_EXPORT QSvgRefCounted
 {
 public:
     QSvgRefCounted() { _ref = 0; }
@@ -101,7 +101,7 @@ private:
     int _ref;
 };
 
-struct Q_SVG_PRIVATE_EXPORT QSvgExtraStates
+struct Q_SVG_EXPORT QSvgExtraStates
 {
     QSvgExtraStates();
 
@@ -119,7 +119,7 @@ struct Q_SVG_PRIVATE_EXPORT QSvgExtraStates
     bool inUse = false; // true if currently in QSvgUseNode
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgStyleProperty : public QSvgRefCounted
+class Q_SVG_EXPORT QSvgStyleProperty : public QSvgRefCounted
 {
 public:
     enum Type
@@ -146,7 +146,7 @@ public:
     bool isDefault() const { return false; } // [not virtual since called from templated class]
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgPaintStyleProperty : public QSvgStyleProperty
+class Q_SVG_EXPORT QSvgPaintStyleProperty : public QSvgStyleProperty
 {
 public:
     virtual QBrush brush(QPainter *p, const QSvgNode *node, QSvgExtraStates &states) = 0;
@@ -154,7 +154,7 @@ public:
     void revert(QPainter *p, QSvgExtraStates &states) override;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgQualityStyle : public QSvgStyleProperty
+class Q_SVG_EXPORT QSvgQualityStyle : public QSvgStyleProperty
 {
 public:
     enum ImageRendering: qint8 {
@@ -196,7 +196,7 @@ private:
 
 
 
-class Q_SVG_PRIVATE_EXPORT QSvgOpacityStyle : public QSvgStyleProperty
+class Q_SVG_EXPORT QSvgOpacityStyle : public QSvgStyleProperty
 {
 public:
     QSvgOpacityStyle(qreal opacity);
@@ -211,7 +211,7 @@ private:
     qreal m_oldOpacity;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgFillStyle : public QSvgStyleProperty
+class Q_SVG_EXPORT QSvgFillStyle : public QSvgStyleProperty
 {
 public:
     QSvgFillStyle();
@@ -284,7 +284,7 @@ private:
     uint m_fillSet : 1;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgViewportFillStyle : public QSvgStyleProperty
+class Q_SVG_EXPORT QSvgViewportFillStyle : public QSvgStyleProperty
 {
 public:
     QSvgViewportFillStyle(const QBrush &brush);
@@ -304,7 +304,7 @@ private:
     QBrush m_oldFill;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgFontStyle : public QSvgStyleProperty
+class Q_SVG_EXPORT QSvgFontStyle : public QSvgStyleProperty
 {
 public:
     static const int LIGHTER = -1;
@@ -386,7 +386,7 @@ private:
     uint m_textAnchorSet : 1;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgStrokeStyle : public QSvgStyleProperty
+class Q_SVG_EXPORT QSvgStrokeStyle : public QSvgStyleProperty
 {
 public:
     QSvgStrokeStyle();
@@ -526,7 +526,7 @@ private:
     uint m_vectorEffectSet : 1;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgSolidColorStyle : public QSvgPaintStyleProperty
+class Q_SVG_EXPORT QSvgSolidColorStyle : public QSvgPaintStyleProperty
 {
 public:
     QSvgSolidColorStyle(const QColor &color);
@@ -551,7 +551,7 @@ private:
     QPen   m_oldStroke;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgGradientStyle : public QSvgPaintStyleProperty
+class Q_SVG_EXPORT QSvgGradientStyle : public QSvgPaintStyleProperty
 {
 public:
     QSvgGradientStyle(QGradient *grad);
@@ -594,7 +594,7 @@ private:
     bool m_gradientStopsSet;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgPatternStyle : public QSvgPaintStyleProperty
+class Q_SVG_EXPORT QSvgPatternStyle : public QSvgPaintStyleProperty
 {
 public:
     QSvgPatternStyle(QSvgPattern *pattern);
@@ -610,7 +610,7 @@ private:
 };
 
 
-class Q_SVG_PRIVATE_EXPORT QSvgTransformStyle : public QSvgStyleProperty
+class Q_SVG_EXPORT QSvgTransformStyle : public QSvgStyleProperty
 {
 public:
     QSvgTransformStyle(const QTransform &transform);
@@ -630,7 +630,7 @@ private:
 };
 
 
-class Q_SVG_PRIVATE_EXPORT QSvgAnimateTransform : public QSvgStyleProperty
+class Q_SVG_EXPORT QSvgAnimateTransform : public QSvgStyleProperty
 {
 public:
     enum TransformType
@@ -703,7 +703,7 @@ private:
 };
 
 
-class Q_SVG_PRIVATE_EXPORT QSvgAnimateColor : public QSvgStyleProperty
+class Q_SVG_EXPORT QSvgAnimateColor : public QSvgStyleProperty
 {
 public:
     QSvgAnimateColor(int startMs, int endMs, int by = 0);
@@ -726,7 +726,7 @@ private:
 };
 
 
-class Q_SVG_PRIVATE_EXPORT QSvgCompOpStyle : public QSvgStyleProperty
+class Q_SVG_EXPORT QSvgCompOpStyle : public QSvgStyleProperty
 {
 public:
     QSvgCompOpStyle(QPainter::CompositionMode mode);
@@ -746,7 +746,7 @@ private:
 };
 
 
-class Q_SVG_PRIVATE_EXPORT QSvgStyle
+class Q_SVG_EXPORT QSvgStyle
 {
 public:
     QSvgStyle()
diff --git a/src/svg/qsvgtinydocument_p.h b/src/svg/qsvgtinydocument_p.h
index 0b6544a..d0b1dbb 100644
--- a/src/svg/qsvgtinydocument_p.h
+++ b/src/svg/qsvgtinydocument_p.h
@@ -33,7 +33,7 @@ class QByteArray;
 class QSvgFont;
 class QTransform;
 
-class Q_SVG_PRIVATE_EXPORT QSvgTinyDocument : public QSvgStructureNode
+class Q_SVG_EXPORT QSvgTinyDocument : public QSvgStructureNode
 {
 public:
     static QSvgTinyDocument * load(const QString &file, QSvg::FeatureSet featureSet = QSvg::FeatureSet::AllAvailable);
@@ -111,7 +111,7 @@ private:
     const QSvg::FeatureSet m_featureSet;
 };
 
-Q_SVG_PRIVATE_EXPORT QDebug operator<<(QDebug debug, const QSvgTinyDocument &doc);
+Q_SVG_EXPORT QDebug operator<<(QDebug debug, const QSvgTinyDocument &doc);
 
 inline QSize QSvgTinyDocument::size() const
 {
diff --git a/src/svg/qsvgvisitor_p.h b/src/svg/qsvgvisitor_p.h
index 3fc93a5..53dd5a2 100644
--- a/src/svg/qsvgvisitor_p.h
+++ b/src/svg/qsvgvisitor_p.h
@@ -22,7 +22,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_SVG_PRIVATE_EXPORT QSvgVisitor {
+class Q_SVG_EXPORT QSvgVisitor {
 public:
     void traverse(const QSvgStructureNode *node);
     virtual ~QSvgVisitor() {}
diff --git a/src/svg/qtsvgglobal_p.h b/src/svg/qtsvgglobal_p.h
index b8f6a04..cd73fbb 100644
--- a/src/svg/qtsvgglobal_p.h
+++ b/src/svg/qtsvgglobal_p.h
@@ -16,7 +16,7 @@
 //
 
 #include "qtsvgglobal.h"
-#include <QtSvg/private/qtsvgexports_p.h>
+#include <QtSvg/qtsvgexports.h>
 
 QT_BEGIN_NAMESPACE