summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2016-03-02 22:17:13 -0800
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2016-03-03 11:35:22 +0000
commitd0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b (patch)
tree8ce164d7991b8384879b1e50e972246ca8768994
parent3bcc303711ed930a96c98a500e9f0aa5ff403da5 (diff)
DirectFB: Fix build in C++98 modev5.6.0
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>
-rw-r--r--src/plugins/platforms/directfb/qdirectfbbackingstore.cpp6
-rw-r--r--src/plugins/platforms/directfb/qdirectfbblitter.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/platforms/directfb/qdirectfbbackingstore.cpp b/src/plugins/platforms/directfb/qdirectfbbackingstore.cpp
index 369fa3b9f8..8fe4bca788 100644
--- a/src/plugins/platforms/directfb/qdirectfbbackingstore.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbbackingstore.cpp
@@ -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));
}
diff --git a/src/plugins/platforms/directfb/qdirectfbblitter.cpp b/src/plugins/platforms/directfb/qdirectfbblitter.cpp
index b87310ed76..75af3f74d6 100644
--- a/src/plugins/platforms/directfb/qdirectfbblitter.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbblitter.cpp
@@ -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