remove unnecessary beginPaint and endPaint overrides
QPlatformBackingStore::endPaint does not take a QRegion parameter.
6ce6b8a378 set the API, but the
platform implementations were not all synced up since then. There
was anyway no point in overriding beginPaint and endPaint on
platforms which don't need to do anything there. This fixes
clang warnings of the form
QXcbBackingStore::endPaint hides overloaded virtual function
Change-Id: Id6cd0fc2c831a34576ac2c73eeb0d5741d26e622
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
bb10
parent
7d3f775075
commit
4c19055cb1
|
|
@ -77,14 +77,5 @@ void QFbBackingStore::resize(const QSize &size, const QRegion &staticContents)
|
|||
mImage = QImage(size, window()->screen()->handle()->format());
|
||||
}
|
||||
|
||||
void QFbBackingStore::beginPaint(const QRegion ®ion)
|
||||
{
|
||||
Q_UNUSED(region);
|
||||
}
|
||||
|
||||
void QFbBackingStore::endPaint()
|
||||
{
|
||||
}
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
|
|
|
|||
|
|
@ -59,9 +59,6 @@ public:
|
|||
virtual QPaintDevice *paintDevice() { return &mImage; }
|
||||
virtual void flush(QWindow *window, const QRegion ®ion, const QPoint &offset);
|
||||
|
||||
virtual void beginPaint(const QRegion ®ion);
|
||||
virtual void endPaint();
|
||||
|
||||
virtual void resize(const QSize &size, const QRegion ®ion);
|
||||
|
||||
const QImage image() { return mImage; }
|
||||
|
|
|
|||
|
|
@ -119,14 +119,4 @@ bool QDirectFbBackingStore::scroll(const QRegion &area, int dx, int dy)
|
|||
return true;
|
||||
}
|
||||
|
||||
void QDirectFbBackingStore::beginPaint(const QRegion ®ion)
|
||||
{
|
||||
Q_UNUSED(region);
|
||||
}
|
||||
|
||||
void QDirectFbBackingStore::endPaint(const QRegion ®ion)
|
||||
{
|
||||
Q_UNUSED(region);
|
||||
}
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
|
|
|||
|
|
@ -61,9 +61,6 @@ public:
|
|||
void resize (const QSize &size, const QRegion &staticContents);
|
||||
bool scroll(const QRegion &area, int dx, int dy);
|
||||
|
||||
void beginPaint(const QRegion ®ion);
|
||||
void endPaint(const QRegion ®ion);
|
||||
|
||||
private:
|
||||
void lockSurfaceToImage();
|
||||
|
||||
|
|
|
|||
|
|
@ -203,10 +203,6 @@ void QEglFSBackingStore::beginPaint(const QRegion &rgn)
|
|||
m_dirty = m_dirty | rgn;
|
||||
}
|
||||
|
||||
void QEglFSBackingStore::endPaint()
|
||||
{
|
||||
}
|
||||
|
||||
void QEglFSBackingStore::resize(const QSize &size, const QRegion &staticContents)
|
||||
{
|
||||
Q_UNUSED(staticContents);
|
||||
|
|
|
|||
|
|
@ -62,7 +62,6 @@ public:
|
|||
QPaintDevice *paintDevice();
|
||||
|
||||
void beginPaint(const QRegion &);
|
||||
void endPaint();
|
||||
|
||||
void flush(QWindow *window, const QRegion ®ion, const QPoint &offset);
|
||||
void resize(const QSize &size, const QRegion &staticContents);
|
||||
|
|
|
|||
|
|
@ -55,7 +55,6 @@ public:
|
|||
QPaintDevice *paintDevice();
|
||||
|
||||
void beginPaint(const QRegion &);
|
||||
void endPaint();
|
||||
|
||||
void flush(QWindow *window, const QRegion ®ion, const QPoint &offset);
|
||||
void resize(const QSize &size, const QRegion &staticContents);
|
||||
|
|
|
|||
|
|
@ -105,12 +105,6 @@ void QIOSBackingStore::flush(QWindow *window, const QRegion ®ion, const QPoin
|
|||
m_context->swapBuffers(window);
|
||||
}
|
||||
|
||||
void QIOSBackingStore::endPaint()
|
||||
{
|
||||
// Calling makeDone() on the context here would be an option,
|
||||
// but is not needed, and would actually add some overhead.
|
||||
}
|
||||
|
||||
void QIOSBackingStore::resize(const QSize &size, const QRegion &staticContents)
|
||||
{
|
||||
Q_UNUSED(staticContents);
|
||||
|
|
|
|||
|
|
@ -78,10 +78,6 @@ void QKmsBackingStore::beginPaint(const QRegion &rgn)
|
|||
m_dirty |= rgn;
|
||||
}
|
||||
|
||||
void QKmsBackingStore::endPaint()
|
||||
{
|
||||
}
|
||||
|
||||
void QKmsBackingStore::flush(QWindow *window, const QRegion ®ion, const QPoint &offset)
|
||||
{
|
||||
Q_UNUSED(region)
|
||||
|
|
|
|||
|
|
@ -59,7 +59,6 @@ public:
|
|||
QPaintDevice *paintDevice();
|
||||
|
||||
void beginPaint(const QRegion &);
|
||||
void endPaint();
|
||||
|
||||
void flush(QWindow *window, const QRegion ®ion, const QPoint &offset);
|
||||
void resize(const QSize &size, const QRegion &staticContents);
|
||||
|
|
|
|||
|
|
@ -169,9 +169,8 @@ void QQnxRasterBackingStore::beginPaint(const QRegion ®ion)
|
|||
platformWindow()->adjustBufferSize();
|
||||
}
|
||||
|
||||
void QQnxRasterBackingStore::endPaint(const QRegion ®ion)
|
||||
void QQnxRasterBackingStore::endPaint()
|
||||
{
|
||||
Q_UNUSED(region);
|
||||
qRasterBackingStoreDebug() << Q_FUNC_INFO << "w =" << window();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ public:
|
|||
void resize(const QSize &size, const QRegion &staticContents);
|
||||
bool scroll(const QRegion &area, int dx, int dy);
|
||||
void beginPaint(const QRegion ®ion);
|
||||
void endPaint(const QRegion ®ion);
|
||||
void endPaint();
|
||||
|
||||
private:
|
||||
class ScrollOp {
|
||||
|
|
|
|||
|
|
@ -283,10 +283,6 @@ void QXcbBackingStore::beginPaint(const QRegion ®ion)
|
|||
}
|
||||
}
|
||||
|
||||
void QXcbBackingStore::endPaint(const QRegion &)
|
||||
{
|
||||
}
|
||||
|
||||
void QXcbBackingStore::flush(QWindow *window, const QRegion ®ion, const QPoint &offset)
|
||||
{
|
||||
if (!m_image || m_image->size().isEmpty())
|
||||
|
|
|
|||
|
|
@ -64,7 +64,6 @@ public:
|
|||
bool scroll(const QRegion &area, int dx, int dy);
|
||||
|
||||
void beginPaint(const QRegion &);
|
||||
void endPaint(const QRegion &);
|
||||
|
||||
private:
|
||||
QXcbShmImage *m_image;
|
||||
|
|
|
|||
Loading…
Reference in New Issue