summaryrefslogtreecommitdiffstats
path: root/src/declarative/extra
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-10-30 05:00:02 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-10-30 05:00:02 (GMT)
commit44a0c19eae2099e6cdb44825123a4b8ee9a5bf20 (patch)
treefa9db593567ccb6b19d21278788ff365ce7608ab /src/declarative/extra
parent45cc1ea534640cb492bd00405bf8fcd5dbfbcf5c (diff)
downloadQt-44a0c19eae2099e6cdb44825123a4b8ee9a5bf20.zip
Qt-44a0c19eae2099e6cdb44825123a4b8ee9a5bf20.tar.gz
Qt-44a0c19eae2099e6cdb44825123a4b8ee9a5bf20.tar.bz2
Rename qfx files to qmlgraphics files
Diffstat (limited to 'src/declarative/extra')
-rw-r--r--src/declarative/extra/extra.pri14
-rw-r--r--src/declarative/extra/qmlgraphicsanimatedimageitem.cpp (renamed from src/declarative/extra/qfxanimatedimageitem.cpp)4
-rw-r--r--src/declarative/extra/qmlgraphicsanimatedimageitem.h (renamed from src/declarative/extra/qfxanimatedimageitem.h)6
-rw-r--r--src/declarative/extra/qmlgraphicsanimatedimageitem_p.h (renamed from src/declarative/extra/qfxanimatedimageitem_p.h)8
-rw-r--r--src/declarative/extra/qmlgraphicsintegermodel.cpp (renamed from src/declarative/extra/qfxintegermodel.cpp)2
-rw-r--r--src/declarative/extra/qmlgraphicsintegermodel.h (renamed from src/declarative/extra/qfxintegermodel.h)4
-rw-r--r--src/declarative/extra/qmlgraphicsparticles.cpp (renamed from src/declarative/extra/qfxparticles.cpp)6
-rw-r--r--src/declarative/extra/qmlgraphicsparticles.h (renamed from src/declarative/extra/qfxparticles.h)6
8 files changed, 25 insertions, 25 deletions
diff --git a/src/declarative/extra/extra.pri b/src/declarative/extra/extra.pri
index 5e5e74e..47cc8f8 100644
--- a/src/declarative/extra/extra.pri
+++ b/src/declarative/extra/extra.pri
@@ -2,9 +2,9 @@ SOURCES += \
extra/qnumberformat.cpp \
extra/qmlnumberformatter.cpp \
extra/qmldatetimeformatter.cpp \
- extra/qfxintegermodel.cpp \
- extra/qfxanimatedimageitem.cpp \
- extra/qfxparticles.cpp \
+ extra/qmlgraphicsintegermodel.cpp \
+ extra/qmlgraphicsanimatedimageitem.cpp \
+ extra/qmlgraphicsparticles.cpp \
extra/qmlbehavior.cpp \
extra/qmlfontloader.cpp
@@ -12,10 +12,10 @@ HEADERS += \
extra/qnumberformat.h \
extra/qmlnumberformatter.h \
extra/qmldatetimeformatter.h \
- extra/qfxintegermodel.h \
- extra/qfxanimatedimageitem.h \
- extra/qfxanimatedimageitem_p.h \
- extra/qfxparticles.h \
+ extra/qmlgraphicsintegermodel.h \
+ extra/qmlgraphicsanimatedimageitem.h \
+ extra/qmlgraphicsanimatedimageitem_p.h \
+ extra/qmlgraphicsparticles.h \
extra/qmlbehavior.h \
extra/qmlfontloader.h
diff --git a/src/declarative/extra/qfxanimatedimageitem.cpp b/src/declarative/extra/qmlgraphicsanimatedimageitem.cpp
index 8a6046e..c22e56d 100644
--- a/src/declarative/extra/qfxanimatedimageitem.cpp
+++ b/src/declarative/extra/qmlgraphicsanimatedimageitem.cpp
@@ -42,8 +42,8 @@
#include <QMovie>
#include <QtDeclarative/qmlcontext.h>
#include <QtDeclarative/qmlengine.h>
-#include "qfxanimatedimageitem.h"
-#include "qfxanimatedimageitem_p.h"
+#include "qmlgraphicsanimatedimageitem.h"
+#include "qmlgraphicsanimatedimageitem_p.h"
#include <QNetworkRequest>
#include <QNetworkReply>
diff --git a/src/declarative/extra/qfxanimatedimageitem.h b/src/declarative/extra/qmlgraphicsanimatedimageitem.h
index 782f920..c62a98e 100644
--- a/src/declarative/extra/qfxanimatedimageitem.h
+++ b/src/declarative/extra/qmlgraphicsanimatedimageitem.h
@@ -39,10 +39,10 @@
**
****************************************************************************/
-#ifndef QFXANIMATEDIMAGEITEM_H
-#define QFXANIMATEDIMAGEITEM_H
+#ifndef QMLGRAPHICSANIMATEDIMAGEITEM_H
+#define QMLGRAPHICSANIMATEDIMAGEITEM_H
-#include <QtDeclarative/qfximage.h>
+#include <QtDeclarative/qmlgraphicsimage.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/extra/qfxanimatedimageitem_p.h b/src/declarative/extra/qmlgraphicsanimatedimageitem_p.h
index e61c488..04f1b6e 100644
--- a/src/declarative/extra/qfxanimatedimageitem_p.h
+++ b/src/declarative/extra/qmlgraphicsanimatedimageitem_p.h
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QFXANIMATEDIMAGE_P_H
-#define QFXANIMATEDIMAGE_P_H
+#ifndef QMLGRAPHICSANIMATEDIMAGE_P_H
+#define QMLGRAPHICSANIMATEDIMAGE_P_H
//
// W A R N I N G
@@ -53,7 +53,7 @@
// We mean it.
//
-#include <private/qfximage_p.h>
+#include <private/qmlgraphicsimage_p.h>
QT_BEGIN_NAMESPACE
@@ -78,4 +78,4 @@ public:
QT_END_NAMESPACE
-#endif // QFXANIMATEDIMAGE_P_H
+#endif // QMLGRAPHICSANIMATEDIMAGE_P_H
diff --git a/src/declarative/extra/qfxintegermodel.cpp b/src/declarative/extra/qmlgraphicsintegermodel.cpp
index 496cd3e..e83b9c9 100644
--- a/src/declarative/extra/qfxintegermodel.cpp
+++ b/src/declarative/extra/qmlgraphicsintegermodel.cpp
@@ -39,7 +39,7 @@
**
****************************************************************************/
-#include "qfxintegermodel.h"
+#include "qmlgraphicsintegermodel.h"
QT_BEGIN_NAMESPACE
diff --git a/src/declarative/extra/qfxintegermodel.h b/src/declarative/extra/qmlgraphicsintegermodel.h
index cf69bdc..3cad05e 100644
--- a/src/declarative/extra/qfxintegermodel.h
+++ b/src/declarative/extra/qmlgraphicsintegermodel.h
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QFXINTMODEL_H
-#define QFXINTMODEL_H
+#ifndef QMLGRAPHICSINTMODEL_H
+#define QMLGRAPHICSINTMODEL_H
#include <QtCore/QObject>
#include <QtDeclarative/qml.h>
diff --git a/src/declarative/extra/qfxparticles.cpp b/src/declarative/extra/qmlgraphicsparticles.cpp
index 0bb4826..dba3ac4 100644
--- a/src/declarative/extra/qfxparticles.cpp
+++ b/src/declarative/extra/qmlgraphicsparticles.cpp
@@ -39,7 +39,7 @@
**
****************************************************************************/
-#include "private/qfxitem_p.h"
+#include "private/qmlgraphicsitem_p.h"
#include <stdlib.h>
#include <math.h>
@@ -50,12 +50,12 @@
#ifndef INT_MAX
#define INT_MAX 2147483647
#endif
-#include <qfxpixmapcache.h>
+#include <qmlgraphicspixmapcache.h>
#include <private/qfxperf_p.h>
#include <private/qmlanimation_p.h>
#include <QNetworkReply>
-#include "qfxparticles.h"
+#include "qmlgraphicsparticles.h"
#include <QPainter>
#include <QtGui/qdrawutil.h>
#include <QVarLengthArray>
diff --git a/src/declarative/extra/qfxparticles.h b/src/declarative/extra/qmlgraphicsparticles.h
index 5e5a581..eed0d62 100644
--- a/src/declarative/extra/qfxparticles.h
+++ b/src/declarative/extra/qmlgraphicsparticles.h
@@ -39,10 +39,10 @@
**
****************************************************************************/
-#ifndef QFXPARTICLES_H
-#define QFXPARTICLES_H
+#ifndef QMLGRAPHICSPARTICLES_H
+#define QMLGRAPHICSPARTICLES_H
-#include <QtDeclarative/qfxitem.h>
+#include <QtDeclarative/qmlgraphicsitem.h>
QT_BEGIN_HEADER