From b855240b782395f94315f43ea3e7e182299fac48 Mon Sep 17 00:00:00 2001
From: Matthew Vogt <matthew.vogt@nokia.com>
Date: Thu, 16 Feb 2012 14:43:03 +1000
Subject: Rename QDeclarative symbols to QQuick and QQml

Symbols beginning with QDeclarative are already exported
by the quick1 module.

Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.

Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>
---
 src/quick/items/qquickflipable.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/quick/items/qquickflipable.cpp')

diff --git a/src/quick/items/qquickflipable.cpp b/src/quick/items/qquickflipable.cpp
index a29c6f0d83..f454ce54d5 100644
--- a/src/quick/items/qquickflipable.cpp
+++ b/src/quick/items/qquickflipable.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -42,9 +42,9 @@
 #include "qquickflipable_p.h"
 #include "qquickitem_p.h"
 
-#include <private/qdeclarativeguard_p.h>
+#include <private/qqmlguard_p.h>
 
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <QtQml/qqmlinfo.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -78,9 +78,9 @@ public:
     void setBackTransform();
 
     QQuickFlipable::Side current;
-    QDeclarativeGuard<QQuickLocalTransform> backTransform;
-    QDeclarativeGuard<QQuickItem> front;
-    QDeclarativeGuard<QQuickItem> back;
+    QQmlGuard<QQuickLocalTransform> backTransform;
+    QQmlGuard<QQuickItem> front;
+    QQmlGuard<QQuickItem> back;
 
     bool sideDirty;
     bool wantBackXFlipped;
@@ -113,7 +113,7 @@ public:
     degrees to produce the flipping effect. When \c flipped is false, the
     item reverts to the default state, in which the \c angle value is 0.
 
-    \snippet doc/src/snippets/declarative/flipable/flipable.qml 0
+    \snippet doc/src/snippets/qml/flipable/flipable.qml 0
 
     \image flipable.gif
 
-- 
cgit v1.2.3