From 90d4366f1e9657b3240a872698614c7d9747f9e0 Mon Sep 17 00:00:00 2001
From: Jason Barron <jbarron@trolltech.com>
Date: Tue, 4 Aug 2009 14:20:41 +0200
Subject: Compile with Q_DECLARE_SCOPED_PRIVATE.

These classes were moved so they were not updated correctly when I
did the merge.
---
 src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h | 2 +-
 src/gui/graphicsview/qgraphicssceneindex_p.h        | 2 +-
 src/gui/graphicsview/qgraphicstransform.h           | 8 ++++----
 src/gui/kernel/qstandardgestures.h                  | 4 ++--
 src/network/access/qnetworkcookiejar.h              | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h b/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h
index 2293a8e..01a8957 100644
--- a/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h
+++ b/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h
@@ -100,7 +100,7 @@ protected:
     void itemChange(const QGraphicsItem *item, QGraphicsItem::GraphicsItemChange change, const QVariant &value);
 
 private :
-    Q_DECLARE_PRIVATE(QGraphicsSceneBspTreeIndex)
+    Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneBspTreeIndex)
     Q_DISABLE_COPY(QGraphicsSceneBspTreeIndex)
     Q_PRIVATE_SLOT(d_func(), void _q_updateSortCache())
     Q_PRIVATE_SLOT(d_func(), void _q_updateIndex())
diff --git a/src/gui/graphicsview/qgraphicssceneindex_p.h b/src/gui/graphicsview/qgraphicssceneindex_p.h
index 37dffb8..d3dfcc8 100644
--- a/src/gui/graphicsview/qgraphicssceneindex_p.h
+++ b/src/gui/graphicsview/qgraphicssceneindex_p.h
@@ -122,7 +122,7 @@ protected:
     friend class QGraphicsSceneBspTreeIndex;
 private:
     Q_DISABLE_COPY(QGraphicsSceneIndex)
-    Q_DECLARE_PRIVATE(QGraphicsSceneIndex)
+    Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneIndex)
 };
 
 class QGraphicsSceneIndexPrivate : public QObjectPrivate
diff --git a/src/gui/graphicsview/qgraphicstransform.h b/src/gui/graphicsview/qgraphicstransform.h
index d7c07d0..fb3a392 100644
--- a/src/gui/graphicsview/qgraphicstransform.h
+++ b/src/gui/graphicsview/qgraphicstransform.h
@@ -74,7 +74,7 @@ protected:
 private:
     friend class QGraphicsItem;
     friend class QGraphicsItemPrivate;
-    Q_DECLARE_PRIVATE(QGraphicsTransform)
+    Q_DECLARE_SCOPED_PRIVATE(QGraphicsTransform)
 };
 
 class QGraphicsScalePrivate;
@@ -106,7 +106,7 @@ Q_SIGNALS:
     void scaleChanged();
 
 private:
-    Q_DECLARE_PRIVATE(QGraphicsScale)
+    Q_DECLARE_SCOPED_PRIVATE(QGraphicsScale)
 };
 
 class QGraphicsRotationPrivate;
@@ -136,7 +136,7 @@ Q_SIGNALS:
 protected:
     QGraphicsRotation(QGraphicsRotationPrivate &p, QObject *parent);
 private:
-    Q_DECLARE_PRIVATE(QGraphicsRotation)
+    Q_DECLARE_SCOPED_PRIVATE(QGraphicsRotation)
 };
 
 class QGraphicsRotation3DPrivate;
@@ -159,7 +159,7 @@ Q_SIGNALS:
     void axisChanged();
 
 private:
-    Q_DECLARE_PRIVATE(QGraphicsRotation3D)
+    Q_DECLARE_SCOPED_PRIVATE(QGraphicsRotation3D)
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qstandardgestures.h b/src/gui/kernel/qstandardgestures.h
index 2234702..a777253 100644
--- a/src/gui/kernel/qstandardgestures.h
+++ b/src/gui/kernel/qstandardgestures.h
@@ -57,7 +57,7 @@ class QPanGesturePrivate;
 class Q_GUI_EXPORT QPanGesture : public QGesture
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QPanGesture)
+    Q_DECLARE_SCOPED_PRIVATE(QPanGesture)
 
     Q_PROPERTY(QSize totalOffset READ totalOffset)
     Q_PROPERTY(QSize lastOffset READ lastOffset)
@@ -82,7 +82,7 @@ class QTapAndHoldGesturePrivate;
 class Q_GUI_EXPORT QTapAndHoldGesture : public QGesture
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QTapAndHoldGesture)
+    Q_DECLARE_SCOPED_PRIVATE(QTapAndHoldGesture)
 
 public:
     QTapAndHoldGesture(QWidget *parent);
diff --git a/src/network/access/qnetworkcookiejar.h b/src/network/access/qnetworkcookiejar.h
index fae0857..269ead9 100644
--- a/src/network/access/qnetworkcookiejar.h
+++ b/src/network/access/qnetworkcookiejar.h
@@ -70,7 +70,7 @@ protected:
     void setAllCookies(const QList<QNetworkCookie> &cookieList);
 
 private:
-    Q_DECLARE_PRIVATE(QNetworkCookieJar)
+    Q_DECLARE_SCOPED_PRIVATE(QNetworkCookieJar)
     Q_DISABLE_COPY(QNetworkCookieJar)
 };
 
-- 
cgit v0.12