--- a/qtmobileextensions/src/keycapture/xqkeycapture.h	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobileextensions/src/keycapture/xqkeycapture.h	Wed Jun 23 19:08:38 2010 +0300
@@ -26,6 +26,7 @@
 #include <QString>
 #include <QObject>
 #include <QList>
+#include <QFlag>
 
 #include <w32std.h>
 
@@ -40,6 +41,150 @@
 typedef QList<Qt::Key> XQKeyCaptureKeyList; 
 typedef QList<TUint> XQKeyCaptureNativeKeyList; 
 
+class XQKEYCAPTURE_EXPORT XQKeyCapture {
+
+public:
+    enum LongFlags {
+    LongShortEventImmediately = ELongCaptureShortEventImmediately,
+    LongRepeatEvents = ELongCaptureRepeatEvents,
+    LongNormal = ELongCaptureNormal,
+    LongWaitShort = ELongCaptureWaitShort,
+    LongWaitNotApplicable = 0
+    };
+		
+    enum CapturingFlag {
+      CaptureNone = 0x0,
+      CaptureBasic = 0x1,
+      CaptureCallHandlingExt = 0x2
+    };
+    Q_DECLARE_FLAGS(CapturingFlags, CapturingFlag)
+    
+public:
+    XQKeyCapture();
+
+    ~XQKeyCapture();
+
+    bool captureKey(Qt::Key aKey,
+        Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+        Qt::KeyboardModifiers aModifier = Qt::NoModifier);
+    
+    bool captureKey(TUint aKey,
+        Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+        Qt::KeyboardModifiers aModifier = Qt::NoModifier);
+
+    bool captureLongKey(Qt::Key aKey,
+        Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+        Qt::KeyboardModifiers aModifier = Qt::NoModifier,
+        XQKeyCapture::LongFlags aLongType = XQKeyCapture::LongNormal);
+
+    bool captureLongKey(TUint aKey,
+        Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+        Qt::KeyboardModifiers aModifier = Qt::NoModifier,
+        XQKeyCapture::LongFlags aLongType = XQKeyCapture::LongNormal);
+
+    bool captureKeyUpAndDowns(Qt::Key aKey,
+        Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+        Qt::KeyboardModifiers aModifier = Qt::NoModifier);
+    
+    bool captureKeyUpAndDowns(TUint aKey,
+        Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+        Qt::KeyboardModifiers aModifier = Qt::NoModifier);
+
+    bool captureKey(XQKeyCaptureKeyList list, 
+            Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+            Qt::KeyboardModifiers aModifier = Qt::NoModifier);
+    
+    bool captureKey(XQKeyCaptureNativeKeyList list, 
+            Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+            Qt::KeyboardModifiers aModifier = Qt::NoModifier);
+    
+    bool captureLongKey(XQKeyCaptureKeyList list, 
+            Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+            Qt::KeyboardModifiers aModifier = Qt::NoModifier,
+            XQKeyCapture::LongFlags aLongType = XQKeyCapture::LongNormal);
+    
+    bool captureLongKey(XQKeyCaptureNativeKeyList list, 
+            Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+            Qt::KeyboardModifiers aModifier = Qt::NoModifier,
+            XQKeyCapture::LongFlags aLongType = XQKeyCapture::LongNormal);
+    
+    bool captureKeyUpAndDowns(XQKeyCaptureKeyList list, 
+            Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+            Qt::KeyboardModifiers aModifier = Qt::NoModifier);
+    
+    bool captureKeyUpAndDowns(XQKeyCaptureNativeKeyList list, 
+            Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+            Qt::KeyboardModifiers aModifier = Qt::NoModifier);
+		
+    bool cancelCaptureKey(Qt::Key aKey,
+        Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+        Qt::KeyboardModifiers aModifier = Qt::NoModifier);
+
+    bool cancelCaptureKey(TUint aKey,
+        Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+        Qt::KeyboardModifiers aModifier = Qt::NoModifier);
+
+    bool cancelCaptureLongKey(Qt::Key aKey,
+        Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+        Qt::KeyboardModifiers aModifier = Qt::NoModifier,
+        XQKeyCapture::LongFlags aLongType = XQKeyCapture::LongNormal);
+
+    bool cancelCaptureLongKey(TUint aKey,
+        Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+        Qt::KeyboardModifiers aModifier = Qt::NoModifier,
+        XQKeyCapture::LongFlags aLongType = XQKeyCapture::LongNormal);
+
+    bool cancelCaptureKeyUpAndDowns(Qt::Key aKey,
+        Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+        Qt::KeyboardModifiers aModifier = Qt::NoModifier);
+
+    bool cancelCaptureKeyUpAndDowns(TUint aKey,
+        Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+        Qt::KeyboardModifiers aModifier = Qt::NoModifier);
+    
+    bool cancelCaptureKey(XQKeyCaptureKeyList list, 
+            Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+            Qt::KeyboardModifiers aModifier = Qt::NoModifier);
+    
+    bool cancelCaptureKey(XQKeyCaptureNativeKeyList list, 
+            Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+            Qt::KeyboardModifiers aModifier = Qt::NoModifier);
+    
+    bool cancelCaptureLongKey(XQKeyCaptureKeyList list, 
+            Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+            Qt::KeyboardModifiers aModifier = Qt::NoModifier,
+            XQKeyCapture::LongFlags aLongType = XQKeyCapture::LongNormal);
+    
+    bool cancelCaptureLongKey(XQKeyCaptureNativeKeyList list, 
+            Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+            Qt::KeyboardModifiers aModifier = Qt::NoModifier,
+            XQKeyCapture::LongFlags aLongType = XQKeyCapture::LongNormal);
+    
+    bool cancelCaptureKeyUpAndDowns(XQKeyCaptureKeyList list, 
+            Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+            Qt::KeyboardModifiers aModifier = Qt::NoModifier);
+    
+    bool cancelCaptureKeyUpAndDowns(XQKeyCaptureNativeKeyList list, 
+            Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+            Qt::KeyboardModifiers aModifier = Qt::NoModifier);
+
+	bool captureRemoteKeys(CapturingFlags flags = CaptureNone);
+    
+    bool cancelCaptureRemoteKeys(CapturingFlags flags = CaptureNone);
+			
+    QString errorString() const;
+
+    int errorId() const;
+
+private:
+    KeyCapturePrivate* d;
+
+};
+
+/*
+@deprecated
+*/
+
 class XQKEYCAPTURE_EXPORT XqKeyCapture {
 
 public:
@@ -50,12 +195,12 @@
     LongWaitShort = ELongCaptureWaitShort,
     LongWaitNotApplicable = 0
     };
-    
+	
 public:
     XqKeyCapture();
 
     ~XqKeyCapture();
-
+	
     bool captureKey(Qt::Key aKey,
         Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
         Qt::KeyboardModifiers aModifier = Qt::NoModifier);
@@ -169,4 +314,6 @@
 
 };
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(XQKeyCapture::CapturingFlags)
+
 #endif /* XQKEYCAPTURE_H */