--- a/qtmobileextensions/src/keycapture/keycapture_s60_p.h	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobileextensions/src/keycapture/keycapture_s60_p.h	Wed Jun 23 19:08:38 2010 +0300
@@ -29,6 +29,8 @@
 
 class RWindowGroup;
 class RWsSession;
+class TargetWrapper;
+
 class QKeyMapperPrivate;
 #ifdef _XQKEYCAPTURE_UNITTEST_
 class MyTestWindowGroup;
@@ -40,7 +42,11 @@
 public:
     KeyCapturePrivate();
     ~KeyCapturePrivate();
+
+    bool initRemote(XQKeyCapture::CapturingFlags);
     
+    bool closeRemote(XQKeyCapture::CapturingFlags);
+
     bool captureKey(Qt::Key aKey, Qt::KeyboardModifiers aModifiersMask,
         Qt::KeyboardModifiers aModifier);
     
@@ -48,10 +54,10 @@
         Qt::KeyboardModifiers aModifier);
     
     bool captureLongKey(Qt::Key aKey, Qt::KeyboardModifiers aModifiersMask,
-        Qt::KeyboardModifiers aModifier, XqKeyCapture::LongFlags aLongType);
+        Qt::KeyboardModifiers aModifier, XQKeyCapture::LongFlags aLongType);
     
     bool captureLongKey(TUint aKey, Qt::KeyboardModifiers aModifiersMask,
-        Qt::KeyboardModifiers aModifier, XqKeyCapture::LongFlags aLongType);
+        Qt::KeyboardModifiers aModifier, XQKeyCapture::LongFlags aLongType);
     
     bool captureKeyUpAndDowns(Qt::Key aKey,
         Qt::KeyboardModifiers aModifiersMask, Qt::KeyboardModifiers aModifier);
@@ -67,11 +73,11 @@
     
     bool cancelCaptureLongKey(Qt::Key aKey,
         Qt::KeyboardModifiers aModifiersMask, Qt::KeyboardModifiers aModifier,
-        XqKeyCapture::LongFlags aLongType);
+        XQKeyCapture::LongFlags aLongType);
     
     bool cancelCaptureLongKey(TUint aKey,
         Qt::KeyboardModifiers aModifiersMask, Qt::KeyboardModifiers aModifier,
-        XqKeyCapture::LongFlags aLongType);
+        XQKeyCapture::LongFlags aLongType);
     
     bool cancelCaptureKeyUpAndDowns(Qt::Key aKey,
         Qt::KeyboardModifiers aModifiersMask, Qt::KeyboardModifiers aModifier);
@@ -85,17 +91,19 @@
 
 private:
 
+    bool resetRemote();
+    
     bool doCapture(TUint aKey, Qt::KeyboardModifiers aModifiersMask,
             Qt::KeyboardModifiers aModifier,
             CaptureRequest::CaptureRequestType type,
-            XqKeyCapture::LongFlags aLongType =
-                    XqKeyCapture::LongWaitNotApplicable);
+            XQKeyCapture::LongFlags aLongType =
+                    XQKeyCapture::LongWaitNotApplicable);
 
     bool doCancelCapture(TUint aKey, Qt::KeyboardModifiers aModifiersMask,
             Qt::KeyboardModifiers aModifier,
             CaptureRequest::CaptureRequestType type,
-            XqKeyCapture::LongFlags aLongType =
-                    XqKeyCapture::LongWaitNotApplicable);
+            XQKeyCapture::LongFlags aLongType =
+                    XQKeyCapture::LongWaitNotApplicable);
 
     void regenerateError();
 
@@ -109,6 +117,8 @@
 #endif
     QList<CaptureRequest*> *mRequestsList;
     QKeyMapperPrivate* mMapper;
+    
+    TargetWrapper *tgWrapper;
     };
 
 #endif /* KEYCAPTUREPRIVATE_S60_H */