AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid QWidget dependency in QtGui

Browse Source 
It's not a real dependency as all we need is to store a pointer,
but better not to use the name QWidget at all.

Change-Id: I30ef1dd44ac7e42c1b9c84675f94088b8c516076
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
This commit is contained in:
Laszlo Agocs 2015-06-01 15:23:19 +02:00
parent 78e3354083
commit 0e1b4e896f
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/painting/qplatformbackingstore.cpp
View File

@ -83,7 +83,7 @@ public:
struct QBackingstoreTextureInfo
{
QWidget *widget; // may be null
void *source; // may be null
GLuint textureId;
QRect rect;
QRect clipRect;
@ -125,10 +125,10 @@ GLuint QPlatformTextureList::textureId(int index) const
return d->textures.at(index).textureId;
}
QWidget *QPlatformTextureList::widget(int index)
void *QPlatformTextureList::source(int index)
{
Q_D(const QPlatformTextureList);
return d->textures.at(index).widget;
return d->textures.at(index).source;
}
QPlatformTextureList::Flags QPlatformTextureList::flags(int index) const
@ -164,12 +164,12 @@ bool QPlatformTextureList::isLocked() const
return d->locked;
}
void QPlatformTextureList::appendTexture(QWidget *widget, GLuint textureId, const QRect &geometry,
void QPlatformTextureList::appendTexture(void *source, GLuint textureId, const QRect &geometry,
const QRect &clipRect, Flags flags)
{
Q_D(QPlatformTextureList);
QBackingstoreTextureInfo bi;
bi.widget = widget;
bi.source = source;
bi.textureId = textureId;
bi.rect = geometry;
bi.clipRect = clipRect;

4
src/gui/painting/qplatformbackingstore.h
View File

@ -83,12 +83,12 @@ public:
GLuint textureId(int index) const;
QRect geometry(int index) const;
QRect clipRect(int index) const;
QWidget *widget(int index);
void *source(int index);
Flags flags(int index) const;
void lock(bool on);
bool isLocked() const;
void appendTexture(QWidget *widget, GLuint textureId, const QRect &geometry,
void appendTexture(void *source, GLuint textureId, const QRect &geometry,
const QRect &clipRect = QRect(), Flags flags = 0);
void clear();

2
src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp
View File

@ -175,7 +175,7 @@ void QOpenGLCompositorBackingStore::composeAndFlush(QWindow *window, const QRegi
m_textures->clear();
for (int i = 0; i < textures->count(); ++i)
m_textures->appendTexture(textures->widget(i), textures->textureId(i), textures->geometry(i),
m_textures->appendTexture(textures->source(i), textures->textureId(i), textures->geometry(i),
textures->clipRect(i), textures->flags(i));
updateTexture();

2
src/widgets/kernel/qwidgetbackingstore.cpp
View File

@ -1157,7 +1157,7 @@ void QWidgetBackingStore::doSync()
#ifndef QT_NO_OPENGL
if (widgetTextures && widgetTextures->count()) {
for (int i = 0; i < widgetTextures->count(); ++i) {
QWidget *w = widgetTextures->widget(i);
QWidget *w = static_cast<QWidget *>(widgetTextures->source(i));
if (dirtyRenderToTextureWidgets.contains(w)) {
const QRect rect = widgetTextures->geometry(i); // mapped to the tlw already
dirty += rect;