Remove Content and ContentWrapper

property aliases do a better job of this

5 files changed, 0 insertions, 310 deletions

diff --git a/src/declarative/fx/fx.pri b/src/declarative/fx/fx.pri
index fd6e480..0c26356 100644
--- a/src/declarative/fx/fx.pri
+++ b/src/declarative/fx/fx.pri
@@ -4,8 +4,6 @@ HEADERS += \
            fx/qfxblurfilter.h \
            fx/qfxcomponentinstance.h \
            fx/qfxcomponentinstance_p.h \
-           fx/qfxcontentwrapper.h \
-           fx/qfxcontentwrapper_p.h \
            fx/qfxevents_p.h \
            fx/qfxflickable.h \
            fx/qfxflickable_p.h \
@@ -51,7 +49,6 @@ SOURCES += \
            fx/qfxanchors.cpp \
            fx/qfxblurfilter.cpp \
            fx/qfxcomponentinstance.cpp \
-           fx/qfxcontentwrapper.cpp \
            fx/qfxevents.cpp \
            fx/qfxflickable.cpp \
            fx/qfxflipable.cpp \
diff --git a/src/declarative/fx/qfxcomponentinstance.cpp b/src/declarative/fx/qfxcomponentinstance.cpp
index 7f592a9..6cf8e74 100644
--- a/src/declarative/fx/qfxcomponentinstance.cpp
+++ b/src/declarative/fx/qfxcomponentinstance.cpp
@@ -42,7 +42,6 @@
 #include "qfxcomponentinstance.h"
 #include "qfxcomponentinstance_p.h"
 #include <private/qfxperf_p.h>
-#include <qfxcontentwrapper.h>
 #include <QtDeclarative/qmlinfo.h>
 
 
diff --git a/src/declarative/fx/qfxcontentwrapper.cpp b/src/declarative/fx/qfxcontentwrapper.cpp
deleted file mode 100644
index 482442b..0000000
--- a/src/declarative/fx/qfxcontentwrapper.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/****************************************************************************
-**
-** 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 "qfxcontentwrapper.h"
-#include "qfxcontentwrapper_p.h"
-
-
-QT_BEGIN_NAMESPACE
-QML_DEFINE_TYPE(QFxContentWrapper,ContentWrapper)
-
-/*!
-    \qmlclass ContentWrapper QFxContentWrapper
-    \ingroup group_utility
-    \brief ContentWrapper provides a component which contains content.
-    \inherits Item
-
-    In some cases the content of a component is not defined by the component itself.
-    For example, the items placed in a group box need to be specified external to
-    group box component definition itself.
-    In cases like these \l Content can be used to specify at what location in the component
-    the content should be placed. It is used in conjuntion with the \e content property of
-    ContentWrapper: any items listed as content will be placed in the location
-    specified by Content.  The component containing the Content must be of type
-    ContentWrapper.
-
-    GroupBox component definition:
-    \quotefile doc/src/snippets/declarative/GroupBox.qml
-
-    \bold Note that in the above component definition ContentWrapper's \e children
-    property is specified explicitly since \e content is the default property.
-
-    Component use:
-    \table
-    \row \o \image content.png
-    \o \quotefile doc/src/snippets/declarative/content.qml
-    \endtable
-
-    \sa Content
-*/
-
-QFxContentWrapper::QFxContentWrapper(QFxItem *parent)
-: QFxItem(*(new QFxContentWrapperPrivate), parent)
-{
-}
-
-QFxContentWrapper::QFxContentWrapper(QFxContentWrapperPrivate &dd, QFxItem *parent)
-  : QFxItem(dd, parent)
-{
-}
-
-/*!
-    \qmlproperty list<Item> ContentWrapper::content
-
-    Contains the list of elements to replace the \l Content
-    placeholder.
-
-    \sa Content
-*/
-QList<QFxItem *> *QFxContentWrapper::content()
-{
-    Q_D(QFxContentWrapper);
-    return &(d->_content);
-}
-
-void QFxContentWrapper::componentComplete()
-{
-    QFxItem::componentComplete();
-    if (content()->size() < 1)
-        return;
-
-    QList<QSimpleCanvasItem *> nodes;
-    nodes.append(this);
-    QFxItem *target = findContent(nodes);
-    if (!target)
-        return;
-    target = target->itemParent();
-
-    QList<QFxItem*> myContent(*content());
-    for (int ii = 0; ii < myContent.count();  ++ii) 
-        myContent.at(ii)->setParent(target);
-}
-
-QFxItem *QFxContentWrapper::findContent(QList<QSimpleCanvasItem *> &nodes)
-{
-    QSimpleCanvasItem *item = nodes.takeFirst();
-    if (qobject_cast<QFxContent*>(item))
-        return static_cast<QFxItem *>(item);
-    nodes << item->children();
-    if (nodes.isEmpty())
-        return 0;
-    return findContent(nodes);
-}
-
-QML_DEFINE_TYPE(QFxContent,Content)
-
-/*!
-    \qmlclass Content QFxContent
-    \ingroup group_utility
-    \brief Content is used as a placeholder for the content of a component.
-    \inherits Item
-
-    The Content element is used to place content within a component.
-    See \l ContentWrapper for usage.
-*/
-
-QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxcontentwrapper.h b/src/declarative/fx/qfxcontentwrapper.h
deleted file mode 100644
index 9a9a89c..0000000
--- a/src/declarative/fx/qfxcontentwrapper.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/****************************************************************************
-**
-** 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 QFXCONTENTWRAPPER_H
-#define QFXCONTENTWRAPPER_H
-
-#include <QtDeclarative/qfxitem.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QFxContentWrapperPrivate;
-class Q_DECLARATIVE_EXPORT QFxContentWrapper : public QFxItem
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QList<QFxItem *>* content READ content DESIGNABLE false)
-    Q_CLASSINFO("DefaultProperty", "content")
-public:
-    QFxContentWrapper(QFxItem *parent=0);
-
-    QList<QFxItem *> *content();
-
-private:
-    void create();
-    QFxItem *findContent(QList<QSimpleCanvasItem *> &nodes);
-
-protected:
-    void componentComplete();
-    QFxContentWrapper(QFxContentWrapperPrivate &dd, QFxItem *parent);
-
-private:
-    Q_DECLARE_PRIVATE(QFxContentWrapper)
-};
-
-class Q_DECLARATIVE_EXPORT QFxContent : public QFxItem
-{
-    Q_OBJECT
-public:
-    QFxContent(QFxItem *parent=0) : QFxItem(parent) {}
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QFxContentWrapper)
-QML_DECLARE_TYPE(QFxContent)
-
-QT_END_HEADER
-
-#endif // QFXCONTENTWRAPPER_H
diff --git a/src/declarative/fx/qfxcontentwrapper_p.h b/src/declarative/fx/qfxcontentwrapper_p.h
deleted file mode 100644
index a75fa1e..0000000
--- a/src/declarative/fx/qfxcontentwrapper_p.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** 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 QFXCONTENTWRAPPER_P_H
-#define QFXCONTENTWRAPPER_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"
-#include "qfxcontentwrapper.h"
-
-
-QT_BEGIN_NAMESPACE
-class QFxContentWrapperPrivate : public QFxItemPrivate
-{
-    Q_DECLARE_PUBLIC(QFxContentWrapper)
-public:
-    QFxContentWrapperPrivate() { }
-
-    QList<QFxItem *> _content;
-};
-
-QT_END_NAMESPACE
-#endif // QFXCONTENTWRAPPER_P_H