--- a/contentstorage/cahandler/app/src/caapphandlerplugin.cpp Fri Apr 16 15:16:09 2010 +0300
+++ b/contentstorage/cahandler/app/src/caapphandlerplugin.cpp Mon May 03 12:48:45 2010 +0300
@@ -19,11 +19,11 @@
#include <qserviceinterfacedescriptor.h>
#include <qabstractsecuritysession.h>
#include <qservicecontext.h>
+
#include "cahandlerloader.h"
-
#include "caapphandler.h"
#include "caapphandlerplugin.h"
-#include "cas60handleradapter.h"
+#include "cas60apphandleradapter.h"
/*!
\class CaAppHandlerPlugin
@@ -47,13 +47,12 @@
if (descriptor.interfaceName() ==
"com.nokia.homescreen.ICommandHandler") {
- return new CaS60HandlerAdapter<CCaAppHandler>;
+ return new CaS60AppHandlerAdapter();
} else {
return 0;
}
}
-// TODO: uncomment when it will be used in plugin
-//Q_EXPORT_PLUGIN2(caapphandlerplugin, CaAppHandlerPlugin)
+Q_EXPORT_PLUGIN2(caapphandlerplugin, CaAppHandlerPlugin)
/*!
@@ -81,7 +80,7 @@
*/
/*!
- \fn int CaS60HandlerAdapter<typename Plugin>::execute(const CaEntry &entry, const QString &commandName)
+ \fn int CaS60HandlerAdapter<typename Plugin>::execute(const CaEntry &entry, const QString &commandName)
\param entry Subject of the command.
\param commandName The name of the command to execute.
\return 0 on success, error code otherwise.