From 83e820ba767c2d37600d3536ebcfde18234d2f46 Mon Sep 17 00:00:00 2001 From: Matthew Vogt Date: Tue, 15 May 2012 09:02:09 +1000 Subject: Remove unnecessary exports Reduce library load time by removing any exports which are not required by existing clients. Task-number: QTBUG-24768 Change-Id: Ia5754d6f97bb2ed46e290820a5b092f85a4bc5b0 Reviewed-by: Martin Jones --- src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h | 2 +- src/quick/scenegraph/coreapi/qsgnodeupdater_p.h | 4 ++-- src/quick/scenegraph/coreapi/qsgrenderer_p.h | 6 +++--- src/quick/scenegraph/coreapi/qsgrendernode_p.h | 3 ++- src/quick/scenegraph/qsgadaptationlayer_p.h | 10 +++++----- src/quick/scenegraph/qsgcontext_p.h | 3 ++- src/quick/scenegraph/qsgcontextplugin_p.h | 6 +++--- src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h | 2 +- src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h | 12 ++++++------ src/quick/scenegraph/util/qsgareaallocator_p.h | 4 ++-- src/quick/scenegraph/util/qsgdistancefieldutil_p.h | 2 +- src/quick/scenegraph/util/qsgpainternode_p.h | 4 ++-- src/quick/scenegraph/util/qsgtexture_p.h | 2 +- src/quick/scenegraph/util/qsgtexturematerial_p.h | 3 ++- 14 files changed, 33 insertions(+), 30 deletions(-) (limited to 'src/quick/scenegraph') diff --git a/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h b/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h index e7cd1b0465..5c12c32c63 100644 --- a/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h +++ b/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h @@ -51,7 +51,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -class Q_QUICK_EXPORT QSGDefaultRenderer : public QSGRenderer +class Q_QUICK_PRIVATE_EXPORT QSGDefaultRenderer : public QSGRenderer { Q_OBJECT public: diff --git a/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h b/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h index c1df82332e..1f2d4f78dd 100644 --- a/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h +++ b/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h @@ -42,7 +42,7 @@ #ifndef NODEUPDATER_P_H #define NODEUPDATER_P_H -#include +#include #include QT_BEGIN_HEADER @@ -57,7 +57,7 @@ class QSGGeometryNode; class QMatrix4x4; class QSGRenderNode; -class Q_QUICK_EXPORT QSGNodeUpdater +class Q_QUICK_PRIVATE_EXPORT QSGNodeUpdater { public: QSGNodeUpdater(); diff --git a/src/quick/scenegraph/coreapi/qsgrenderer_p.h b/src/quick/scenegraph/coreapi/qsgrenderer_p.h index 3dced9cfa9..82bd2ef0cb 100644 --- a/src/quick/scenegraph/coreapi/qsgrenderer_p.h +++ b/src/quick/scenegraph/coreapi/qsgrenderer_p.h @@ -66,7 +66,7 @@ class TextureReference; class QSGBindable; class QSGNodeUpdater; -class Q_QUICK_EXPORT QSGRenderer : public QObject, public QOpenGLFunctions +class Q_QUICK_PRIVATE_EXPORT QSGRenderer : public QObject, public QOpenGLFunctions { Q_OBJECT public: @@ -186,7 +186,7 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QSGRenderer::ClearMode) -class Q_QUICK_EXPORT QSGBindable +class Q_QUICK_PRIVATE_EXPORT QSGBindable { public: virtual ~QSGBindable() { } @@ -224,7 +224,7 @@ QSGMaterialShader::RenderState QSGRenderer::state(QSGMaterialShader::RenderState } -class Q_QUICK_EXPORT QSGNodeDumper : public QSGNodeVisitor { +class Q_QUICK_PRIVATE_EXPORT QSGNodeDumper : public QSGNodeVisitor { public: static void dump(QSGNode *n); diff --git a/src/quick/scenegraph/coreapi/qsgrendernode_p.h b/src/quick/scenegraph/coreapi/qsgrendernode_p.h index 45636cc796..3596d6cf73 100644 --- a/src/quick/scenegraph/coreapi/qsgrendernode_p.h +++ b/src/quick/scenegraph/coreapi/qsgrendernode_p.h @@ -54,12 +54,13 @@ // #include "qsgnode.h" +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -class Q_QUICK_EXPORT QSGRenderNode : public QSGNode +class Q_QUICK_PRIVATE_EXPORT QSGRenderNode : public QSGNode { public: enum StateFlag diff --git a/src/quick/scenegraph/qsgadaptationlayer_p.h b/src/quick/scenegraph/qsgadaptationlayer_p.h index 77cd814ce8..3c62ce03dd 100644 --- a/src/quick/scenegraph/qsgadaptationlayer_p.h +++ b/src/quick/scenegraph/qsgadaptationlayer_p.h @@ -70,7 +70,7 @@ class QSGDistanceFieldGlyphCacheManager; class QSGDistanceFieldGlyphNode; // TODO: Rename from XInterface to AbstractX. -class Q_QUICK_EXPORT QSGRectangleNode : public QSGGeometryNode +class Q_QUICK_PRIVATE_EXPORT QSGRectangleNode : public QSGGeometryNode { public: virtual void setRect(const QRectF &rect) = 0; @@ -85,7 +85,7 @@ public: }; -class Q_QUICK_EXPORT QSGImageNode : public QSGGeometryNode +class Q_QUICK_PRIVATE_EXPORT QSGImageNode : public QSGGeometryNode { public: virtual void setTargetRect(const QRectF &rect) = 0; @@ -101,7 +101,7 @@ public: }; -class Q_QUICK_EXPORT QSGGlyphNode : public QSGGeometryNode +class Q_QUICK_PRIVATE_EXPORT QSGGlyphNode : public QSGGeometryNode { public: enum AntialiasingMode @@ -134,7 +134,7 @@ protected: QQuickItem *m_ownerElement; }; -class Q_QUICK_EXPORT QSGDistanceFieldGlyphConsumer +class Q_QUICK_PRIVATE_EXPORT QSGDistanceFieldGlyphConsumer { public: virtual ~QSGDistanceFieldGlyphConsumer() {} @@ -142,7 +142,7 @@ public: virtual void invalidateGlyphs(const QVector &glyphs) = 0; }; -class Q_QUICK_EXPORT QSGDistanceFieldGlyphCache +class Q_QUICK_PRIVATE_EXPORT QSGDistanceFieldGlyphCache { public: QSGDistanceFieldGlyphCache(QSGDistanceFieldGlyphCacheManager *man, QOpenGLContext *c, const QRawFont &font); diff --git a/src/quick/scenegraph/qsgcontext_p.h b/src/quick/scenegraph/qsgcontext_p.h index 35b97c3d15..30372c371a 100644 --- a/src/quick/scenegraph/qsgcontext_p.h +++ b/src/quick/scenegraph/qsgcontext_p.h @@ -48,6 +48,7 @@ #include #include +#include #include #include @@ -75,7 +76,7 @@ class QOpenGLFramebufferObject; class QQuickTextureFactory; -class Q_QUICK_EXPORT QSGContext : public QObject +class Q_QUICK_PRIVATE_EXPORT QSGContext : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QSGContext) diff --git a/src/quick/scenegraph/qsgcontextplugin_p.h b/src/quick/scenegraph/qsgcontextplugin_p.h index 2c4531c239..bc056b96fe 100644 --- a/src/quick/scenegraph/qsgcontextplugin_p.h +++ b/src/quick/scenegraph/qsgcontextplugin_p.h @@ -42,7 +42,7 @@ #ifndef QSGCONTEXTPLUGIN_H #define QSGCONTEXTPLUGIN_H -#include +#include #include #include #include @@ -55,7 +55,7 @@ class QSGContext; class QQuickWindowManager; -struct Q_QUICK_EXPORT QSGContextFactoryInterface : public QFactoryInterface +struct Q_QUICK_PRIVATE_EXPORT QSGContextFactoryInterface : public QFactoryInterface { virtual QSGContext *create(const QString &key) const = 0; @@ -67,7 +67,7 @@ struct Q_QUICK_EXPORT QSGContextFactoryInterface : public QFactoryInterface "org.qt-project.Qt.QSGContextFactoryInterface" Q_DECLARE_INTERFACE(QSGContextFactoryInterface, QSGContextFactoryInterface_iid) -class Q_QUICK_EXPORT QSGContextPlugin : public QObject, public QSGContextFactoryInterface +class Q_QUICK_PRIVATE_EXPORT QSGContextPlugin : public QObject, public QSGContextFactoryInterface { Q_OBJECT Q_INTERFACES(QSGContextFactoryInterface:QFactoryInterface) diff --git a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h index 38cc649b3a..5c38c1b656 100644 --- a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h +++ b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICK_EXPORT QSGDefaultDistanceFieldGlyphCache : public QSGDistanceFieldGlyphCache +class Q_QUICK_PRIVATE_EXPORT QSGDefaultDistanceFieldGlyphCache : public QSGDistanceFieldGlyphCache { public: QSGDefaultDistanceFieldGlyphCache(QSGDistanceFieldGlyphCacheManager *man, QOpenGLContext *c, const QRawFont &font); diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h b/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h index 8b2654e078..904f78a4a9 100644 --- a/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h +++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICK_EXPORT QSGDistanceFieldTextMaterial: public QSGMaterial +class Q_QUICK_PRIVATE_EXPORT QSGDistanceFieldTextMaterial: public QSGMaterial { public: QSGDistanceFieldTextMaterial(); @@ -82,7 +82,7 @@ protected: qreal m_fontScale; }; -class Q_QUICK_EXPORT QSGDistanceFieldStyledTextMaterial : public QSGDistanceFieldTextMaterial +class Q_QUICK_PRIVATE_EXPORT QSGDistanceFieldStyledTextMaterial : public QSGDistanceFieldTextMaterial { public: QSGDistanceFieldStyledTextMaterial(); @@ -99,7 +99,7 @@ protected: QColor m_styleColor; }; -class Q_QUICK_EXPORT QSGDistanceFieldOutlineTextMaterial : public QSGDistanceFieldStyledTextMaterial +class Q_QUICK_PRIVATE_EXPORT QSGDistanceFieldOutlineTextMaterial : public QSGDistanceFieldStyledTextMaterial { public: QSGDistanceFieldOutlineTextMaterial(); @@ -109,7 +109,7 @@ public: virtual QSGMaterialShader *createShader() const; }; -class Q_QUICK_EXPORT QSGDistanceFieldShiftedStyleTextMaterial : public QSGDistanceFieldStyledTextMaterial +class Q_QUICK_PRIVATE_EXPORT QSGDistanceFieldShiftedStyleTextMaterial : public QSGDistanceFieldStyledTextMaterial { public: QSGDistanceFieldShiftedStyleTextMaterial(); @@ -125,14 +125,14 @@ protected: QPointF m_shift; }; -class Q_QUICK_EXPORT QSGHiQSubPixelDistanceFieldTextMaterial : public QSGDistanceFieldTextMaterial +class Q_QUICK_PRIVATE_EXPORT QSGHiQSubPixelDistanceFieldTextMaterial : public QSGDistanceFieldTextMaterial { public: virtual QSGMaterialType *type() const; virtual QSGMaterialShader *createShader() const; }; -class Q_QUICK_EXPORT QSGLoQSubPixelDistanceFieldTextMaterial : public QSGDistanceFieldTextMaterial +class Q_QUICK_PRIVATE_EXPORT QSGLoQSubPixelDistanceFieldTextMaterial : public QSGDistanceFieldTextMaterial { public: virtual QSGMaterialType *type() const; diff --git a/src/quick/scenegraph/util/qsgareaallocator_p.h b/src/quick/scenegraph/util/qsgareaallocator_p.h index 998f7ef4d1..f1017145f2 100644 --- a/src/quick/scenegraph/util/qsgareaallocator_p.h +++ b/src/quick/scenegraph/util/qsgareaallocator_p.h @@ -42,7 +42,7 @@ #ifndef AREAALLOCATOR_H #define AREAALLOCATOR_H -#include +#include #include QT_BEGIN_NAMESPACE @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE class QRect; class QPoint; struct QSGAreaAllocatorNode; -class Q_QUICK_EXPORT QSGAreaAllocator +class Q_QUICK_PRIVATE_EXPORT QSGAreaAllocator { public: QSGAreaAllocator(const QSize &size); diff --git a/src/quick/scenegraph/util/qsgdistancefieldutil_p.h b/src/quick/scenegraph/util/qsgdistancefieldutil_p.h index 4ed4c28657..329df98a34 100644 --- a/src/quick/scenegraph/util/qsgdistancefieldutil_p.h +++ b/src/quick/scenegraph/util/qsgdistancefieldutil_p.h @@ -55,7 +55,7 @@ class QOpenGLShaderProgram; class QSGDistanceFieldGlyphCache; class QSGContext; -class Q_QUICK_EXPORT QSGDistanceFieldGlyphCacheManager +class Q_QUICK_PRIVATE_EXPORT QSGDistanceFieldGlyphCacheManager { public: QSGDistanceFieldGlyphCacheManager(); diff --git a/src/quick/scenegraph/util/qsgpainternode_p.h b/src/quick/scenegraph/util/qsgpainternode_p.h index 24b4d26855..7779b3d16f 100644 --- a/src/quick/scenegraph/util/qsgpainternode_p.h +++ b/src/quick/scenegraph/util/qsgpainternode_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE class QOpenGLFramebufferObject; class QOpenGLPaintDevice; -class Q_QUICK_EXPORT QSGPainterTexture : public QSGPlainTexture +class Q_QUICK_PRIVATE_EXPORT QSGPainterTexture : public QSGPlainTexture { public: QSGPainterTexture(); @@ -70,7 +70,7 @@ private: QRect m_dirty_rect; }; -class Q_QUICK_EXPORT QSGPainterNode : public QSGGeometryNode +class Q_QUICK_PRIVATE_EXPORT QSGPainterNode : public QSGGeometryNode { public: QSGPainterNode(QQuickPaintedItem *item); diff --git a/src/quick/scenegraph/util/qsgtexture_p.h b/src/quick/scenegraph/util/qsgtexture_p.h index 3d80035c9a..a2c8bbad12 100644 --- a/src/quick/scenegraph/util/qsgtexture_p.h +++ b/src/quick/scenegraph/util/qsgtexture_p.h @@ -67,7 +67,7 @@ public: uint filterMode : 2; }; -class Q_QUICK_EXPORT QSGPlainTexture : public QSGTexture +class Q_QUICK_PRIVATE_EXPORT QSGPlainTexture : public QSGTexture { Q_OBJECT public: diff --git a/src/quick/scenegraph/util/qsgtexturematerial_p.h b/src/quick/scenegraph/util/qsgtexturematerial_p.h index 0895dbd6c2..fe14726de7 100644 --- a/src/quick/scenegraph/util/qsgtexturematerial_p.h +++ b/src/quick/scenegraph/util/qsgtexturematerial_p.h @@ -43,12 +43,13 @@ #define TEXTUREMATERIAL_P_H #include "qsgtexturematerial.h" +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -class Q_QUICK_EXPORT QSGOpaqueTextureMaterialShader : public QSGMaterialShader +class Q_QUICK_PRIVATE_EXPORT QSGOpaqueTextureMaterialShader : public QSGMaterialShader { public: virtual void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect); -- cgit v1.2.3