Make simple wrappers don't derive from QQmlParserStatus

This completes 3275aad72a85f6f7e32f80c67c1e6fd87d8ab68c
and fixes similar issues not handled by it.

Change-Id: I07e7ec866864887866a72b92e453e83d9bb681f6
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>

1 files changed, 21 insertions, 107 deletions

diff --git a/src/imports/organizer/qdeclarativeorganizeritemfilter.cpp b/src/imports/organizer/qdeclarativeorganizeritemfilter.cpp
index f090c49bb..16c5eda8f 100644
--- a/src/imports/organizer/qdeclarativeorganizeritemfilter.cpp
+++ b/src/imports/organizer/qdeclarativeorganizeritemfilter.cpp
@@ -414,28 +414,12 @@ QOrganizerItemFilter QDeclarativeOrganizerItemCollectionFilter::filter() const
  */
 QDeclarativeOrganizerItemDetailFilter::QDeclarativeOrganizerItemDetailFilter(QObject *parent)
     : QDeclarativeOrganizerItemFilter(parent)
-    , m_detail(0), m_componentCompleted(false)
+    , m_detail(0)
 {
     connect(this, SIGNAL(valueChanged()), SIGNAL(filterChanged()));
 }
 
 /*!
-    \internal
- */
-void QDeclarativeOrganizerItemDetailFilter::classBegin()
-{
-}
-
-/*!
-    \internal
- */
-void QDeclarativeOrganizerItemDetailFilter::componentComplete()
-{
-    setDetail();
-    m_componentCompleted = true;
-}
-
-/*!
     \qmlproperty Detail DetailFilter::detail
 
     This property holds the detail instance used by this filter for matching.
@@ -449,8 +433,10 @@ void QDeclarativeOrganizerItemDetailFilter::setDetail(QDeclarativeOrganizerItemD
 {
     if (m_detail != detail) {
         m_detail = detail;
-        if (m_componentCompleted)
-            setDetail();
+        if (m_detail && m_detail->detail() != d.detail()) {
+            d.setDetail(m_detail->detail());
+            emit valueChanged();
+        }
     }
 }
 
@@ -463,17 +449,6 @@ QOrganizerItemFilter QDeclarativeOrganizerItemDetailFilter::filter() const
     return d;
 }
 
-/*!
-    \internal
- */
-void QDeclarativeOrganizerItemDetailFilter::setDetail()
-{
-    if (m_detail) {
-        d.setDetail(m_detail->detail());
-        emit valueChanged();
-    }
-}
-
 
 /*!
     \qmltype DetailFieldFilter
@@ -523,30 +498,11 @@ void QDeclarativeOrganizerItemDetailFilter::setDetail()
  */
 QDeclarativeOrganizerItemDetailFieldFilter::QDeclarativeOrganizerItemDetailFieldFilter(QObject *parent)
     : QDeclarativeOrganizerItemFilter(parent)
