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

DirectFB: Fix build in C++98 mode

Browse Source 
Many DirectFB types have constructors in C++, so we can't initialize
them with = {...}, like we would be able to if they had been regular POD
types.

Change-Id: Ic747cc2ab45e4dc6bb70ffff143840e5780ac2bc
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
This commit is contained in:
Thiago Macieira 2016-03-02 22:17:13 -08:00 committed by Jani Heikkinen
parent 3bcc303711
commit d0cdc7ad1e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/platforms/directfb/qdirectfbbackingstore.cpp
View File

@ -67,7 +67,7 @@ void QDirectFbBackingStore::flush(QWindow *, const QRegion &region, const QPoint
QVector<QRect> rects = region.rects();
for (int i = 0 ; i < rects.size(); i++) {
const QRect rect = rects.at(i);
DFBRegion dfbReg = { rect.x() + offset.x(),rect.y() + offset.y(),rect.right() + offset.x(),rect.bottom() + offset.y()};
DFBRegion dfbReg(rect.x() + offset.x(),rect.y() + offset.y(),rect.right() + offset.x(),rect.bottom() + offset.y());
m_dfbSurface->Flip(m_dfbSurface.data(), &dfbReg, DFBSurfaceFlipFlags(DSFLIP_BLIT|DSFLIP_ONSYNC));
}
}
@ -86,9 +86,9 @@ void QDirectFbBackingStore::resize(const QSize &size, const QRegion& reg)
static inline void scrollSurface(IDirectFBSurface *surface, const QRect &r, int dx, int dy)
{
const DFBRectangle rect = { r.x(), r.y(), r.width(), r.height() };
const DFBRectangle rect(r.x(), r.y(), r.width(), r.height());
surface->Blit(surface, surface, &rect, r.x() + dx, r.y() + dy);
const DFBRegion region = { rect.x + dx, rect.y + dy, r.right() + dx, r.bottom() + dy };
const DFBRegion region(rect.x + dx, rect.y + dy, r.right() + dx, r.bottom() + dy);
surface->Flip(surface, &region, DFBSurfaceFlipFlags(DSFLIP_BLIT));
}

4
src/plugins/platforms/directfb/qdirectfbblitter.cpp
View File

@ -173,8 +173,8 @@ void QDirectFbBlitter::drawPixmapOpacity(const QRectF &rect, const QPixmap &pixm
{
QRect sQRect = subrect.toRect();
QRect dQRect = rect.toRect();
DFBRectangle sRect = { sQRect.x(), sQRect.y(), sQRect.width(), sQRect.height() };
DFBRectangle dRect = { dQRect.x(), dQRect.y(), dQRect.width(), dQRect.height() };
DFBRectangle sRect(sQRect.x(), sQRect.y(), sQRect.width(), sQRect.height());
DFBRectangle dRect(dQRect.x(), dQRect.y(), dQRect.width(), dQRect.height());
DFBResult result;
// skip if dst too small