diff -r 000000000000 -r 876b1a06bc25 src/messaging/qmessagefolderfilter_qmf.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/messaging/qmessagefolderfilter_qmf.cpp	Wed Aug 25 15:49:42 2010 +0300
@@ -0,0 +1,275 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $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 Technology Preview License Agreement accompanying
+** this package.
+**
+** 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.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "qmessagefolderfilter.h"
+#include "qmfhelpers_p.h"
+
+#include <qmailaccountkey.h>
+#include <qmailfolderkey.h>
+#include <qmailmessagekey.h>
+
+using namespace QTM_PREPEND_NAMESPACE(QmfHelpers);
+
+QTM_BEGIN_NAMESPACE
+
+class QMessageFolderFilterPrivate
+{
+public:
+    QMessageFolderFilterPrivate() : _key(), _matchFlags(0) {}
+
+    QMailFolderKey _key;
+    QMessageDataComparator::MatchFlags _matchFlags;
+
+    //static QMessageFolderFilter convert(const QMailFolderKey &key);
+    static QMailFolderKey convert(const QMessageFolderFilter &filter);
+};
+
+/*
+QMessageFolderFilter QMessageFolderFilterPrivate::convert(const QMailFolderKey &key)
+{
+    QMessageFolderFilter result;
+    result.d_ptr->_key = key;
+    return result;
+}
+*/
+
+QMailFolderKey QMessageFolderFilterPrivate::convert(const QMessageFolderFilter &filter)
+{
+    return filter.d_ptr->_key;
+}
+
+namespace QmfHelpers {
+
+/*
+QMessageFolderFilter convert(const QMailFolderKey &key)
+{
+    return QMessageFolderFilterPrivate::convert(key);
+}
+*/
+
+QMailFolderKey convert(const QMessageFolderFilter &filter)
+{
+    return QMessageFolderFilterPrivate::convert(filter);
+}
+
+}
+
+QMessageFolderFilter::QMessageFolderFilter()
+    : d_ptr(new QMessageFolderFilterPrivate)
+{
+}
+
+QMessageFolderFilter::QMessageFolderFilter(const QMessageFolderFilter &other)
+    : d_ptr(new QMessageFolderFilterPrivate)
+{
+    this->operator=(other);
+}
+
+QMessageFolderFilter::~QMessageFolderFilter()
+{
+    delete d_ptr;
+    d_ptr = 0;
+}
+
+QMessageFolderFilter& QMessageFolderFilter::operator=(const QMessageFolderFilter& other)
+{
+    if (&other != this) {
+        d_ptr->_key = other.d_ptr->_key;
+        d_ptr->_matchFlags = other.d_ptr->_matchFlags;
+    }
+
+    return *this;
+}
+
+void QMessageFolderFilter::setMatchFlags(QMessageDataComparator::MatchFlags matchFlags)
+{
+    d_ptr->_matchFlags = matchFlags;
+}
+
+QMessageDataComparator::MatchFlags QMessageFolderFilter::matchFlags() const
+{
+    return d_ptr->_matchFlags;
+}
+
+bool QMessageFolderFilter::isEmpty() const
+{
+    return d_ptr->_key.isEmpty();
+}
+
+bool QMessageFolderFilter::isSupported() const
+{
+    return !d_ptr->_matchFlags;
+}
+
+QMessageFolderFilter QMessageFolderFilter::operator~() const
+{
+    QMessageFolderFilter result;
+    result.d_ptr->_key = ~d_ptr->_key;
+    return result;
+}
+
+QMessageFolderFilter QMessageFolderFilter::operator&(const QMessageFolderFilter& other) const
+{
+    QMessageFolderFilter result;
+    result.d_ptr->_key = d_ptr->_key & other.d_ptr->_key;
+    result.d_ptr->_matchFlags = d_ptr->_matchFlags | other.d_ptr->_matchFlags; // matchFlags not supported
+    return result;
+}
+
+QMessageFolderFilter QMessageFolderFilter::operator|(const QMessageFolderFilter& other) const
+{
+    QMessageFolderFilter result;
+    result.d_ptr->_key = d_ptr->_key | other.d_ptr->_key;
+    result.d_ptr->_matchFlags = d_ptr->_matchFlags | other.d_ptr->_matchFlags; // matchFlags not supported
+    return result;
+}
+
+const QMessageFolderFilter& QMessageFolderFilter::operator&=(const QMessageFolderFilter& other)
+{
+    d_ptr->_key &= other.d_ptr->_key;
+    d_ptr->_matchFlags |= other.d_ptr->_matchFlags; // matchFlags not supported
+    return *this;
+}
+
+const QMessageFolderFilter& QMessageFolderFilter::operator|=(const QMessageFolderFilter& other)
+{
+    d_ptr->_key |= other.d_ptr->_key;
+    d_ptr->_matchFlags |= other.d_ptr->_matchFlags; // matchFlags not supported
+    return *this;
+}
+
+bool QMessageFolderFilter::operator==(const QMessageFolderFilter& other) const
+{
+    return ((d_ptr->_key == other.d_ptr->_key)
+            && (d_ptr->_matchFlags == other.d_ptr->_matchFlags));
+}
+
+QMessageFolderFilter QMessageFolderFilter::byId(const QMessageFolderId &id, QMessageDataComparator::EqualityComparator cmp)
+{
+    QMessageFolderFilter result;
+    result.d_ptr->_key = QMailFolderKey::id(convert(id), convert(cmp));
+    return result;
+}
+
+QMessageFolderFilter QMessageFolderFilter::byId(const QMessageFolderIdList &ids, QMessageDataComparator::InclusionComparator cmp)
+{
+    QMessageFolderFilter result;
+    result.d_ptr->_key = QMailFolderKey::id(convert(ids), convert(cmp));
+    return result;
+}
+
+QMessageFolderFilter QMessageFolderFilter::byId(const QMessageFolderFilter &filter, QMessageDataComparator::InclusionComparator cmp)
+{
+    QMessageFolderFilter result;
+    result.d_ptr->_key = QMailFolderKey::id(convert(filter), convert(cmp));
+    return result;
+}
+
+QMessageFolderFilter QMessageFolderFilter::byName(const QString &value, QMessageDataComparator::EqualityComparator cmp)
+{
+    QMessageFolderFilter result;
+    result.d_ptr->_key = QMailFolderKey::displayName(value, convert(cmp));
+    return result;
+}
+
+QMessageFolderFilter QMessageFolderFilter::byName(const QString &value, QMessageDataComparator::InclusionComparator cmp)
+{
+    QMessageFolderFilter result;
+    result.d_ptr->_key = QMailFolderKey::displayName(value, convert(cmp));
+    return result;
+}
+
+QMessageFolderFilter QMessageFolderFilter::byPath(const QString &value, QMessageDataComparator::EqualityComparator cmp)
+{
+    QMessageFolderFilter result;
+    result.d_ptr->_key = QMailFolderKey::path(value, convert(cmp));
+    return result;
+}
+
+QMessageFolderFilter QMessageFolderFilter::byPath(const QString &value, QMessageDataComparator::InclusionComparator cmp)
+{
+    QMessageFolderFilter result;
+    result.d_ptr->_key = QMailFolderKey::path(value, convert(cmp));
+    return result;
+}
+
+QMessageFolderFilter QMessageFolderFilter::byParentAccountId(const QMessageAccountId &id, QMessageDataComparator::EqualityComparator cmp)
+{
+    QMessageFolderFilter result;
+    result.d_ptr->_key = QMailFolderKey::parentAccountId(convert(id), convert(cmp));
+    return result;
+}
+
+QMessageFolderFilter QMessageFolderFilter::byParentAccountId(const QMessageAccountFilter &filter, QMessageDataComparator::InclusionComparator cmp)
+{
+    QMessageFolderFilter result;
+    result.d_ptr->_key = QMailFolderKey::parentAccountId(convert(filter), convert(cmp));
+    return result;
+}
+
+QMessageFolderFilter QMessageFolderFilter::byParentFolderId(const QMessageFolderId &id, QMessageDataComparator::EqualityComparator cmp)
+{
+    QMessageFolderFilter result;
+    result.d_ptr->_key = QMailFolderKey::parentFolderId(convert(id), convert(cmp));
+    return result;
+}
+
+QMessageFolderFilter QMessageFolderFilter::byParentFolderId(const QMessageFolderFilter &filter, QMessageDataComparator::InclusionComparator cmp)
+{
+    QMessageFolderFilter result;
+    result.d_ptr->_key = QMailFolderKey::parentFolderId(convert(filter), convert(cmp));
+    return result;
+}
+
+QMessageFolderFilter QMessageFolderFilter::byAncestorFolderIds(const QMessageFolderId &id, QMessageDataComparator::InclusionComparator cmp)
+{
+    QMessageFolderFilter result;
+    result.d_ptr->_key = QMailFolderKey::ancestorFolderIds(convert(id), convert(cmp));
+    return result;
+}
+
+QMessageFolderFilter QMessageFolderFilter::byAncestorFolderIds(const QMessageFolderFilter &filter, QMessageDataComparator::InclusionComparator cmp)
+{
+    QMessageFolderFilter result;
+    result.d_ptr->_key = QMailFolderKey::ancestorFolderIds(convert(filter), convert(cmp));
+    return result;
+}
+
+QTM_END_NAMESPACE