-    , m_detail(QDeclarativeOrganizerItemDetail::Undefined)
-    , m_field(-1)
-    , m_componentCompleted(false)
 {
     connect(this, SIGNAL(valueChanged()), SIGNAL(filterChanged()));
 }
 
 /*!
-    \internal
- */
-void QDeclarativeOrganizerItemDetailFieldFilter::classBegin()
-{
-}
-
-/*!
-    \internal
- */
-void QDeclarativeOrganizerItemDetailFieldFilter::componentComplete()
-{
-    setDetail();
-    m_componentCompleted = true;
-}
-
-/*!
     \qmlproperty enum DetailFieldFilter::detail
 
     This property holds the detail type of which the detail filter will be matched to. The value
@@ -554,15 +510,14 @@ void QDeclarativeOrganizerItemDetailFieldFilter::componentComplete()
   */
 QDeclarativeOrganizerItemDetail::DetailType QDeclarativeOrganizerItemDetailFieldFilter::detail() const
 {
-    return m_detail;
+    return static_cast<QDeclarativeOrganizerItemDetail::DetailType>(d.detailType());
 }
 
 void QDeclarativeOrganizerItemDetailFieldFilter::setDetail(QDeclarativeOrganizerItemDetail::DetailType detail)
 {
-    if (m_detail != detail) {
-        m_detail = detail;
-        if (m_componentCompleted)
-            setDetail();
+    if (detail != static_cast<QDeclarativeOrganizerItemDetail::DetailType>(d.detailType())) {
+        d.setDetail(static_cast<QOrganizerItemDetail::DetailType>(detail), d.detailField());
+        emit valueChanged();
     }
 }
 
@@ -578,15 +533,14 @@ void QDeclarativeOrganizerItemDetailFieldFilter::setDetail(QDeclarativeOrganizer
   */
 int QDeclarativeOrganizerItemDetailFieldFilter::field() const
 {
-    return m_field;
+    return d.detailField();
 }
 
 void QDeclarativeOrganizerItemDetailFieldFilter::setField(int field)
 {
-    if (field != m_field) {
-        m_field = field;
-        if (m_componentCompleted)
-            setDetail();
+    if (field != d.detailField()) {
+        d.setDetail(d.detailType(), field);
+        emit valueChanged();
     }
 }
 
@@ -651,15 +605,6 @@ QOrganizerItemFilter QDeclarativeOrganizerItemDetailFieldFilter::filter() const
     return d;
 }
 
-/*!
-    \internal
- */
-void QDeclarativeOrganizerItemDetailFieldFilter::setDetail()
-{
-    d.setDetail(static_cast<QOrganizerItemDetail::DetailType>(m_detail), m_field);
-    emit valueChanged();
-}
-
 
 /*!
     \qmltype DetailRangeFilter
@@ -681,30 +626,11 @@ void QDeclarativeOrganizerItemDetailFieldFilter::setDetail()
  */
 QDeclarativeOrganizerItemDetailRangeFilter::QDeclarativeOrganizerItemDetailRangeFilter(QObject *parent)
     : QDeclarativeOrganizerItemFilter(parent)
-    , m_detail(QDeclarativeOrganizerItemDetail::Undefined)
-    , m_field(-1)
-    , m_componentCompleted(false)
 {
     connect(this, SIGNAL(valueChanged()), SIGNAL(filterChanged()));
 }
 
 /*!
-    \internal
- */
-void QDeclarativeOrganizerItemDetailRangeFilter::classBegin()
-{
-}
-
-/*!
-    \internal
- */
-void QDeclarativeOrganizerItemDetailRangeFilter::componentComplete()
-{
-    setDetail();
-    m_componentCompleted = true;
-}
-
-/*!
     \qmlproperty enum DetailRangeFilter::detail
 
     This property holds the detail type of which the detail filter will be matched to. The value
@@ -712,15 +638,14 @@ void QDeclarativeOrganizerItemDetailRangeFilter::componentComplete()
   */
 QDeclarativeOrganizerItemDetail::DetailType QDeclarativeOrganizerItemDetailRangeFilter::detail() const
 {
-    return m_detail;
+    return static_cast<QDeclarativeOrganizerItemDetail::DetailType>(d.detailType());
 }
 
 void QDeclarativeOrganizerItemDetailRangeFilter::setDetail(QDeclarativeOrganizerItemDetail::DetailType detail)
 {
-    if (m_detail != detail) {
-        m_detail = detail;
-        if (m_componentCompleted)
-            setDetail();
+    if (detail != static_cast<QDeclarativeOrganizerItemDetail::DetailType>(d.detailType())) {
+        d.setDetail(static_cast<QOrganizerItemDetail::DetailType>(detail), d.detailField());
+        emit valueChanged();
     }
 }
 
@@ -736,16 +661,14 @@ void QDeclarativeOrganizerItemDetailRangeFilter::setDetail(QDeclarativeOrganizer
   */
 int QDeclarativeOrganizerItemDetailRangeFilter::field() const
 {
-    return m_field;
+    return d.detailField();
 }
 
 void QDeclarativeOrganizerItemDetailRangeFilter::setField(int field)
 {
-    if (field != m_field || m_componentCompleted) {
-        m_field = field;
-        if (m_componentCompleted)
-            setDetail();
-        emit filterChanged();
+    if (field != d.detailField()) {
+        d.setDetail(d.detailType(), field);
+        emit valueChanged();
     }
 }
 
@@ -844,15 +767,6 @@ QOrganizerItemFilter QDeclarativeOrganizerItemDetailRangeFilter::filter() const
     return d;
 }
 
-/*!
-    \internal
- */
-void QDeclarativeOrganizerItemDetailRangeFilter::setDetail()
-{
-    d.setDetail(static_cast<QOrganizerItemDetail::DetailType>(m_detail), m_field);
-    emit valueChanged();
-}
-
 
 /*!
     \qmltype IdFilter