aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/scenegraph
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative/scenegraph')
-rw-r--r--src/declarative/scenegraph/qsgadaptationlayer_p.h6
-rw-r--r--src/declarative/scenegraph/qsgcontext.cpp2
-rw-r--r--src/declarative/scenegraph/qsgdefaultglyphnode_p.h2
-rw-r--r--src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp10
-rw-r--r--src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h7
-rw-r--r--src/declarative/scenegraph/util/qsgpainternode.cpp36
-rw-r--r--src/declarative/scenegraph/util/qsgpainternode_p.h13
-rw-r--r--src/declarative/scenegraph/util/qsgtextureprovider.cpp3
8 files changed, 39 insertions, 40 deletions
diff --git a/src/declarative/scenegraph/qsgadaptationlayer_p.h b/src/declarative/scenegraph/qsgadaptationlayer_p.h
index f1e9a89f43..0ad60913b3 100644
--- a/src/declarative/scenegraph/qsgadaptationlayer_p.h
+++ b/src/declarative/scenegraph/qsgadaptationlayer_p.h
@@ -44,7 +44,6 @@
#include "qsgnode.h"
#include "qsgtexture.h"
-#include <private/qsgtext_p.h>
#include <QtCore/qobject.h>
#include <QtCore/qrect.h>
#include <QtGui/qbrush.h>
@@ -53,7 +52,8 @@
#include <QtGui/qglyphrun.h>
#include <QtCore/qurl.h>
-#include <private/qsgtext_p.h>
+// ### remove
+#include <private/qquicktext_p.h>
QT_BEGIN_HEADER
@@ -109,7 +109,7 @@ public:
virtual void setGlyphs(const QPointF &position, const QGlyphRun &glyphs) = 0;
virtual void setColor(const QColor &color) = 0;
- virtual void setStyle(QSGText::TextStyle style) = 0;
+ virtual void setStyle(QQuickText::TextStyle style) = 0;
virtual void setStyleColor(const QColor &color) = 0;
virtual QPointF baseLine() const = 0;
diff --git a/src/declarative/scenegraph/qsgcontext.cpp b/src/declarative/scenegraph/qsgcontext.cpp
index 9016b81278..466ae5919e 100644
--- a/src/declarative/scenegraph/qsgcontext.cpp
+++ b/src/declarative/scenegraph/qsgcontext.cpp
@@ -322,7 +322,7 @@ QSGGlyphNode *QSGContext::createGlyphNode()
Factory function for the scene graph renderers.
The renderers are used for the toplevel renderer and once for every
- QSGShaderEffectSource used in the QML scene.
+ QQuickShaderEffectSource used in the QML scene.
*/
QSGRenderer *QSGContext::createRenderer()
{
diff --git a/src/declarative/scenegraph/qsgdefaultglyphnode_p.h b/src/declarative/scenegraph/qsgdefaultglyphnode_p.h
index 993eabcd3c..f9d163c425 100644
--- a/src/declarative/scenegraph/qsgdefaultglyphnode_p.h
+++ b/src/declarative/scenegraph/qsgdefaultglyphnode_p.h
@@ -64,7 +64,7 @@ public:
virtual void setColor(const QColor &color);
virtual void setPreferredAntialiasingMode(AntialiasingMode) { }
- virtual void setStyle(QSGText::TextStyle) { }
+ virtual void setStyle(QQuickText::TextStyle) { }
virtual void setStyleColor(const QColor &) { }
virtual void update() { }
diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp b/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp
index 3586c9daa2..5426c3b40a 100644
--- a/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp
+++ b/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp
@@ -51,7 +51,7 @@ QSGDistanceFieldGlyphNode::QSGDistanceFieldGlyphNode(QSGDistanceFieldGlyphCacheM
, m_glyph_cacheManager(cacheManager)
, m_glyph_cache(0)
, m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 0)
- , m_style(QSGText::Normal)
+ , m_style(QQuickText::Normal)
, m_antialiasingMode(GrayAntialiasing)
, m_dirtyFont(false)
, m_dirtyGeometry(false)
@@ -102,7 +102,7 @@ void QSGDistanceFieldGlyphNode::setGlyphs(const QPointF &position, const QGlyphR
m_dirtyMaterial = true;
}
-void QSGDistanceFieldGlyphNode::setStyle(QSGText::TextStyle style)
+void QSGDistanceFieldGlyphNode::setStyle(QQuickText::TextStyle style)
{
if (m_style == style)
return;
@@ -255,7 +255,7 @@ void QSGDistanceFieldGlyphNode::updateMaterial()
{
delete m_material;
- if (m_style == QSGText::Normal) {
+ if (m_style == QQuickText::Normal) {
switch (m_antialiasingMode) {
case HighQualitySubPixelAntialiasing:
m_material = new QSGHiQSubPixelDistanceFieldTextMaterial;
@@ -270,11 +270,11 @@ void QSGDistanceFieldGlyphNode::updateMaterial()
}
} else {
QSGDistanceFieldStyledTextMaterial *material;
- if (m_style == QSGText::Outline) {
+ if (m_style == QQuickText::Outline) {
material = new QSGDistanceFieldOutlineTextMaterial;
} else {
QSGDistanceFieldShiftedStyleTextMaterial *sMaterial = new QSGDistanceFieldShiftedStyleTextMaterial;
- if (m_style == QSGText::Raised)
+ if (m_style == QQuickText::Raised)
sMaterial->setShift(QPointF(0.0, 1.0));
else
sMaterial->setShift(QPointF(0.0, -1.0));
diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h b/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h
index 9004549a3a..1d8bcea868 100644
--- a/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h
+++ b/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h
@@ -44,7 +44,8 @@
#include <private/qsgadaptationlayer_p.h>
#include "qsgtexture.h"
-#include <private/qsgtext_p.h>
+
+#include <private/qquicktext_p.h>
QT_BEGIN_HEADER
@@ -67,7 +68,7 @@ public:
virtual void setPreferredAntialiasingMode(AntialiasingMode mode);
- virtual void setStyle(QSGText::TextStyle style);
+ virtual void setStyle(QQuickText::TextStyle style);
virtual void setStyleColor(const QColor &color);
virtual void update();
@@ -85,7 +86,7 @@ private:
QSGDistanceFieldGlyphCacheManager *m_glyph_cacheManager;
QSGDistanceFieldGlyphCache *m_glyph_cache;
QSGGeometry m_geometry;
- QSGText::TextStyle m_style;
+ QQuickText::TextStyle m_style;
QColor m_styleColor;
AntialiasingMode m_antialiasingMode;
diff --git a/src/declarative/scenegraph/util/qsgpainternode.cpp b/src/declarative/scenegraph/util/qsgpainternode.cpp
index fb35467ce2..3f07f20695 100644
--- a/src/declarative/scenegraph/util/qsgpainternode.cpp
+++ b/src/declarative/scenegraph/util/qsgpainternode.cpp
@@ -41,8 +41,8 @@
#include "qsgpainternode_p.h"
-#include "qsgpainteditem.h"
-#include <private/qsgpainteditem_p.h>
+#include <private/qquickpainteditem_p.h>
+
#include <private/qsgcontext_p.h>
#include <private/qopenglextensions_p.h>
#include <qopenglframebufferobject.h>
@@ -105,10 +105,10 @@ void QSGPainterTexture::bind()
m_dirty_rect = QRect();
}
-QSGPainterNode::QSGPainterNode(QSGPaintedItem *item)
+QSGPainterNode::QSGPainterNode(QQuickPaintedItem *item)
: QSGGeometryNode()
- , m_preferredRenderTarget(QSGPaintedItem::Image)
- , m_actualRenderTarget(QSGPaintedItem::Image)
+ , m_preferredRenderTarget(QQuickPaintedItem::Image)
+ , m_actualRenderTarget(QQuickPaintedItem::Image)
, m_item(item)
, m_fbo(0)
, m_multisampledFbo(0)
@@ -130,7 +130,7 @@ QSGPainterNode::QSGPainterNode(QSGPaintedItem *item)
, m_dirtyRenderTarget(false)
, m_dirtyTexture(false)
{
- m_context = static_cast<QSGPaintedItemPrivate *>(QObjectPrivate::get(item))->sceneGraphContext();
+ m_context = static_cast<QQuickPaintedItemPrivate *>(QObjectPrivate::get(item))->sceneGraphContext();
setMaterial(&m_materialO);
setOpaqueMaterial(&m_material);
@@ -150,7 +150,7 @@ void QSGPainterNode::paint()
QRect dirtyRect = m_dirtyRect.isNull() ? QRect(0, 0, m_size.width(), m_size.height()) : m_dirtyRect;
QPainter painter;
- if (m_actualRenderTarget == QSGPaintedItem::Image)
+ if (m_actualRenderTarget == QQuickPaintedItem::Image)
painter.begin(&m_image);
else {
if (!m_gl_device) {
@@ -188,7 +188,7 @@ void QSGPainterNode::paint()
m_item->paint(&painter);
painter.end();
- if (m_actualRenderTarget == QSGPaintedItem::Image) {
+ if (m_actualRenderTarget == QQuickPaintedItem::Image) {
m_texture->setImage(m_image);
m_texture->setDirtyRect(dirtyRect);
} else if (m_multisampledFbo) {
@@ -234,7 +234,7 @@ void QSGPainterNode::updateTexture()
void QSGPainterNode::updateGeometry()
{
QRectF source;
- if (m_actualRenderTarget == QSGPaintedItem::Image)
+ if (m_actualRenderTarget == QQuickPaintedItem::Image)
source = QRectF(0, 0, 1, 1);
else
source = QRectF(0, 0, qreal(m_size.width()) / m_fboSize.width(), qreal(m_size.height()) / m_fboSize.height());
@@ -255,14 +255,14 @@ void QSGPainterNode::updateRenderTarget()
m_dirtyContents = true;
- QSGPaintedItem::RenderTarget oldTarget = m_actualRenderTarget;
- if (m_preferredRenderTarget == QSGPaintedItem::Image) {
- m_actualRenderTarget = QSGPaintedItem::Image;
+ QQuickPaintedItem::RenderTarget oldTarget = m_actualRenderTarget;
+ if (m_preferredRenderTarget == QQuickPaintedItem::Image) {
+ m_actualRenderTarget = QQuickPaintedItem::Image;
} else {
if (!m_multisamplingSupported && m_smoothPainting)
- m_actualRenderTarget = QSGPaintedItem::Image;
+ m_actualRenderTarget = QQuickPaintedItem::Image;
else
- m_actualRenderTarget = QSGPaintedItem::FramebufferObject;
+ m_actualRenderTarget = QQuickPaintedItem::FramebufferObject;
}
if (oldTarget != m_actualRenderTarget) {
m_image = QImage();
@@ -271,7 +271,7 @@ void QSGPainterNode::updateRenderTarget()
m_fbo = m_multisampledFbo = 0;
}
- if (m_actualRenderTarget == QSGPaintedItem::FramebufferObject) {
+ if (m_actualRenderTarget == QQuickPaintedItem::FramebufferObject) {
const QOpenGLContext *ctx = m_context->glContext();
if (m_fbo && !m_dirtyGeometry && (!ctx->format().samples() || !m_multisamplingSupported))
return;
@@ -309,7 +309,7 @@ void QSGPainterNode::updateRenderTarget()
}
QSGPainterTexture *texture = new QSGPainterTexture;
- if (m_actualRenderTarget == QSGPaintedItem::Image) {
+ if (m_actualRenderTarget == QQuickPaintedItem::Image) {
texture->setOwnsTexture(true);
texture->setTextureSize(m_size);
} else {
@@ -341,7 +341,7 @@ void QSGPainterNode::updateFBOSize()
m_fboSize = QSize(fboWidth, fboHeight);
}
-void QSGPainterNode::setPreferredRenderTarget(QSGPaintedItem::RenderTarget target)
+void QSGPainterNode::setPreferredRenderTarget(QQuickPaintedItem::RenderTarget target)
{
if (m_preferredRenderTarget == target)
return;
@@ -446,7 +446,7 @@ void QSGPainterNode::setFastFBOResizing(bool dynamic)
QImage QSGPainterNode::toImage() const
{
- if (m_actualRenderTarget == QSGPaintedItem::Image)
+ if (m_actualRenderTarget == QQuickPaintedItem::Image)
return m_image;
else
return m_fbo->toImage();
diff --git a/src/declarative/scenegraph/util/qsgpainternode_p.h b/src/declarative/scenegraph/util/qsgpainternode_p.h
index e30dc7c30f..c838ed1a0c 100644
--- a/src/declarative/scenegraph/util/qsgpainternode_p.h
+++ b/src/declarative/scenegraph/util/qsgpainternode_p.h
@@ -45,7 +45,8 @@
#include "qsgnode.h"
#include "qsgtexturematerial.h"
#include "qsgtexture_p.h"
-#include "qsgpainteditem.h"
+
+#include <qquickpainteditem.h>
#include <QtGui/qcolor.h>
@@ -74,10 +75,10 @@ private:
class Q_DECLARATIVE_EXPORT QSGPainterNode : public QSGGeometryNode
{
public:
- QSGPainterNode(QSGPaintedItem *item);
+ QSGPainterNode(QQuickPaintedItem *item);
virtual ~QSGPainterNode();
- void setPreferredRenderTarget(QSGPaintedItem::RenderTarget target);
+ void setPreferredRenderTarget(QQuickPaintedItem::RenderTarget target);
void setSize(const QSize &size);
QSize size() const { return m_size; }
@@ -118,10 +119,10 @@ private:
QSGContext *m_context;
- QSGPaintedItem::RenderTarget m_preferredRenderTarget;
- QSGPaintedItem::RenderTarget m_actualRenderTarget;
+ QQuickPaintedItem::RenderTarget m_preferredRenderTarget;
+ QQuickPaintedItem::RenderTarget m_actualRenderTarget;
- QSGPaintedItem *m_item;
+ QQuickPaintedItem *m_item;
QOpenGLFramebufferObject *m_fbo;
QOpenGLFramebufferObject *m_multisampledFbo;
diff --git a/src/declarative/scenegraph/util/qsgtextureprovider.cpp b/src/declarative/scenegraph/util/qsgtextureprovider.cpp
index 5605f28602..10faf2e5d4 100644
--- a/src/declarative/scenegraph/util/qsgtextureprovider.cpp
+++ b/src/declarative/scenegraph/util/qsgtextureprovider.cpp
@@ -41,9 +41,6 @@
#include "qsgtextureprovider_p.h"
-#include <private/qsgimage_p.h>
-#include <private/qsgshadereffectsource_p.h>
-
#ifndef GL_CLAMP_TO_EDGE
#define GL_CLAMP_TO_EDGE 0x812F
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 17:07:22 +0000