From a20f8dcbeafa34b50ef69d1c5db0f17b09731d2a Mon Sep 17 00:00:00 2001 From: Jason Barron Date: Tue, 28 Jul 2009 11:34:20 +0200 Subject: Compile fixes after latest merge of 4.6. The ususal suspects like QScopedPointer fixes, but also some changes since the introduction of qcore_unix.* --- src/corelib/kernel/qcore_unix_p.h | 3 +++ src/gui/graphicsview/qgraphicsitem_p.h | 8 ++++---- src/gui/graphicsview/qgraphicsscene.cpp | 2 +- src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp | 4 ++-- src/gui/kernel/qwidget.cpp | 7 +++---- src/gui/styles/qs60style.cpp | 6 ++---- src/network/socket/qnativesocketengine_unix.cpp | 5 +++++ 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h index dd97841..565c895 100644 --- a/src/corelib/kernel/qcore_unix_p.h +++ b/src/corelib/kernel/qcore_unix_p.h @@ -238,6 +238,8 @@ static inline int qt_safe_close(int fd) #undef QT_CLOSE #define QT_CLOSE qt_safe_close +// Open C does not (yet?) implement these on Symbian OS +#ifndef Q_OS_SYMBIAN static inline int qt_safe_execve(const char *filename, char *const argv[], char *const envp[]) { @@ -259,6 +261,7 @@ static inline int qt_safe_execvp(const char *file, char *const argv[]) EINTR_LOOP(ret, ::execvp(file, argv)); return ret; } +#endif static inline pid_t qt_safe_waitpid(pid_t pid, int *status, int options) { diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index 3d9f8a6..c395cd6 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -171,11 +171,11 @@ public: static const QGraphicsItemPrivate *get(const QGraphicsItem *item) { - return item->d_ptr; + return item->d_ptr.data(); } static QGraphicsItemPrivate *get(QGraphicsItem *item) { - return item->d_ptr; + return item->d_ptr.data(); } void updateAncestorFlag(QGraphicsItem::GraphicsItemFlag childFlag, @@ -514,8 +514,8 @@ struct QGraphicsItemPrivate::TransformData { inline bool qt_closestLeaf(const QGraphicsItem *item1, const QGraphicsItem *item2) { // Return true if sibling item1 is on top of item2. - const QGraphicsItemPrivate *d1 = item1->d_ptr; - const QGraphicsItemPrivate *d2 = item2->d_ptr; + const QGraphicsItemPrivate *d1 = item1->d_ptr.data(); + const QGraphicsItemPrivate *d2 = item2->d_ptr.data(); bool f1 = d1->flags & QGraphicsItem::ItemStacksBehindParent; bool f2 = d2->flags & QGraphicsItem::ItemStacksBehindParent; if (f1 != f2) diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index d721d0d..a1a2b60 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -4651,7 +4651,7 @@ void QGraphicsScenePrivate::processDirtyItemsRecursive(QGraphicsItem *item, bool if (dirtyRect.isEmpty()) continue; // Discard updates outside the bounding rect. - if (!updateHelper(viewPrivate, item->d_ptr, dirtyRect, itemIsUntransformable) + if (!updateHelper(viewPrivate, item->d_ptr.data(), dirtyRect, itemIsUntransformable) && item->d_ptr->paintedViewBoundingRectsNeedRepaint) { paintedViewBoundingRect = QRect(-1, -1, -1, -1); // Outside viewport. } diff --git a/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp b/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp index 3cb33d1..40043e7 100644 --- a/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp +++ b/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp @@ -413,8 +413,8 @@ QList QGraphicsSceneBspTreeIndexPrivate::estimateItems(const QR bool QGraphicsSceneBspTreeIndexPrivate::closestItemFirst_withoutCache(const QGraphicsItem *item1, const QGraphicsItem *item2) { // Siblings? Just check their z-values. - const QGraphicsItemPrivate *d1 = item1->d_ptr; - const QGraphicsItemPrivate *d2 = item2->d_ptr; + const QGraphicsItemPrivate *d1 = item1->d_ptr.data(); + const QGraphicsItemPrivate *d2 = item2->d_ptr.data(); if (d1->parent == d2->parent) return qt_closestLeaf(item1, item2); diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 334706d..c2fdadf 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -2051,9 +2051,8 @@ static inline void fillRegion(QPainter *painter, const QRegion &rgn, const QBrus #else #if !defined(QT_NO_STYLE_S60) // Defined in qs60style.cpp - extern bool qt_s60_fill_background(QPainter *painter, const QRegion &rgn, - const QPoint &offset, const QBrush &brush); - if (!qt_s60_fill_background(painter, rgn, offset, brush)) + extern bool qt_s60_fill_background(QPainter *painter, const QRegion &rgn, const QBrush &brush); + if (!qt_s60_fill_background(painter, rgn, brush)) #endif // !defined(QT_NO_STYLE_S60) { const QRect rect(rgn.boundingRect()); @@ -2078,7 +2077,7 @@ void QWidgetPrivate::paintBackground(QPainter *painter, const QRegion &rgn, int //If we are painting the viewport of a scrollarea, we must apply an offset to the brush in case we are drawing a texture QAbstractScrollArea *scrollArea = qobject_cast(parent); if (scrollArea && scrollArea->viewport() == q) { - QObjectData *scrollPrivate = static_cast(scrollArea)->d_ptr; + QObjectData *scrollPrivate = static_cast(scrollArea)->d_ptr.data(); QAbstractScrollAreaPrivate *priv = static_cast(scrollPrivate); oldBrushOrigin = painter->brushOrigin(); resetBrushOrigin = true; diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index b083f4b..2c486a2 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -2854,8 +2854,7 @@ QIcon QS60Style::standardIconImplementation(StandardPixmap standardIcon, extern QPoint qt_s60_fill_background_offset(const QWidget *targetWidget); -bool qt_s60_fill_background(QPainter *painter, const QRegion &rgn, const QPoint &offset, - const QBrush &brush) +bool qt_s60_fill_background(QPainter *painter, const QRegion &rgn, const QBrush &brush) { const QPixmap backgroundTexture(QS60StylePrivate::backgroundTexture()); if (backgroundTexture.cacheKey() != brush.texture().cacheKey()) @@ -2864,8 +2863,7 @@ bool qt_s60_fill_background(QPainter *painter, const QRegion &rgn, const QPoint const QPaintDevice *target = painter->device(); if (target->devType() == QInternal::Widget) { const QWidget *widget = static_cast(target); - const QRegion translated = rgn.translated(offset); - const QVector &rects = translated.rects(); + const QVector &rects = rgn.rects(); for (int i = 0; i < rects.size(); ++i) { const QRect rect(rects.at(i)); painter->drawPixmap(rect.topLeft(), backgroundTexture, diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp index ea8e756..67a6fdf 100644 --- a/src/network/socket/qnativesocketengine_unix.cpp +++ b/src/network/socket/qnativesocketengine_unix.cpp @@ -68,7 +68,12 @@ #include #endif +#ifdef Q_OS_SYMBIAN // ### TODO: Are these headers right? +#include +#include +#else #include +#endif QT_BEGIN_NAMESPACE -- cgit v0.12