Implement intersection, union and itemId filters

1, Implement intersetion union and itemId filters jsondb backend
2, Fix bugs of QML APIs to enable intersection and union filters
3, Add c++ and QML unit test
4, Organizer QML example is changed and using intersection filter as default filter which would contain the collection id filter
5, Fix organizer qml example warnings

Change-Id: Ia85f5742a52676cdbac24ca59307974ab44688d3
Reviewed-on: http://codereview.qt-project.org/5726
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Päivi Rajala <paivi.rajala@nokia.com>
Reviewed-by: Iiro Kause <iiro.kause@nokia.com>
Reviewed-by: pengwu <peng.1.wu@nokia.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/src/imports/organizer/qdeclarativeorganizeritemfilter.cpp b/src/imports/organizer/qdeclarativeorganizeritemfilter.cpp
index 46164e09c..32476f2f3 100644
--- a/src/imports/organizer/qdeclarativeorganizeritemfilter.cpp
+++ b/src/imports/organizer/qdeclarativeorganizeritemfilter.cpp
@@ -379,8 +379,8 @@ void QDeclarativeOrganizerItemCompoundFilter::filters_append(QDeclarativeListPro
 {
     QDeclarativeOrganizerItemCompoundFilter* compoundFilter = static_cast<QDeclarativeOrganizerItemCompoundFilter*>(prop->object);
     compoundFilter->m_filters.append(filter);
-    QObject::connect(filter, SIGNAL(filterChanged()), compoundFilter, SIGNAL(filterChanged()));
-    emit compoundFilter->filterChanged();
+    QObject::connect(filter, SIGNAL(filterChanged()), compoundFilter, SIGNAL(valueChanged()));
+    emit compoundFilter->valueChanged();
 }
 
 int QDeclarativeOrganizerItemCompoundFilter::filters_count(QDeclarativeListProperty<QDeclarativeOrganizerItemFilter>* prop)
@@ -397,7 +397,8 @@ QDeclarativeOrganizerItemFilter* QDeclarativeOrganizerItemCompoundFilter::filter
 void QDeclarativeOrganizerItemCompoundFilter::filters_clear(QDeclarativeListProperty<QDeclarativeOrganizerItemFilter>* prop)
 {
     QDeclarativeOrganizerItemCompoundFilter* filter = static_cast<QDeclarativeOrganizerItemCompoundFilter*>(prop->object);
-    qDeleteAll(filter->m_filters);
-    filter->m_filters.clear();
-    emit filter->filterChanged();
+    if (!filter->m_filters.isEmpty()) {
+        filter->m_filters.clear();
+        emit filter->valueChanged();
+    }
 }