diff -r 5ef31a21fdd5 -r e7325f632549 contentstorage/caclient/s60/src/cahandlerproxy.cpp
--- a/contentstorage/caclient/s60/src/cahandlerproxy.cpp	Fri Jun 11 16:25:06 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:
- *
- */
-
-#include <caentry.h>
-#include "cahandler.h"
-#include "cahandlerproxy.h"
-#include "cahandlerloader.h"
-#include "cainnerentry.h"
-#include "caobjectadapter.h"
-
-/*!
-    \class CaHandlerProxy
-    \ingroup
-    \brief Forwards execute request to an implemenation provided by specific handler loader.
-
-    \sa CaHandlerLoader
-*/
-
-/*!
-  Destructor.
-*/
-CaHandlerProxy::~CaHandlerProxy()
-{
-}
-
-
-/*!
-  Constructs handler proxy.
-  \param loader Provides handler implementations. It has to be pointer to a valid object.
-*/
-CaHandlerProxy::CaHandlerProxy(CaHandlerLoader *loader):
-    mLoader(loader)
-{
-    Q_ASSERT(!mLoader.isNull());
-}
-
-/*!
-  Forwards execute request to an appropriate handler if found otherwise ignores the request.
-  \param entry Subject for the requested command.
-  \param commandName Name of the command to be executed.
-  \return KErrNone (i.e. 0) on succes, error code otherwise.
-  \sa e32err.h for KErrNone definition.
-*/
-TInt CaHandlerProxy::execute(const CaEntry &entry, const QString &commandName)
-{
-    CaHandler *const handler = getHandler(entry, commandName);
-
-    TInt result = KErrNotFound;
-
-    if (handler != NULL) {
-        QScopedPointer<CCaInnerEntry> innerEntry(NULL);
-        TRAP(result,
-            innerEntry.reset(CCaInnerEntry::NewL());
-            CaObjectAdapter::convertL(entry, *innerEntry);
-            )
-        if (result == KErrNone) {
-            result = handler->execute(*innerEntry, commandName);
-        }
-    }
-    return result;
-}
-
-/*!
-  Looks for handler implementation in local cache or if not found, request it from
-  handler loader.
-  \param entry The entry being a subject for the requested command.
-  \param commandName Name of the command to be executed.
-  \return Pointer to a handler instance if available, NULL otherwise.
-*/
-CaHandler *CaHandlerProxy::getHandler(const CaEntry &entry,
-                                      const QString &commandName)
-{
-    CaHandler *implementation(0);
-
-    const QString entryTypeName(entry.entryTypeName());
-
-    const ImplementationMapIterator it(
-        mImplementationMap.find(entryTypeName));
-
-    if (it != mImplementationMap.end()) {
-        implementation = it->data();
-    } else {
-        implementation = mLoader->loadHandler(entryTypeName, commandName);
-        mImplementationMap[entryTypeName] = QSharedPointer<CaHandler>(implementation);
-    }
-
-    return implementation;
-}