diff options
| author | MattV <qt-info@nokia.com> | 2009-12-17 15:43:28 +1000 |
|---|---|---|
| committer | MattV <qt-info@nokia.com> | 2009-12-17 15:43:28 +1000 |
| commit | 6280cb14f22732bd2912ab074c93edeec8931f0a (patch) | |
| tree | 1eb0597ae99067407770419e2a2bf6cccbb6c785 | |
| parent | e0274fb3f1140f52480cd3e396d94a2def775040 (diff) | |
Rename QMessageStore:: and QMessageManager::lastError() to error().
This is the more common form in Qt, and in line with the equivalent
Contacts interface name.
29 files changed, 657 insertions, 657 deletions
diff --git a/examples/keepintouch/addressfinder.cpp b/examples/keepintouch/addressfinder.cpp index 0b4f14c7a5..b7911c7cc0 100644 --- a/examples/keepintouch/addressfinder.cpp +++ b/examples/keepintouch/addressfinder.cpp @@ -261,7 +261,7 @@ void AddressFinder::searchMessages() void AddressFinder::stateChanged(QMessageService::State newState) { if (newState == QMessageService::FinishedState) { - if (service.lastError() == QMessageManager::NoError) { + if (service.error() == QMessageManager::NoError) { if (!inclusionFilter.isEmpty()) { // Now find the included messages service.queryMessages(inclusionFilter); diff --git a/examples/querymessages/main.cpp b/examples/querymessages/main.cpp index 51e6ba3793..bbdd326955 100644 --- a/examples/querymessages/main.cpp +++ b/examples/querymessages/main.cpp @@ -75,7 +75,7 @@ int main(int argc, char *argv[]) QMessage message(manager.message(id)); //! [iterate-results] - if (manager.lastError() == QMessageManager::NoError) { + if (manager.error() == QMessageManager::NoError) { QStringList result; if (app.arguments().count() < 2) { diff --git a/examples/serviceactions/mainwindow.cpp b/examples/serviceactions/mainwindow.cpp index 09aec25365..a1b2835047 100644 --- a/examples/serviceactions/mainwindow.cpp +++ b/examples/serviceactions/mainwindow.cpp @@ -374,7 +374,7 @@ void RecentMessagesWidget::messagesFound(const QMessageIdList& ids) void RecentMessagesWidget::stateChanged(QMessageService::State newState) { if (newState == QMessageService::FinishedState) { - if ((m_state != LoadFailed) && (m_service->lastError() == QMessageManager::NoError)) { + if ((m_state != LoadFailed) && (m_service->error() == QMessageManager::NoError)) { m_state = LoadFinished; } else { m_state = LoadFailed; @@ -887,7 +887,7 @@ void MessageViewWidget::stateChanged(QMessageService::State newState) if (newState == QMessageService::ActiveState) { m_state = Loading; } else if (newState == QMessageService::FinishedState) { - m_state = (m_service->lastError() == QMessageManager::NoError ? Loaded : LoadFailed); + m_state = (m_service->error() == QMessageManager::NoError ? Loaded : LoadFailed); } updateState(); @@ -1325,7 +1325,7 @@ bool MainWindow::eventFilter(QObject* source, QEvent* e) void MainWindow::serviceStateChanged(QMessageService::State newState) { - if ((newState == QMessageService::FinishedState) && (m_service->lastError() != QMessageManager::NoError)) + if ((newState == QMessageService::FinishedState) && (m_service->error() != QMessageManager::NoError)) QMessageBox::critical(this,"Error","One or more service actions failed"); } diff --git a/examples/writemessage/messagesender.cpp b/examples/writemessage/messagesender.cpp index b7d1aedf5c..e5faa553bd 100644 --- a/examples/writemessage/messagesender.cpp +++ b/examples/writemessage/messagesender.cpp @@ -283,7 +283,7 @@ void MessageSender::send() void MessageSender::stateChanged(QMessageService::State newState) { if (newState == QMessageService::FinishedState) { - if (service.lastError() == QMessageManager::NoError) { + if (service.error() == QMessageManager::NoError) { QMessageBox::information(0, tr("Success"), tr("Message sent successfully")); sendButton->setEnabled(true); } else { diff --git a/src/messaging/qmessagefilter_p.h b/src/messaging/qmessagefilter_p.h index 347518cb86..40a54eea90 100644 --- a/src/messaging/qmessagefilter_p.h +++ b/src/messaging/qmessagefilter_p.h @@ -177,12 +177,12 @@ public: static QMessageFilter from(QMessageFilterPrivate::Field field, const QVariant &value, QMessageDataComparator::InclusionComparator cmp); static QMessageFilterPrivate* implementation(const QMessageFilter &filter); - static MapiFolderIterator folderIterator(const QMessageFilter &filter, QMessageManager::Error *lastError, const MapiStorePtr &store); - static MapiStoreIterator storeIterator(const QMessageFilter &filter, QMessageManager::Error *lastError, const MapiSessionPtr &session); + static MapiFolderIterator folderIterator(const QMessageFilter &filter, QMessageManager::Error *error, const MapiStorePtr &store); + static MapiStoreIterator storeIterator(const QMessageFilter &filter, QMessageManager::Error *error, const MapiSessionPtr &session); static QList<QMessageFilter> subfilters(const QMessageFilter &filter); - static QMessageFilter preprocess(QMessageManager::Error *lastError, MapiSessionPtr session, const QMessageFilter &filter); - static bool preprocess(QMessageManager::Error *lastError, MapiSessionPtr session, QMessageFilter *filter); + static QMessageFilter preprocess(QMessageManager::Error *error, MapiSessionPtr session, const QMessageFilter &filter); + static bool preprocess(QMessageManager::Error *error, MapiSessionPtr session, QMessageFilter *filter); static bool isNonMatching(const QMessageFilter &filter); // Possibly should be in public QMessageFilter API static bool matchesMessageSimple(const QMessageFilter &filter, const QMessage &message); static bool matchesMessage(const QMessageFilter &filter, const QMessage &message, MapiStore *store); diff --git a/src/messaging/qmessagefilter_win.cpp b/src/messaging/qmessagefilter_win.cpp index e247bea319..0ba894608c 100644 --- a/src/messaging/qmessagefilter_win.cpp +++ b/src/messaging/qmessagefilter_win.cpp @@ -276,10 +276,10 @@ QMessageFilterPrivate* QMessageFilterPrivate::implementation(const QMessageFilte return filter.d_ptr; } -MapiFolderIterator QMessageFilterPrivate::folderIterator(const QMessageFilter &filter, QMessageManager::Error *lastError, const MapiStorePtr &store) +MapiFolderIterator QMessageFilterPrivate::folderIterator(const QMessageFilter &filter, QMessageManager::Error *error, const MapiStorePtr &store) { return MapiFolderIterator(store, - store->rootFolder(lastError), + store->rootFolder(error), filter.d_ptr->_standardFoldersInclude, filter.d_ptr->_standardFoldersExclude, filter.d_ptr->_parentInclude, @@ -288,9 +288,9 @@ MapiFolderIterator QMessageFilterPrivate::folderIterator(const QMessageFilter &f filter.d_ptr->_ancestorExclude); } -MapiStoreIterator QMessageFilterPrivate::storeIterator(const QMessageFilter &filter, QMessageManager::Error *lastError, const MapiSessionPtr &session) +MapiStoreIterator QMessageFilterPrivate::storeIterator(const QMessageFilter &filter, QMessageManager::Error *error, const MapiSessionPtr &session) { - return MapiStoreIterator(session->allStores(lastError), filter.d_ptr->_accountsInclude, filter.d_ptr->_accountsExclude); + return MapiStoreIterator(session->allStores(error), filter.d_ptr->_accountsInclude, filter.d_ptr->_accountsExclude); } QList<QMessageFilter> QMessageFilterPrivate::subfilters(const QMessageFilter &filter) @@ -314,15 +314,15 @@ QList<QMessageFilter> QMessageFilterPrivate::subfilters(const QMessageFilter &fi // Several filters require QMessageManager::queryX to be called to evaluate filter member variables, // namely byIds(const QMessageFilter &, ...), byParentAccountId(const QMessageAccountFilter &, ...), // byFolderIds(const QMessageFolderFilter &, ...), byAncestorFolderIds(const QMessageFolderFilter &, ...) -QMessageFilter QMessageFilterPrivate::preprocess(QMessageManager::Error *lastError, MapiSessionPtr session, const QMessageFilter &filter) +QMessageFilter QMessageFilterPrivate::preprocess(QMessageManager::Error *error, MapiSessionPtr session, const QMessageFilter &filter) { QMessageFilter result(filter); - QMessageFilterPrivate::preprocess(lastError, session, &result); + QMessageFilterPrivate::preprocess(error, session, &result); return result; } // returns true if filter is modified -bool QMessageFilterPrivate::preprocess(QMessageManager::Error *lastError, MapiSessionPtr session, QMessageFilter *filter) +bool QMessageFilterPrivate::preprocess(QMessageManager::Error *error, MapiSessionPtr session, QMessageFilter *filter) { if (!filter) return false; @@ -341,14 +341,14 @@ bool QMessageFilterPrivate::preprocess(QMessageManager::Error *lastError, MapiSe if (filter->d_ptr->_messageFilter->isEmpty()) { result = ~result; // match all for include, match none for exclude } else { - QMessageIdList ids(session->queryMessages(lastError, *filter->d_ptr->_messageFilter)); + QMessageIdList ids(session->queryMessages(error, *filter->d_ptr->_messageFilter)); result = QMessageFilter::byId(ids, inclusion ? QMessageDataComparator::Includes : QMessageDataComparator::Excludes); } } else if (filter->d_ptr->_field == AccountFilter) { if (filter->d_ptr->_accountFilter->isEmpty()) { result = ~result; // match all for include, match none for exclude } else { - QList<MapiStorePtr> stores(session->filterStores(lastError, *filter->d_ptr->_accountFilter)); + QList<MapiStorePtr> stores(session->filterStores(error, *filter->d_ptr->_accountFilter)); foreach(MapiStorePtr store, stores) { if (inclusion) { result |= QMessageFilter::byParentAccountId(store->id()); @@ -361,7 +361,7 @@ bool QMessageFilterPrivate::preprocess(QMessageManager::Error *lastError, MapiSe if (filter->d_ptr->_folderFilter->isEmpty()) { result = ~result; // match all for include, match none for exclude } else { - QList<MapiFolderPtr> folders(session->filterFolders(lastError, *filter->d_ptr->_folderFilter)); + QList<MapiFolderPtr> folders(session->filterFolders(error, *filter->d_ptr->_folderFilter)); foreach(MapiFolderPtr folder, folders) { if (inclusion) { result |= QMessageFilter::byParentFolderId(folder->id()); @@ -371,7 +371,7 @@ bool QMessageFilterPrivate::preprocess(QMessageManager::Error *lastError, MapiSe } } } else if (filter->d_ptr->_field == AncestorFilter) { - QList<MapiFolderPtr> folders(session->filterFolders(lastError, *filter->d_ptr->_folderFilter)); + QList<MapiFolderPtr> folders(session->filterFolders(error, *filter->d_ptr->_folderFilter)); foreach(MapiFolderPtr folder, folders) { if (inclusion) { result |= QMessageFilter::byAncestorFolderIds(folder->id()); @@ -383,8 +383,8 @@ bool QMessageFilterPrivate::preprocess(QMessageManager::Error *lastError, MapiSe QMessageFilter *l(filter->d_ptr->_left); QMessageFilter *r(filter->d_ptr->_right); bool modified(true); //TODO: should default to false but tst_qmessagestorekeys (id list exclusion 3) is failing - modified |= preprocess(lastError, session, l); - modified |= preprocess(lastError, session, r); + modified |= preprocess(error, session, l); + modified |= preprocess(error, session, r); // It's necessary to recombine bool op filters, because the operands may now have non-empty containerFilter parts, // specifically in the case that one of the operands has a *Filter field. diff --git a/src/messaging/qmessagefolderfilter_p.h b/src/messaging/qmessagefolderfilter_p.h index c48ec993ea..9247d8ccd1 100644 --- a/src/messaging/qmessagefolderfilter_p.h +++ b/src/messaging/qmessagefolderfilter_p.h @@ -140,8 +140,8 @@ public: #endif #ifdef Q_OS_WIN - static QMessageFolderFilter preprocess(QMessageManager::Error *lastError, MapiSessionPtr session, const QMessageFolderFilter &filter); - static void preprocess(QMessageManager::Error *lastError, MapiSessionPtr session, QMessageFolderFilter *filter); + static QMessageFolderFilter preprocess(QMessageManager::Error *error, MapiSessionPtr session, const QMessageFolderFilter &filter); + static void preprocess(QMessageManager::Error *error, MapiSessionPtr session, QMessageFolderFilter *filter); static bool matchesFolder(const QMessageFolderFilter &filter, const MapiFolderPtr &folder); static bool QMessageFolderFilterPrivate::isNonMatching(const QMessageFolderFilter &filter); #endif diff --git a/src/messaging/qmessagefolderfilter_win.cpp b/src/messaging/qmessagefolderfilter_win.cpp index 78eeea5690..130840e13c 100644 --- a/src/messaging/qmessagefolderfilter_win.cpp +++ b/src/messaging/qmessagefolderfilter_win.cpp @@ -245,14 +245,14 @@ bool QMessageFolderFilterPrivate::matchesFolder(const QMessageFolderFilter &filt return result; } -QMessageFolderFilter QMessageFolderFilterPrivate::preprocess(QMessageManager::Error *lastError, MapiSessionPtr session, const QMessageFolderFilter &filter) +QMessageFolderFilter QMessageFolderFilterPrivate::preprocess(QMessageManager::Error *error, MapiSessionPtr session, const QMessageFolderFilter &filter) { QMessageFolderFilter result(filter); - QMessageFolderFilterPrivate::preprocess(lastError, session, &result); + QMessageFolderFilterPrivate::preprocess(error, session, &result); return result; } -void QMessageFolderFilterPrivate::preprocess(QMessageManager::Error *lastError, MapiSessionPtr session, QMessageFolderFilter *filter) +void QMessageFolderFilterPrivate::preprocess(QMessageManager::Error *error, MapiSessionPtr session, QMessageFolderFilter *filter) { if (!filter) return; @@ -263,7 +263,7 @@ void QMessageFolderFilterPrivate::preprocess(QMessageManager::Error *lastError, result = ~QMessageFolderFilter(); } if (filter->d_ptr->_criterion == ParentAccountFilter) { - QList<MapiStorePtr> stores(session->filterStores(lastError, *filter->d_ptr->_accountFilter)); + QList<MapiStorePtr> stores(session->filterStores(error, *filter->d_ptr->_accountFilter)); foreach(MapiStorePtr store, stores) { if (inclusion) { result |= QMessageFolderFilter::byParentAccountId(store->id()); @@ -272,7 +272,7 @@ void QMessageFolderFilterPrivate::preprocess(QMessageManager::Error *lastError, } } } else if (filter->d_ptr->_criterion == ParentFolderFilter) { - QList<MapiFolderPtr> folders(session->filterFolders(lastError, *filter->d_ptr->_folderFilter)); + QList<MapiFolderPtr> folders(session->filterFolders(error, *filter->d_ptr->_folderFilter)); foreach(MapiFolderPtr folder, folders) { if (inclusion) { result |= QMessageFolderFilter::byParentFolderId(folder->id()); @@ -281,7 +281,7 @@ void QMessageFolderFilterPrivate::preprocess(QMessageManager::Error *lastError, } } } else if (filter->d_ptr->_criterion == AncestorFolderFilter) { - QList<MapiFolderPtr> folders(session->filterFolders(lastError, *filter->d_ptr->_folderFilter)); + QList<MapiFolderPtr> folders(session->filterFolders(error, *filter->d_ptr->_folderFilter)); foreach(MapiFolderPtr folder, folders) { if (inclusion) { result |= QMessageFolderFilter::byAncestorFolderIds(folder->id()); @@ -291,7 +291,7 @@ void QMessageFolderFilterPrivate::preprocess(QMessageManager::Error *lastError, } } else { foreach(QMessageFolderFilter *subfilter, filter->d_ptr->_arguments) { - preprocess(lastError, session, subfilter); + preprocess(error, session, subfilter); } return; } diff --git a/src/messaging/qmessagemanager.cpp b/src/messaging/qmessagemanager.cpp index 70bc7ddd42..d21ac1021f 100644 --- a/src/messaging/qmessagemanager.cpp +++ b/src/messaging/qmessagemanager.cpp @@ -76,9 +76,9 @@ QTM_BEGIN_NAMESPACE on data already on the device. See QMessageService for functions related to initiating network activity. - If a QMessageManager operation fails, the lastError() function will return an error code + If a QMessageManager operation fails, the error() function will return an error code value indicating the failure mode encountered. A successful operation will set the - lastError() result to QMessageManager::NoError. + error() result to QMessageManager::NoError. Messages in the messaging store are identified by QMessageId objects. The data associated with a message is retrieved in the form of a QMessage object using message(). Likewise @@ -158,13 +158,13 @@ QMessageManager::~QMessageManager() } /*! - \fn QMessageManager::lastError() const + \fn QMessageManager::error() const Returns the code of the last error condition reported by the messaging store. */ -QMessageManager::Error QMessageManager::lastError() const +QMessageManager::Error QMessageManager::error() const { - return store->lastError(); + return store->error(); } /*! @@ -179,7 +179,7 @@ QMessageManager::Error QMessageManager::lastError() const ids in the list returned. \a offset specifies how many ids to skip at the beginning of the list returned. - \sa lastError(), countMessages() + \sa error(), countMessages() */ QMessageIdList QMessageManager::queryMessages(const QMessageFilter &filter, const QMessageSortOrder &sortOrder, uint limit, uint offset) const { @@ -198,7 +198,7 @@ QMessageIdList QMessageManager::queryMessages(const QMessageFilter &filter, cons ids in the list returned. \a offset specifies how many ids to skip at the beginning of the list returned. - \sa lastError(), countMessages() + \sa error(), countMessages() */ QMessageIdList QMessageManager::queryMessages(const QMessageFilter &filter, const QList<QMessageSortOrder> &sortOrders, uint limit, uint offset) const { @@ -227,7 +227,7 @@ QMessageIdList QMessageManager::queryMessages(const QMessageFilter &filter, cons \a offset specifies how many ids to skip at the beginning of the list returned. \a matchFlags specifies the matching method to use. - \sa lastError(), countMessages() + \sa error(), countMessages() */ QMessageIdList QMessageManager::queryMessages(const QMessageFilter &filter, const QString &body, QMessageDataComparator::MatchFlags matchFlags, const QMessageSortOrder &sortOrder, uint limit, uint offset) const { @@ -248,7 +248,7 @@ QMessageIdList QMessageManager::queryMessages(const QMessageFilter &filter, cons \a offset specifies how many ids to skip at the beginning of the list returned. \a matchFlags specifies the matching method to use. - \sa lastError(), countMessages() + \sa error(), countMessages() */ QMessageIdList QMessageManager::queryMessages(const QMessageFilter &filter, const QString &body, QMessageDataComparator::MatchFlags matchFlags, const QList<QMessageSortOrder> &sortOrders, uint limit, uint offset) const { @@ -275,7 +275,7 @@ QMessageIdList QMessageManager::queryMessages(const QMessageFilter &filter, cons ids in the list returned. \a offset specifies how many ids to skip at the beginning of the list returned. - \sa lastError(), countFolders() + \sa error(), countFolders() */ QMessageFolderIdList QMessageManager::queryFolders(const QMessageFolderFilter &filter, const QMessageFolderSortOrder &sortOrder, uint limit, uint offset) const { @@ -294,7 +294,7 @@ QMessageFolderIdList QMessageManager::queryFolders(const QMessageFolderFilter &f ids in the list returned. \a offset specifies how many ids to skip at the beginning of the list returned. - \sa lastError(), countFolders() + \sa error(), countFolders() */ QMessageFolderIdList QMessageManager::queryFolders(const QMessageFolderFilter &filter, const QList<QMessageFolderSortOrder> &sortOrders, uint limit, uint offset) const { @@ -321,7 +321,7 @@ QMessageFolderIdList QMessageManager::queryFolders(const QMessageFolderFilter &f ids in the list returned. \a offset specifies how many ids to skip at the beginning of the list returned. - \sa lastError(), countAccounts() + \sa error(), countAccounts() */ QMessageAccountIdList QMessageManager::queryAccounts(const QMessageAccountFilter &filter, const QMessageAccountSortOrder &sortOrder, uint limit, uint offset) const { @@ -340,7 +340,7 @@ QMessageAccountIdList QMessageManager::queryAccounts(const QMessageAccountFilter ids in the list returned. \a offset specifies how many ids to skip at the beginning of the list returned. - \sa lastError(), countAccounts() + \sa error(), countAccounts() */ QMessageAccountIdList QMessageManager::queryAccounts(const QMessageAccountFilter &filter, const QList<QMessageAccountSortOrder> &sortOrders, uint limit, uint offset) const { @@ -360,7 +360,7 @@ QMessageAccountIdList QMessageManager::queryAccounts(const QMessageAccountFilter in QMessageFilter \a filter. If \a filter is empty the count of all available messages is returned. - \sa lastError(), queryMessages() + \sa error(), queryMessages() */ int QMessageManager::countMessages(const QMessageFilter& filter) const { @@ -374,7 +374,7 @@ int QMessageManager::countMessages(const QMessageFilter& filter) const in QMessageFolderFilter \a filter. If \a filter is empty the count of all available folders is returned. - \sa lastError(), queryFolders() + \sa error(), queryFolders() */ int QMessageManager::countFolders(const QMessageFolderFilter& filter) const { @@ -388,7 +388,7 @@ int QMessageManager::countFolders(const QMessageFolderFilter& filter) const in QMessageAccountFilter \a filter. If \a filter is empty the count of all available accounts is returned. - \sa lastError(), queryAccounts() + \sa error(), queryAccounts() */ int QMessageManager::countAccounts(const QMessageAccountFilter& filter) const { diff --git a/src/messaging/qmessagemanager.h b/src/messaging/qmessagemanager.h index 5833d92a6f..f9ea61d8d2 100644 --- a/src/messaging/qmessagemanager.h +++ b/src/messaging/qmessagemanager.h @@ -90,7 +90,7 @@ public: QMessageManager(QObject *parent = 0); ~QMessageManager(); - QMessageManager::Error lastError() const; + QMessageManager::Error error() const; QMessageIdList queryMessages(const QMessageFilter &filter = QMessageFilter(), const QMessageSortOrder &sortOrder = QMessageSortOrder(), uint limit = 0, uint offset = 0) const; QMessageIdList queryMessages(const QMessageFilter &filter, const QList<QMessageSortOrder> &sortOrders, uint limit = 0, uint offset = 0) const; diff --git a/src/messaging/qmessageservice.cpp b/src/messaging/qmessageservice.cpp index 636f8d8da6..114c2a4a64 100644 --- a/src/messaging/qmessageservice.cpp +++ b/src/messaging/qmessageservice.cpp @@ -65,7 +65,7 @@ QTM_BEGIN_NAMESPACE Service request operations report progress information by emitting the progressChanged() signal. - If a requested operation fails after being initiated then the lastError() + If a requested operation fails after being initiated then the error() function will return a value indicating the failure mode encountered. A client may attempt to cancel a requested operation after it has been @@ -339,7 +339,7 @@ QTM_BEGIN_NAMESPACE */ /*! - \fn QMessageService::lastError() const + \fn QMessageService::error() const Returns a value indicating the last error condition encountered by the operation. */ diff --git a/src/messaging/qmessageservice.h b/src/messaging/qmessageservice.h index e7ee05de8a..83e237d894 100644 --- a/src/messaging/qmessageservice.h +++ b/src/messaging/qmessageservice.h @@ -81,7 +81,7 @@ public: bool exportUpdates(const QMessageAccountId &id); State state() const; - QMessageManager::Error lastError() const; + QMessageManager::Error error() const; public slots: void cancel(); diff --git a/src/messaging/qmessageservice_maemo.cpp b/src/messaging/qmessageservice_maemo.cpp index 392925750b..47aaab953f 100644 --- a/src/messaging/qmessageservice_maemo.cpp +++ b/src/messaging/qmessageservice_maemo.cpp @@ -131,7 +131,7 @@ void QMessageService::cancel() { } -QMessageManager::Error QMessageService::lastError() const +QMessageManager::Error QMessageService::error() const { return QMessageManager::NoError; } diff --git a/src/messaging/qmessageservice_qmf.cpp b/src/messaging/qmessageservice_qmf.cpp index 02ad01ef9f..0d73af4bfa 100644 --- a/src/messaging/qmessageservice_qmf.cpp +++ b/src/messaging/qmessageservice_qmf.cpp @@ -586,7 +586,7 @@ void QMessageService::cancel() } } -QMessageManager::Error QMessageService::lastError() const +QMessageManager::Error QMessageService::error() const { return d_ptr->_error; } diff --git a/src/messaging/qmessageservice_symbian.cpp b/src/messaging/qmessageservice_symbian.cpp index c8a5277f80..c8d7f6def2 100644 --- a/src/messaging/qmessageservice_symbian.cpp +++ b/src/messaging/qmessageservice_symbian.cpp @@ -131,9 +131,9 @@ bool QMessageServicePrivate::retrieveHeader(const QMessageId& id) void QMessageServicePrivate::setFinished(bool successful, void (QMessageService::*signal)(QMessageService::State)) { - if (!successful && (_lastError == QMessageManager::NoError)) { + if (!successful && (_error == QMessageManager::NoError)) { // We must report an error of some sort - _lastError = QMessageManager::RequestIncomplete; + _error = QMessageManager::RequestIncomplete; } _state = QMessageService::FinishedState; @@ -162,7 +162,7 @@ bool QMessageService::queryMessages(const QMessageFilter &filter, const QMessage } d_ptr->_active = true; - d_ptr->_lastError = QMessageManager::NoError; + d_ptr->_error = QMessageManager::NoError; if (d_ptr->queryMessages(filter, sortOrder, limit, offset)) { d_ptr->_state = QMessageService::ActiveState; @@ -181,7 +181,7 @@ bool QMessageService::queryMessages(const QMessageFilter &filter, const QString } d_ptr->_active = true; - d_ptr->_lastError = QMessageManager::NoError; + d_ptr->_error = QMessageManager::NoError; if (d_ptr->queryMessages(filter, body, matchFlags, sortOrder, limit, offset)) { d_ptr->_state = QMessageService::ActiveState; @@ -200,7 +200,7 @@ bool QMessageService::countMessages(const QMessageFilter &filter) } d_ptr->_active = true; - d_ptr->_lastError = QMessageManager::NoError; + d_ptr->_error = QMessageManager::NoError; if (d_ptr->countMessages(filter)) { d_ptr->_state = QMessageService::ActiveState; @@ -219,7 +219,7 @@ bool QMessageService::send(QMessage &message) } d_ptr->_active = true; - d_ptr->_lastError = QMessageManager::NoError; + d_ptr->_error = QMessageManager::NoError; bool retVal = true; @@ -228,7 +228,7 @@ bool QMessageService::send(QMessage &message) // Check message type if(message.type() == QMessage::AnyType || message.type() == QMessage::NoType) { - d_ptr->_lastError = QMessageManager::ConstraintFailure; + d_ptr->_error = QMessageManager::ConstraintFailure; retVal = false; } @@ -238,7 +238,7 @@ bool QMessageService::send(QMessage &message) if (!accountId.isValid()) { accountId = QMessageAccount::defaultAccount(message.type()); if (!accountId.isValid()) { - d_ptr->_lastError = QMessageManager::InvalidId; + d_ptr->_error = QMessageManager::InvalidId; retVal = false; } } @@ -248,7 +248,7 @@ bool QMessageService::send(QMessage &message) // Check account/message type compatibility QMessageAccount account(accountId); if (!(account.messageTypes() & message.type())) { - d_ptr->_lastError = QMessageManager::ConstraintFailure; + d_ptr->_error = QMessageManager::ConstraintFailure; retVal = false; } } @@ -257,7 +257,7 @@ bool QMessageService::send(QMessage &message) // Check recipients QMessageAddressList recipients = message.to() + message.bcc() + message.cc(); if (recipients.isEmpty()) { - d_ptr->_lastError = QMessageManager::ConstraintFailure; + d_ptr->_error = QMessageManager::ConstraintFailure; return false; } } @@ -290,7 +290,7 @@ bool QMessageService::compose(const QMessage &message) } d_ptr->_active = true; - d_ptr->_lastError = QMessageManager::NoError; + d_ptr->_error = QMessageManager::NoError; bool retVal = true; d_ptr->_state = QMessageService::ActiveState; @@ -309,7 +309,7 @@ bool QMessageService::retrieveHeader(const QMessageId& id) } d_ptr->_active = true; - d_ptr->_lastError = QMessageManager::NoError; + d_ptr->_error = QMessageManager::NoError; bool retVal = true; d_ptr->_state = QMessageService::ActiveState; @@ -328,7 +328,7 @@ bool QMessageService::retrieveBody(const QMessageId& id) } d_ptr->_active = true; - d_ptr->_lastError = QMessageManager::NoError; + d_ptr->_error = QMessageManager::NoError; bool retVal = true; d_ptr->_state = QMessageService::ActiveState; @@ -347,7 +347,7 @@ bool QMessageService::retrieve(const QMessageId &messageId, const QMessageConten } d_ptr->_active = true; - d_ptr->_lastError = QMessageManager::NoError; + d_ptr->_error = QMessageManager::NoError; bool retVal = true; d_ptr->_state = QMessageService::ActiveState; @@ -366,7 +366,7 @@ bool QMessageService::show(const QMessageId& id) } d_ptr->_active = true; - d_ptr->_lastError = QMessageManager::NoError; + d_ptr->_error = QMessageManager::NoError; bool retVal = true; d_ptr->_state = QMessageService::ActiveState; @@ -393,9 +393,9 @@ void QMessageService::cancel() { } -QMessageManager::Error QMessageService::lastError() const +QMessageManager::Error QMessageService::error() const { - return d_ptr->_lastError; + return d_ptr->_error; } #include "moc_qmessageservice_symbian_p.cpp" diff --git a/src/messaging/qmessageservice_symbian_p.h b/src/messaging/qmessageservice_symbian_p.h index dd20c0c22d..13f0029258 100644 --- a/src/messaging/qmessageservice_symbian_p.h +++ b/src/messaging/qmessageservice_symbian_p.h @@ -78,7 +78,7 @@ signals: private: QMessageService *q_ptr; QMessageService::State _state; - QMessageManager::Error _lastError; + QMessageManager::Error _error; int _actionId; bool _active; diff --git a/src/messaging/qmessageservice_win.cpp b/src/messaging/qmessageservice_win.cpp index 7c1262dbec..dec48ab7ea 100644 --- a/src/messaging/qmessageservice_win.cpp +++ b/src/messaging/qmessageservice_win.cpp @@ -108,7 +108,7 @@ public: QMessageService* q_ptr; QMessageManager _manager; bool _active; - QMessageManager::Error _lastError; + QMessageManager::Error _error; QMessageIdList _candidateIds; int _count; QMessageService::State _state; @@ -162,7 +162,7 @@ void QueryThread::run() WinHelpers::MapiInitializationToken token(WinHelpers::initializeMapi()); _parent->_candidateIds = _manager.queryMessages(_filter, _body, _matchFlags, _ordering, _limit, _offset); - _parent->_lastError = _manager.lastError(); + _parent->_error = _manager.error(); emit completed(); } @@ -177,7 +177,7 @@ void QMessageServicePrivate::completed() void QMessageServicePrivate::reportMatchingIds() { - if (_lastError == QMessageManager::NoError) { + if (_error == QMessageManager::NoError) { emit messagesFound(_candidateIds); } @@ -186,7 +186,7 @@ void QMessageServicePrivate::reportMatchingIds() void QMessageServicePrivate::reportMessagesCounted() { - if (_lastError == QMessageManager::NoError) { + if (_error == QMessageManager::NoError) { emit messagesCounted(_candidateIds.count()); } completed(); @@ -243,7 +243,7 @@ bool QMessageServicePrivate::send(const QMessage& message, bool showComposer) if(message.type() == QMessage::AnyType || message.type() == QMessage::NoType) { qWarning() << "Unsupported message type for sending/composition"; - _lastError = QMessageManager::ConstraintFailure; + _error = QMessageManager::ConstraintFailure; return false; } @@ -257,7 +257,7 @@ bool QMessageServicePrivate::send(const QMessage& message, bool showComposer) if(!accountId.isValid()) { qWarning() << "Invalid account for sending/composition"; - _lastError = QMessageManager::InvalidId; + _error = QMessageManager::InvalidId; return false; } } @@ -268,7 +268,7 @@ bool QMessageServicePrivate::send(const QMessage& message, bool showComposer) if(!(account.messageTypes() & message.type())) { qWarning() << "Message type unsupported by account"; - _lastError = QMessageManager::ConstraintFailure; + _error = QMessageManager::ConstraintFailure; return false; } @@ -363,7 +363,7 @@ bool QMessageServicePrivate::send(const QMessage& message, bool showComposer) if(FAILED(MailComposeMessage(&mcf))) { - _lastError = QMessageManager::FrameworkFault; + _error = QMessageManager::FrameworkFault; qWarning() << "MailComposeMessage failed"; return false; } @@ -377,12 +377,12 @@ bool QMessageServicePrivate::send(const QMessage& message, bool showComposer) if(recipients.isEmpty() && !showComposer) { qWarning() << "Message must have recipients for sending"; - _lastError = QMessageManager::ConstraintFailure; + _error = QMessageManager::ConstraintFailure; return false; } - MapiSessionPtr mapiSession(MapiSession::createSession(&_lastError)); - if (_lastError != QMessageManager::NoError) + MapiSessionPtr mapiSession(MapiSession::createSession(&_error)); + if (_error != QMessageManager::NoError) { qWarning() << "Could not create MAPI session for sending"; return false; @@ -397,9 +397,9 @@ bool QMessageServicePrivate::send(const QMessage& message, bool showComposer) if(!outgoing.parentAccountId().isValid()) outgoing.setParentAccountId(accountId); - MapiStorePtr mapiStore = mapiSession->findStore(&_lastError, outgoing.parentAccountId(),false); + MapiStorePtr mapiStore = mapiSession->findStore(&_error, outgoing.parentAccountId(),false); - if(mapiStore.isNull() || _lastError != QMessageManager::NoError) + if(mapiStore.isNull() || _error != QMessageManager::NoError) { qWarning() << "Unable to retrieve MAPI store for account"; return false; @@ -407,20 +407,20 @@ bool QMessageServicePrivate::send(const QMessage& message, bool showComposer) //try first to create message in outbox for store, failing that attempt draft - MapiFolderPtr mapiFolder = mapiStore->findFolder(&_lastError,QMessage::OutboxFolder); + MapiFolderPtr mapiFolder = mapiStore->findFolder(&_error,QMessage::OutboxFolder); - if( mapiFolder.isNull() || _lastError != QMessageManager::NoError ) { + if( mapiFolder.isNull() || _error != QMessageManager::NoError ) { qWarning() << "Unable to retrieve outbox MAPI folder for sending, attempting drafts..."; - mapiFolder = mapiStore->findFolder(&_lastError,QMessage::DraftsFolder); - if(mapiFolder.isNull() || _lastError != QMessageManager::NoError) { + mapiFolder = mapiStore->findFolder(&_error,QMessage::DraftsFolder); + if(mapiFolder.isNull() || _error != QMessageManager::NoError) { qWarning() << "Unable to retrieve drafts MAPI folder for sending"; return false; } } - IMessage* mapiMessage = mapiFolder->createMessage(&_lastError, outgoing, mapiSession, DontSavePropertyChanges); + IMessage* mapiMessage = mapiFolder->createMessage(&_error, outgoing, mapiSession, DontSavePropertyChanges); - if(!mapiMessage || _lastError != QMessageManager::NoError) + if(!mapiMessage || _error != QMessageManager::NoError) { qWarning() << "Unable to create MAPI message from source"; mapiRelease(mapiMessage); @@ -437,7 +437,7 @@ bool QMessageServicePrivate::send(const QMessage& message, bool showComposer) if(!result) { qWarning() << "MapiForm::Show failed"; - _lastError = QMessageManager::FrameworkFault; + _error = QMessageManager::FrameworkFault; return false; } } @@ -447,7 +447,7 @@ bool QMessageServicePrivate::send(const QMessage& message, bool showComposer) if(FAILED(mapiMessage->SubmitMessage(0))) { qWarning() << "MAPI SubmitMessage failed."; - _lastError = QMessageManager::FrameworkFault; + _error = QMessageManager::FrameworkFault; mapiRelease(mapiMessage); return false; } @@ -464,7 +464,7 @@ bool QMessageServicePrivate::show(const QMessageId& messageId) { if(!messageId.isValid()) { - _lastError = QMessageManager::InvalidId; + _error = QMessageManager::InvalidId; qWarning() << "Invalid QMessageId"; return false; } @@ -475,15 +475,15 @@ bool QMessageServicePrivate::show(const QMessageId& messageId) if(FAILED(MailDisplayMessage(entryIdPtr,entryId.length()))) { qWarning() << "MailDisplayMessage failed"; - _lastError = QMessageManager::FrameworkFault; + _error = QMessageManager::FrameworkFault; return false; } return true; #else - MapiSessionPtr mapiSession(MapiSession::createSession(&_lastError)); - if (_lastError != QMessageManager::NoError) + MapiSessionPtr mapiSession(MapiSession::createSession(&_error)); + if (_error != QMessageManager::NoError) { qWarning() << "Could not create MAPI seesion"; return false; @@ -493,24 +493,24 @@ bool QMessageServicePrivate::show(const QMessageId& messageId) MapiRecordKey folderRecordKey = QMessageIdPrivate::folderRecordKey(messageId); MapiRecordKey storeRecordKey = QMessageIdPrivate::storeRecordKey(messageId); - MapiStorePtr mapiStore = mapiSession->findStore(&_lastError,QMessageAccountIdPrivate::from(storeRecordKey)); + MapiStorePtr mapiStore = mapiSession->findStore(&_error,QMessageAccountIdPrivate::from(storeRecordKey)); - if(mapiStore.isNull() || _lastError != QMessageManager::NoError) + if(mapiStore.isNull() || _error != QMessageManager::NoError) { qWarning() << "Unable to retrieve MAPI store for account"; return false; } - MapiFolderPtr mapiFolder = mapiStore->openFolderWithKey(&_lastError,folderRecordKey); + MapiFolderPtr mapiFolder = mapiStore->openFolderWithKey(&_error,folderRecordKey); - if( mapiFolder.isNull() || _lastError != QMessageManager::NoError ) { + if( mapiFolder.isNull() || _error != QMessageManager::NoError ) { qWarning() << "Unable to retrieve MAPI folder for message"; return false; } - IMessage* mapiMessage = mapiFolder->openMessage(&_lastError,entryId); + IMessage* mapiMessage = mapiFolder->openMessage(&_error,entryId); - if(!mapiMessage || _lastError != QMessageManager::NoError) + if(!mapiMessage || _error != QMessageManager::NoError) { qWarning() << "Unable to retrieve MAPI message"; mapiRelease(mapiMessage); @@ -524,7 +524,7 @@ bool QMessageServicePrivate::show(const QMessageId& messageId) if(!result) { qWarning() << "MapiForm::show failed."; - _lastError = QMessageManager::FrameworkFault; + _error = QMessageManager::FrameworkFault; return false; } @@ -541,32 +541,32 @@ bool QMessageServicePrivate::isPartiallyDownloaded(const QMessageId& id, bool co { if(!id.isValid()) { - _lastError = QMessageManager::InvalidId; + _error = QMessageManager::InvalidId; qWarning() << "Invalid QMessageId"; return false; } - MapiSessionPtr mapiSession(MapiSession::createSession(&_lastError)); + MapiSessionPtr mapiSession(MapiSession::createSession(&_error)); - if (_lastError != QMessageManager::NoError) + if (_error != QMessageManager::NoError) { qWarning() << "Could not create MAPI session"; return false; } - MapiStorePtr mapiStore = mapiSession->openStore(&_lastError,QMessageIdPrivate::storeRecordKey(id)); + MapiStorePtr mapiStore = mapiSession->openStore(&_error,QMessageIdPrivate::storeRecordKey(id)); - if(mapiStore.isNull() || _lastError != QMessageManager::NoError) { + if(mapiStore.isNull() || _error != QMessageManager::NoError) { qWarning() << "Unable to retrieve MAPI store for account"; return false; } - IMessage* message = mapiStore->openMessage(&_lastError,QMessageIdPrivate::entryId(id)); + IMessage* message = mapiStore->openMessage(&_error,QMessageIdPrivate::entryId(id)); ULONG status = 0; if(!getMapiProperty(message,PR_MSG_STATUS,&status)) { qWarning() << "Unable to get MAPI message status flags"; - _lastError = QMessageManager::FrameworkFault; + _error = QMessageManager::FrameworkFault; return false; } else @@ -582,35 +582,35 @@ bool QMessageServicePrivate::markForDownload(const QMessageId& id, bool includeA { if(!id.isValid()) { - _lastError = QMessageManager::InvalidId; + _error = QMessageManager::InvalidId; qWarning() << "Invalid QMessageId"; return false; } - MapiSessionPtr mapiSession(MapiSession::createSession(&_lastError)); + MapiSessionPtr mapiSession(MapiSession::createSession(&_error)); - if (_lastError != QMessageManager::NoError) + if (_error != QMessageManager::NoError) { qWarning() << "Could not create MAPI session"; return false; } - MapiStorePtr mapiStore = mapiSession->openStore(&_lastError,QMessageIdPrivate::storeRecordKey(id)); + MapiStorePtr mapiStore = mapiSession->openStore(&_error,QMessageIdPrivate::storeRecordKey(id)); - if(mapiStore.isNull() || _lastError != QMessageManager::NoError) + if(mapiStore.isNull() || _error != QMessageManager::NoError) { qWarning() << "Unable to retrieve MAPI store for message account"; return false; } - IMessage* message = mapiStore->openMessage(&_lastError,QMessageIdPrivate::entryId(id)); + IMessage* message = mapiStore->openMessage(&_error,QMessageIdPrivate::entryId(id)); ULONG status = 0; if(!getMapiProperty(message,PR_MSG_STATUS,&status)) { qWarning() << "Unable to get MAPI message status flags"; - _lastError = QMessageManager::FrameworkFault; + _error = QMessageManager::FrameworkFault; return false; } else @@ -624,7 +624,7 @@ bool QMessageServicePrivate::markForDownload(const QMessageId& id, bool includeA if(!setMapiProperty(message, PR_MSG_STATUS, status)) { qWarning() << "Could not mark the MAPI message for download!"; - _lastError = QMessageManager::FrameworkFault; + _error = QMessageManager::FrameworkFault; return false; } @@ -648,7 +648,7 @@ bool QMessageServicePrivate::synchronize(const QMessageAccountId& id) if(!id.isValid()) { qWarning() << "Cannot synchronize invalid QMessageAccountId"; - _lastError = QMessageManager::InvalidId; + _error = QMessageManager::InvalidId; return false; } @@ -656,7 +656,7 @@ bool QMessageServicePrivate::synchronize(const QMessageAccountId& id) if(FAILED(MailSyncMessages(LptstrFromQString(account.name()),MCF_ACCOUNT_IS_NAME | MCF_RUN_IN_BACKGROUND))) { qWarning() << "MailSyncMessages failed for account: " << account.name(); - _lastError = QMessageManager::FrameworkFault; + _error = QMessageManager::FrameworkFault; return false; } return true; @@ -667,7 +667,7 @@ bool QMessageServicePrivate::registerUpdates(const QMessageId& id) if(!id.isValid()) { qWarning() << "Cannot register for update notifications on invalid QMessageId"; - _lastError = QMessageManager::InvalidId; + _error = QMessageManager::InvalidId; return false; } @@ -694,7 +694,7 @@ bool QMessageServicePrivate::retrieveBody(const QMessage& partialMessage) if(partialMessage.type() != QMessage::Email) { qWarning() << "Cannot retrieve body for non-email message type"; - _lastError = QMessageManager::ConstraintFailure; + _error = QMessageManager::ConstraintFailure; return false; } @@ -708,15 +708,15 @@ bool QMessageServicePrivate::retrieveBody(const QMessage& partialMessage) } else QTimer::singleShot(0,this,SLOT(completed())); - return (_lastError == QMessageManager::NoError); + return (_error == QMessageManager::NoError); } #endif void QMessageServicePrivate::setFinished(bool successful) { - if (!successful && (_lastError == QMessageManager::NoError)) { - _lastError = QMessageManager::RequestIncomplete; + if (!successful && (_error == QMessageManager::NoError)) { + _error = QMessageManager::RequestIncomplete; } completed(); @@ -756,13 +756,13 @@ bool QMessageService::queryMessages(const QMessageFilter &filter, const QString d_ptr->_active = true; - d_ptr->_lastError = QMessageManager::NoError; + d_ptr->_error = QMessageManager::NoError; d_ptr->_state = QMessageService::ActiveState; emit stateChanged(d_ptr->_state); #if 0 d_ptr->_candidateIds = d_ptr->_manager.queryMessages(filter, body, matchFlags, sortOrder, limit, offset); - d_ptr->_lastError = d_ptr->_manager.lastError(); + d_ptr->_error = d_ptr->_manager.error(); QTimer::singleShot(0,d_ptr,SLOT(reportMatchingIds())); #else // Perform the query in another thread to keep the UI thread free @@ -790,7 +790,7 @@ bool QMessageService::countMessages(const QMessageFilter &filter) return false; } d_ptr->_active = true; - d_ptr->_lastError = QMessageManager::NoError; + d_ptr->_error = QMessageManager::NoError; d_ptr->_state = QMessageService::ActiveState; emit stateChanged(d_ptr->_state); @@ -820,7 +820,7 @@ bool QMessageService::send(QMessage &message) d_ptr->_active = true; d_ptr->_state = QMessageService::ActiveState; - d_ptr->_lastError = QMessageManager::NoError; + d_ptr->_error = QMessageManager::NoError; emit stateChanged(d_ptr->_state); bool result = d_ptr->send(message); @@ -838,7 +838,7 @@ bool QMessageService::compose(const QMessage &message) d_ptr->_active = true; d_ptr->_state = QMessageService::ActiveState; - d_ptr->_lastError = QMessageManager::NoError; + d_ptr->_error = QMessageManager::NoError; emit stateChanged(d_ptr->_state); bool result = d_ptr->send(message,true); @@ -856,7 +856,7 @@ bool QMessageService::retrieveHeader(const QMessageId& id) return false; } - d_ptr->_lastError = QMessageManager::NoError; + d_ptr->_error = QMessageManager::NoError; d_ptr->setFinished(true); return true; @@ -874,29 +874,29 @@ bool QMessageService::retrieveBody(const QMessageId& id) d_ptr->_active = true; d_ptr->_state = ActiveState; - d_ptr->_lastError = QMessageManager::NoError; + d_ptr->_error = QMessageManager::NoError; emit stateChanged(d_ptr->_state); if(!id.isValid()) { qWarning() << "Invalid QMessageId"; - d_ptr->_lastError = QMessageManager::InvalidId; + d_ptr->_error = QMessageManager::InvalidId; } QMessage message; - if(d_ptr->_lastError == QMessageManager::NoError) + if(d_ptr->_error == QMessageManager::NoError) { message = QMessage(id); - d_ptr->_lastError = QMessageManager().lastError(); + d_ptr->_error = QMessageManager().error(); } - if(d_ptr->_lastError == QMessageManager::NoError) + if(d_ptr->_error == QMessageManager::NoError) d_ptr->retrieveBody(message); //emit failure immediately - if (d_ptr->_lastError != QMessageManager::NoError) { + if (d_ptr->_error != QMessageManager::NoError) { d_ptr->setFinished(false); return false; } @@ -906,7 +906,7 @@ bool QMessageService::retrieveBody(const QMessageId& id) #else Q_UNUSED(id); - d_ptr->_lastError = QMessageManager::NotYetImplemented; + d_ptr->_error = QMessageManager::NotYetImplemented; d_ptr->setFinished(false); return false; #endif @@ -924,24 +924,24 @@ bool QMessageService::retrieve(const QMessageId& messageId, const QMessageConten d_ptr->_active = true; d_ptr->_state = ActiveState; - d_ptr->_lastError = QMessageManager::NoError; + d_ptr->_error = QMessageManager::NoError; emit stateChanged(d_ptr->_state); if(!messageId.isValid()) { qWarning() << "Invalid QMessageId"; - d_ptr->_lastError = QMessageManager::InvalidId; + d_ptr->_error = QMessageManager::InvalidId; } QMessage message; - if(d_ptr->_lastError == QMessageManager::NoError) + if(d_ptr->_error == QMessageManager::NoError) { message = QMessage(messageId); - d_ptr->_lastError = d_ptr->_manager.lastError(); + d_ptr->_error = d_ptr->_manager.error(); } - if(d_ptr->_lastError == QMessageManager::NoError) + if(d_ptr->_error == QMessageManager::NoError) { bool isBodyContainer = message.bodyId() == id; if(isBodyContainer) @@ -950,7 +950,7 @@ bool QMessageService::retrieve(const QMessageId& messageId, const QMessageConten } //emit failure immediately - if (d_ptr->_lastError != QMessageManager::NoError) { + if (d_ptr->_error != QMessageManager::NoError) { d_ptr->setFinished(false); return false; } @@ -961,7 +961,7 @@ bool QMessageService::retrieve(const QMessageId& messageId, const QMessageConten Q_UNUSED(messageId) Q_UNUSED(id) - d_ptr->_lastError = QMessageManager::NotYetImplemented; + d_ptr->_error = QMessageManager::NotYetImplemented; d_ptr->setFinished(false); #endif @@ -977,7 +977,7 @@ bool QMessageService::show(const QMessageId& id) d_ptr->_active = true; d_ptr->_state = ActiveState; - d_ptr->_lastError = QMessageManager::NoError; + d_ptr->_error = QMessageManager::NoError; emit stateChanged(d_ptr->_state); bool result = d_ptr->show(id); @@ -995,7 +995,7 @@ bool QMessageService::exportUpdates(const QMessageAccountId &id) return false; } - d_ptr->_lastError = QMessageManager::NotYetImplemented; + d_ptr->_error = QMessageManager::NotYetImplemented; d_ptr->setFinished(false); return false; @@ -1016,7 +1016,7 @@ void QMessageService::cancel() if(awaitingBodyRetrieval) { d_ptr->unregisterUpdates(); - d_ptr->_lastError = QMessageManager::NoError; + d_ptr->_error = QMessageManager::NoError; d_ptr->_state = QMessageService::InactiveState; d_ptr->_active = false; emit stateChanged(d_ptr->_state); @@ -1027,9 +1027,9 @@ void QMessageService::cancel() #endif } -QMessageManager::Error QMessageService::lastError() const +QMessageManager::Error QMessageService::error() const { - return d_ptr->_lastError; + return d_ptr->_error; } #include <qmessageservice_win.moc> diff --git a/src/messaging/qmessagesortorder_p.h b/src/messaging/qmessagesortorder_p.h index 9318f8fb1a..94a29b4534 100644 --- a/src/messaging/qmessagesortorder_p.h +++ b/src/messaging/qmessagesortorder_p.h @@ -67,7 +67,7 @@ public: enum Field { Type = 0, Sender, Recipients, Subject, TimeStamp, ReceptionTimeStamp, Read, HasAttachments, Incoming, Removed, Priority, Size }; QList<QPair<Field, Qt::SortOrder> > _fieldOrderList; static bool lessThan(const QMessageSortOrder &sortOrder, const QMessage &left, const QMessage &right); - static void sortTable(QMessageManager::Error *lastError, const QMessageSortOrder &sortOrder, LPMAPITABLE); + static void sortTable(QMessageManager::Error *error, const QMessageSortOrder &sortOrder, LPMAPITABLE); static QMessageSortOrder from(QMessageSortOrderPrivate::Field field, Qt::SortOrder order); static bool isFilterType(const QMessageSortOrder &sortOrder); diff --git a/src/messaging/qmessagesortorder_win.cpp b/src/messaging/qmessagesortorder_win.cpp index b3b0001f18..b436ec4b72 100644 --- a/src/messaging/qmessagesortorder_win.cpp +++ b/src/messaging/qmessagesortorder_win.cpp @@ -118,7 +118,7 @@ struct MapiSortOrderSet SSortOrder aSort[maxSortOrders]; }; -void QMessageSortOrderPrivate::sortTable(QMessageManager::Error *lastError, const QMessageSortOrder &sortOrder, LPMAPITABLE messagesTable) +void QMessageSortOrderPrivate::sortTable(QMessageManager::Error *error, const QMessageSortOrder &sortOrder, LPMAPITABLE messagesTable) { MapiSortOrderSet multiSort; QMessageSortOrderPrivate *d(sortOrder.d_ptr); @@ -172,7 +172,7 @@ void QMessageSortOrderPrivate::sortTable(QMessageManager::Error *lastError, cons //Note: Windows Mobile does not support multiple sort levels multiSort.cSorts = qMin<int>(maxSortOrders, fieldOrderList.count()); if (messagesTable->SortTable(reinterpret_cast<SSortOrderSet*>(&multiSort), 0) != S_OK) { - *lastError = QMessageManager::NotYetImplemented; + *error = QMessageManager::NotYetImplemented; return; } return; diff --git a/src/messaging/qmessagestore.h b/src/messaging/qmessagestore.h index d15d4823fe..2bfb3c384c 100644 --- a/src/messaging/qmessagestore.h +++ b/src/messaging/qmessagestore.h @@ -66,7 +66,7 @@ class QMessageStore : public QObject friend class QMessageStorePrivate; public: - QMessageManager::Error lastError() const; + QMessageManager::Error error() const; QMessageIdList queryMessages(const QMessageFilter &filter = QMessageFilter(), const QMessageSortOrder &sortOrder = QMessageSortOrder(), uint limit = 0, uint offset = 0) const; QMessageIdList queryMessages(const QMessageFilter &filter, const QString &body, QMessageDataComparator::MatchFlags matchFlags = 0, const QMessageSortOrder &sortOrder = QMessageSortOrder(), uint limit = 0, uint offset = 0) const; diff --git a/src/messaging/qmessagestore_maemo.cpp b/src/messaging/qmessagestore_maemo.cpp index 7927e6dda5..d71be627a4 100644 --- a/src/messaging/qmessagestore_maemo.cpp +++ b/src/messaging/qmessagestore_maemo.cpp @@ -91,7 +91,7 @@ QMessageStore* QMessageStore::instance() return d->q_ptr; } -QMessageManager::Error QMessageManager::lastError() const +QMessageManager::Error QMessageManager::error() const { return NotYetImplemented; } diff --git a/src/messaging/qmessagestore_qmf.cpp b/src/messaging/qmessagestore_qmf.cpp index 68049fc41c..b7cbe7c8c9 100644 --- a/src/messaging/qmessagestore_qmf.cpp +++ b/src/messaging/qmessagestore_qmf.cpp @@ -130,7 +130,7 @@ QMessageStore::~QMessageStore() delete d_ptr; } -QMessageManager::Error QMessageStore::lastError() const +QMessageManager::Error QMessageStore::error() const { if (d_ptr->_error != QMessageManager::NoError) { return d_ptr->_error; diff --git a/src/messaging/qmessagestore_symbian.cpp b/src/messaging/qmessagestore_symbian.cpp index a8ca4a6b9b..edb6f95b31 100644 --- a/src/messaging/qmessagestore_symbian.cpp +++ b/src/messaging/qmessagestore_symbian.cpp @@ -257,7 +257,7 @@ QMessageStore* QMessageStore::instance() return d->q_ptr; } -QMessageManager::Error QMessageStore::lastError() const +QMessageManager::Error QMessageStore::error() const { return QMessageManager::NoError; } diff --git a/src/messaging/qmessagestore_win.cpp b/src/messaging/qmessagestore_win.cpp index 8b4bba0e71..5eb302ff71 100644 --- a/src/messaging/qmessagestore_win.cpp +++ b/src/messaging/qmessagestore_win.cpp @@ -102,7 +102,7 @@ public: QMessageStorePrivate *d_ptr; QMessageStore *q_ptr; - QMessageManager::Error lastError; + QMessageManager::Error error; MapiSessionPtr session; QMutex mutex; @@ -114,13 +114,13 @@ private slots: QMessageStorePrivatePlatform::QMessageStorePrivatePlatform(QMessageStorePrivate *d, QMessageStore *q) :d_ptr(d), q_ptr(q), - lastError(QMessageManager::NoError), - session(MapiSession::createSession(&lastError)), + error(QMessageManager::NoError), + session(MapiSession::createSession(&error)), mutex(QMutex::Recursive) { connect(QCoreApplication::instance(), SIGNAL(destroyed()), this, SLOT(appDestroyed())); - if (session && (lastError == QMessageManager::NoError)) { + if (session && (error == QMessageManager::NoError)) { MapiSession *o(session.data()); connect(o, SIGNAL(messageAdded(QMessageId, QMessageManager::NotificationFilterIdSet)), q, SIGNAL(messageAdded(QMessageId, QMessageManager::NotificationFilterIdSet))); connect(o, SIGNAL(messageRemoved(QMessageId, QMessageManager::NotificationFilterIdSet)), q, SIGNAL(messageRemoved(QMessageId, QMessageManager::NotificationFilterIdSet))); @@ -192,9 +192,9 @@ QMessageStore* QMessageStore::instance() return d->q_ptr; } -QMessageManager::Error QMessageStore::lastError() const +QMessageManager::Error QMessageStore::error() const { - return d_ptr->p_ptr->lastError; + return d_ptr->p_ptr->error; } QMessageIdList QMessageStore::queryMessages(const QMessageFilter &filter, const QMessageSortOrder &sortOrder, uint limit, uint offset) const @@ -204,16 +204,16 @@ QMessageIdList QMessageStore::queryMessages(const QMessageFilter &filter, const MutexTryLocker locker(&d_ptr->p_ptr->mutex); if (!locker) { - d_ptr->p_ptr->lastError = QMessageManager::Busy; + d_ptr->p_ptr->error = QMessageManager::Busy; return result; } if (!d_ptr->p_ptr->session) { - d_ptr->p_ptr->lastError = QMessageManager::ContentInaccessible; + d_ptr->p_ptr->error = QMessageManager::ContentInaccessible; return result; } else { - d_ptr->p_ptr->lastError = QMessageManager::NoError; - result = d_ptr->p_ptr->session->queryMessages(&d_ptr->p_ptr->lastError, filter, sortOrder, limit, offset); + d_ptr->p_ptr->error = QMessageManager::NoError; + result = d_ptr->p_ptr->session->queryMessages(&d_ptr->p_ptr->error, filter, sortOrder, limit, offset); } return result; @@ -225,21 +225,21 @@ QMessageIdList QMessageStore::queryMessages(const QMessageFilter &filter, const MutexTryLocker locker(&d_ptr->p_ptr->mutex); if (!locker) { - d_ptr->p_ptr->lastError = QMessageManager::Busy; + d_ptr->p_ptr->error = QMessageManager::Busy; return result; } if (matchFlags & QMessageDataComparator::MatchFullWord) { - d_ptr->p_ptr->lastError = QMessageManager::NotYetImplemented; + d_ptr->p_ptr->error = QMessageManager::NotYetImplemented; return result; } if (!d_ptr->p_ptr->session) { - d_ptr->p_ptr->lastError = QMessageManager::ContentInaccessible; + d_ptr->p_ptr->error = QMessageManager::ContentInaccessible; return result; } else { - d_ptr->p_ptr->lastError = QMessageManager::NoError; - result = d_ptr->p_ptr->session->queryMessages(&d_ptr->p_ptr->lastError, filter, sortOrder, limit, offset, body, matchFlags); + d_ptr->p_ptr->error = QMessageManager::NoError; + result = d_ptr->p_ptr->session->queryMessages(&d_ptr->p_ptr->error, filter, sortOrder, limit, offset, body, matchFlags); } return result; @@ -251,17 +251,17 @@ QMessageFolderIdList QMessageStore::queryFolders(const QMessageFolderFilter &fil MutexTryLocker locker(&d_ptr->p_ptr->mutex); if (!locker) { - d_ptr->p_ptr->lastError = QMessageManager::Busy; + d_ptr->p_ptr->error = QMessageManager::Busy; return result; } if (!d_ptr->p_ptr->session) { - d_ptr->p_ptr->lastError = QMessageManager::ContentInaccessible; + d_ptr->p_ptr->error = QMessageManager::ContentInaccessible; return result; } - d_ptr->p_ptr->lastError = QMessageManager::NoError; - foreach (const MapiFolderPtr &folder, d_ptr->p_ptr->session->filterFolders(&d_ptr->p_ptr->lastError, filter, sortOrder, limit, offset)) { + d_ptr->p_ptr->error = QMessageManager::NoError; + foreach (const MapiFolderPtr &folder, d_ptr->p_ptr->session->filterFolders(&d_ptr->p_ptr->error, filter, sortOrder, limit, offset)) { result.append(folder->id()); } @@ -274,17 +274,17 @@ QMessageAccountIdList QMessageStore::queryAccounts(const QMessageAccountFilter & MutexTryLocker locker(&d_ptr->p_ptr->mutex); if (!locker) { - d_ptr->p_ptr->lastError = QMessageManager::Busy; + d_ptr->p_ptr->error = QMessageManager::Busy; return result; } if (!d_ptr->p_ptr->session) { - d_ptr->p_ptr->lastError = QMessageManager::ContentInaccessible; + d_ptr->p_ptr->error = QMessageManager::ContentInaccessible; return result; } - d_ptr->p_ptr->lastError = QMessageManager::NoError; - foreach (const MapiStorePtr &store, d_ptr->p_ptr->session->filterStores(&d_ptr->p_ptr->lastError, filter, sortOrder, limit, offset)) { + d_ptr->p_ptr->error = QMessageManager::NoError; + foreach (const MapiStorePtr &store, d_ptr->p_ptr->session->filterStores(&d_ptr->p_ptr->error, filter, sortOrder, limit, offset)) { result.append(store->id()); } @@ -315,20 +315,20 @@ bool QMessageStore::removeMessage(const QMessageId& id, QMessageManager::Removal MutexTryLocker locker(&d_ptr->p_ptr->mutex); if (!locker) { - d_ptr->p_ptr->lastError = QMessageManager::Busy; + d_ptr->p_ptr->error = QMessageManager::Busy; return result; } if (!d_ptr->p_ptr->session) { - d_ptr->p_ptr->lastError = QMessageManager::ContentInaccessible; + d_ptr->p_ptr->error = QMessageManager::ContentInaccessible; } else { - d_ptr->p_ptr->lastError = QMessageManager::NoError; + d_ptr->p_ptr->error = QMessageManager::NoError; QMessageIdList ids; ids.append(id); - d_ptr->p_ptr->session->removeMessages(&d_ptr->p_ptr->lastError, ids); + d_ptr->p_ptr->session->removeMessages(&d_ptr->p_ptr->error, ids); - result = (d_ptr->p_ptr->lastError == QMessageManager::NoError); + result = (d_ptr->p_ptr->error == QMessageManager::NoError); } return result; @@ -343,21 +343,21 @@ bool QMessageStore::removeMessages(const QMessageFilter& filter, QMessageManager MutexTryLocker locker(&d_ptr->p_ptr->mutex); if (!locker) { - d_ptr->p_ptr->lastError = QMessageManager::Busy; + d_ptr->p_ptr->error = QMessageManager::Busy; return result; } if (!d_ptr->p_ptr->session) { - d_ptr->p_ptr->lastError = QMessageManager::ContentInaccessible; + d_ptr->p_ptr->error = QMessageManager::ContentInaccessible; } else { - d_ptr->p_ptr->lastError = QMessageManager::NoError; + d_ptr->p_ptr->error = QMessageManager::NoError; QMessageIdList ids = queryMessages(filter, QMessageSortOrder(), 0, 0); - if (d_ptr->p_ptr->lastError == QMessageManager::NoError) { - d_ptr->p_ptr->session->removeMessages(&d_ptr->p_ptr->lastError, ids); + if (d_ptr->p_ptr->error == QMessageManager::NoError) { + d_ptr->p_ptr->session->removeMessages(&d_ptr->p_ptr->error, ids); } - result = (d_ptr->p_ptr->lastError == QMessageManager::NoError); + result = (d_ptr->p_ptr->error == QMessageManager::NoError); } return result; @@ -369,19 +369,19 @@ bool QMessageStore::addMessage(QMessage *message) MutexTryLocker locker(&d_ptr->p_ptr->mutex); if (!locker) { - d_ptr->p_ptr->lastError = QMessageManager::Busy; + d_ptr->p_ptr->error = QMessageManager::Busy; return result; } if (!d_ptr->p_ptr->session) { - d_ptr->p_ptr->lastError = QMessageManager::ContentInaccessible; + d_ptr->p_ptr->error = QMessageManager::ContentInaccessible; return result; } else { - d_ptr->p_ptr->lastError = QMessageManager::NoError; + d_ptr->p_ptr->error = QMessageManager::NoError; } if (message && !message->id().isValid()) { - QMessageManager::Error* lError = &d_ptr->p_ptr->lastError; + QMessageManager::Error* lError = &d_ptr->p_ptr->error; MapiStorePtr mapiStore = d_ptr->p_ptr->session->findStore(lError,message->parentAccountId(),false); if (*lError == QMessageManager::NoError && !mapiStore.isNull()) { @@ -465,23 +465,23 @@ bool QMessageStore::updateMessage(QMessage *message) MutexTryLocker locker(&d_ptr->p_ptr->mutex); if (!locker) { - d_ptr->p_ptr->lastError = QMessageManager::Busy; + d_ptr->p_ptr->error = QMessageManager::Busy; return result; } if (!d_ptr->p_ptr->session) { - d_ptr->p_ptr->lastError = QMessageManager::ContentInaccessible; + d_ptr->p_ptr->error = QMessageManager::ContentInaccessible; return result; } else { - d_ptr->p_ptr->lastError = QMessageManager::NoError; + d_ptr->p_ptr->error = QMessageManager::NoError; } //check store/message type compatibility - if(MapiStorePtr mapiStore = d_ptr->p_ptr->session->findStore(&d_ptr->p_ptr->lastError,message->parentAccountId())) + if(MapiStorePtr mapiStore = d_ptr->p_ptr->session->findStore(&d_ptr->p_ptr->error,message->parentAccountId())) { if(!(mapiStore->types() & message->type())) { - d_ptr->p_ptr->lastError = QMessageManager::ConstraintFailure; + d_ptr->p_ptr->error = QMessageManager::ConstraintFailure; return false; } } @@ -492,7 +492,7 @@ bool QMessageStore::updateMessage(QMessage *message) if (message && message->id().isValid()) { - QMessageManager::Error* lError = &d_ptr->p_ptr->lastError; + QMessageManager::Error* lError = &d_ptr->p_ptr->error; d_ptr->p_ptr->session->updateMessage(lError, *message); if (*lError == QMessageManager::NoError) { @@ -513,18 +513,18 @@ QMessage QMessageStore::message(const QMessageId& id) const MutexTryLocker locker(&d_ptr->p_ptr->mutex); if (!locker) { - d_ptr->p_ptr->lastError = QMessageManager::Busy; + d_ptr->p_ptr->error = QMessageManager::Busy; return result; } if (!d_ptr->p_ptr->session) { - d_ptr->p_ptr->lastError = QMessageManager::ContentInaccessible; + d_ptr->p_ptr->error = QMessageManager::ContentInaccessible; return result; } else { - d_ptr->p_ptr->lastError = QMessageManager::NoError; + d_ptr->p_ptr->error = QMessageManager::NoError; } - return d_ptr->p_ptr->session->message(&d_ptr->p_ptr->lastError, id); + return d_ptr->p_ptr->session->message(&d_ptr->p_ptr->error, id); } QMessageFolder QMessageStore::folder(const QMessageFolderId& id) const @@ -533,18 +533,18 @@ QMessageFolder QMessageStore::folder(const QMessageFolderId& id) const MutexTryLocker locker(&d_ptr->p_ptr->mutex); if (!locker) { - d_ptr->p_ptr->lastError = QMessageManager::Busy; + d_ptr->p_ptr->error = QMessageManager::Busy; return result; } if (!d_ptr->p_ptr->session) { - d_ptr->p_ptr->lastError = QMessageManager::ContentInaccessible; + d_ptr->p_ptr->error = QMessageManager::ContentInaccessible; return result; } else { - d_ptr->p_ptr->lastError = QMessageManager::NoError; + d_ptr->p_ptr->error = QMessageManager::NoError; } - return d_ptr->p_ptr->session->folder(&d_ptr->p_ptr->lastError, id); + return d_ptr->p_ptr->session->folder(&d_ptr->p_ptr->error, id); } QMessageAccount QMessageStore::account(const QMessageAccountId& id) const @@ -553,18 +553,18 @@ QMessageAccount QMessageStore::account(const QMessageAccountId& id) const MutexTryLocker locker(&d_ptr->p_ptr->mutex); if (!locker) { - d_ptr->p_ptr->lastError = QMessageManager::Busy; + d_ptr->p_ptr->error = QMessageManager::Busy; return result; } if (!d_ptr->p_ptr->session) { - d_ptr->p_ptr->lastError = QMessageManager::ContentInaccessible; + d_ptr->p_ptr->error = QMessageManager::ContentInaccessible; return result; } else { - d_ptr->p_ptr->lastError = QMessageManager::NoError; + d_ptr->p_ptr->error = QMessageManager::NoError; } - MapiStorePtr mapiStore(d_ptr->p_ptr->session->findStore(&d_ptr->p_ptr->lastError, id)); + MapiStorePtr mapiStore(d_ptr->p_ptr->session->findStore(&d_ptr->p_ptr->error, id)); if (mapiStore && mapiStore->isValid()) { result = QMessageAccountPrivate::from(mapiStore->id(), mapiStore->name(), mapiStore->address(), mapiStore->types()); } @@ -578,33 +578,33 @@ QMessageManager::NotificationFilterId QMessageStore::registerNotificationFilter( MutexTryLocker locker(&d_ptr->p_ptr->mutex); if (!locker) { - d_ptr->p_ptr->lastError = QMessageManager::Busy; + d_ptr->p_ptr->error = QMessageManager::Busy; return result; } if (!d_ptr->p_ptr->session) { - d_ptr->p_ptr->lastError = QMessageManager::ContentInaccessible; + d_ptr->p_ptr->error = QMessageManager::ContentInaccessible; return result; } else { - d_ptr->p_ptr->lastError = QMessageManager::NoError; + d_ptr->p_ptr->error = QMessageManager::NoError; } - return d_ptr->p_ptr->session->registerNotificationFilter(&d_ptr->p_ptr->lastError, filter); + return d_ptr->p_ptr->session->registerNotificationFilter(&d_ptr->p_ptr->error, filter); } void QMessageStore::unregisterNotificationFilter(QMessageManager::NotificationFilterId notificationFilterId) { MutexTryLocker locker(&d_ptr->p_ptr->mutex); if (!locker) { - d_ptr->p_ptr->lastError = QMessageManager::Busy; + d_ptr->p_ptr->error = QMessageManager::Busy; return; } if (!d_ptr->p_ptr->session) { - d_ptr->p_ptr->lastError = QMessageManager::ContentInaccessible; + d_ptr->p_ptr->error = QMessageManager::ContentInaccessible; } else { - d_ptr->p_ptr->lastError = QMessageManager::NoError; - d_ptr->p_ptr->session->unregisterNotificationFilter(&d_ptr->p_ptr->lastError, notificationFilterId); + d_ptr->p_ptr->error = QMessageManager::NoError; + d_ptr->p_ptr->session->unregisterNotificationFilter(&d_ptr->p_ptr->error, notificationFilterId); } } diff --git a/src/messaging/qmtmengine_symbian.cpp b/src/messaging/qmtmengine_symbian.cpp index f72aba1a09..cfc24d3674 100644 --- a/src/messaging/qmtmengine_symbian.cpp +++ b/src/messaging/qmtmengine_symbian.cpp @@ -1690,8 +1690,8 @@ void CMTMEngine::filterAndOrderMessagesReady(bool success, int operationId, QMes } } else { iMessageQueries[index].privateService->_active = false; - if (iMessageQueries[index].privateService->_lastError == QMessageManager::NoError) { - iMessageQueries[index].privateService->_lastError = QMessageManager::RequestIncomplete; + if (iMessageQueries[index].privateService->_error == QMessageManager::NoError) { + iMessageQueries[index].privateService->_error = QMessageManager::RequestIncomplete; } emit iMessageQueries[index].privateService->stateChanged(QMessageService::FinishedState); } diff --git a/src/messaging/winhelpers.cpp b/src/messaging/winhelpers.cpp index cb7c98f012..08ae2f52de 100644 --- a/src/messaging/winhelpers.cpp +++ b/src/messaging/winhelpers.cpp @@ -313,7 +313,7 @@ namespace { LONG rowCount(); bool query(); LPSRowSet rows() const; - QMessageManager::Error lastError() const; + QMessageManager::Error error() const; private: LPMAPITABLE m_table; @@ -321,7 +321,7 @@ namespace { LPSRestriction m_restriction; LPSSortOrderSet m_sortOrderSet; LPSRowSet m_rows; - QMessageManager::Error m_lastError; + QMessageManager::Error m_error; }; QueryAllRows::QueryAllRows(LPMAPITABLE ptable, @@ -335,7 +335,7 @@ namespace { m_restriction(pres), m_sortOrderSet(psos), m_rows(0), - m_lastError(QMessageManager::NoError) + m_error(QMessageManager::NoError) { bool initFailed = false; @@ -360,7 +360,7 @@ namespace { } if(initFailed) - m_lastError = QMessageManager::ContentInaccessible; + m_error = QMessageManager::ContentInaccessible; } QueryAllRows::~QueryAllRows() @@ -371,13 +371,13 @@ namespace { LONG QueryAllRows::rowCount() { - if (m_lastError != QMessageManager::NoError) + if (m_error != QMessageManager::NoError) return -1; ULONG count(0); HRESULT rv = m_table->GetRowCount(0, &count); if (HR_FAILED(rv)) { - m_lastError = QMessageManager::ContentInaccessible; + m_error = QMessageManager::ContentInaccessible; return -1; } @@ -386,16 +386,16 @@ namespace { bool QueryAllRows::query() { - if (m_lastError != QMessageManager::NoError) + if (m_error != QMessageManager::NoError) return false; FreeProws(m_rows); m_rows = 0; - m_lastError = QMessageManager::NoError; + m_error = QMessageManager::NoError; HRESULT rv = m_table->QueryRows( QueryAllRows::BatchSize, NULL, &m_rows); if (HR_FAILED(rv)) { - m_lastError = QMessageManager::ContentInaccessible; + m_error = QMessageManager::ContentInaccessible; return false; } @@ -407,9 +407,9 @@ namespace { return m_rows; } - QMessageManager::Error QueryAllRows::lastError() const + QMessageManager::Error QueryAllRows::error() const { - return m_lastError; + return m_error; } ADRLIST *createAddressList(int count, int propertyCount) @@ -668,7 +668,7 @@ namespace { return result; } - ULONG streamSize(QMessageManager::Error* lastError, IStream* is) + ULONG streamSize(QMessageManager::Error* error, IStream* is) { ULONG size = 0; STATSTG stg = { 0 }; @@ -676,12 +676,12 @@ namespace { if (HR_SUCCEEDED(rv)) { size = stg.cbSize.LowPart; } else { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; } return size; } - QByteArray readStream(QMessageManager::Error *lastError, IStream *is) + QByteArray readStream(QMessageManager::Error *error, IStream *is) { QByteArray result; @@ -693,19 +693,19 @@ namespace { ULONG bytes = 0; rv = is->Read(result.data(), sz, &bytes); if (HR_FAILED(rv)) { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; } } else { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; } return result; } - bool writeStream(QMessageManager::Error *lastError, IStream *os, const void *address, ULONG bytes, bool truncate) + bool writeStream(QMessageManager::Error *error, IStream *os, const void *address, ULONG bytes, bool truncate) { - ULONG existingSize = truncate ? streamSize(lastError, os) : 0; - if (*lastError == QMessageManager::NoError) { + ULONG existingSize = truncate ? streamSize(error, os) : 0; + if (*error == QMessageManager::NoError) { HRESULT rv = S_OK; if (existingSize > bytes) { ULARGE_INTEGER uli = { 0 }; @@ -735,7 +735,7 @@ namespace { } } - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; return false; } @@ -995,16 +995,16 @@ namespace { } #endif - void storeMessageProperties(QMessageManager::Error *lastError, const QMessage &source, IMessage *message) + void storeMessageProperties(QMessageManager::Error *error, const QMessage &source, IMessage *message) { if (!setMapiProperty(message, PR_SUBJECT, source.subject())) { qWarning() << "Unable to set subject in message."; - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; } else { QString emailAddress = source.from().recipient(); if (!setMapiProperty(message, PR_SENDER_EMAIL_ADDRESS, emailAddress)) { qWarning() << "Unable to set sender address in message."; - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; } else { #ifdef _WIN32_WCE unsigned long msgType = 0; @@ -1018,50 +1018,50 @@ namespace { if(msgType && !setMapiProperty(message, PR_MSG_STATUS, static_cast<long>(msgType))) { qWarning() << "Unable to set type of message."; - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; } else { #endif if (!setMapiProperty(message, PR_CLIENT_SUBMIT_TIME, toFileTime(source.date()))) { qWarning() << "Unable to set submit time in message."; - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; } else { QDateTime receivedDate(source.receivedDate()); if (receivedDate.isValid()) { if (!setMapiProperty(message, PR_MESSAGE_DELIVERY_TIME, toFileTime(receivedDate))) { qWarning() << "Unable to set delivery time in message."; - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; } } - if (*lastError == QMessageManager::NoError) { + if (*error == QMessageManager::NoError) { // Mark this message as read/unread #ifndef _WIN32_WCE LONG flags = (source.status() & QMessage::Read ? 0 : CLEAR_READ_FLAG); HRESULT rv = message->SetReadFlag(flags); if (HR_FAILED(rv)) { qWarning() << "Unable to set flags in message."; - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; } #else LONG flags = (source.status() & QMessage::Read ? MSGFLAG_READ : 0); if (!setMapiProperty(message, PR_MESSAGE_FLAGS, flags)) { qWarning() << "Unable to set flags in message."; - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; } #endif } - if (*lastError == QMessageManager::NoError) { + if (*error == QMessageManager::NoError) { LONG priority = (source.priority() == QMessage::HighPriority ? PRIO_URGENT : (source.priority() == QMessage::NormalPriority ? PRIO_NORMAL : PRIO_NONURGENT)); if (!setMapiProperty(message, PR_PRIORITY, priority)) { qWarning() << "Unable to set priority in message."; - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; } } - if (*lastError == QMessageManager::NoError) { + if (*error == QMessageManager::NoError) { QStringList headers; foreach (const QByteArray &name, source.headerFields()) { foreach (const QString &value, source.headerFieldValues(name)) { @@ -1073,7 +1073,7 @@ namespace { QString transportHeaders = headers.join("\r\n").append("\r\n\r\n"); if (!setMapiProperty(message, PR_TRANSPORT_MESSAGE_HEADERS, transportHeaders)) { qWarning() << "Unable to set transport headers in message."; - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; } } } @@ -1085,7 +1085,7 @@ namespace { } } - void replaceMessageRecipients(QMessageManager::Error *lastError, const QMessage &source, IMessage *message, IMAPISession *session) + void replaceMessageRecipients(QMessageManager::Error *error, const QMessage &source, IMessage *message, IMAPISession *session) { #ifdef _WIN32_WCE Q_UNUSED(session) @@ -1120,37 +1120,37 @@ namespace { } } - if (qar.lastError() != QMessageManager::NoError) { - *lastError = qar.lastError(); + if (qar.error() != QMessageManager::NoError) { + *error = qar.error(); } else { rv = message->ModifyRecipients(MODRECIP_REMOVE, list); if (HR_FAILED(rv)) { qWarning() << "Unable to clear address list for message."; - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; } } destroyAddressList(list, QList<LPTSTR>()); } else { qWarning() << "Unable to allocate address list for message."; - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; } } } else { qWarning() << "Unable to get row count for recipients table."; - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; } mapiRelease(recipientsTable); } else { if (rv != MAPI_E_NO_RECIPIENTS) { - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; qWarning() << "Unable to get recipients table from message."; } } #endif - if (*lastError == QMessageManager::NoError) { + if (*error == QMessageManager::NoError) { // Add the current message recipients uint recipientCount(source.to().count() + source.cc().count() + source.bcc().count()); if (recipientCount) { @@ -1189,25 +1189,25 @@ namespace { rv = message->ModifyRecipients(MODRECIP_ADD, list); if (HR_FAILED(rv)) { qWarning() << "Unable to store address list for message."; - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; } #ifndef _WIN32_WCE } else { qWarning() << "Unable to resolve address list for message."; - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; } #endif destroyAddressList(list, addresses); } else { qWarning() << "Unable to allocate address list for message."; - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; } } } } - void replaceMessageBody(QMessageManager::Error *lastError, const QMessage &source, IMessage *message, const MapiStorePtr &store) + void replaceMessageBody(QMessageManager::Error *error, const QMessage &source, IMessage *message, const MapiStorePtr &store) { Q_UNUSED(store); // Remove any preexisting body elements @@ -1254,12 +1254,12 @@ namespace { #endif if (HR_SUCCEEDED(rv)) { QByteArray body(bodyContent.textContent().toLatin1()); - writeStream(lastError, os, body.data(), body.count(), true); + writeStream(error, os, body.data(), body.count(), true); mapiRelease(os); } else { qWarning() << "Unable to write HTML to body"; - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; } #else if ((subType == "rtf") || (subType == "html")) { @@ -1280,7 +1280,7 @@ namespace { // Mark this message as formatted if (!setMapiProperty(message, PR_MSG_EDITOR_FORMAT, textFormat)) { qWarning() << "Unable to set message editor format in message."; - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; } IStream *os(0); @@ -1290,18 +1290,18 @@ namespace { rv = WrapCompressedRTFStream(os, MAPI_MODIFY, &compressor); if (HR_SUCCEEDED(rv)) { // The wrapper stream does not support Stat() - writeStream(lastError, compressor, body.data(), body.length(), false); + writeStream(error, compressor, body.data(), body.length(), false); compressor->Release(); } else { qWarning() << "Unable to open RTF compressor stream for write."; - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; } os->Release(); } else { qWarning() << "Unable to open compressed RTF stream for write."; - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; } #endif } else { @@ -1311,35 +1311,35 @@ namespace { IStream *os(0); HRESULT rv = message->OpenProperty(PR_BODY_W, 0, STGM_WRITE, MAPI_MODIFY | MAPI_CREATE,(LPUNKNOWN*)&os); if (HR_SUCCEEDED(rv)) { - writeStream(lastError, os, body.utf16(), body.count() * sizeof(WCHAR), true); + writeStream(error, os, body.utf16(), body.count() * sizeof(WCHAR), true); mapiRelease(os); } else { qWarning() << "Unable to write text to body"; - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; } #else // Mark this message as plain text LONG textFormat(EDITOR_FORMAT_PLAINTEXT); if (!setMapiProperty(message, PR_MSG_EDITOR_FORMAT, textFormat)) { qWarning() << "Unable to set message editor format in message."; - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; } if (!setMapiProperty(message, PR_BODY, body)) { qWarning() << "Unable to set body in message."; - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; } #endif } } } else { qWarning() << "Unable to delete existing body properties from message."; - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; } } - void addMessageAttachments(QMessageManager::Error *lastError, const QMessage &source, IMessage *message, WinHelpers::SavePropertyOption saveOption = WinHelpers::SavePropertyChanges ) + void addMessageAttachments(QMessageManager::Error *error, const QMessage &source, IMessage *message, WinHelpers::SavePropertyOption saveOption = WinHelpers::SavePropertyChanges ) { Q_UNUSED(saveOption); @@ -1359,18 +1359,18 @@ namespace { } } - *lastError = qar.lastError(); - if (*lastError != QMessageManager::NoError) { + *error = qar.error(); + if (*error != QMessageManager::NoError) { qWarning() << "Unable to get attachments numbers from table."; } mapiRelease(attachmentsTable); } else { qWarning() << "Unable to get attachments table from message."; - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; } } - if (*lastError == QMessageManager::NoError) { + if (*error == QMessageManager::NoError) { // Add any current attachments not present foreach (const QMessageContentContainerId &attachmentId, source.attachmentIds()) { QMessageContentContainer attachment(source.find(attachmentId)); @@ -1406,10 +1406,10 @@ namespace { // FolderHeap is a binary heap used to merge sort messages from different folders and stores class FolderHeap { public: - FolderHeap(QMessageManager::Error *lastError, const QList<FolderHeapNodePtr> &protoHeap, const QMessageSortOrder &sortOrder); + FolderHeap(QMessageManager::Error *error, const QList<FolderHeapNodePtr> &protoHeap, const QMessageSortOrder &sortOrder); ~FolderHeap(); - QMessage takeFront(QMessageManager::Error *lastError); + QMessage takeFront(QMessageManager::Error *error); bool isEmpty() const { return _heap.count() == 0; } private: @@ -1420,7 +1420,7 @@ namespace { QList<FolderHeapNodePtr> _heap; }; - FolderHeap::FolderHeap(QMessageManager::Error *lastError, const QList<FolderHeapNodePtr> &protoHeap, const QMessageSortOrder &sortOrder) + FolderHeap::FolderHeap(QMessageManager::Error *error, const QList<FolderHeapNodePtr> &protoHeap, const QMessageSortOrder &sortOrder) { _ordering = sortOrder; @@ -1431,19 +1431,19 @@ namespace { } QMessageIdList messageIdList; - node->_table = node->_folder->queryBegin(lastError, node->_filter, sortOrder); - if (*lastError == QMessageManager::NoError) { + node->_table = node->_folder->queryBegin(error, node->_filter, sortOrder); + if (*error == QMessageManager::NoError) { if (node->_table) { - messageIdList = node->_folder->queryNext(lastError, node->_table, node->_filter); - if (messageIdList.isEmpty() || (*lastError != QMessageManager::NoError)) { + messageIdList = node->_folder->queryNext(error, node->_table, node->_filter); + if (messageIdList.isEmpty() || (*error != QMessageManager::NoError)) { node->_folder->queryEnd(node->_table); } } if (!messageIdList.isEmpty()) { - node->_front = node->_folder->message(lastError, messageIdList.front()); + node->_front = node->_folder->message(error, messageIdList.front()); - if (*lastError == QMessageManager::NoError) { + if (*error == QMessageManager::NoError) { _heap.append(node); } } @@ -1460,7 +1460,7 @@ namespace { { } - QMessage FolderHeap::takeFront(QMessageManager::Error *lastError) + QMessage FolderHeap::takeFront(QMessageManager::Error *error) { QMessage result(_heap[0]->_front); @@ -1468,12 +1468,12 @@ namespace { QMessageIdList messageIdList; if (node->_table) { - messageIdList = node->_folder->queryNext(lastError, node->_table, node->_filter); - if (messageIdList.isEmpty() || (*lastError != QMessageManager::NoError)) { + messageIdList = node->_folder->queryNext(error, node->_table, node->_filter); + if (messageIdList.isEmpty() || (*error != QMessageManager::NoError)) { node->_folder->queryEnd(node->_table); } } - if (*lastError != QMessageManager::NoError) + if (*error != QMessageManager::NoError) return result; if (messageIdList.isEmpty()) { @@ -1483,8 +1483,8 @@ namespace { _heap.pop_back(); } } else { - node->_front = node->_folder->message(lastError, messageIdList.front()); - if (*lastError != QMessageManager::NoError) + node->_front = node->_folder->message(error, messageIdList.front()); + if (*error != QMessageManager::NoError) return result; } @@ -1531,13 +1531,13 @@ namespace { return bodyContainer.textContent().contains(body, Qt::CaseInsensitive); } - QMessageIdList filterMessages(QMessageManager::Error *lastError, QList<FolderHeapNodePtr> &folderNodes, const QMessageSortOrder &sortOrder, uint limit, uint offset, const QString &body = QString(), QMessageDataComparator::MatchFlags matchFlags = 0) + QMessageIdList filterMessages(QMessageManager::Error *error, QList<FolderHeapNodePtr> &folderNodes, const QMessageSortOrder &sortOrder, uint limit, uint offset, const QString &body = QString(), QMessageDataComparator::MatchFlags matchFlags = 0) { QMessageIdList result; QHash<QMessageId, bool> avoidDuplicates; // For complex filters it's necessary to check for duplicates - FolderHeap folderHeap(lastError, folderNodes, sortOrder); - if (*lastError != QMessageManager::NoError) + FolderHeap folderHeap(error, folderNodes, sortOrder); + if (*error != QMessageManager::NoError) return result; int count = 0 - offset; @@ -1548,8 +1548,8 @@ namespace { if (limit && (count == limit)) break; - QMessage front(folderHeap.takeFront(lastError)); - if (*lastError != QMessageManager::NoError) + QMessage front(folderHeap.takeFront(error)); + if (*error != QMessageManager::NoError) return result; if (!avoidDuplicates.contains(front.id()) && bodyMatches(front, body, matchFlags)) { @@ -1907,9 +1907,9 @@ MapiFolder::MapiFolder() { } -MapiFolderPtr MapiFolder::createFolder(QMessageManager::Error *lastError, const MapiStorePtr &store, IMAPIFolder *folder, const MapiRecordKey &recordKey, const QString &name, const MapiEntryId &entryId, bool hasSubFolders, uint messageCount) +MapiFolderPtr MapiFolder::createFolder(QMessageManager::Error *error, const MapiStorePtr &store, IMAPIFolder *folder, const MapiRecordKey &recordKey, const QString &name, const MapiEntryId &entryId, bool hasSubFolders, uint messageCount) { - Q_UNUSED(lastError); + Q_UNUSED(error); MapiFolderPtr ptr = MapiFolderPtr(new MapiFolder(store, folder, recordKey, name, entryId, hasSubFolders, messageCount)); if (!ptr.isNull()) { ptr->_self = ptr; @@ -1937,10 +1937,10 @@ MapiFolder::~MapiFolder() _init = false; } -void MapiFolder::findSubFolders(QMessageManager::Error *lastError) +void MapiFolder::findSubFolders(QMessageManager::Error *error) { if (!_folder) { - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; qWarning() << "No folder to search for subfolders"; } else if (_hasSubFolders) { IMAPITable *subFolders(0); @@ -1989,25 +1989,25 @@ void MapiFolder::findSubFolders(QMessageManager::Error *lastError) break; } } else { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; qWarning() << "Error getting rows from sub folder table."; break; } } } else { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; qWarning() << "Unable to set columns on folder table."; } mapiRelease(subFolders); } else { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; qWarning() << "Unable to get hierarchy table for folder:" << name(); } } } -MapiFolderPtr MapiFolder::nextSubFolder(QMessageManager::Error *lastError) +MapiFolderPtr MapiFolder::nextSubFolder(QMessageManager::Error *error) { MapiFolderPtr result; @@ -2017,15 +2017,15 @@ MapiFolderPtr MapiFolder::nextSubFolder(QMessageManager::Error *lastError) if (!_init) { _init = true; - findSubFolders(lastError); - if (*lastError != QMessageManager::NoError) { + findSubFolders(error); + if (*error != QMessageManager::NoError) { qWarning() << "Unable to find sub folders."; return result; } } if (!_subFolders.isEmpty()) { - result = _store->openFolder(lastError, _subFolders.takeFirst()); + result = _store->openFolder(error, _subFolders.takeFirst()); } else { // Allow the traversal to be restarted _init = false; @@ -2034,17 +2034,17 @@ MapiFolderPtr MapiFolder::nextSubFolder(QMessageManager::Error *lastError) return result; } -LPMAPITABLE MapiFolder::queryBegin(QMessageManager::Error *lastError, const QMessageFilter &filter, const QMessageSortOrder &sortOrder) +LPMAPITABLE MapiFolder::queryBegin(QMessageManager::Error *error, const QMessageFilter &filter, const QMessageSortOrder &sortOrder) { if (!_valid || !_folder) { Q_ASSERT(_valid && _folder); - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; return 0; } MapiRestriction restriction(filter); if (!restriction.isValid()) { - *lastError = QMessageManager::ConstraintFailure; + *error = QMessageManager::ConstraintFailure; return 0; } @@ -2055,33 +2055,33 @@ LPMAPITABLE MapiFolder::queryBegin(QMessageManager::Error *lastError, const QMes rv = messagesTable->SetColumns(reinterpret_cast<LPSPropTagArray>(&columns), 0); if (HR_SUCCEEDED(rv)) { if (!sortOrder.isEmpty()) { - QMessageSortOrderPrivate::sortTable(lastError, sortOrder, messagesTable); + QMessageSortOrderPrivate::sortTable(error, sortOrder, messagesTable); } if (!restriction.isEmpty()) { ULONG flags(0); if (messagesTable->Restrict(restriction.sRestriction(), flags) != S_OK) - *lastError = QMessageManager::ConstraintFailure; + *error = QMessageManager::ConstraintFailure; } - if (*lastError != QMessageManager::NoError) { + if (*error != QMessageManager::NoError) { return 0; } return messagesTable; } else { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; return 0; } mapiRelease(messagesTable); messagesTable = 0; } else { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; return 0; } return 0; } -QMessageIdList MapiFolder::queryNext(QMessageManager::Error *lastError, LPMAPITABLE messagesTable, const QMessageFilter &filter) +QMessageIdList MapiFolder::queryNext(QMessageManager::Error *error, LPMAPITABLE messagesTable, const QMessageFilter &filter) { QMessageIdList result; while (true) { @@ -2111,7 +2111,7 @@ QMessageIdList MapiFolder::queryNext(QMessageManager::Error *lastError, LPMAPITA return result; } } else { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; qWarning() << "Unable to query rows in message table."; return result; } @@ -2123,19 +2123,19 @@ void MapiFolder::queryEnd(LPMAPITABLE messagesTable) mapiRelease(messagesTable); } -uint MapiFolder::countMessages(QMessageManager::Error *lastError, const QMessageFilter &filter) const +uint MapiFolder::countMessages(QMessageManager::Error *error, const QMessageFilter &filter) const { uint result(0); if (!_valid || !_folder) { Q_ASSERT(_valid && _folder); - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; return result; } MapiRestriction restriction(filter); if (!restriction.isValid()) { - *lastError = QMessageManager::ConstraintFailure; + *error = QMessageManager::ConstraintFailure; return result; } @@ -2146,11 +2146,11 @@ uint MapiFolder::countMessages(QMessageManager::Error *lastError, const QMessage ULONG flags(0); rv = messagesTable->Restrict(restriction.sRestriction(), flags); if (HR_FAILED(rv)) { - *lastError = QMessageManager::ConstraintFailure; + *error = QMessageManager::ConstraintFailure; qWarning() << "Unable to set restriction on message table."; } } - if (*lastError == QMessageManager::NoError) { + if (*error == QMessageManager::NoError) { ULONG count(0); rv = messagesTable->GetRowCount(0, &count); if (HR_SUCCEEDED(rv)) { @@ -2162,14 +2162,14 @@ uint MapiFolder::countMessages(QMessageManager::Error *lastError, const QMessage mapiRelease(messagesTable); } else { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; qWarning() << "Unable to get folder contents table."; } return result; } -void MapiFolder::removeMessages(QMessageManager::Error *lastError, const QMessageIdList &ids) +void MapiFolder::removeMessages(QMessageManager::Error *error, const QMessageIdList &ids) { SBinary *bin(0); if (MAPIAllocateBuffer(ids.count() * sizeof(SBinary), reinterpret_cast<LPVOID*>(&bin)) != S_OK) { @@ -2198,7 +2198,7 @@ void MapiFolder::removeMessages(QMessageManager::Error *lastError, const QMessag //flags |= DELETE_HARD_DELETE; this flag is only available when the store is exchange... HRESULT rv = _folder->DeleteMessages(&entryList, 0, 0, flags); if (HR_FAILED(rv)) { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; qWarning() << "Unable to delete messages from folder."; } } @@ -2206,7 +2206,7 @@ void MapiFolder::removeMessages(QMessageManager::Error *lastError, const QMessag MAPIFreeBuffer(bin); } -MapiEntryId MapiFolder::messageEntryId(QMessageManager::Error *lastError, const MapiRecordKey &messageKey) +MapiEntryId MapiFolder::messageEntryId(QMessageManager::Error *error, const MapiRecordKey &messageKey) { MapiEntryId result; MapiRecordKey key(messageKey); @@ -2238,32 +2238,32 @@ MapiEntryId MapiFolder::messageEntryId(QMessageManager::Error *lastError, const LPSPropValue entryIdProp(&rows->aRow[0].lpProps[0]); result = MapiEntryId(entryIdProp->Value.bin.lpb, entryIdProp->Value.bin.cb); } else { - *lastError = QMessageManager::InvalidId; + *error = QMessageManager::InvalidId; } FreeProws(rows); } else { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; qWarning() << "Unable to query rows from message table."; } } else { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; qWarning() << "Unable to set columns on message table."; } } else { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; qWarning() << "Unable to restrict content table."; } mapiRelease(messagesTable); } else { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; qWarning() << "Unable to get contents table for folder."; } return result; } -IMessage *MapiFolder::openMessage(QMessageManager::Error *lastError, const MapiEntryId &entryId) +IMessage *MapiFolder::openMessage(QMessageManager::Error *error, const MapiEntryId &entryId) { IMessage *message(0); @@ -2271,21 +2271,21 @@ IMessage *MapiFolder::openMessage(QMessageManager::Error *lastError, const MapiE ULONG objectType(0); HRESULT rv = _folder->OpenEntry(entryId.count(), entryIdPtr, 0, MAPI_BEST_ACCESS, &objectType, reinterpret_cast<LPUNKNOWN*>(&message)); if (rv != S_OK) { - *lastError = QMessageManager::InvalidId; + *error = QMessageManager::InvalidId; qWarning() << "Invalid message entryId:" << entryId.toBase64(); } return message; } -QMessageFolder MapiFolder::folder(QMessageManager::Error *lastError, const QMessageFolderId& id) const +QMessageFolder MapiFolder::folder(QMessageManager::Error *error, const QMessageFolderId& id) const { - return _store->folder(lastError, id); + return _store->folder(error, id); } -QMessage MapiFolder::message(QMessageManager::Error *lastError, const QMessageId& id) const +QMessage MapiFolder::message(QMessageManager::Error *error, const QMessageId& id) const { - return _store->message(lastError, id); + return _store->message(error, id); } QMessage::StandardFolder MapiFolder::standardFolder() const @@ -2383,70 +2383,70 @@ static unsigned long commonFolderMap(QMessage::StandardFolder folder) return propertyMap.value(folder); } -IMessage *MapiFolder::createMessage(QMessageManager::Error* lastError) +IMessage *MapiFolder::createMessage(QMessageManager::Error* error) { IMessage *message = 0; if(FAILED(_folder->CreateMessage(NULL, 0, &message)!=S_OK)) { - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; mapiRelease(message); } return message; } -IMessage* MapiFolder::createMessage(QMessageManager::Error* lastError, const QMessage& source, const MapiSessionPtr &session, SavePropertyOption saveOption ) +IMessage* MapiFolder::createMessage(QMessageManager::Error* error, const QMessage& source, const MapiSessionPtr &session, SavePropertyOption saveOption ) { IMessage* mapiMessage(0); HRESULT rv = _folder->CreateMessage(0, 0, &mapiMessage); if (HR_SUCCEEDED(rv)) { // Store the message properties - if (*lastError == QMessageManager::NoError) { - storeMessageProperties(lastError, source, mapiMessage); + if (*error == QMessageManager::NoError) { + storeMessageProperties(error, source, mapiMessage); } #ifndef _WIN32_WCE //Ensure the message is moved to the sent folder after submission //On Windows Mobile occurs by default and at discretion of mail client settings. - MapiFolderPtr sentFolder = _store->findFolder(lastError,QMessage::SentFolder); - if (!sentFolder.isNull() && *lastError == QMessageManager::NoError) { + MapiFolderPtr sentFolder = _store->findFolder(error,QMessage::SentFolder); + if (!sentFolder.isNull() && *error == QMessageManager::NoError) { if (!setMapiProperty(mapiMessage, PR_SENTMAIL_ENTRYID, sentFolder->entryId())) { qWarning() << "Unable to set sent folder entry id on message"; } } #endif - if (*lastError == QMessageManager::NoError) { - replaceMessageRecipients(lastError, source, mapiMessage, session->session()); + if (*error == QMessageManager::NoError) { + replaceMessageRecipients(error, source, mapiMessage, session->session()); } - if (*lastError == QMessageManager::NoError) { - replaceMessageBody(lastError, source, mapiMessage, _store); + if (*error == QMessageManager::NoError) { + replaceMessageBody(error, source, mapiMessage, _store); } - if (*lastError == QMessageManager::NoError) { - addMessageAttachments(lastError, source, mapiMessage, saveOption ); + if (*error == QMessageManager::NoError) { + addMessageAttachments(error, source, mapiMessage, saveOption ); } #ifndef _WIN32_WCE //unsupported - if (*lastError == QMessageManager::NoError && saveOption == SavePropertyChanges ) { + if (*error == QMessageManager::NoError && saveOption == SavePropertyChanges ) { if (HR_FAILED(mapiMessage->SaveChanges(0))) { qWarning() << "Unable to save changes for message."; } } #endif - if (*lastError != QMessageManager::NoError) { + if (*error != QMessageManager::NoError) { mapiRelease(mapiMessage); } } else { qWarning() << "Failed to create MAPI message"; - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; } return mapiMessage; } -MapiStorePtr MapiStore::createStore(QMessageManager::Error *lastError, const MapiSessionPtr &session, IMsgStore *store, const MapiRecordKey &key, const MapiEntryId &entryId, const QString &name, bool cachedMode) +MapiStorePtr MapiStore::createStore(QMessageManager::Error *error, const MapiSessionPtr &session, IMsgStore *store, const MapiRecordKey &key, const MapiEntryId &entryId, const QString &name, bool cachedMode) { - Q_UNUSED(lastError); + Q_UNUSED(error); MapiStorePtr ptr = MapiStorePtr(new MapiStore(session, store, key, entryId, name, cachedMode)); if (!ptr.isNull()) { ptr->_self = ptr; @@ -2497,18 +2497,18 @@ MapiStore::~MapiStore() _valid = false; } -MapiFolderPtr MapiStore::findFolder(QMessageManager::Error *lastError, QMessage::StandardFolder sf) +MapiFolderPtr MapiStore::findFolder(QMessageManager::Error *error, QMessage::StandardFolder sf) { MapiFolderPtr result; if (_standardFolderId.contains(sf)) { - result = openFolder(lastError, _standardFolderId[sf]); + result = openFolder(error, _standardFolderId[sf]); } return result; } -MapiEntryId MapiStore::standardFolderId(QMessageManager::Error *lastError, QMessage::StandardFolder sf) const +MapiEntryId MapiStore::standardFolderId(QMessageManager::Error *error, QMessage::StandardFolder sf) const { MapiEntryId result; @@ -2554,7 +2554,7 @@ MapiEntryId MapiStore::standardFolderId(QMessageManager::Error *lastError, QMess #endif if (sf == QMessage::InboxFolder) { - result = receiveFolderId(lastError); + result = receiveFolderId(error); } else { IMAPIProp* source = _store; MapiFolderPtr rf; @@ -2563,11 +2563,11 @@ MapiEntryId MapiStore::standardFolderId(QMessageManager::Error *lastError, QMess //the drafts entryid can only be queried on the inbox or root folder. if(sf == QMessage::DraftsFolder) { - rf = receiveFolder(lastError); - if(*lastError != QMessageManager::NoError) { + rf = receiveFolder(error); + if(*error != QMessageManager::NoError) { //inbox failed, try root folder. - rf = rootFolder(lastError); - if(*lastError != QMessageManager::NoError) + rf = rootFolder(error); + if(*error != QMessageManager::NoError) { return result; } @@ -2580,7 +2580,7 @@ MapiEntryId MapiStore::standardFolderId(QMessageManager::Error *lastError, QMess if (getMapiProperty(source, commonFolderMap(sf), &entryId)) { result = entryId; } else { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; } } @@ -2588,18 +2588,18 @@ MapiEntryId MapiStore::standardFolderId(QMessageManager::Error *lastError, QMess return result; } -QMessageFolderIdList MapiStore::folderIds(QMessageManager::Error *lastError) const +QMessageFolderIdList MapiStore::folderIds(QMessageManager::Error *error) const { QMessageFolderIdList folderIds; - MapiFolderPtr root(rootFolder(lastError)); - if (*lastError == QMessageManager::NoError) { + MapiFolderPtr root(rootFolder(error)); + if (*error == QMessageManager::NoError) { QList<MapiFolderPtr> folders; folders.append(root); // No valid reason to list the root folder. while (!folders.isEmpty()) { - MapiFolderPtr subFolder(folders.back()->nextSubFolder(lastError)); + MapiFolderPtr subFolder(folders.back()->nextSubFolder(error)); if (!subFolder.isNull() && subFolder->isValid()) { folderIds.append(subFolder->id()); folders.append(subFolder); @@ -2614,16 +2614,16 @@ QMessageFolderIdList MapiStore::folderIds(QMessageManager::Error *lastError) con return folderIds; } -QMessageFolder MapiStore::folderFromId(QMessageManager::Error *lastError, const QMessageFolderId &folderId) +QMessageFolder MapiStore::folderFromId(QMessageManager::Error *error, const QMessageFolderId &folderId) { QMessageFolder result; QList<MapiFolderPtr> folders; - MapiFolderPtr root(rootFolder(lastError)); + MapiFolderPtr root(rootFolder(error)); if (!root.isNull() && root->isValid()) folders.append(root); while (!folders.isEmpty()) { - MapiFolderPtr subFolder(folders.back()->nextSubFolder(lastError)); + MapiFolderPtr subFolder(folders.back()->nextSubFolder(error)); if (!subFolder.isNull() && subFolder->isValid()) { if (folderId == subFolder->id()) { QStringList path; @@ -2645,16 +2645,16 @@ QMessageFolder MapiStore::folderFromId(QMessageManager::Error *lastError, const return result; } -QList<MapiFolderPtr> MapiStore::filterFolders(QMessageManager::Error *lastError, const QMessageFolderFilter &afilter) const +QList<MapiFolderPtr> MapiStore::filterFolders(QMessageManager::Error *error, const QMessageFolderFilter &afilter) const { QList<MapiFolderPtr> result; - QMessageFolderFilter filter(QMessageFolderFilterPrivate::preprocess(lastError, _session, afilter)); - if (*lastError != QMessageManager::NoError) + QMessageFolderFilter filter(QMessageFolderFilterPrivate::preprocess(error, _session, afilter)); + if (*error != QMessageManager::NoError) return result; #if 0 //(was ifndef _WIN32_WCE) TODO: fix issue with GetHierarchyTable only returning top level folders - MapiFolderPtr root(rootFolder(lastError)); - if (*lastError == QMessageManager::NoError) { + MapiFolderPtr root(rootFolder(error)); + if (*error == QMessageManager::NoError) { IMAPITable *folderTable(0); HRESULT rv = root->_folder->GetHierarchyTable(CONVENIENT_DEPTH | MAPI_UNICODE, &folderTable); if (HR_SUCCEEDED(rv)) { @@ -2684,7 +2684,7 @@ QList<MapiFolderPtr> MapiStore::filterFolders(QMessageManager::Error *lastError, if (!special) { MapiEntryId entryId(props[0].Value.bin.lpb, props[0].Value.bin.cb); - MapiFolderPtr folder(openFolder(lastError, entryId)); + MapiFolderPtr folder(openFolder(error, entryId)); if (QMessageFolderFilterPrivate::matchesFolder(filter, folder)) { result.append(folder); } @@ -2692,16 +2692,16 @@ QList<MapiFolderPtr> MapiStore::filterFolders(QMessageManager::Error *lastError, } } - *lastError = qar.lastError(); + *error = qar.error(); mapiRelease(folderTable); } } #else // Windows mobile does not support CONVENIENT_DEPTH... - foreach (const QMessageFolderId &folderId, folderIds(lastError)) { + foreach (const QMessageFolderId &folderId, folderIds(error)) { MapiEntryId entryId = QMessageFolderIdPrivate::entryId(folderId); - MapiFolderPtr folder(openFolder(lastError, entryId)); + MapiFolderPtr folder(openFolder(error, entryId)); if (QMessageFolderFilterPrivate::matchesFolder(filter, folder)) { result.append(folder); } @@ -2711,19 +2711,19 @@ QList<MapiFolderPtr> MapiStore::filterFolders(QMessageManager::Error *lastError, return result; } -MapiEntryId MapiStore::messageEntryId(QMessageManager::Error *lastError, const MapiRecordKey &folderKey, const MapiRecordKey &messageKey) +MapiEntryId MapiStore::messageEntryId(QMessageManager::Error *error, const MapiRecordKey &folderKey, const MapiRecordKey &messageKey) { MapiEntryId result; - MapiFolderPtr folder(openFolderWithKey(lastError, folderKey)); - if (*lastError == QMessageManager::NoError) { - result = folder->messageEntryId(lastError, messageKey); + MapiFolderPtr folder(openFolderWithKey(error, folderKey)); + if (*error == QMessageManager::NoError) { + result = folder->messageEntryId(error, messageKey); } return result; } -MapiFolderPtr MapiStore::openFolder(QMessageManager::Error *lastError, const MapiEntryId& entryId) const +MapiFolderPtr MapiStore::openFolder(QMessageManager::Error *error, const MapiEntryId& entryId) const { MapiFolderPtr result(0); @@ -2738,8 +2738,8 @@ MapiFolderPtr MapiStore::openFolder(QMessageManager::Error *lastError, const Map } // We need to create a new instance - IMAPIFolder *folder = openMapiFolder(lastError, entryId); - if (folder && (*lastError == QMessageManager::NoError)) { + IMAPIFolder *folder = openMapiFolder(error, entryId); + if (folder && (*error == QMessageManager::NoError)) { SizedSPropTagArray(4, columns) = {4, {PR_DISPLAY_NAME, PR_RECORD_KEY, PR_CONTENT_COUNT, PR_SUBFOLDERS}}; SPropValue *properties(0); ULONG count; @@ -2750,8 +2750,8 @@ MapiFolderPtr MapiStore::openFolder(QMessageManager::Error *lastError, const Map uint messageCount = properties[2].Value.ul; bool hasSubFolders = properties[3].Value.b; - MapiFolderPtr folderPtr = MapiFolder::createFolder(lastError, _self.toStrongRef(), folder, recordKey, name, entryId, hasSubFolders, messageCount); - if (*lastError == QMessageManager::NoError) { + MapiFolderPtr folderPtr = MapiFolder::createFolder(error, _self.toStrongRef(), folder, recordKey, name, entryId, hasSubFolders, messageCount); + if (*error == QMessageManager::NoError) { result = folderPtr; // Add to the map @@ -2772,13 +2772,13 @@ MapiFolderPtr MapiStore::openFolder(QMessageManager::Error *lastError, const Map return result; } -MapiFolderPtr MapiStore::openFolderWithKey(QMessageManager::Error *lastError, const MapiRecordKey &recordKey) const +MapiFolderPtr MapiStore::openFolderWithKey(QMessageManager::Error *error, const MapiRecordKey &recordKey) const { #if 0 // Doesn't work on desktop or mobile, only searches top level folders MapiFolderPtr result; - MapiFolderPtr root(rootFolder(lastError)); - if (*lastError == QMessageManager::NoError) { + MapiFolderPtr root(rootFolder(error)); + if (*error == QMessageManager::NoError) { if (root->recordKey() == recordKey) { result = root; } else { @@ -2810,26 +2810,26 @@ MapiFolderPtr MapiStore::openFolderWithKey(QMessageManager::Error *lastError, co MapiEntryId entryId(rows->aRow[0].lpProps[0].Value.bin.lpb, rows->aRow[0].lpProps[0].Value.bin.cb); // Open the folder using its entry ID - result = openFolder(lastError, entryId); + result = openFolder(error, entryId); } else { - *lastError = QMessageManager::InvalidId; + *error = QMessageManager::InvalidId; } FreeProws(rows); } else { - *lastError = QMessageManager::InvalidId; + *error = QMessageManager::InvalidId; } } else { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; qWarning() << "Unable to set columns for folder table"; } } else { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; qWarning() << "Unable to restrict folder table"; } mapiRelease(folderTable); } else { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; qWarning() << "Unable to open hierarchy table for store."; } } @@ -2837,11 +2837,11 @@ MapiFolderPtr MapiStore::openFolderWithKey(QMessageManager::Error *lastError, co return result; #else - foreach (const QMessageFolderId &folderId, folderIds(lastError)) { + foreach (const QMessageFolderId &folderId, folderIds(error)) { MapiRecordKey key = QMessageFolderIdPrivate::folderRecordKey(folderId); if (key == recordKey) { MapiEntryId entryId = QMessageFolderIdPrivate::entryId(folderId); - MapiFolderPtr folder(openFolder(lastError, entryId)); + MapiFolderPtr folder(openFolder(error, entryId)); return folder; } } @@ -2862,7 +2862,7 @@ bool MapiStore::supports(ULONG featureFlag) const return true; } -IMessage *MapiStore::openMessage(QMessageManager::Error *lastError, const MapiEntryId &entryId) +IMessage *MapiStore::openMessage(QMessageManager::Error *error, const MapiEntryId &entryId) { IMessage *message(0); @@ -2873,17 +2873,17 @@ IMessage *MapiStore::openMessage(QMessageManager::Error *lastError, const MapiEn if (objectType != MAPI_MESSAGE) { qWarning() << "Not a message - wrong object type:" << objectType; mapiRelease(message); - *lastError = QMessageManager::InvalidId; + *error = QMessageManager::InvalidId; } } else { - *lastError = QMessageManager::InvalidId; + *error = QMessageManager::InvalidId; qWarning() << "Invalid message entryId:" << entryId.toBase64(); } return message; } -IMAPIFolder *MapiStore::openMapiFolder(QMessageManager::Error *lastError, const MapiEntryId &entryId) const +IMAPIFolder *MapiStore::openMapiFolder(QMessageManager::Error *error, const MapiEntryId &entryId) const { IMAPIFolder *folder(0); @@ -2896,10 +2896,10 @@ IMAPIFolder *MapiStore::openMapiFolder(QMessageManager::Error *lastError, const if (objectType != MAPI_FOLDER) { qWarning() << "Not a folder - wrong object type:" << objectType; mapiRelease(folder); - *lastError = QMessageManager::InvalidId; + *error = QMessageManager::InvalidId; } } else { - *lastError = QMessageManager::InvalidId; + *error = QMessageManager::InvalidId; qWarning() << "Invalid folder entryId:" << entryId.toBase64(); } @@ -2944,25 +2944,25 @@ MapiSessionPtr MapiStore::session() const return _session.toStrongRef(); } -MapiFolderPtr MapiStore::rootFolder(QMessageManager::Error *lastError) const +MapiFolderPtr MapiStore::rootFolder(QMessageManager::Error *error) const { MapiFolderPtr result; - MapiEntryId entryId(rootFolderId(lastError)); - if (*lastError == QMessageManager::NoError) { - result = openFolder(lastError, entryId); + MapiEntryId entryId(rootFolderId(error)); + if (*error == QMessageManager::NoError) { + result = openFolder(error, entryId); } return result; } -MapiEntryId MapiStore::rootFolderId(QMessageManager::Error *lastError) const +MapiEntryId MapiStore::rootFolderId(QMessageManager::Error *error) const { MapiEntryId result; if (!_valid || !_store) { Q_ASSERT(_valid && _store); - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; return result; } @@ -2970,32 +2970,32 @@ MapiEntryId MapiStore::rootFolderId(QMessageManager::Error *lastError) const if (getMapiProperty(_store, PR_IPM_SUBTREE_ENTRYID, &entryId)) { result = entryId; } else { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; qWarning() << "Unable to get root folder entry ID for store:" << _name; } return result; } -MapiFolderPtr MapiStore::receiveFolder(QMessageManager::Error *lastError) const +MapiFolderPtr MapiStore::receiveFolder(QMessageManager::Error *error) const { MapiFolderPtr result; - MapiEntryId entryId(receiveFolderId(lastError)); - if (*lastError == QMessageManager::NoError) { - result = openFolder(lastError, entryId); + MapiEntryId entryId(receiveFolderId(error)); + if (*error == QMessageManager::NoError) { + result = openFolder(error, entryId); } return result; } -MapiEntryId MapiStore::receiveFolderId(QMessageManager::Error *lastError) const +MapiEntryId MapiStore::receiveFolderId(QMessageManager::Error *error) const { MapiEntryId result; if (!_valid || !_store) { Q_ASSERT(_valid && _store); - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; return result; } @@ -3007,20 +3007,20 @@ MapiEntryId MapiStore::receiveFolderId(QMessageManager::Error *lastError) const MAPIFreeBuffer(entryIdPtr); } else { - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; } return result; } -QMessageFolder MapiStore::folder(QMessageManager::Error *lastError, const QMessageFolderId& id) const +QMessageFolder MapiStore::folder(QMessageManager::Error *error, const QMessageFolderId& id) const { - return _session.toStrongRef()->folder(lastError, id); + return _session.toStrongRef()->folder(error, id); } -QMessage MapiStore::message(QMessageManager::Error *lastError, const QMessageId& id) const +QMessage MapiStore::message(QMessageManager::Error *error, const QMessageId& id) const { - return _session.toStrongRef()->message(lastError, id); + return _session.toStrongRef()->message(error, id); } QMessage::StandardFolder MapiStore::standardFolder(const MapiEntryId &entryId) const @@ -3196,14 +3196,14 @@ void SessionManager::appDestroyed() Q_GLOBAL_STATIC(SessionManager, manager); -MapiSessionPtr MapiSession::createSession(QMessageManager::Error *lastError) +MapiSessionPtr MapiSession::createSession(QMessageManager::Error *error) { - static bool initialized(manager()->initialize(new MapiSession(lastError))); + static bool initialized(manager()->initialize(new MapiSession(error))); MapiSessionPtr ptr(manager()->session()); if (ptr.isNull()) { - if (*lastError == QMessageManager::NoError) { - *lastError = QMessageManager::ContentInaccessible; + if (*error == QMessageManager::NoError) { + *error = QMessageManager::ContentInaccessible; } qWarning() << "Unable to instantiate session"; } @@ -3219,7 +3219,7 @@ MapiSession::MapiSession() { } -MapiSession::MapiSession(QMessageManager::Error *lastError) +MapiSession::MapiSession(QMessageManager::Error *error) :QObject(), _token(WinHelpers::initializeMapi()), _mapiSession(0), @@ -3227,13 +3227,13 @@ MapiSession::MapiSession(QMessageManager::Error *lastError) _registered(false) { if (!_token->_initialized) { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; } else { // Attempt to start a MAPI session on the default profile HRESULT rv = MAPILogonEx(0, (LPTSTR)0, 0, MAPI_EXTENDED | MAPI_USE_DEFAULT | MAPI_NEW_SESSION, &_mapiSession); if (HR_FAILED(rv)) { qWarning() << "Failed to login to MAPI session - rv:" << hex << (ULONG)rv; - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; _mapiSession = 0; } @@ -3253,18 +3253,18 @@ MapiSession::~MapiSession() } } -MapiStorePtr MapiSession::findStore(QMessageManager::Error *lastError, const QMessageAccountId &id, bool cachedMode) const +MapiStorePtr MapiSession::findStore(QMessageManager::Error *error, const QMessageAccountId &id, bool cachedMode) const { MapiStorePtr result(0); if (!_mapiSession) { Q_ASSERT(_mapiSession); - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; return result; } IMAPITable *mapiMessageStoresTable(0); if (_mapiSession->GetMsgStoresTable(0, &mapiMessageStoresTable) != S_OK) { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; return result; } @@ -3286,13 +3286,13 @@ MapiStorePtr MapiSession::findStore(QMessageManager::Error *lastError, const QMe if ((!id.isValid() && props[defaultStoreColumn].Value.b) || // default store found (id.isValid() && (id == QMessageAccountIdPrivate::from(storeKey)))) { // specified store found MapiEntryId entryId(props[entryIdColumn].Value.bin.lpb, props[entryIdColumn].Value.bin.cb); - result = openStore(lastError, entryId, cachedMode); + result = openStore(error, entryId, cachedMode); break; } } } - *lastError = qar.lastError(); + *error = qar.error(); mapiRelease(mapiMessageStoresTable); @@ -3300,23 +3300,23 @@ MapiStorePtr MapiSession::findStore(QMessageManager::Error *lastError, const QMe } template<typename Predicate, typename Ordering> -QList<MapiStorePtr> MapiSession::filterStores(QMessageManager::Error *lastError, Predicate predicate, Ordering sortOrder, uint limit, uint offset, bool cachedMode) const +QList<MapiStorePtr> MapiSession::filterStores(QMessageManager::Error *error, Predicate predicate, Ordering sortOrder, uint limit, uint offset, bool cachedMode) const { if (!predicate._filter.isSupported()) { - *lastError = QMessageManager::ConstraintFailure; + *error = QMessageManager::ConstraintFailure; return QList<MapiStorePtr>(); } QList<MapiStorePtr> result; if (!_mapiSession) { Q_ASSERT(_mapiSession); - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; return result; } IMAPITable *mapiMessageStoresTable(0); if (_mapiSession->GetMsgStoresTable(0, &mapiMessageStoresTable) != S_OK) { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; } else { SizedSPropTagArray(1, columns) = {1, {PR_ENTRYID}}; @@ -3325,7 +3325,7 @@ QList<MapiStorePtr> MapiSession::filterStores(QMessageManager::Error *lastError, while (qar.query()) { for (uint n = 0; n < qar.rows()->cRows; ++n) { MapiEntryId entryId(qar.rows()->aRow[n].lpProps[0].Value.bin.lpb, qar.rows()->aRow[n].lpProps[0].Value.bin.cb); - MapiStorePtr store(openStore(lastError, entryId, cachedMode)); + MapiStorePtr store(openStore(error, entryId, cachedMode)); if (!store.isNull()) { #ifndef _WIN32_WCE // We only want stores that contain private messages @@ -3340,7 +3340,7 @@ QList<MapiStorePtr> MapiSession::filterStores(QMessageManager::Error *lastError, } } - *lastError = qar.lastError(); + *error = qar.error(); mapiRelease(mapiMessageStoresTable); } @@ -3366,40 +3366,40 @@ QList<MapiStorePtr> MapiSession::filterStores(QMessageManager::Error *lastError, } } -QList<MapiStorePtr> MapiSession::filterStores(QMessageManager::Error *lastError, const QMessageAccountFilter &filter, const QMessageAccountSortOrder &sortOrder, uint limit, uint offset, bool cachedMode) const +QList<MapiStorePtr> MapiSession::filterStores(QMessageManager::Error *error, const QMessageAccountFilter &filter, const QMessageAccountSortOrder &sortOrder, uint limit, uint offset, bool cachedMode) const { AccountFilterPredicate pred(filter); - return filterStores<const AccountFilterPredicate&, const QMessageAccountSortOrder &>(lastError, pred, sortOrder, limit, offset, cachedMode); + return filterStores<const AccountFilterPredicate&, const QMessageAccountSortOrder &>(error, pred, sortOrder, limit, offset, cachedMode); } -QList<MapiStorePtr> MapiSession::allStores(QMessageManager::Error *lastError, bool cachedMode) const +QList<MapiStorePtr> MapiSession::allStores(QMessageManager::Error *error, bool cachedMode) const { - return filterStores(lastError, QMessageAccountFilter(), QMessageAccountSortOrder(), 0, 0, cachedMode); + return filterStores(error, QMessageAccountFilter(), QMessageAccountSortOrder(), 0, 0, cachedMode); } -QList<MapiFolderPtr> MapiSession::filterFolders(QMessageManager::Error *lastError, const QMessageFolderFilter &filter, const QMessageFolderSortOrder &sortOrder, uint limit, uint offset, bool cachedMode) const +QList<MapiFolderPtr> MapiSession::filterFolders(QMessageManager::Error *error, const QMessageFolderFilter &filter, const QMessageFolderSortOrder &sortOrder, uint limit, uint offset, bool cachedMode) const { if (!filter.isSupported()) { - *lastError = QMessageManager::ConstraintFailure; + *error = QMessageManager::ConstraintFailure; return QList<MapiFolderPtr>(); } QList<MapiFolderPtr> result; if (!_mapiSession) { Q_ASSERT(_mapiSession); - *lastError = QMessageManager::FrameworkFault; + *error = QMessageManager::FrameworkFault; return result; } - foreach (const MapiStorePtr &store, allStores(lastError, cachedMode)) { - result.append(store->filterFolders(lastError, filter)); + foreach (const MapiStorePtr &store, allStores(error, cachedMode)) { + result.append(store->filterFolders(error, filter)); } if (!sortOrder.isEmpty()) { QList<FolderSortHelper> folderList; foreach (MapiFolderPtr folderPtr, result) { - QMessageFolder orderFolder(folder(lastError, folderPtr->id())); - if (*lastError != QMessageManager::NoError) { + QMessageFolder orderFolder(folder(error, folderPtr->id())); + if (*error != QMessageManager::NoError) { folderList.clear(); break; } @@ -3421,7 +3421,7 @@ QList<MapiFolderPtr> MapiSession::filterFolders(QMessageManager::Error *lastErro } } -IMsgStore *MapiSession::openMapiStore(QMessageManager::Error *lastError, const MapiEntryId &entryId, bool cachedMode) const +IMsgStore *MapiSession::openMapiStore(QMessageManager::Error *error, const MapiEntryId &entryId, bool cachedMode) const { IMsgStore *store(0); @@ -3433,14 +3433,14 @@ IMsgStore *MapiSession::openMapiStore(QMessageManager::Error *lastError, const M HRESULT rv = _mapiSession->OpenMsgStore(0, entryId.count(), entryIdPtr, 0, openFlags, reinterpret_cast<LPMDB*>(&store)); if (HR_FAILED(rv)) { - *lastError = QMessageManager::InvalidId; + *error = QMessageManager::InvalidId; qWarning() << "Invalid store entryId:" << entryId.toBase64(); } return store; } -MapiStorePtr MapiSession::openStore(QMessageManager::Error *lastError, const MapiEntryId& entryId, bool cachedMode) const +MapiStorePtr MapiSession::openStore(QMessageManager::Error *error, const MapiEntryId& entryId, bool cachedMode) const { MapiStorePtr result(0); @@ -3451,8 +3451,8 @@ MapiStorePtr MapiSession::openStore(QMessageManager::Error *lastError, const Map } // We need to create a new instance - IMsgStore *store = openMapiStore(lastError, entryId, cachedMode); - if (store && (*lastError == QMessageManager::NoError)) { + IMsgStore *store = openMapiStore(error, entryId, cachedMode); + if (store && (*error == QMessageManager::NoError)) { // Find the other properties of this store SizedSPropTagArray(2, columns) = {2, {PR_DISPLAY_NAME, PR_RECORD_KEY}}; SPropValue *properties(0); @@ -3462,8 +3462,8 @@ MapiStorePtr MapiSession::openStore(QMessageManager::Error *lastError, const Map QString name(QStringFromLpctstr(properties[0].Value.LPSZ)); MapiRecordKey recordKey(properties[1].Value.bin.lpb, properties[1].Value.bin.cb); - MapiStorePtr storePtr = MapiStore::createStore(lastError, _self.toStrongRef(), store, recordKey, entryId, name, cachedMode); - if (*lastError == QMessageManager::NoError) { + MapiStorePtr storePtr = MapiStore::createStore(error, _self.toStrongRef(), store, recordKey, entryId, name, cachedMode); + if (*error == QMessageManager::NoError) { result = storePtr; // Add to the map @@ -3482,7 +3482,7 @@ MapiStorePtr MapiSession::openStore(QMessageManager::Error *lastError, const Map return result; } -MapiStorePtr MapiSession::openStoreWithKey(QMessageManager::Error *lastError, const MapiRecordKey &recordKey, bool cachedMode) const +MapiStorePtr MapiSession::openStoreWithKey(QMessageManager::Error *error, const MapiRecordKey &recordKey, bool cachedMode) const { MapiStorePtr result; @@ -3512,37 +3512,37 @@ MapiStorePtr MapiSession::openStoreWithKey(QMessageManager::Error *lastError, co if (rows->cRows == 1) { MapiEntryId entryId(rows->aRow[0].lpProps[0].Value.bin.lpb, rows->aRow[0].lpProps[0].Value.bin.cb); - result = openStore(lastError, entryId, cachedMode); + result = openStore(error, entryId, cachedMode); } else { - *lastError = QMessageManager::InvalidId; + *error = QMessageManager::InvalidId; } FreeProws(rows); } else { - *lastError = QMessageManager::InvalidId; + *error = QMessageManager::InvalidId; } } else { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; qWarning() << "Unable to set columns for stores table"; } } else { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; qWarning() << "Unable to restrict stores table"; } mapiRelease(storesTable); } else { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; qWarning() << "Unable to open stores table."; } return result; } -QMessageAccountId MapiSession::defaultAccountId(QMessageManager::Error *lastError, QMessage::Type type) const +QMessageAccountId MapiSession::defaultAccountId(QMessageManager::Error *error, QMessage::Type type) const { #ifdef _WIN32_WCE if (type == QMessage::Sms) { - foreach (MapiStorePtr store, allStores(lastError)) { + foreach (MapiStorePtr store, allStores(error)) { if (store->name() == "SMS") { return store->id(); } @@ -3552,8 +3552,8 @@ QMessageAccountId MapiSession::defaultAccountId(QMessageManager::Error *lastErro #endif if (type == QMessage::Email) { // Return the account of the default store - MapiStorePtr store(defaultStore(lastError)); - if (*lastError == QMessageManager::NoError) { + MapiStorePtr store(defaultStore(error)); + if (*error == QMessageManager::NoError) { return store->id(); } } @@ -3561,7 +3561,7 @@ QMessageAccountId MapiSession::defaultAccountId(QMessageManager::Error *lastErro return QMessageAccountId(); } -IMessage *MapiSession::openMapiMessage(QMessageManager::Error *lastError, const QMessageId &id, MapiStorePtr *storePtr) const +IMessage *MapiSession::openMapiMessage(QMessageManager::Error *error, const QMessageId &id, MapiStorePtr *storePtr) const { IMessage *message(0); @@ -3571,12 +3571,12 @@ IMessage *MapiSession::openMapiMessage(QMessageManager::Error *lastError, const MapiRecordKey storeRecordKey(QMessageIdPrivate::storeRecordKey(id)); #endif - MapiStorePtr mapiStore(findStore(lastError, QMessageAccountIdPrivate::from(storeRecordKey))); - if (*lastError == QMessageManager::NoError) { + MapiStorePtr mapiStore(findStore(error, QMessageAccountIdPrivate::from(storeRecordKey))); + if (*error == QMessageManager::NoError) { MapiEntryId entryId(QMessageIdPrivate::entryId(id)); - message = mapiStore->openMessage(lastError, entryId); - if (*lastError == QMessageManager::NoError) { + message = mapiStore->openMessage(error, entryId); + if (*error == QMessageManager::NoError) { if (storePtr) { *storePtr = mapiStore; } @@ -3591,24 +3591,24 @@ IMessage *MapiSession::openMapiMessage(QMessageManager::Error *lastError, const return message; } -MapiEntryId MapiSession::messageEntryId(QMessageManager::Error *lastError, const MapiRecordKey &storeKey, const MapiRecordKey &folderKey, const MapiRecordKey &messageKey) +MapiEntryId MapiSession::messageEntryId(QMessageManager::Error *error, const MapiRecordKey &storeKey, const MapiRecordKey &folderKey, const MapiRecordKey &messageKey) { MapiEntryId result; - MapiStorePtr store(openStoreWithKey(lastError, storeKey)); - if (*lastError == QMessageManager::NoError) { - result = store->messageEntryId(lastError, folderKey, messageKey); + MapiStorePtr store(openStoreWithKey(error, storeKey)); + if (*error == QMessageManager::NoError) { + result = store->messageEntryId(error, folderKey, messageKey); } return result; } -MapiRecordKey MapiSession::messageRecordKey(QMessageManager::Error *lastError, const QMessageId &id) +MapiRecordKey MapiSession::messageRecordKey(QMessageManager::Error *error, const QMessageId &id) { MapiRecordKey result; - IMessage *message = openMapiMessage(lastError, id); - if (*lastError == QMessageManager::NoError) { + IMessage *message = openMapiMessage(error, id); + if (*error == QMessageManager::NoError) { if (!getMapiProperty(message, PR_RECORD_KEY, &result)) { qWarning() << "Unable to query message record key."; } @@ -3619,18 +3619,18 @@ MapiRecordKey MapiSession::messageRecordKey(QMessageManager::Error *lastError, c return result; } -MapiRecordKey MapiSession::folderRecordKey(QMessageManager::Error *lastError, const QMessageId &id) +MapiRecordKey MapiSession::folderRecordKey(QMessageManager::Error *error, const QMessageId &id) { MapiRecordKey result; MapiStorePtr store; - IMessage *message = openMapiMessage(lastError, id, &store); - if (*lastError == QMessageManager::NoError) { + IMessage *message = openMapiMessage(error, id, &store); + if (*error == QMessageManager::NoError) { // Find the parent folder for the message MapiEntryId folderId; if (getMapiProperty(message, PR_PARENT_ENTRYID, &folderId)) { - MapiFolderPtr folder = store->openFolder(lastError, folderId); - if (*lastError == QMessageManager::NoError) { + MapiFolderPtr folder = store->openFolder(error, folderId); + if (*error == QMessageManager::NoError) { result = folder->recordKey(); } } else { @@ -3645,12 +3645,12 @@ MapiRecordKey MapiSession::folderRecordKey(QMessageManager::Error *lastError, co #ifdef _WIN32_WCE -MapiEntryId MapiSession::folderEntryId(QMessageManager::Error *lastError, const QMessageId &id) +MapiEntryId MapiSession::folderEntryId(QMessageManager::Error *error, const QMessageId &id) { MapiEntryId result; - IMessage *message = openMapiMessage(lastError, id); - if (*lastError == QMessageManager::NoError) { + IMessage *message = openMapiMessage(error, id); + if (*error == QMessageManager::NoError) { // Find the parent folder for the message MapiEntryId folderId; if (getMapiProperty(message, PR_PARENT_ENTRYID, &folderId)) { @@ -3682,13 +3682,13 @@ bool MapiSession::equal(const MapiEntryId &lhs, const MapiEntryId &rhs) const return (result != FALSE); } -QMessageFolder MapiSession::folder(QMessageManager::Error *lastError, const QMessageFolderId& id) const +QMessageFolder MapiSession::folder(QMessageManager::Error *error, const QMessageFolderId& id) const { QMessageFolder result; if(!id.isValid()) { - *lastError = QMessageManager::InvalidId; + *error = QMessageManager::InvalidId; return result; } @@ -3697,18 +3697,18 @@ QMessageFolder MapiSession::folder(QMessageManager::Error *lastError, const QMes #else MapiRecordKey storeRecordKey(QMessageFolderIdPrivate::storeRecordKey(id)); #endif - MapiStorePtr mapiStore(findStore(lastError, QMessageAccountIdPrivate::from(storeRecordKey))); - if (*lastError != QMessageManager::NoError) + MapiStorePtr mapiStore(findStore(error, QMessageAccountIdPrivate::from(storeRecordKey))); + if (*error != QMessageManager::NoError) return result; // Find the root folder for this store - MapiFolderPtr storeRoot(mapiStore->rootFolder(lastError)); - if (*lastError != QMessageManager::NoError) + MapiFolderPtr storeRoot(mapiStore->rootFolder(error)); + if (*error != QMessageManager::NoError) return result; MapiEntryId entryId(QMessageFolderIdPrivate::entryId(id)); - MapiFolderPtr folder = mapiStore->openFolder(lastError, entryId); - if (folder && (*lastError == QMessageManager::NoError)) { + MapiFolderPtr folder = mapiStore->openFolder(error, entryId); + if (folder && (*error == QMessageManager::NoError)) { #ifndef _WIN32_WCE SizedSPropTagArray(3, columns) = {3, {PR_DISPLAY_NAME, PR_PARENT_ENTRYID, PR_RECORD_KEY}}; #else @@ -3744,8 +3744,8 @@ QMessageFolder MapiSession::folder(QMessageManager::Error *lastError, const QMes MapiFolderPtr ancestorFolder; // Iterate through ancestors towards the root - while ((ancestorFolder = mapiStore->openFolder(lastError, ancestorEntryId)) && - (ancestorFolder && (*lastError == QMessageManager::NoError))) { + while ((ancestorFolder = mapiStore->openFolder(error, ancestorEntryId)) && + (ancestorFolder && (*error == QMessageManager::NoError))) { SPropValue *ancestorProperties(0); if (ancestorFolder->folder()->GetProps(reinterpret_cast<LPSPropTagArray>(&columns), MAPI_UNICODE, &count, &ancestorProperties) == S_OK) { #ifndef _WIN32_WCE @@ -3786,13 +3786,13 @@ QMessageFolder MapiSession::folder(QMessageManager::Error *lastError, const QMes } // Failed to quickly retrieve the folder, fallback to an exhaustive search of all folders - result = mapiStore->folderFromId(lastError, id); + result = mapiStore->folderFromId(error, id); return result; } -QMessage MapiSession::message(QMessageManager::Error *lastError, const QMessageId& id) const +QMessage MapiSession::message(QMessageManager::Error *error, const QMessageId& id) const { - Q_UNUSED(lastError); + Q_UNUSED(error); QMessage result = QMessagePrivate::from(id); @@ -3809,7 +3809,7 @@ QMessage MapiSession::message(QMessageManager::Error *lastError, const QMessageI return result; } -bool MapiSession::updateMessageProperties(QMessageManager::Error *lastError, QMessage *msg) const +bool MapiSession::updateMessageProperties(QMessageManager::Error *error, QMessage *msg) const { bool result(false); @@ -3818,8 +3818,8 @@ bool MapiSession::updateMessageProperties(QMessageManager::Error *lastError, QMe msg->d_ptr->_elementsPresent.properties = 1; MapiStorePtr store; - IMessage *message = openMapiMessage(lastError, msg->id(), &store); - if (*lastError == QMessageManager::NoError) { + IMessage *message = openMapiMessage(error, msg->id(), &store); + if (*error == QMessageManager::NoError) { #ifndef _WIN32_WCE const int np = 14; #else @@ -3949,7 +3949,7 @@ bool MapiSession::updateMessageProperties(QMessageManager::Error *lastError, QMe // will treat Outgoing as meaning 'in the Sent folder' msg->setStatus(QMessage::Incoming, (msg->standardFolder() != QMessage::SentFolder)); - MapiFolderPtr parentFolder(store->openFolder(lastError, parentEntryId)); + MapiFolderPtr parentFolder(store->openFolder(error, parentEntryId)); if (parentFolder) { QMessagePrivate::setParentFolderId(*msg, parentFolder->id()); } @@ -3962,7 +3962,7 @@ bool MapiSession::updateMessageProperties(QMessageManager::Error *lastError, QMe MAPIFreeBuffer(properties); } else { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; } mapiRelease(message); @@ -3972,7 +3972,7 @@ bool MapiSession::updateMessageProperties(QMessageManager::Error *lastError, QMe return result; } -bool MapiSession::updateMessageRecipients(QMessageManager::Error *lastError, QMessage *msg) const +bool MapiSession::updateMessageRecipients(QMessageManager::Error *error, QMessage *msg) const { bool result(false); @@ -3980,8 +3980,8 @@ bool MapiSession::updateMessageRecipients(QMessageManager::Error *lastError, QMe bool isModified(msg->d_ptr->_modified); msg->d_ptr->_elementsPresent.recipients = 1; - IMessage *message = openMapiMessage(lastError, msg->id()); - if (*lastError == QMessageManager::NoError) { + IMessage *message = openMapiMessage(error, msg->id()); + if (*error == QMessageManager::NoError) { // Extract the recipients for the message IMAPITable *recipientsTable(0); HRESULT rv = message->GetRecipientTable(0, &recipientsTable); @@ -4063,8 +4063,8 @@ bool MapiSession::updateMessageRecipients(QMessageManager::Error *lastError, QMe msg->d_ptr->_modified = false; } - if (qar.lastError() != QMessageManager::NoError) { - *lastError = qar.lastError(); + if (qar.error() != QMessageManager::NoError) { + *error = qar.error(); result = false; } else { result = true; @@ -4074,16 +4074,16 @@ bool MapiSession::updateMessageRecipients(QMessageManager::Error *lastError, QMe } else { #ifdef _WIN32_WCE if (rv == MAPI_E_NO_RECIPIENTS) { - updateMessageProperties(lastError, msg); - if (*lastError == QMessageManager::NoError) { + updateMessageProperties(error, msg); + if (*error == QMessageManager::NoError) { if (msg->d_ptr->_contentFormat == EDITOR_FORMAT_MIME) { // The recipient info can be extracted from the MIME body - updateMessageBody(lastError, msg); + updateMessageBody(error, msg); } } } else { #endif - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; #ifdef _WIN32_WCE } #endif @@ -4096,7 +4096,7 @@ bool MapiSession::updateMessageRecipients(QMessageManager::Error *lastError, QMe return result; } -bool MapiSession::updateMessageBody(QMessageManager::Error *lastError, QMessage *msg) const +bool MapiSession::updateMessageBody(QMessageManager::Error *error, QMessage *msg) const { bool result(false); @@ -4105,7 +4105,7 @@ bool MapiSession::updateMessageBody(QMessageManager::Error *lastError, QMessage if (!msg->d_ptr->_elementsPresent.body) { if (!msg->d_ptr->_elementsPresent.properties) { // We need the properties before we can fetch the body - if (!updateMessageProperties(lastError, msg)) { + if (!updateMessageProperties(error, msg)) { return false; } } @@ -4117,8 +4117,8 @@ bool MapiSession::updateMessageBody(QMessageManager::Error *lastError, QMessage QByteArray bodySubType; MapiStorePtr store; - IMessage *message = openMapiMessage(lastError, msg->id(), &store); - if (*lastError == QMessageManager::NoError) { + IMessage *message = openMapiMessage(error, msg->id(), &store); + if (*error == QMessageManager::NoError) { //SMS body stored in subject on CEMAPI if (store->types() & QMessage::Sms) { messageBody.append(reinterpret_cast<const char*>(msg->subject().utf16()),msg->subject().count()*sizeof(quint16)); @@ -4142,7 +4142,7 @@ bool MapiSession::updateMessageBody(QMessageManager::Error *lastError, QMessage for (int i = 0; i < n; ++i) { HRESULT rv = message->OpenProperty(tags[i], &IID_IStream, STGM_READ, 0, (IUnknown**)&is); if (HR_SUCCEEDED(rv)) { - messageBody = readStream(lastError, is); + messageBody = readStream(error, is); bodySubType = "plain"; if (i == 2) { asciiData = true; @@ -4165,7 +4165,7 @@ bool MapiSession::updateMessageBody(QMessageManager::Error *lastError, QMessage for (int i = 0; i < n; ++i) { HRESULT rv = message->OpenProperty(tags[i], &IID_IStream, STGM_READ, 0, (IUnknown**)&is); if (HR_SUCCEEDED(rv)) { - messageBody = readStream(lastError, is); + messageBody = readStream(error, is); bodySubType = "html"; if (i == 2) { asciiData = true; @@ -4186,7 +4186,7 @@ bool MapiSession::updateMessageBody(QMessageManager::Error *lastError, QMessage // MIME format is only used on mobile HRESULT rv = message->OpenProperty(PR_CE_MIME_TEXT, &IID_IStream, STGM_READ, 0, (IUnknown**)&is); if (HR_SUCCEEDED(rv)) { - messageBody = readStream(lastError, is); + messageBody = readStream(error, is); QMailMessage mimeMsg(QMailMessage::fromRfc2822(messageBody)); @@ -4301,7 +4301,7 @@ bool MapiSession::updateMessageBody(QMessageManager::Error *lastError, QMessage IStream *ts(0); rv = message->OpenProperty(PR_BODY, &IID_IStream, STGM_READ, 0, (IUnknown**)&ts); if (HR_SUCCEEDED(rv)) { - messageBody = readStream(lastError, ts); + messageBody = readStream(error, ts); bodySubType = "plain"; asciiData = false; @@ -4329,7 +4329,7 @@ bool MapiSession::updateMessageBody(QMessageManager::Error *lastError, QMessage } } } else { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; qWarning() << "Unable to decompress RTF"; bodySubType = "plain"; } @@ -4348,7 +4348,7 @@ bool MapiSession::updateMessageBody(QMessageManager::Error *lastError, QMessage } } - if (*lastError == QMessageManager::NoError) { + if (*error == QMessageManager::NoError) { QMessageContentContainerPrivate *messageContainer(((QMessageContentContainer *)(msg))->d_ptr); bool bodyDownloaded = true; @@ -4392,14 +4392,14 @@ bool MapiSession::updateMessageBody(QMessageManager::Error *lastError, QMessage return result; } -bool MapiSession::updateMessageAttachments(QMessageManager::Error *lastError, QMessage *msg) const +bool MapiSession::updateMessageAttachments(QMessageManager::Error *error, QMessage *msg) const { bool result(false); if (!msg->d_ptr->_elementsPresent.attachments) { if (!msg->d_ptr->_elementsPresent.properties) { // We need the properties before we can fetch the attachments - if (!updateMessageProperties(lastError, msg)) { + if (!updateMessageProperties(error, msg)) { return false; } } @@ -4408,8 +4408,8 @@ bool MapiSession::updateMessageAttachments(QMessageManager::Error *lastError, QM msg->d_ptr->_elementsPresent.attachments = 1; if (msg->d_ptr->_hasAttachments) { - IMessage *message = openMapiMessage(lastError, msg->id()); - if (*lastError == QMessageManager::NoError) { + IMessage *message = openMapiMessage(error, msg->id()); + if (*error == QMessageManager::NoError) { QMessageContentContainerPrivate *messageContainer(((QMessageContentContainer *)(msg))->d_ptr); // Find any attachments for this message @@ -4491,7 +4491,7 @@ bool MapiSession::updateMessageAttachments(QMessageManager::Error *lastError, QM container->_name = filename.toAscii(); container->_size = size; - container->_available = haveAttachmentData(lastError,msg->id(),number); + container->_available = haveAttachmentData(error,msg->id(),number); messageContainer->appendContent(attachment); if (!isModified) { @@ -4500,15 +4500,15 @@ bool MapiSession::updateMessageAttachments(QMessageManager::Error *lastError, QM } } - if (qar.lastError() != QMessageManager::NoError) { - *lastError = qar.lastError(); + if (qar.error() != QMessageManager::NoError) { + *error = qar.error(); } else { result = true; } mapiRelease(attachmentsTable); } else { - *lastError = QMessageManager::ContentInaccessible; + *error = QMessageManager::ContentInaccessible; qWarning() << "Unable to access attachments table."; } @@ -4520,19 +4520,19 @@ bool MapiSession::updateMessageAttachments(QMessageManager::Error *lastError, QM return result; } -bool MapiSession::haveAttachmentData(QMessageManager::Error *lastError, const QMessageId& id, ULONG number) const +bool MapiSession::haveAttachmentData(QMessageManager::Error *error, const QMessageId& id, ULONG number) const { bool result = false; - IMessage *message = openMapiMessage(lastError, id); - if (*lastError == QMessageManager::NoError) { + IMessage *message = openMapiMessage(error, id); + if (*error == QMessageManager::NoError) { LPATTACH attachment(0); HRESULT rv = message->OpenAttach(number, 0, 0, &attachment); if (HR_SUCCEEDED(rv)) { IStream *is(0); rv = attachment->OpenProperty(PR_ATTACH_DATA_BIN, &IID_IStream, STGM_READ, 0, (IUnknown**)&is); if (HR_SUCCEEDED(rv)) { - result = streamSize(lastError, is) > 0; + result = streamSize(error, is) > 0; mapiRelease(is); } mapiRelease(attachment); @@ -4547,19 +4547,19 @@ bool MapiSession::haveAttachmentData(QMessageManager::Error *lastError, const QM } -QByteArray MapiSession::attachmentData(QMessageManager::Error *lastError, const QMessageId& id, ULONG number) const +QByteArray MapiSession::attachmentData(QMessageManager::Error *error, const QMessageId& id, ULONG number) const { QByteArray result; - IMessage *message = openMapiMessage(lastError, id); - if (*lastError == QMessageManager::NoError) { + IMessage *message = openMapiMessage(error, id); + if (*error == QMessageManager::NoError) { LPATTACH attachment(0); HRESULT rv = message->OpenAttach(number, 0, 0, &attachment); if (HR_SUCCEEDED(rv)) { IStream *is(0); rv = attachment->OpenProperty(PR_ATTACH_DATA_BIN, &IID_IStream, STGM_READ, 0, (IUnknown**)&is); if (HR_SUCCEEDED(rv)) { - result = readStream(lastError, is); + result = readStream(error, is); mapiRelease(is); } @@ -4574,10 +4574,10 @@ QByteArray MapiSession::attachmentData(QMessageManager::Error *lastError, const return result; } -QMessageIdList MapiSession::queryMessages(QMessageManager::Error *lastError, const QMessageFilter &filter, const QMessageSortOrder &sortOrder, uint limit, uint offset, const QString &body, QMessageDataComparator::MatchFlags matchFlags) const +QMessageIdList MapiSession::queryMessages(QMessageManager::Error *error, const QMessageFilter &filter, const QMessageSortOrder &sortOrder, uint limit, uint offset, const QString &body, QMessageDataComparator::MatchFlags matchFlags) const { if (!filter.isSupported()) { - *lastError = QMessageManager::ConstraintFailure; + *error = QMessageManager::ConstraintFailure; return QMessageIdList(); } @@ -4586,8 +4586,8 @@ QMessageIdList MapiSession::queryMessages(QMessageManager::Error *lastError, con } QList<FolderHeapNodePtr> folderNodes; - QMessageFilter processedFilter(QMessageFilterPrivate::preprocess(lastError, _self.toStrongRef(), filter)); - if (*lastError != QMessageManager::NoError) + QMessageFilter processedFilter(QMessageFilterPrivate::preprocess(error, _self.toStrongRef(), filter)); + if (*error != QMessageManager::NoError) return QMessageIdList(); if (QMessageFilterPrivate::isNonMatching(processedFilter)) { // Filter maybe be simplified by preprocessing @@ -4595,9 +4595,9 @@ QMessageIdList MapiSession::queryMessages(QMessageManager::Error *lastError, con } foreach (QMessageFilter subfilter, QMessageFilterPrivate::subfilters(processedFilter)) { - MapiStoreIterator storeIt(QMessageFilterPrivate::storeIterator(subfilter, lastError, _self.toStrongRef())); + MapiStoreIterator storeIt(QMessageFilterPrivate::storeIterator(subfilter, error, _self.toStrongRef())); for (MapiStorePtr store(storeIt.next()); store && store->isValid(); store = storeIt.next()) { - MapiFolderIterator folderIt(QMessageFilterPrivate::folderIterator(subfilter, lastError, store)); + MapiFolderIterator folderIt(QMessageFilterPrivate::folderIterator(subfilter, error, store)); for (MapiFolderPtr folder(folderIt.next()); folder && folder->isValid(); folder = folderIt.next()) { QList<QMessageFilter> orderingFilters; orderingFilters.append(subfilter); @@ -4608,33 +4608,33 @@ QMessageIdList MapiSession::queryMessages(QMessageManager::Error *lastError, con } } - if (*lastError != QMessageManager::NoError) + if (*error != QMessageManager::NoError) return QMessageIdList(); - return filterMessages(lastError, folderNodes, sortOrder, limit, offset, body, matchFlags); + return filterMessages(error, folderNodes, sortOrder, limit, offset, body, matchFlags); } -void MapiSession::updateMessage(QMessageManager::Error* lastError, const QMessage& source) +void MapiSession::updateMessage(QMessageManager::Error* error, const QMessage& source) { MapiStorePtr store; - IMessage *mapiMessage = openMapiMessage(lastError, source.id(), &store); - if (*lastError == QMessageManager::NoError) { + IMessage *mapiMessage = openMapiMessage(error, source.id(), &store); + if (*error == QMessageManager::NoError) { // Update the stored properties - if (*lastError == QMessageManager::NoError) { - storeMessageProperties(lastError, source, mapiMessage); + if (*error == QMessageManager::NoError) { + storeMessageProperties(error, source, mapiMessage); } - if (*lastError == QMessageManager::NoError) { - replaceMessageRecipients(lastError, source, mapiMessage, _mapiSession); + if (*error == QMessageManager::NoError) { + replaceMessageRecipients(error, source, mapiMessage, _mapiSession); } - if (*lastError == QMessageManager::NoError) { - replaceMessageBody(lastError, source, mapiMessage, store); + if (*error == QMessageManager::NoError) { + replaceMessageBody(error, source, mapiMessage, store); } - if (*lastError == QMessageManager::NoError) { + if (*error == QMessageManager::NoError) { // Attachments cannot be removed from a QMessage but new ones can be added - addMessageAttachments(lastError, source, mapiMessage); + addMessageAttachments(error, source, mapiMessage); } #ifndef _WIN32_WCE //unsupported - if (*lastError == QMessageManager::NoError) { + if (*error == QMessageManager::NoError) { if (HR_FAILED(mapiMessage->SaveChanges(0))) { qWarning() << "Unable to save changes for message."; } @@ -4645,7 +4645,7 @@ void MapiSession::updateMessage(QMessageManager::Error* lastError, const QMessag } } -void MapiSession::removeMessages(QMessageManager::Error *lastError, const QMessageIdList &ids) +void MapiSession::removeMessages(QMessageManager::Error *error, const QMessageIdList &ids) { #ifdef _WIN32_WCE typedef QPair<MapiEntryId, MapiEntryId> FolderKey; @@ -4689,8 +4689,8 @@ void MapiSession::removeMessages(QMessageManager::Error *lastError, const QMessa } } - if ((error != QMessageManager::NoError) && (*lastError == QMessageManager::NoError)) { - *lastError = error; + if ((error != QMessageManager::NoError) && (*error == QMessageManager::NoError)) { + *error = error; } } } @@ -4759,7 +4759,7 @@ void MapiSession::notify(MapiStore *store, const QMessageId &id, MapiSession::No } } -QMessageManager::NotificationFilterId MapiSession::registerNotificationFilter(QMessageManager::Error *lastError, const QMessageFilter &filter) +QMessageManager::NotificationFilterId MapiSession::registerNotificationFilter(QMessageManager::Error *error, const QMessageFilter &filter) { QMessageManager::NotificationFilterId filterId = ++_filterId; _filters.insert(filterId, filter); @@ -4767,7 +4767,7 @@ QMessageManager::NotificationFilterId MapiSession::registerNotificationFilter(QM if (!_registered) { _registered = true; - foreach (MapiStorePtr store, allStores(lastError)) { + foreach (MapiStorePtr store, allStores(error)) { store->notifyEvents(fnevNewMail | fnevObjectCreated | fnevObjectCopied | fnevObjectDeleted | fnevObjectModified | fnevObjectMoved); } } @@ -4775,11 +4775,11 @@ QMessageManager::NotificationFilterId MapiSession::registerNotificationFilter(QM return filterId; } -void MapiSession::unregisterNotificationFilter(QMessageManager::Error *lastError, QMessageManager::NotificationFilterId filterId) +void MapiSession::unregisterNotificationFilter(QMessageManager::Error *error, QMessageManager::NotificationFilterId filterId) { _filters.remove(filterId); - Q_UNUSED(lastError) + Q_UNUSED(error) } void MapiSession::dispatchNotifications() diff --git a/src/messaging/winhelpers_p.h b/src/messaging/winhelpers_p.h index 4d19749c21..03853a3779 100644 --- a/src/messaging/winhelpers_p.h +++ b/src/messaging/winhelpers_p.h @@ -206,21 +206,21 @@ bool setMapiProperty(IMAPIProp *object, ULONG tag, MapiEntryId value); class MapiFolder { public: - static MapiFolderPtr createFolder(QMessageManager::Error *lastError, const MapiStorePtr &store, IMAPIFolder *folder, const MapiRecordKey &recordKey, const QString &name, const MapiEntryId &entryId, bool hasSubFolders, uint messageCount); + static MapiFolderPtr createFolder(QMessageManager::Error *error, const MapiStorePtr &store, IMAPIFolder *folder, const MapiRecordKey &recordKey, const QString &name, const MapiEntryId &entryId, bool hasSubFolders, uint messageCount); ~MapiFolder(); - MapiFolderPtr nextSubFolder(QMessageManager::Error *lastError); + MapiFolderPtr nextSubFolder(QMessageManager::Error *error); - LPMAPITABLE queryBegin(QMessageManager::Error *lastError, const QMessageFilter &filter, const QMessageSortOrder &sortOrder); - QMessageIdList queryNext(QMessageManager::Error *lastError, LPMAPITABLE messagesTable, const QMessageFilter &filter); + LPMAPITABLE queryBegin(QMessageManager::Error *error, const QMessageFilter &filter, const QMessageSortOrder &sortOrder); + QMessageIdList queryNext(QMessageManager::Error *error, LPMAPITABLE messagesTable, const QMessageFilter &filter); void queryEnd(LPMAPITABLE messagesTable); - uint countMessages(QMessageManager::Error *lastError, const QMessageFilter &filter = QMessageFilter()) const; + uint countMessages(QMessageManager::Error *error, const QMessageFilter &filter = QMessageFilter()) const; - void removeMessages(QMessageManager::Error *lastError, const QMessageIdList &ids); + void removeMessages(QMessageManager::Error *error, const QMessageIdList &ids); - MapiEntryId messageEntryId(QMessageManager::Error *lastError, const MapiRecordKey &messagekey); + MapiEntryId messageEntryId(QMessageManager::Error *error, const MapiRecordKey &messagekey); QMessageFolderId id() const; @@ -240,13 +240,13 @@ public: bool hasSubFolders() const { return _hasSubFolders; } uint messageCount() const { return _messageCount; } - IMessage *createMessage(QMessageManager::Error* lastError); - IMessage *createMessage(QMessageManager::Error* lastError, const QMessage& source, const MapiSessionPtr &session, WinHelpers::SavePropertyOption saveOption = WinHelpers::SavePropertyChanges ); + IMessage *createMessage(QMessageManager::Error* error); + IMessage *createMessage(QMessageManager::Error* error, const QMessage& source, const MapiSessionPtr &session, WinHelpers::SavePropertyOption saveOption = WinHelpers::SavePropertyChanges ); - IMessage *openMessage(QMessageManager::Error *lastError, const MapiEntryId &entryId); + IMessage *openMessage(QMessageManager::Error *error, const MapiEntryId &entryId); - QMessageFolder folder(QMessageManager::Error *lastError, const QMessageFolderId& id) const; - QMessage message(QMessageManager::Error *lastError, const QMessageId& id) const; + QMessageFolder folder(QMessageManager::Error *error, const QMessageFolderId& id) const; + QMessage message(QMessageManager::Error *error, const QMessageId& id) const; QMessage::StandardFolder standardFolder() const; @@ -254,7 +254,7 @@ private: MapiFolder(); MapiFolder(const MapiStorePtr &store, IMAPIFolder *folder, const MapiRecordKey &recordKey, const QString &name, const MapiEntryId &entryId, bool hasSubFolders, uint messageCount); - void findSubFolders(QMessageManager::Error *lastError); + void findSubFolders(QMessageManager::Error *error); friend class MapiStore; @@ -273,21 +273,21 @@ private: class MapiStore { public: - static MapiStorePtr createStore(QMessageManager::Error *lastError, const MapiSessionPtr &session, IMsgStore *store, const MapiRecordKey &key, const MapiEntryId &entryId, const QString &name, bool cachedMode); + static MapiStorePtr createStore(QMessageManager::Error *error, const MapiSessionPtr &session, IMsgStore *store, const MapiRecordKey &key, const MapiEntryId &entryId, const QString &name, bool cachedMode); ~MapiStore(); - MapiFolderPtr findFolder(QMessageManager::Error *lastError, QMessage::StandardFolder sf); + MapiFolderPtr findFolder(QMessageManager::Error *error, QMessage::StandardFolder sf); - QMessageFolderIdList folderIds(QMessageManager::Error *lastError) const; - QMessageFolder folderFromId(QMessageManager::Error *lastError, const QMessageFolderId &folderId); + QMessageFolderIdList folderIds(QMessageManager::Error *error) const; + QMessageFolder folderFromId(QMessageManager::Error *error, const QMessageFolderId &folderId); - QList<MapiFolderPtr> filterFolders(QMessageManager::Error *lastError, const QMessageFolderFilter &filter) const; + QList<MapiFolderPtr> filterFolders(QMessageManager::Error *error, const QMessageFolderFilter &filter) const; - MapiEntryId messageEntryId(QMessageManager::Error *lastError, const MapiRecordKey &folderKey, const MapiRecordKey &messageKey); + MapiEntryId messageEntryId(QMessageManager::Error *error, const MapiRecordKey &folderKey, const MapiRecordKey &messageKey); - MapiFolderPtr openFolder(QMessageManager::Error *lastError, const MapiEntryId& id) const; - MapiFolderPtr openFolderWithKey(QMessageManager::Error *lastError, const MapiRecordKey& key) const; + MapiFolderPtr openFolder(QMessageManager::Error *error, const MapiEntryId& id) const; + MapiFolderPtr openFolderWithKey(QMessageManager::Error *error, const MapiRecordKey& key) const; bool supports(ULONG featureFlag) const; @@ -302,13 +302,13 @@ public: MapiSessionPtr session() const; - MapiFolderPtr rootFolder(QMessageManager::Error *lastError) const; - MapiFolderPtr receiveFolder(QMessageManager::Error *lastError) const; + MapiFolderPtr rootFolder(QMessageManager::Error *error) const; + MapiFolderPtr receiveFolder(QMessageManager::Error *error) const; - IMessage *openMessage(QMessageManager::Error *lastError, const MapiEntryId &entryId); + IMessage *openMessage(QMessageManager::Error *error, const MapiEntryId &entryId); - QMessageFolder folder(QMessageManager::Error *lastError, const QMessageFolderId& id) const; - QMessage message(QMessageManager::Error *lastError, const QMessageId& id) const; + QMessageFolder folder(QMessageManager::Error *error, const QMessageFolderId& id) const; + QMessage message(QMessageManager::Error *error, const QMessageId& id) const; QMessage::StandardFolder standardFolder(const MapiEntryId &entryId) const; @@ -322,11 +322,11 @@ private: MapiStore(); MapiStore(const MapiSessionPtr &session, IMsgStore *store, const MapiRecordKey &key, const MapiEntryId &entryId, const QString &name, bool cachedMode); - MapiEntryId standardFolderId(QMessageManager::Error *lastError, QMessage::StandardFolder sf) const; - MapiEntryId rootFolderId(QMessageManager::Error *lastError) const; - MapiEntryId receiveFolderId(QMessageManager::Error *lastError) const; + MapiEntryId standardFolderId(QMessageManager::Error *error, QMessage::StandardFolder sf) const; + MapiEntryId rootFolderId(QMessageManager::Error *error) const; + MapiEntryId receiveFolderId(QMessageManager::Error *error) const; - IMAPIFolder *openMapiFolder(QMessageManager::Error *lastError, const MapiEntryId &entryId) const; + IMAPIFolder *openMapiFolder(QMessageManager::Error *error, const MapiEntryId &entryId) const; bool setAdviseSink(ULONG mask, IMAPIAdviseSink *sink); @@ -380,58 +380,58 @@ public: NotifyType _notifyType; }; - static MapiSessionPtr createSession(QMessageManager::Error *lastError); + static MapiSessionPtr createSession(QMessageManager::Error *error); ~MapiSession(); bool isValid() const { return (_mapiSession != 0); } - MapiStorePtr findStore(QMessageManager::Error *lastError, const QMessageAccountId &id = QMessageAccountId(), bool cachedMode = true) const; - MapiStorePtr defaultStore(QMessageManager::Error *lastError, bool cachedMode = true) const { return findStore(lastError,QMessageAccountId(),cachedMode); } + MapiStorePtr findStore(QMessageManager::Error *error, const QMessageAccountId &id = QMessageAccountId(), bool cachedMode = true) const; + MapiStorePtr defaultStore(QMessageManager::Error *error, bool cachedMode = true) const { return findStore(error,QMessageAccountId(),cachedMode); } - QList<MapiStorePtr> filterStores(QMessageManager::Error *lastError, const QMessageAccountFilter &filter, const QMessageAccountSortOrder &sortOrder = QMessageAccountSortOrder(), uint limit = 0, uint offset = 0, bool cachedMode = true) const; + QList<MapiStorePtr> filterStores(QMessageManager::Error *error, const QMessageAccountFilter &filter, const QMessageAccountSortOrder &sortOrder = QMessageAccountSortOrder(), uint limit = 0, uint offset = 0, bool cachedMode = true) const; - QList<MapiStorePtr> allStores(QMessageManager::Error *lastError, bool cachedMode = true) const; + QList<MapiStorePtr> allStores(QMessageManager::Error *error, bool cachedMode = true) const; - QList<MapiFolderPtr> filterFolders(QMessageManager::Error *lastError, const QMessageFolderFilter &filter, const QMessageFolderSortOrder &sortOrder = QMessageFolderSortOrder(), uint limit = 0, uint offset = 0, bool cachedMode = true) const; + QList<MapiFolderPtr> filterFolders(QMessageManager::Error *error, const QMessageFolderFilter &filter, const QMessageFolderSortOrder &sortOrder = QMessageFolderSortOrder(), uint limit = 0, uint offset = 0, bool cachedMode = true) const; - MapiStorePtr openStore(QMessageManager::Error *lastError, const MapiEntryId& id, bool cachedMode = true) const; - MapiStorePtr openStoreWithKey(QMessageManager::Error *lastError, const MapiRecordKey& key, bool cachedMode = true) const; + MapiStorePtr openStore(QMessageManager::Error *error, const MapiEntryId& id, bool cachedMode = true) const; + MapiStorePtr openStoreWithKey(QMessageManager::Error *error, const MapiRecordKey& key, bool cachedMode = true) const; - QMessageAccountId defaultAccountId(QMessageManager::Error *lastError, QMessage::Type type) const; + QMessageAccountId defaultAccountId(QMessageManager::Error *error, QMessage::Type type) const; - MapiEntryId messageEntryId(QMessageManager::Error *lastError, const MapiRecordKey &storeKey, const MapiRecordKey &folderKey, const MapiRecordKey &messageKey); + MapiEntryId messageEntryId(QMessageManager::Error *error, const MapiRecordKey &storeKey, const MapiRecordKey &folderKey, const MapiRecordKey &messageKey); - MapiRecordKey messageRecordKey(QMessageManager::Error *lastError, const QMessageId &id); - MapiRecordKey folderRecordKey(QMessageManager::Error *lastError, const QMessageId &id); + MapiRecordKey messageRecordKey(QMessageManager::Error *error, const QMessageId &id); + MapiRecordKey folderRecordKey(QMessageManager::Error *error, const QMessageId &id); #ifdef _WIN32_WCE - MapiEntryId folderEntryId(QMessageManager::Error *lastError, const QMessageId &id); + MapiEntryId folderEntryId(QMessageManager::Error *error, const QMessageId &id); #endif bool equal(const MapiEntryId &lhs, const MapiEntryId &rhs) const; - QMessageFolder folder(QMessageManager::Error *lastError, const QMessageFolderId& id) const; - QMessage message(QMessageManager::Error *lastError, const QMessageId& id) const; + QMessageFolder folder(QMessageManager::Error *error, const QMessageFolderId& id) const; + QMessage message(QMessageManager::Error *error, const QMessageId& id) const; - bool updateMessageProperties(QMessageManager::Error *lastError, QMessage *msg) const; - bool updateMessageRecipients(QMessageManager::Error *lastError, QMessage *msg) const; - bool updateMessageBody(QMessageManager::Error *lastError, QMessage *msg) const; - bool updateMessageAttachments(QMessageManager::Error *lastError, QMessage *msg) const; + bool updateMessageProperties(QMessageManager::Error *error, QMessage *msg) const; + bool updateMessageRecipients(QMessageManager::Error *error, QMessage *msg) const; + bool updateMessageBody(QMessageManager::Error *error, QMessage *msg) const; + bool updateMessageAttachments(QMessageManager::Error *error, QMessage *msg) const; - bool haveAttachmentData(QMessageManager::Error* lastError, const QMessageId& id, ULONG number) const; - QByteArray attachmentData(QMessageManager::Error *lastError, const QMessageId& id, ULONG number) const; + bool haveAttachmentData(QMessageManager::Error* error, const QMessageId& id, ULONG number) const; + QByteArray attachmentData(QMessageManager::Error *error, const QMessageId& id, ULONG number) const; - QMessageIdList queryMessages(QMessageManager::Error *lastError, const QMessageFilter &filter, const QMessageSortOrder &sortOrder = QMessageSortOrder(), uint limit = 0, uint offset = 0, const QString &body = QString(), QMessageDataComparator::MatchFlags matchFlags = 0) const; + QMessageIdList queryMessages(QMessageManager::Error *error, const QMessageFilter &filter, const QMessageSortOrder &sortOrder = QMessageSortOrder(), uint limit = 0, uint offset = 0, const QString &body = QString(), QMessageDataComparator::MatchFlags matchFlags = 0) const; - void updateMessage(QMessageManager::Error* lastError, const QMessage& source); + void updateMessage(QMessageManager::Error* error, const QMessage& source); - void removeMessages(QMessageManager::Error *lastError, const QMessageIdList &ids); + void removeMessages(QMessageManager::Error *error, const QMessageIdList &ids); IMAPISession* session() const { return _mapiSession; } - QMessageManager::NotificationFilterId registerNotificationFilter(QMessageManager::Error *lastError, const QMessageFilter &filter); - void unregisterNotificationFilter(QMessageManager::Error *lastError, QMessageManager::NotificationFilterId filterId); + QMessageManager::NotificationFilterId registerNotificationFilter(QMessageManager::Error *error, const QMessageFilter &filter); + void unregisterNotificationFilter(QMessageManager::Error *error, QMessageManager::NotificationFilterId filterId); static QMessagePrivate *messageImpl(const QMessage &message); static QMessageContentContainerPrivate *containerImpl(const QMessageContentContainer &); @@ -450,10 +450,10 @@ public slots: private: MapiSession(); - MapiSession(QMessageManager::Error *lastError); + MapiSession(QMessageManager::Error *error); - IMsgStore *openMapiStore(QMessageManager::Error *lastError, const MapiEntryId &entryId, bool cachedMode = true) const; - IMessage *openMapiMessage(QMessageManager::Error *lastError, const QMessageId &id, MapiStorePtr *storePtr = 0) const; + IMsgStore *openMapiStore(QMessageManager::Error *error, const MapiEntryId &entryId, bool cachedMode = true) const; + IMessage *openMapiMessage(QMessageManager::Error *error, const QMessageId &id, MapiStorePtr *storePtr = 0) const; void addRecipients(LPMESSAGE message, const QMessageAddressList& addressList, unsigned long mapiAddressType); void addAttachment(LPMESSAGE message, const QMessageContentContainer& attachmentContainer); @@ -463,7 +463,7 @@ private: void notify(MapiStore *store, const QMessageId &id, NotifyType notifyType); template<typename Predicate, typename Ordering> - QList<MapiStorePtr> filterStores(QMessageManager::Error *lastError, Predicate predicate, Ordering sortOrder, uint limit, uint offset, bool cachedMode) const; + QList<MapiStorePtr> filterStores(QMessageManager::Error *error, Predicate predicate, Ordering sortOrder, uint limit, uint offset, bool cachedMode) const; private: friend class SessionManager; diff --git a/tests/auto/qmessagestore/tst_qmessagestore.cpp b/tests/auto/qmessagestore/tst_qmessagestore.cpp index 1051858c4b..ba65bf1b21 100644 --- a/tests/auto/qmessagestore/tst_qmessagestore.cpp +++ b/tests/auto/qmessagestore/tst_qmessagestore.cpp @@ -656,7 +656,7 @@ void tst_QMessageStore::testMessage() QAPPROXIMATECOMPARE(body.size(), 72, 36); manager->updateMessage(&message); - QCOMPARE(manager->lastError(), QMessageManager::NoError); + QCOMPARE(manager->error(), QMessageManager::NoError); #if defined(Q_OS_WIN) QTest::qSleep(1000); @@ -724,7 +724,7 @@ void tst_QMessageStore::testMessage() } else { // byFilter manager->removeMessages(QMessageFilter::byId(message.id())); } - QCOMPARE(manager->lastError(), QMessageManager::NoError); + QCOMPARE(manager->error(), QMessageManager::NoError); QCOMPARE(manager->countMessages(), originalCount); #if defined(Q_OS_WIN) diff --git a/tests/auto/support/support_win.cpp b/tests/auto/support/support_win.cpp index 75177ff74c..7a8cdaf0e9 100644 --- a/tests/auto/support/support_win.cpp +++ b/tests/auto/support/support_win.cpp @@ -114,7 +114,7 @@ public: bool query(); LPSRowSet rows() const; - QMessageManager::Error lastError() const; + QMessageManager::Error error() const; private: LPMAPITABLE m_table; @@ -122,7 +122,7 @@ private: LPSRestriction m_restriction; LPSSortOrderSet m_sortOrderSet; LPSRowSet m_rows; - QMessageManager::Error m_lastError; + QMessageManager::Error m_error; }; QueryAllRows::QueryAllRows(LPMAPITABLE ptable, @@ -136,7 +136,7 @@ QueryAllRows::QueryAllRows(LPMAPITABLE ptable, m_restriction(pres), m_sortOrderSet(psos), m_rows(0), - m_lastError(QMessageManager::NoError) + m_error(QMessageManager::NoError) { #ifndef _WIN32_WCE const ULONG options(TBL_BATCH); @@ -157,7 +157,7 @@ QueryAllRows::QueryAllRows(LPMAPITABLE ptable, if(setPosition) initFailed |= FAILED(m_table->SeekRow(BOOKMARK_BEGINNING, 0, NULL)); - if(initFailed) m_lastError = QMessageManager::ContentInaccessible; + if(initFailed) m_error = QMessageManager::ContentInaccessible; } QueryAllRows::~QueryAllRows() @@ -168,17 +168,17 @@ QueryAllRows::~QueryAllRows() bool QueryAllRows::query() { - if(m_lastError != QMessageManager::NoError) + if(m_error != QMessageManager::NoError) return false; FreeProws(m_rows); m_rows = 0; - m_lastError = QMessageManager::NoError; + m_error = QMessageManager::NoError; bool failed = FAILED(m_table->QueryRows( QueryAllRows::BatchSize, NULL, &m_rows)); if(failed) - m_lastError = QMessageManager::ContentInaccessible; + m_error = QMessageManager::ContentInaccessible; if(failed || m_rows && !m_rows->cRows) return false; @@ -190,9 +190,9 @@ LPSRowSet QueryAllRows::rows() const return m_rows; } -QMessageManager::Error QueryAllRows::lastError() const +QMessageManager::Error QueryAllRows::error() const { - return m_lastError; + return m_error; } #ifndef _WIN32_WCE @@ -259,7 +259,7 @@ QList<ProfileDetail> profileDetails(LPPROFADMIN profAdmin) } } - if(qar.lastError() != QMessageManager::NoError) + if(qar.error() != QMessageManager::NoError) qWarning() << "profileNames: QueryAllRows failed"; profileTable->Release(); @@ -316,7 +316,7 @@ QList<ServiceDetail> serviceDetails(LPSERVICEADMIN svcAdmin) } } - if(qar.lastError() != QMessageManager::NoError) + if(qar.error() != QMessageManager::NoError) qWarning() << "serviceDetails: QueryAllRows failed"; svcTable->Release(); @@ -367,7 +367,7 @@ QList<StoreDetail> storeDetails(LPMAPISESSION session) } } - if(qar.lastError() != QMessageManager::NoError) + if(qar.error() != QMessageManager::NoError) qWarning() << "storeDetails: QueryAllRows failed"; storesTable->Release(); @@ -590,7 +590,7 @@ MAPIUID findProviderUid(const QByteArray &name, IProviderAdmin *providerAdmin) } } - if(qar.lastError() != QMessageManager::NoError) + if(qar.error() != QMessageManager::NoError) qWarning() << "findProviderUid: QueryAllRows failed"; providerTable->Release(); @@ -798,7 +798,7 @@ IMsgStore *openStoreByName(const QString &storeName, IMAPISession* session) } } - if(qar.lastError() != QMessageManager::NoError) + if(qar.error() != QMessageManager::NoError) qWarning() << "openStoreByName: QueryAllRows failed"; storesTable->Release(); @@ -883,7 +883,7 @@ QList<QByteArray> subFolderEntryIds(IMAPIFolder *folder) } } - if(qar.lastError() != QMessageManager::NoError) + if(qar.error() != QMessageManager::NoError) qWarning() << "subFolderEntryIds: QueryAllRows failed"; hierarchyTable->Release(); |