7 files changed, 201 insertions, 7 deletions
diff --git a/src/declarative/fx/fx.pri b/src/declarative/fx/fx.pri
index a6c5281..266fd71 100644
--- a/src/declarative/fx/fx.pri
+++ b/src/declarative/fx/fx.pri
@@ -9,9 +9,11 @@ HEADERS += \
            fx/qfxflipable.h \
            fx/qfxgridview.h \
            fx/qfximage.h \
+           fx/qfximagebase.h \
            fx/qfxpainteditem.h \
            fx/qfxpainteditem_p.h \
            fx/qfximage_p.h \
+           fx/qfximagebase_p.h \
            fx/qfxitem.h \
            fx/qfxitem_p.h \
            fx/qfxfocusscope.h \
@@ -52,6 +54,7 @@ SOURCES += \
            fx/qfxflipable.cpp \
            fx/qfxgridview.cpp \
            fx/qfximage.cpp \
+           fx/qfximagebase.cpp \
            fx/qfxpainteditem.cpp \
            fx/qfxitem.cpp \
            fx/qfxfocusscope.cpp \
diff --git a/src/declarative/fx/qfximage.cpp b/src/declarative/fx/qfximage.cpp
index 26e2727..b1c6bda 100644
--- a/src/declarative/fx/qfximage.cpp
+++ b/src/declarative/fx/qfximage.cpp
@@ -41,7 +41,7 @@
 
 #include "qfximage.h"
 #include "qfximage_p.h"
-#include <private/qfxperf_p.h>
+//#include <private/qfxperf_p.h>
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QFile>
@@ -144,13 +144,13 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Image,QFxImage)
 */
 
 QFxImage::QFxImage(QFxItem *parent)
-  : QFxItem(*(new QFxImagePrivate), parent)
+  : QFxImageBase(*(new QFxImagePrivate), parent)
 {
     setFlag(QGraphicsItem::ItemHasNoContents, false);
 }
 
 QFxImage::QFxImage(QFxImagePrivate &dd, QFxItem *parent)
-  : QFxItem(dd, parent)
+  : QFxImageBase(dd, parent)
 {
     setFlag(QGraphicsItem::ItemHasNoContents, false);
 }
diff --git a/src/declarative/fx/qfximage.h b/src/declarative/fx/qfximage.h
index fc9cfe0..642e4c8 100644
--- a/src/declarative/fx/qfximage.h
+++ b/src/declarative/fx/qfximage.h
@@ -42,9 +42,8 @@
 #ifndef QFXIMAGE_H
 #define QFXIMAGE_H
 
-#include <QtDeclarative/qfxitem.h>
 #include <QtNetwork/qnetworkreply.h>
-
+#include "qfximagebase.h"
 
 QT_BEGIN_HEADER
 
@@ -55,7 +54,7 @@ class QFxImagePrivate;
 class QFxScaleGrid;
 class QFxGridScaledImage;
 
-class Q_DECLARATIVE_EXPORT QFxImage : public QFxItem
+class Q_DECLARATIVE_EXPORT QFxImage : public QFxImageBase
 {
     Q_OBJECT
     Q_ENUMS(Status)
diff --git a/src/declarative/fx/qfximage_p.h b/src/declarative/fx/qfximage_p.h
index 2ce41f8..d198c27 100644
--- a/src/declarative/fx/qfximage_p.h
+++ b/src/declarative/fx/qfximage_p.h
@@ -55,6 +55,7 @@
 
 #include "qfxitem_p.h"
 #include "qfxscalegrid_p.h"
+#include "qfximagebase_p.h"
 
 #include <QtCore/qpointer.h>
 
@@ -65,7 +66,7 @@ class QWebPage;
 class QNetworkReply;
 class QIODevice;
 
-class QFxImagePrivate : public QFxItemPrivate
+class QFxImagePrivate : public QFxImageBasePrivate
 {
     Q_DECLARE_PUBLIC(QFxImage)
 
diff --git a/src/declarative/fx/qfximagebase.cpp b/src/declarative/fx/qfximagebase.cpp
new file mode 100644
index 0000000..e0b72c2
--- /dev/null
+++ b/src/declarative/fx/qfximagebase.cpp
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qfximagebase.h"
+#include "qfximagebase_p.h"
+
+QT_BEGIN_NAMESPACE
+
+QFxImageBase::QFxImageBase(QFxItem *parent)
+  : QFxItem(*(new QFxImageBasePrivate), parent)
+{
+}
+
+QFxImageBase::QFxImageBase(QFxImageBasePrivate &dd, QFxItem *parent)
+  : QFxItem(dd, parent)
+{
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfximagebase.h b/src/declarative/fx/qfximagebase.h
new file mode 100644
index 0000000..7e04f0d
--- /dev/null
+++ b/src/declarative/fx/qfximagebase.h
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QFXIMAGEBASE_H
+#define QFXIMAGEBASE_H
+
+#include <QtDeclarative/qfxitem.h>
+
+QT_BEGIN_NAMESPACE
+
+class QFxImageBasePrivate;
+class QFxImageBase : public QFxItem
+{
+public:
+    QFxImageBase(QFxItem *parent = 0);
+
+protected:
+    QFxImageBase(QFxImageBasePrivate &dd, QFxItem *parent);
+
+};
+
+QT_END_NAMESPACE
+
+#endif // QFXIMAGEBASE_H
diff --git a/src/declarative/fx/qfximagebase_p.h b/src/declarative/fx/qfximagebase_p.h
new file mode 100644
index 0000000..7e5d722
--- /dev/null
+++ b/src/declarative/fx/qfximagebase_p.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QFXIMAGEBASE_P_H
+#define QFXIMAGEBASE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qfxitem_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QFxImageBasePrivate : public QFxItemPrivate
+{
+    Q_DECLARE_PUBLIC(QFxImageBase)
+
+public:
+    QFxImageBasePrivate()
+    {
+    }
+};
+
+QT_END_NAMESPACE
+
+#endif