summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Barron <jbarron@trolltech.com>2009-08-03 06:35:03 (GMT)
committerJason Barron <jbarron@trolltech.com>2009-08-03 06:35:03 (GMT)
commita0df97c03f26a38af17a42fb44ad6910536c8857 (patch)
tree649342f844bc29ab5bb1d497fe9fa06a4da0df4b
parenta08b3f5336e5c819b33d922d3a809b5203d728f3 (diff)
downloadQt-a0df97c03f26a38af17a42fb44ad6910536c8857.zip
Qt-a0df97c03f26a38af17a42fb44ad6910536c8857.tar.gz
Qt-a0df97c03f26a38af17a42fb44ad6910536c8857.tar.bz2
Compile fixes related to QScopedPointer.
Just a few small fixes to get things compiling with the QScopedPointer changes.
-rw-r--r--src/gui/graphicsview/qgraphicsitem.cpp2
-rw-r--r--src/gui/graphicsview/qgraphicstransform.cpp2
-rw-r--r--src/xml/sax/qxml.cpp5
3 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 731a9a9..db00fbd 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -1201,7 +1201,7 @@ QGraphicsItem::~QGraphicsItem()
if (d_ptr->transformData) {
for(int i = 0; i < d_ptr->transformData->graphicsTransforms.size(); ++i) {
QGraphicsTransform *t = d_ptr->transformData->graphicsTransforms.at(i);
- static_cast<QGraphicsTransformPrivate *>(t->d_ptr)->item = 0;
+ static_cast<QGraphicsTransformPrivate *>(t->d_ptr.data())->item = 0;
delete t;
}
}
diff --git a/src/gui/graphicsview/qgraphicstransform.cpp b/src/gui/graphicsview/qgraphicstransform.cpp
index b55d78e..a71d5cc 100644
--- a/src/gui/graphicsview/qgraphicstransform.cpp
+++ b/src/gui/graphicsview/qgraphicstransform.cpp
@@ -59,7 +59,7 @@ void QGraphicsTransformPrivate::setItem(QGraphicsItem *i)
if (item) {
Q_Q(QGraphicsTransform);
- QGraphicsItemPrivate *d_ptr = item->d_ptr;
+ QGraphicsItemPrivate *d_ptr = item->d_ptr.data();
item->prepareGeometryChange();
Q_ASSERT(d_ptr->transformData);
diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
index 9177490..96a509d 100644
--- a/src/xml/sax/qxml.cpp
+++ b/src/xml/sax/qxml.cpp
@@ -568,9 +568,10 @@ QXmlParseException::QXmlParseException(const QString& name, int c, int l,
/*!
Creates a copy of \a other.
*/
-QXmlParseException::QXmlParseException(const QXmlParseException& other)
+QXmlParseException::QXmlParseException(const QXmlParseException& other) :
+ d(new QXmlParseExceptionPrivate(*other.d))
{
- d = new QXmlParseExceptionPrivate(*other.d);
+
}
/*!