--- a/contentstorage/caclient/src/caservice.cpp Mon May 24 20:50:46 2010 +0300
+++ b/contentstorage/caclient/src/caservice.cpp Fri May 28 16:17:03 2010 +0300
@@ -30,6 +30,8 @@
#include "caclientproxy.h"
#include "caclientnotifierproxy.h"
+#include "cahandlerproxy.h"
+#include "caqtsfhandlerloader.h"
#include "caobjectadapter.h"
#include "caclienttest_global.h"
@@ -89,7 +91,6 @@
CaService::CaService(QObject *parent) :
QObject(parent), m_d(new CaServicePrivate(this))
{
-
}
/*!
@@ -944,7 +945,10 @@
\param servicePublic pointer to public service
*/
CaServicePrivate::CaServicePrivate(CaService *servicePublic) :
- m_q(servicePublic), mProxy(new CaClientProxy),
+ m_q(servicePublic),
+ mCommandHandler(new CaHandlerProxy(QSharedPointer<CaHandlerLoader>
+ (new CaQtSfHandlerLoader()))),
+ mProxy(new CaClientProxy()),
mNotifierProxy(NULL)
{
const ErrorCode connectionResult = mProxy->connect();
@@ -1338,7 +1342,7 @@
touch(entry);
}
- mErrorCode = mProxy->executeCommand(entry, command);
+ mErrorCode = mCommandHandler->execute(entry, command);
qDebug() << "CaServicePrivate::executeCommand mErrorCode on return:"
<< mErrorCode;