equal
deleted
inserted
replaced
42 #include "winhelpers_p.h" |
42 #include "winhelpers_p.h" |
43 #include <QByteArray> |
43 #include <QByteArray> |
44 #include <QDataStream> |
44 #include <QDataStream> |
45 #include <MAPIUtil.h> |
45 #include <MAPIUtil.h> |
46 #include <QDebug> |
46 #include <QDebug> |
|
47 #include <messagingutil_p.h> |
47 |
48 |
48 QTM_BEGIN_NAMESPACE |
49 QTM_BEGIN_NAMESPACE |
49 |
50 |
50 #ifdef _WIN32_WCE |
51 #ifdef _WIN32_WCE |
51 |
52 |
106 } |
107 } |
107 |
108 |
108 QMessageFolderId::QMessageFolderId(const QString& id) |
109 QMessageFolderId::QMessageFolderId(const QString& id) |
109 : d_ptr(new QMessageFolderIdPrivate(this)) |
110 : d_ptr(new QMessageFolderIdPrivate(this)) |
110 { |
111 { |
111 QDataStream idStream(QByteArray::fromBase64(WinHelpers::stripIdPrefix(id).toLatin1())); |
112 QDataStream idStream(QByteArray::fromBase64(MessagingUtil::stripIdPrefix(id).toLatin1())); |
112 d_ptr->_valid = true; |
113 d_ptr->_valid = true; |
113 #ifdef _WIN32_WCE |
114 #ifdef _WIN32_WCE |
114 idStream >> d_ptr->_entryId; |
115 idStream >> d_ptr->_entryId; |
115 #else |
116 #else |
116 idStream >> d_ptr->_folderRecordKey; |
117 idStream >> d_ptr->_folderRecordKey; |
183 } |
184 } |
184 |
185 |
185 QString QMessageFolderId::toString() const |
186 QString QMessageFolderId::toString() const |
186 { |
187 { |
187 if (!isValid()) |
188 if (!isValid()) |
188 return QString(); |
189 return MessagingUtil::addIdPrefix(QString()); |
189 QByteArray encodedId; |
190 QByteArray encodedId; |
190 QDataStream encodedIdStream(&encodedId, QIODevice::WriteOnly); |
191 QDataStream encodedIdStream(&encodedId, QIODevice::WriteOnly); |
191 #ifdef _WIN32_WCE |
192 #ifdef _WIN32_WCE |
192 encodedIdStream << d_ptr->_entryId; |
193 encodedIdStream << d_ptr->_entryId; |
193 #else |
194 #else |
199 encodedIdStream << d_ptr->_folderRecordKey; |
200 encodedIdStream << d_ptr->_folderRecordKey; |
200 #else |
201 #else |
201 if (d_ptr->_entryId.count()) |
202 if (d_ptr->_entryId.count()) |
202 encodedIdStream << d_ptr->_entryId; |
203 encodedIdStream << d_ptr->_entryId; |
203 #endif |
204 #endif |
204 return WinHelpers::addIdPrefix(encodedId.toBase64()); |
205 return MessagingUtil::addIdPrefix(encodedId.toBase64()); |
205 } |
206 } |
206 |
207 |
207 bool QMessageFolderId::isValid() const |
208 bool QMessageFolderId::isValid() const |
208 { |
209 { |
209 #ifdef _WIN32_WCE |
210 #ifdef _WIN32_WCE |