summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/declarative/extra/qfxanimatedimageitem.h2
-rw-r--r--src/declarative/extra/qfxparticles.h2
-rw-r--r--src/declarative/fx/qfxborderimage.h2
-rw-r--r--src/declarative/fx/qfxcomponentinstance.h2
-rw-r--r--src/declarative/fx/qfxflickable.h2
-rw-r--r--src/declarative/fx/qfxflipable.h2
-rw-r--r--src/declarative/fx/qfxgridview.h2
-rw-r--r--src/declarative/fx/qfximage.h2
-rw-r--r--src/declarative/fx/qfximagebase.h2
-rw-r--r--src/declarative/fx/qfxitem.h2
-rw-r--r--src/declarative/fx/qfxlistview.h2
-rw-r--r--src/declarative/fx/qfxloader.h2
-rw-r--r--src/declarative/fx/qfxmouseregion.h2
-rw-r--r--src/declarative/fx/qfxpainteditem.h2
-rw-r--r--src/declarative/fx/qfxpathview.h2
-rw-r--r--src/declarative/fx/qfxpositioners.h2
-rw-r--r--src/declarative/fx/qfxrect.h2
-rw-r--r--src/declarative/fx/qfxrepeater.h2
-rw-r--r--src/declarative/fx/qfxtext.h2
-rw-r--r--src/declarative/fx/qfxtextedit.h2
-rw-r--r--src/declarative/fx/qfxtextinput.h2
-rw-r--r--src/declarative/fx/qfxwebview.h2
-rw-r--r--src/declarative/qml/qmlcomponent.cpp2
-rw-r--r--src/declarative/util/qmlanimation.cpp6
-rw-r--r--src/declarative/util/qmlanimation.h1
-rw-r--r--src/declarative/util/qmlstate.cpp4
26 files changed, 29 insertions, 28 deletions
diff --git a/src/declarative/extra/qfxanimatedimageitem.h b/src/declarative/extra/qfxanimatedimageitem.h
index 2d531ee..4002a3f 100644
--- a/src/declarative/extra/qfxanimatedimageitem.h
+++ b/src/declarative/extra/qfxanimatedimageitem.h
@@ -94,7 +94,7 @@ protected:
private:
Q_DISABLE_COPY(QFxAnimatedImageItem)
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxAnimatedImageItem)
+ Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxAnimatedImageItem)
};
QT_END_NAMESPACE
diff --git a/src/declarative/extra/qfxparticles.h b/src/declarative/extra/qfxparticles.h
index bde6ec6..959c518 100644
--- a/src/declarative/extra/qfxparticles.h
+++ b/src/declarative/extra/qfxparticles.h
@@ -214,7 +214,7 @@ private Q_SLOTS:
private:
Q_DISABLE_COPY(QFxParticles)
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxParticles)
+ Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxParticles)
};
QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxborderimage.h b/src/declarative/fx/qfxborderimage.h
index c6885fb..37e48f9 100644
--- a/src/declarative/fx/qfxborderimage.h
+++ b/src/declarative/fx/qfxborderimage.h
@@ -94,7 +94,7 @@ private Q_SLOTS:
private:
Q_DISABLE_COPY(QFxBorderImage)
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxBorderImage)
+ Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxBorderImage)
};
QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxcomponentinstance.h b/src/declarative/fx/qfxcomponentinstance.h
index 940fb6d..62e34ff 100644
--- a/src/declarative/fx/qfxcomponentinstance.h
+++ b/src/declarative/fx/qfxcomponentinstance.h
@@ -78,7 +78,7 @@ protected:
QFxComponentInstance(QFxComponentInstancePrivate &dd, QFxItem *parent);
private:
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxComponentInstance)
+ Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxComponentInstance)
};
QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxflickable.h b/src/declarative/fx/qfxflickable.h
index 4fcaf44..40c13a7 100644
--- a/src/declarative/fx/qfxflickable.h
+++ b/src/declarative/fx/qfxflickable.h
@@ -184,7 +184,7 @@ protected:
private:
Q_DISABLE_COPY(QFxFlickable)
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxFlickable)
+ Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxFlickable)
};
QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxflipable.h b/src/declarative/fx/qfxflipable.h
index 0ab8fd2..14716a3 100644
--- a/src/declarative/fx/qfxflipable.h
+++ b/src/declarative/fx/qfxflipable.h
@@ -80,7 +80,7 @@ Q_SIGNALS:
private:
Q_DISABLE_COPY(QFxFlipable)
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxFlipable)
+ Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxFlipable)
};
QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxgridview.h b/src/declarative/fx/qfxgridview.h
index 63f93ca..4f2146d 100644
--- a/src/declarative/fx/qfxgridview.h
+++ b/src/declarative/fx/qfxgridview.h
@@ -55,7 +55,7 @@ class QFxGridViewPrivate;
class Q_DECLARATIVE_EXPORT QFxGridView : public QFxFlickable
{
Q_OBJECT
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxGridView)
+ Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxGridView)
Q_PROPERTY(QVariant model READ model WRITE setModel)
Q_CLASSINFO("DefaultProperty", "delegate")
diff --git a/src/declarative/fx/qfximage.h b/src/declarative/fx/qfximage.h
index 4f46495..fc8079c 100644
--- a/src/declarative/fx/qfximage.h
+++ b/src/declarative/fx/qfximage.h
@@ -80,7 +80,7 @@ protected:
private:
Q_DISABLE_COPY(QFxImage)
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxImage)
+ Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxImage)
};
QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfximagebase.h b/src/declarative/fx/qfximagebase.h
index ce9c0c3..226d3c3 100644
--- a/src/declarative/fx/qfximagebase.h
+++ b/src/declarative/fx/qfximagebase.h
@@ -81,7 +81,7 @@ private Q_SLOTS:
private:
Q_DISABLE_COPY(QFxImageBase)
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxImageBase)
+ Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxImageBase)
};
QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxitem.h b/src/declarative/fx/qfxitem.h
index cb2d97a..165e4cc 100644
--- a/src/declarative/fx/qfxitem.h
+++ b/src/declarative/fx/qfxitem.h
@@ -199,7 +199,7 @@ private:
friend class QmlStatePrivate;
friend class QFxAnchors;
Q_DISABLE_COPY(QFxItem)
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxItem)
+ Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxItem)
};
// ### move to QGO
diff --git a/src/declarative/fx/qfxlistview.h b/src/declarative/fx/qfxlistview.h
index 858e5ed..dbab57b 100644
--- a/src/declarative/fx/qfxlistview.h
+++ b/src/declarative/fx/qfxlistview.h
@@ -56,7 +56,7 @@ class QFxListViewPrivate;
class Q_DECLARATIVE_EXPORT QFxListView : public QFxFlickable
{
Q_OBJECT
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxListView)
+ Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxListView)
Q_ENUMS(CurrentItemPositioning)
Q_PROPERTY(QVariant model READ model WRITE setModel)
diff --git a/src/declarative/fx/qfxloader.h b/src/declarative/fx/qfxloader.h
index f11d116..f294abe 100644
--- a/src/declarative/fx/qfxloader.h
+++ b/src/declarative/fx/qfxloader.h
@@ -72,7 +72,7 @@ Q_SIGNALS:
private:
Q_DISABLE_COPY(QFxLoader)
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxLoader)
+ Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxLoader)
Q_PRIVATE_SLOT(d_func(), void _q_sourceLoaded())
};
diff --git a/src/declarative/fx/qfxmouseregion.h b/src/declarative/fx/qfxmouseregion.h
index 7fb34b5..114ea87 100644
--- a/src/declarative/fx/qfxmouseregion.h
+++ b/src/declarative/fx/qfxmouseregion.h
@@ -167,7 +167,7 @@ protected:
private:
Q_DISABLE_COPY(QFxMouseRegion)
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxMouseRegion)
+ Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxMouseRegion)
};
QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxpainteditem.h b/src/declarative/fx/qfxpainteditem.h
index 9c40458..776ef329 100644
--- a/src/declarative/fx/qfxpainteditem.h
+++ b/src/declarative/fx/qfxpainteditem.h
@@ -91,7 +91,7 @@ protected Q_SLOTS:
private:
void init();
Q_DISABLE_COPY(QFxPaintedItem)
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxPaintedItem)
+ Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxPaintedItem)
};
QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxpathview.h b/src/declarative/fx/qfxpathview.h
index 9cc8adb..a0ef262 100644
--- a/src/declarative/fx/qfxpathview.h
+++ b/src/declarative/fx/qfxpathview.h
@@ -126,7 +126,7 @@ private:
friend class QFxPathViewAttached;
static QHash<QObject*, QObject*> attachedProperties;
Q_DISABLE_COPY(QFxPathView)
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxPathView)
+ Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxPathView)
};
QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxpositioners.h b/src/declarative/fx/qfxpositioners.h
index 9c18452..89a61d7 100644
--- a/src/declarative/fx/qfxpositioners.h
+++ b/src/declarative/fx/qfxpositioners.h
@@ -108,7 +108,7 @@ private:
void applyTransition(const QList<QPair<QString, QVariant> >& changes, QFxItem* target,
QmlStateOperation::ActionList &actions);
Q_DISABLE_COPY(QFxBasePositioner)
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxBasePositioner)
+ Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxBasePositioner)
};
class Q_DECLARATIVE_EXPORT QFxColumn : public QFxBasePositioner
diff --git a/src/declarative/fx/qfxrect.h b/src/declarative/fx/qfxrect.h
index fb96217..359e8fc 100644
--- a/src/declarative/fx/qfxrect.h
+++ b/src/declarative/fx/qfxrect.h
@@ -174,7 +174,7 @@ protected:
private:
Q_DISABLE_COPY(QFxRect)
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxRect)
+ Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxRect)
};
QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxrepeater.h b/src/declarative/fx/qfxrepeater.h
index 7fa914e..3311281 100644
--- a/src/declarative/fx/qfxrepeater.h
+++ b/src/declarative/fx/qfxrepeater.h
@@ -78,7 +78,7 @@ protected:
private:
Q_DISABLE_COPY(QFxRepeater)
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxRepeater)
+ Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxRepeater)
};
QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxtext.h b/src/declarative/fx/qfxtext.h
index fcfe2b1..763e2aa 100644
--- a/src/declarative/fx/qfxtext.h
+++ b/src/declarative/fx/qfxtext.h
@@ -134,7 +134,7 @@ protected:
private:
Q_DISABLE_COPY(QFxText)
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxText)
+ Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxText)
};
QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxtextedit.h b/src/declarative/fx/qfxtextedit.h
index f24faf9..6a10e85 100644
--- a/src/declarative/fx/qfxtextedit.h
+++ b/src/declarative/fx/qfxtextedit.h
@@ -222,7 +222,7 @@ protected:
void drawContents(QPainter *, const QRect &);
private:
Q_DISABLE_COPY(QFxTextEdit)
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxTextEdit)
+ Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxTextEdit)
};
QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxtextinput.h b/src/declarative/fx/qfxtextinput.h
index b5812d4..1dca945 100644
--- a/src/declarative/fx/qfxtextinput.h
+++ b/src/declarative/fx/qfxtextinput.h
@@ -182,7 +182,7 @@ private Q_SLOTS:
void cursorPosChanged();
private:
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxTextInput);
+ Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxTextInput);
};
QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxwebview.h b/src/declarative/fx/qfxwebview.h
index 40c86b4..b1709e9 100644
--- a/src/declarative/fx/qfxwebview.h
+++ b/src/declarative/fx/qfxwebview.h
@@ -221,7 +221,7 @@ private:
void init();
virtual void componentComplete();
Q_DISABLE_COPY(QFxWebView)
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxWebView)
+ Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxWebView)
};
QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index 0e141da..9e1deb0 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -487,7 +487,7 @@ QObject *QmlComponent::beginCreate(QmlContext *context)
QmlContextPrivate *contextPriv =
static_cast<QmlContextPrivate *>(QObjectPrivate::get(context));
QmlContext *ctxt = new QmlContext(context, 0, true);
- static_cast<QmlContextPrivate*>(ctxt->d_ptr)->url = d->cc->url;
+ static_cast<QmlContextPrivate*>(ctxt->d_func())->url = d->cc->url;
QmlVME vme;
QObject *rv = vme.run(ctxt, d->cc, d->start, d->count);
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index 720a045..89b5660 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -407,12 +407,12 @@ void QmlAbstractAnimation::setGroup(QmlAnimationGroup *g)
if (d->group == g)
return;
if (d->group)
- static_cast<QmlAnimationGroupPrivate *>(d->group->d_ptr)->animations.removeAll(this);
+ static_cast<QmlAnimationGroupPrivate *>(d->group->d_func())->animations.removeAll(this);
d->group = g;
- if (d->group && !static_cast<QmlAnimationGroupPrivate *>(d->group->d_ptr)->animations.contains(this))
- static_cast<QmlAnimationGroupPrivate *>(d->group->d_ptr)->animations.append(this);
+ if (d->group && !static_cast<QmlAnimationGroupPrivate *>(d->group->d_func())->animations.contains(this))
+ static_cast<QmlAnimationGroupPrivate *>(d->group->d_func())->animations.append(this);
if (d->group)
((QAnimationGroup*)d->group->qtAnimation())->addAnimation(qtAnimation());
diff --git a/src/declarative/util/qmlanimation.h b/src/declarative/util/qmlanimation.h
index f5180a5..ba1e430 100644
--- a/src/declarative/util/qmlanimation.h
+++ b/src/declarative/util/qmlanimation.h
@@ -355,6 +355,7 @@ public:
virtual ~QmlAnimationGroup();
QmlList<QmlAbstractAnimation *>* animations();
+ friend class QmlAbstractAnimation;
};
class QmlSequentialAnimation : public QmlAnimationGroup
diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp
index e7149d5..a17d16e 100644
--- a/src/declarative/util/qmlstate.cpp
+++ b/src/declarative/util/qmlstate.cpp
@@ -281,7 +281,7 @@ QmlStatePrivate::generateActionList(QmlStateGroup *group) const
QList<QmlState *> states = group->states();
for (int ii = 0; ii < states.count(); ++ii)
if (states.at(ii)->name() == extends)
- applyList = static_cast<QmlStatePrivate*>(states.at(ii)->d_ptr)->generateActionList(group);
+ applyList = static_cast<QmlStatePrivate*>(states.at(ii)->d_func())->generateActionList(group);
}
foreach(QmlStateOperation *op, operations)
@@ -330,7 +330,7 @@ void QmlState::apply(QmlStateGroup *group, QmlTransition *trans, QmlState *rever
if (revert) {
QmlStatePrivate *revertPrivate =
- static_cast<QmlStatePrivate*>(revert->d_ptr);
+ static_cast<QmlStatePrivate*>(revert->d_func());
d->revertList = revertPrivate->revertList;
revertPrivate->revertList.clear();
}
generated by cgit v0.12 at 2024-11-27 09:02:03 (GMT)