diff -r 453da2cfceef -r 71781823f776 qtmobility/src/messaging/messagingutil.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/src/messaging/messagingutil.cpp	Thu May 27 13:42:11 2010 +0300
@@ -0,0 +1,242 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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 "messagingutil_p.h"
+#include "qmessageid.h"
+#include "qmessageaccountid.h"
+#include "qmessagefolderid.h"
+#include <qmessageglobal.h>
+
+#include <QDebug>
+
+
+
+QTM_BEGIN_NAMESPACE
+
+namespace SymbianHelpers {
+
+    EngineType idType(const QString& id)
+    {
+        if (id.startsWith(mtmPrefix)) {
+            return EngineTypeMTM;
+        } else if (id.startsWith(freestylePrefix)) {
+            return EngineTypeFreestyle;
+        } else {
+            return EngineTypeMTM;
+        }
+    }
+
+    EngineType idType(const QMessageId& id)
+    {
+        if (id.toString().startsWith(mtmPrefix)) {
+            return EngineTypeMTM;
+        } else if (id.toString().startsWith(freestylePrefix)) {
+            return EngineTypeFreestyle;
+        } else {
+            return EngineTypeMTM;
+        }
+    }
+    
+    EngineType idType(const QMessageAccountId& id)
+    {
+        if (id.toString().startsWith(mtmPrefix)) {
+            return EngineTypeMTM;
+        } else if (id.toString().startsWith(freestylePrefix)) {
+            return EngineTypeFreestyle;
+        } else {
+            return EngineTypeMTM;
+        }
+    }
+    
+    EngineType idType(const QMessageFolderId& id)
+    {
+        if (id.toString().startsWith(mtmPrefix)) {
+            return EngineTypeMTM;
+        } else if (id.toString().startsWith(freestylePrefix)) {
+            return EngineTypeFreestyle;
+        } else {
+            return EngineTypeMTM;
+        }
+    }
+
+    
+    QString addIdPrefix(const QString& id, const EngineType& type)
+    {
+        switch (type) {
+        case EngineTypeFreestyle:
+            Q_ASSERT(!id.startsWith(freestylePrefix));
+            return QString(freestylePrefix) + id;
+            break;
+        case EngineTypeMTM:
+            Q_ASSERT(!id.startsWith(mtmPrefix));
+            return QString(mtmPrefix) + id;
+        default:
+            return QString(id);
+            break;
+        }
+    }
+
+    QMessageAccountId addIdPrefix(const QMessageAccountId& id, const EngineType& type)
+    {
+        switch (type) {
+        case EngineTypeFreestyle:
+            Q_ASSERT(!id.toString().startsWith(freestylePrefix));
+            return QMessageAccountId(QString(freestylePrefix) + id.toString());
+            break;
+        case EngineTypeMTM:
+            Q_ASSERT(!id.toString().startsWith(mtmPrefix));
+            return QMessageAccountId(QString(mtmPrefix) + id.toString());
+            break;
+        default:
+            return QMessageAccountId(id);
+            break;
+        }
+    }
+
+    QMessageFolderId addIdPrefix(const QMessageFolderId& id, const EngineType& type)
+    {
+        switch (type) {
+        case EngineTypeFreestyle:
+            Q_ASSERT(!id.toString().startsWith(freestylePrefix));
+            return QMessageFolderId(QString(freestylePrefix) + id.toString());
+            break;
+        case EngineTypeMTM:
+            Q_ASSERT(!id.toString().startsWith(mtmPrefix));
+            return QMessageFolderId(QString(mtmPrefix) + id.toString());
+            break;
+        default:
+            return QMessageFolderId(id);
+            break;
+        }
+    }
+
+    QMessageId addIdPrefix(const QMessageId& id, const EngineType& type)
+    {
+        switch (type) {
+        case EngineTypeFreestyle:
+            Q_ASSERT(!id.toString().startsWith(freestylePrefix));
+            return QMessageId(freestylePrefix + id.toString());
+            break;
+        case EngineTypeMTM:
+            Q_ASSERT(!id.toString().startsWith(mtmPrefix));
+            return QMessageId(mtmPrefix + id.toString());
+            break;
+        default:
+            return QMessageId(id);
+            break;
+        }
+    }
+
+    QString stripIdPrefix(const QString& id)
+    {
+        if (id.startsWith(freestylePrefix))
+            return id.right(id.length() - QString(freestylePrefix).length());
+        else if (id.startsWith(mtmPrefix))
+            return id.right(id.length() - QString(mtmPrefix).length());
+        else
+            return QString(id);
+    }
+
+    QMessageId stripIdPrefix(const QMessageId& id)
+    {
+        if (id.toString().startsWith(freestylePrefix))
+            return QMessageId(id.toString().right(id.toString().length() - QString(freestylePrefix).length()));
+        else if (id.toString().startsWith(mtmPrefix))
+            return QMessageId(id.toString().right(id.toString().length() - QString(mtmPrefix).length()));
+        else
+            return QMessageId(id);
+    }
+
+    QMessageAccountId stripIdPrefix(const QMessageAccountId& id)
+    {
+        if (id.toString().startsWith(freestylePrefix))
+            return QMessageAccountId(id.toString().right(id.toString().length() - QString(freestylePrefix).length()));
+        else if (id.toString().startsWith(mtmPrefix))
+            return QMessageAccountId(id.toString().right(id.toString().length() - QString(mtmPrefix).length()));
+        else
+            return QMessageAccountId(id);
+    }
+
+    QMessageFolderId stripIdPrefix(const QMessageFolderId& id)
+    {
+        if (id.toString().startsWith(freestylePrefix))
+            return QMessageFolderId(id.toString().right(id.toString().length() - QString(freestylePrefix).length()));
+        else if (id.toString().startsWith(mtmPrefix))
+            return QMessageFolderId(id.toString().right(id.toString().length() - QString(mtmPrefix).length()));
+        else
+            return QMessageFolderId(id);
+    }
+
+}
+
+namespace MessagingUtil {
+
+    QString addIdPrefix(const QString& id)
+    {
+        if(id.startsWith(idPrefix()))
+			qWarning() << "ID already prefixed";
+
+        return idPrefix() + id;
+    }
+
+    QString stripIdPrefix(const QString& id)
+    {
+		if(!id.startsWith(idPrefix()))
+			qWarning() << "ID not prefixed";
+
+		return id.right(id.length() - idPrefix().length());
+    }
+
+    QString idPrefix()
+    {
+#ifdef Q_OS_SYMBIAN
+        static QString prefix(SymbianHelpers::mtmPrefix);
+#elif defined(Q_OS_WIN)
+        static QString prefix("WIN_");
+#else
+        static QString prefix("QMF_");
+#endif
+        return prefix;
+    }
+
+}
+
+QTM_END_NAMESPACE