diff -r 6fbed849b4f4 -r 1f895d8a5b2b qtmobileextensions/src/keycapture/targetwrapper.h --- a/qtmobileextensions/src/keycapture/targetwrapper.h Wed Jun 23 19:08:38 2010 +0300 +++ b/qtmobileextensions/src/keycapture/targetwrapper.h Tue Jul 06 15:12:50 2010 +0300 @@ -32,6 +32,7 @@ #include #include +#include #include @@ -59,7 +60,7 @@ ~TargetWrapper(); - void init(); + void init(XQKeyCapture::CapturingFlags flags); public: // -- MRemConCoreApiTargetObserver overloaded methods -- @@ -85,34 +86,28 @@ void SpeedDial( const TInt aIndex ); - void setBasicApi(bool); - - void setCallHandlingApi(bool); - protected: void initMapping(); QWidget *getTargetWidget(); - void sendPressKey(Qt::Key key, Qt::KeyboardModifiers modFlags); - - void sendReleaseKey(Qt::Key key, Qt::KeyboardModifiers modFlags); + void sendKey(QEvent::Type eventType, Qt::Key key, Qt::KeyboardModifiers modFlags, + TRemConCoreApiOperationId aOperationId = ENop); Qt::Key mapKey(TRemConCoreApiOperationId aOperationId); private: CRemConInterfaceSelector *selector; - bool basicApi; - bool callHandlingApi; - CRemConCoreApiTarget *target; CRemConCallHandlingTarget *targetEx; ResponseHandler *handler; ResponseHandlerEx *handlerEx; + XQKeyCapture::CapturingFlags captureFlags; + QMap keyMapping; };