diff --git a/server/src/handler/resourceselect.cpp b/server/src/handler/resourceselect.cpp index 15ce82eb8..d30670fe0 100644 --- a/server/src/handler/resourceselect.cpp +++ b/server/src/handler/resourceselect.cpp @@ -1,50 +1,50 @@ /* Copyright (c) 2009 Volker Krause This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "resourceselect.h" #include #include #include using namespace Akonadi; ResourceSelect::ResourceSelect() : Handler() { } bool ResourceSelect::parseStream() { const QString resourceName = m_streamParser->readUtf8String(); if ( resourceName.isEmpty() ) { connection()->setResourceContext( Resource() ); return successResponse( "Resource deselected" ); } const Resource res = Resource::retrieveByName( resourceName ); if ( !res.isValid() ) throw HandlerException( QByteArray(resourceName.toUtf8() + " is not a valid resource identifier") ); connection()->setResourceContext( res ); - return successResponse( QByteArray(resourceName.toUtf8() + " selected") ); + return successResponse( QByteArray( resourceName.toUtf8() + " selected" ) ); } #include "resourceselect.moc" diff --git a/server/src/handler/transaction.cpp b/server/src/handler/transaction.cpp index 900cdfabb..78e9b838f 100644 --- a/server/src/handler/transaction.cpp +++ b/server/src/handler/transaction.cpp @@ -1,60 +1,60 @@ /* Copyright (c) 2006 Volker Krause This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "transaction.h" #include "storage/datastore.h" #include "akonadiconnection.h" #include "response.h" #include "imapstreamparser.h" #include Akonadi::TransactionHandler::TransactionHandler( Mode mode ) : mMode( mode ) { } bool Akonadi::TransactionHandler::parseStream() { DataStore *store = connection()->storageBackend(); if ( mMode == Begin ) { if ( !store->beginTransaction() ) return failureResponse( "Unable to begin transaction." ); } if ( mMode == Rollback ) { if ( !store->inTransaction() ) return failureResponse( "There is no transaction in progress." ); if ( !store->rollbackTransaction() ) return failureResponse( "Unable to roll back transaction." ); } if ( mMode == Commit ) { if ( !store->inTransaction() ) return failureResponse( "There is no transaction in progress." ); if ( !store->commitTransaction() ) return failureResponse( "Unable to commit transaction." ); } const QMetaEnum me = metaObject()->enumerator( metaObject()->indexOfEnumerator( "Mode" ) ); - return successResponse( QByteArray(me.valueToKey( mMode ) + QByteArray( " completed" )) ); + return successResponse( QByteArray( me.valueToKey( mMode ) + QByteArray( " completed" ) ) ); } #include "transaction.moc"