diff -r b99b84bcd2d1 -r 9b022b1f357c contentstorage/caclient/src/caservice.cpp --- a/contentstorage/caclient/src/caservice.cpp Wed Jun 23 18:33:40 2010 +0300 +++ b/contentstorage/caclient/src/caservice.cpp Tue Jul 06 14:37:10 2010 +0300 @@ -823,7 +823,7 @@ Execute command. \param entryId id of an entry. \param command command. - \retval true if operation was successful. + \retval 0 if operation was successful. \example \code @@ -833,15 +833,15 @@ itemExecute.setTypeName("application"); itemExecute.setAttribute("application:uid", "0x12345678"); CaEntry * entryExecute = service->createEntry(itemExecute->id()); - bool result = service->executeCommand(entryExecute->id(), "remove"); + int result = service->executeCommand(entryExecute->id(), "remove"); ... \b Output: - result == true + result == 0 \endcode */ -bool CaService::executeCommand(int entryId, const QString &command) const +int CaService::executeCommand(int entryId, const QString &command) const { - bool result = false; + int result = -19; const QSharedPointer temporaryEntry = getEntry(entryId); @@ -855,7 +855,7 @@ Execute command. \param entry entry. \param command command. - \retval true if operation was successful. + \retval 0 if operation was successful. \example \code @@ -865,13 +865,13 @@ itemExecute.setTypeName("url"); itemExecute.setAttribute("url", "http://www.nokia.com"); CaEntry * entryExecute = service->createEntry(itemExecute->id()); - bool result = service->executeCommand(*entryExecute, "open"); + int result = service->executeCommand(*entryExecute, "open"); ... \b Output: - result == true + result == 0 \endcode */ -bool CaService::executeCommand(const CaEntry &entry, const QString &command) const +int CaService::executeCommand(const CaEntry &entry, const QString &command) const { return m_d->executeCommand(entry, command); } @@ -1329,9 +1329,9 @@ Executes command on entry (fe. "open", "remove") \param const reference to an entry on which command will be issued \param string containing a command - \retval boolean which is used as an error code return value, true means positive result + \retval int which is used as an error code return value, 0 means no errors */ -bool CaServicePrivate::executeCommand(const CaEntry &entry, +int CaServicePrivate::executeCommand(const CaEntry &entry, const QString &command) { qDebug() << "CaServicePrivate::executeCommand" @@ -1340,21 +1340,23 @@ CACLIENTTEST_FUNC_ENTRY("CaServicePrivate::executeCommand"); if (entry.flags() & UninstallEntryFlag) { - return false; + return 0; } if (command == caCmdOpen) { touch(entry); } - mErrorCode = mCommandHandler->execute(entry, command); + int errorCode = mCommandHandler->execute(entry, command); + mErrorCode = CaObjectAdapter::convertErrorCode(errorCode); + qDebug() << "CaServicePrivate::executeCommand mErrorCode on return:" << mErrorCode; CACLIENTTEST_FUNC_EXIT("CaServicePrivate::executeCommand"); - return (mErrorCode == NoErrorCode); + return errorCode; } /*!