--- a/qtmobileextensions/src/keycapture/xqkeycapture.h	Fri Sep 17 08:34:25 2010 +0300
+++ b/qtmobileextensions/src/keycapture/xqkeycapture.h	Mon Oct 04 01:32:41 2010 +0300
@@ -57,7 +57,8 @@
         CaptureNone = 0x0,
         CaptureBasic = 0x1,
         CaptureCallHandlingExt = 0x2,
-        CaptureEnableRemoteExtEvents = 0x4
+        CaptureSideKeys = 0x4, // for future use
+        CaptureEnableRemoteExtEvents = 0x4000
     };
     
     Q_DECLARE_FLAGS(CapturingFlags, CapturingFlag)
@@ -188,139 +189,6 @@
 
 };
 
-/*
-@deprecated
-*/
-
-class XQKEYCAPTURE_EXPORT XqKeyCapture {
-
-public:
-    enum LongFlags {
-    LongShortEventImmediately = ELongCaptureShortEventImmediately,
-    LongRepeatEvents = ELongCaptureRepeatEvents,
-    LongNormal = ELongCaptureNormal,
-    LongWaitShort = ELongCaptureWaitShort,
-    LongWaitNotApplicable = 0
-    };
-    
-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);
-
-    QString errorString() const;
-
-    int errorId() const;
-
-private:
-    KeyCapturePrivate* d;
-
-};
-
 Q_DECLARE_OPERATORS_FOR_FLAGS(XQKeyCapture::CapturingFlags)
 
 #endif /* XQKEYCAPTURE_H */