From eece19e62638409b479cabcbb985978d61d84307 Mon Sep 17 00:00:00 2001 From: Louai Al-Khanji Date: Mon, 17 Nov 2014 01:39:44 +0200 Subject: Export private symbols for use from other Qt modules Change-Id: I74aa76cb485cb652eba04ff2387165bab9663c99 Reviewed-by: Laszlo Agocs --- src/svg/qsvgfont_p.h | 5 +++-- src/svg/qsvggraphics_p.h | 25 +++++++++++---------- src/svg/qsvghandler_p.h | 3 ++- src/svg/qsvgnode_p.h | 3 ++- src/svg/qsvgstructure_p.h | 9 ++++---- src/svg/qsvgstyle_p.h | 35 ++++++++++++++--------------- src/svg/qsvgtinydocument_p.h | 4 ++-- src/svg/qtsvgglobal_p.h | 52 ++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 97 insertions(+), 39 deletions(-) create mode 100644 src/svg/qtsvgglobal_p.h diff --git a/src/svg/qsvgfont_p.h b/src/svg/qsvgfont_p.h index bdf9a73..01389c4 100644 --- a/src/svg/qsvgfont_p.h +++ b/src/svg/qsvgfont_p.h @@ -49,10 +49,11 @@ #include "qhash.h" #include "qstring.h" #include "qsvgstyle_p.h" +#include "qtsvgglobal_p.h" QT_BEGIN_NAMESPACE -class QSvgGlyph +class Q_SVG_PRIVATE_EXPORT QSvgGlyph { public: QSvgGlyph(QChar unicode, const QPainterPath &path, qreal horizAdvX); @@ -64,7 +65,7 @@ public: }; -class QSvgFont : public QSvgRefCounted +class Q_SVG_PRIVATE_EXPORT QSvgFont : public QSvgRefCounted { public: QSvgFont(qreal horizAdvX); diff --git a/src/svg/qsvggraphics_p.h b/src/svg/qsvggraphics_p.h index 6c7c083..79f257d 100644 --- a/src/svg/qsvggraphics_p.h +++ b/src/svg/qsvggraphics_p.h @@ -46,6 +46,7 @@ // #include "qsvgnode_p.h" +#include "qtsvgglobal_p.h" #include "QtGui/qpainterpath.h" #include "QtGui/qimage.h" @@ -57,14 +58,14 @@ QT_BEGIN_NAMESPACE class QTextCharFormat; -class QSvgAnimation : public QSvgNode +class Q_SVG_PRIVATE_EXPORT QSvgAnimation : public QSvgNode { public: virtual void draw(QPainter *p, QSvgExtraStates &states); virtual Type type() const; }; -class QSvgArc : public QSvgNode +class Q_SVG_PRIVATE_EXPORT QSvgArc : public QSvgNode { public: QSvgArc(QSvgNode *parent, const QPainterPath &path); @@ -75,7 +76,7 @@ private: QPainterPath m_path; }; -class QSvgEllipse : public QSvgNode +class Q_SVG_PRIVATE_EXPORT QSvgEllipse : public QSvgNode { public: QSvgEllipse(QSvgNode *parent, const QRectF &rect); @@ -86,14 +87,14 @@ private: QRectF m_bounds; }; -class QSvgCircle : public QSvgEllipse +class Q_SVG_PRIVATE_EXPORT QSvgCircle : public QSvgEllipse { public: QSvgCircle(QSvgNode *parent, const QRectF &rect) : QSvgEllipse(parent, rect) { } virtual Type type() const; }; -class QSvgImage : public QSvgNode +class Q_SVG_PRIVATE_EXPORT QSvgImage : public QSvgNode { public: QSvgImage(QSvgNode *parent, const QImage &image, @@ -106,7 +107,7 @@ private: QRect m_bounds; }; -class QSvgLine : public QSvgNode +class Q_SVG_PRIVATE_EXPORT QSvgLine : public QSvgNode { public: QSvgLine(QSvgNode *parent, const QLineF &line); @@ -117,7 +118,7 @@ private: QLineF m_line; }; -class QSvgPath : public QSvgNode +class Q_SVG_PRIVATE_EXPORT QSvgPath : public QSvgNode { public: QSvgPath(QSvgNode *parent, const QPainterPath &qpath); @@ -132,7 +133,7 @@ private: QPainterPath m_path; }; -class QSvgPolygon : public QSvgNode +class Q_SVG_PRIVATE_EXPORT QSvgPolygon : public QSvgNode { public: QSvgPolygon(QSvgNode *parent, const QPolygonF &poly); @@ -143,7 +144,7 @@ private: QPolygonF m_poly; }; -class QSvgPolyline : public QSvgNode +class Q_SVG_PRIVATE_EXPORT QSvgPolyline : public QSvgNode { public: QSvgPolyline(QSvgNode *parent, const QPolygonF &poly); @@ -154,7 +155,7 @@ private: QPolygonF m_poly; }; -class QSvgRect : public QSvgNode +class Q_SVG_PRIVATE_EXPORT QSvgRect : public QSvgNode { public: QSvgRect(QSvgNode *paren, const QRectF &rect, int rx=0, int ry=0); @@ -168,7 +169,7 @@ private: class QSvgTspan; -class QSvgText : public QSvgNode +class Q_SVG_PRIVATE_EXPORT QSvgText : public QSvgNode { public: enum WhitespaceMode @@ -204,7 +205,7 @@ private: WhitespaceMode m_mode; }; -class QSvgTspan : public QSvgNode +class Q_SVG_PRIVATE_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 cfe19bf..338c6c1 100644 --- a/src/svg/qsvghandler_p.h +++ b/src/svg/qsvghandler_p.h @@ -51,6 +51,7 @@ #include "qsvgstyle_p.h" #include "private/qcssparser_p.h" #include "qsvggraphics_p.h" +#include "qtsvgglobal_p.h" QT_BEGIN_NAMESPACE @@ -71,7 +72,7 @@ struct QSvgCssAttribute #endif -class QSvgHandler +class Q_SVG_PRIVATE_EXPORT QSvgHandler { public: enum LengthType { diff --git a/src/svg/qsvgnode_p.h b/src/svg/qsvgnode_p.h index 00df81b..c7c4c34 100644 --- a/src/svg/qsvgnode_p.h +++ b/src/svg/qsvgnode_p.h @@ -46,6 +46,7 @@ // #include "qsvgstyle_p.h" +#include "qtsvgglobal_p.h" #include "QtCore/qstring.h" #include "QtCore/qhash.h" @@ -55,7 +56,7 @@ QT_BEGIN_NAMESPACE class QPainter; class QSvgTinyDocument; -class QSvgNode +class Q_SVG_PRIVATE_EXPORT QSvgNode { public: enum Type diff --git a/src/svg/qsvgstructure_p.h b/src/svg/qsvgstructure_p.h index e4c73e8..03ea9f5 100644 --- a/src/svg/qsvgstructure_p.h +++ b/src/svg/qsvgstructure_p.h @@ -46,6 +46,7 @@ // #include "qsvgnode_p.h" +#include "qtsvgglobal_p.h" #include "QtCore/qlist.h" #include "QtCore/qhash.h" @@ -57,7 +58,7 @@ class QSvgNode; class QPainter; class QSvgDefs; -class QSvgStructureNode : public QSvgNode +class Q_SVG_PRIVATE_EXPORT QSvgStructureNode : public QSvgNode { public: QSvgStructureNode(QSvgNode *parent); @@ -73,7 +74,7 @@ protected: QList m_linkedScopes; }; -class QSvgG : public QSvgStructureNode +class Q_SVG_PRIVATE_EXPORT QSvgG : public QSvgStructureNode { public: QSvgG(QSvgNode *parent); @@ -81,7 +82,7 @@ public: Type type() const; }; -class QSvgDefs : public QSvgStructureNode +class Q_SVG_PRIVATE_EXPORT QSvgDefs : public QSvgStructureNode { public: QSvgDefs(QSvgNode *parent); @@ -89,7 +90,7 @@ public: Type type() const; }; -class QSvgSwitch : public QSvgStructureNode +class Q_SVG_PRIVATE_EXPORT QSvgSwitch : public QSvgStructureNode { public: QSvgSwitch(QSvgNode *parent); diff --git a/src/svg/qsvgstyle_p.h b/src/svg/qsvgstyle_p.h index 6232531..dc408a6 100644 --- a/src/svg/qsvgstyle_p.h +++ b/src/svg/qsvgstyle_p.h @@ -52,6 +52,7 @@ #include "QtGui/qcolor.h" #include "QtGui/qfont.h" #include +#include "qtsvgglobal_p.h" QT_BEGIN_NAMESPACE @@ -107,7 +108,7 @@ private: T *t; }; -class QSvgRefCounted +class Q_SVG_PRIVATE_EXPORT QSvgRefCounted { public: QSvgRefCounted() { _ref = 0; } @@ -127,7 +128,7 @@ private: int _ref; }; -struct QSvgExtraStates +struct Q_SVG_PRIVATE_EXPORT QSvgExtraStates { QSvgExtraStates(); @@ -141,7 +142,7 @@ struct QSvgExtraStates bool vectorEffect; // true if pen is cosmetic }; -class QSvgStyleProperty : public QSvgRefCounted +class Q_SVG_PRIVATE_EXPORT QSvgStyleProperty : public QSvgRefCounted { public: enum Type @@ -166,7 +167,7 @@ public: virtual Type type() const=0; }; -class QSvgFillStyleProperty : public QSvgStyleProperty +class Q_SVG_PRIVATE_EXPORT QSvgFillStyleProperty : public QSvgStyleProperty { public: virtual QBrush brush(QPainter *p, QSvgExtraStates &states) = 0; @@ -174,7 +175,7 @@ public: virtual void revert(QPainter *p, QSvgExtraStates &states); }; -class QSvgQualityStyle : public QSvgStyleProperty +class Q_SVG_PRIVATE_EXPORT QSvgQualityStyle : public QSvgStyleProperty { public: QSvgQualityStyle(int color); @@ -206,7 +207,7 @@ private: -class QSvgOpacityStyle : public QSvgStyleProperty +class Q_SVG_PRIVATE_EXPORT QSvgOpacityStyle : public QSvgStyleProperty { public: QSvgOpacityStyle(qreal opacity); @@ -218,7 +219,7 @@ private: qreal m_oldOpacity; }; -class QSvgFillStyle : public QSvgStyleProperty +class Q_SVG_PRIVATE_EXPORT QSvgFillStyle : public QSvgStyleProperty { public: QSvgFillStyle(); @@ -291,7 +292,7 @@ private: uint m_fillSet : 1; }; -class QSvgViewportFillStyle : public QSvgStyleProperty +class Q_SVG_PRIVATE_EXPORT QSvgViewportFillStyle : public QSvgStyleProperty { public: QSvgViewportFillStyle(const QBrush &brush); @@ -311,7 +312,7 @@ private: QBrush m_oldFill; }; -class QSvgFontStyle : public QSvgStyleProperty +class Q_SVG_PRIVATE_EXPORT QSvgFontStyle : public QSvgStyleProperty { public: static const int LIGHTER = -1; @@ -395,7 +396,7 @@ private: uint m_textAnchorSet : 1; }; -class QSvgStrokeStyle : public QSvgStyleProperty +class Q_SVG_PRIVATE_EXPORT QSvgStrokeStyle : public QSvgStyleProperty { public: QSvgStrokeStyle(); @@ -535,7 +536,7 @@ private: uint m_vectorEffectSet : 1; }; -class QSvgSolidColorStyle : public QSvgFillStyleProperty +class Q_SVG_PRIVATE_EXPORT QSvgSolidColorStyle : public QSvgFillStyleProperty { public: QSvgSolidColorStyle(const QColor &color); @@ -560,7 +561,7 @@ private: QPen m_oldStroke; }; -class QSvgGradientStyle : public QSvgFillStyleProperty +class Q_SVG_PRIVATE_EXPORT QSvgGradientStyle : public QSvgFillStyleProperty { public: QSvgGradientStyle(QGradient *grad); @@ -602,7 +603,7 @@ private: bool m_gradientStopsSet; }; -class QSvgTransformStyle : public QSvgStyleProperty +class Q_SVG_PRIVATE_EXPORT QSvgTransformStyle : public QSvgStyleProperty { public: QSvgTransformStyle(const QTransform &transform); @@ -621,7 +622,7 @@ private: }; -class QSvgAnimateTransform : public QSvgStyleProperty +class Q_SVG_PRIVATE_EXPORT QSvgAnimateTransform : public QSvgStyleProperty { public: enum TransformType @@ -694,7 +695,7 @@ private: }; -class QSvgAnimateColor : public QSvgStyleProperty +class Q_SVG_PRIVATE_EXPORT QSvgAnimateColor : public QSvgStyleProperty { public: QSvgAnimateColor(int startMs, int endMs, int by = 0); @@ -717,7 +718,7 @@ private: }; -class QSvgCompOpStyle : public QSvgStyleProperty +class Q_SVG_PRIVATE_EXPORT QSvgCompOpStyle : public QSvgStyleProperty { public: QSvgCompOpStyle(QPainter::CompositionMode mode); @@ -737,7 +738,7 @@ private: }; -class QSvgStyle +class Q_SVG_PRIVATE_EXPORT QSvgStyle { public: QSvgStyle() diff --git a/src/svg/qsvgtinydocument_p.h b/src/svg/qsvgtinydocument_p.h index 1dc9f3f..c219ddc 100644 --- a/src/svg/qsvgtinydocument_p.h +++ b/src/svg/qsvgtinydocument_p.h @@ -46,7 +46,7 @@ // #include "qsvgstructure_p.h" -#include "qtsvgglobal.h" +#include "qtsvgglobal_p.h" #include "QtCore/qrect.h" #include "QtCore/qlist.h" @@ -62,7 +62,7 @@ class QPainter; class QByteArray; class QSvgFont; -class Q_SVG_EXPORT QSvgTinyDocument : public QSvgStructureNode +class Q_SVG_PRIVATE_EXPORT QSvgTinyDocument : public QSvgStructureNode { public: static QSvgTinyDocument * load(const QString &file); diff --git a/src/svg/qtsvgglobal_p.h b/src/svg/qtsvgglobal_p.h new file mode 100644 index 0000000..d04bf94 --- /dev/null +++ b/src/svg/qtsvgglobal_p.h @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt SVG module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL21$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QTSVGGLOBAL_P_H +#define QTSVGGLOBAL_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "qtsvgglobal.h" + +#define Q_SVG_PRIVATE_EXPORT Q_SVG_EXPORT + +#endif // QTSVGGLOBAL_P_H -- cgit v1.2.1